basic structure changes for getting onto merb 0.9.1

git-svn-id: https://pmpknpi.googlecode.com/svn/trunk@48 8b0ec7b7-bd45-0410-8a4e-3563a9e70f90

.gitignore

@@ -1,4 +1,5 @@
+.DS_Store
 *.log
-config.database.yml
 log/*.pid
-.DS_Store
+config/database.yml
+db/*.sqlite3

app/models/article.rb

@@ -12,7 +12,7 @@ class Article < ActiveRecord::Base
   before_save :draft_check
 
   # PLUGINS
-  merb_can_filter :body, :excerpt
+  #merb_can_filter :body, :excerpt
 
   # ACCESSORS
   attr_accessor :draft

app/models/comment.rb

@@ -11,7 +11,7 @@ class Comment < ActiveRecord::Base
     :with => /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?$/ix,
     :if => :website_submitted?
 
-  merb_can_filter :body
+  #merb_can_filter :body
 
   def filter
     "Textile"

config/environments/development.rb

@@ -1 +1,6 @@
-puts "Loaded DEVELOPMENT Environment..."
+Merb.logger.info("Loaded DEVELOPMENT Environment...")
+Merb::Config.use { |c|
+  c[:exception_details] = true
+  c[:reload_classes] = true
+  c[:reload_time] = 0.5
+}

config/environments/production.rb

@@ -1 +1,5 @@
-puts "Loaded PRODUCTION Environment..."
+Merb.logger.info("Loaded PRODUCTION Environment...")
+Merb::Config.use { |c|
+  c[:exception_details] = false
+  c[:reload_classes] = false
+}

config/environments/test.rb

@@ -1 +1,6 @@
-puts "Loaded TEST Environment..."
+Merb.logger.info("Loaded TEST Environment...")
+Merb::Config.use { |c|
+  c[:exception_details] = true
+  c[:reload_classes] = true
+  c[:reload_time] = 0.5
+}

config/dependencies.rb → config/init.rb

@@ -5,6 +5,17 @@
 # Make the app's "lib" directory a place where ruby files get "require"d from
 $LOAD_PATH.unshift(Merb.root / "lib")
 
+
+Merb::Config.use do |c|
+
+  ### Sets up a custom session id key, if you want to piggyback sessions of other applications
+  ### with the cookie session store. If not specified, defaults to '_session_id'.
+  # c[:session_id_key] = '_session_id'
+
+  c[:session_secret_key]  = '669bed3f14d49f3bfa52530312c225f3753455e1'
+  c[:session_store] = 'cookie'
+end  
+
 ### ORM
 use_orm :activerecord
 
@@ -13,7 +24,7 @@
 
 ### Requrements
 require 'authenticated_system'
-require 'active_record_extension'
+#require 'active_record_extension'
 require 'date_and_time_helpers'
 require 'global_mixin'
 
@@ -24,10 +35,21 @@
               "coderay",
               "merb_helpers"
 
+### Add your other dependencies here
+
+# These are some examples of how you might specify dependencies.
+# 
+# dependencies "RedCloth", "merb_helpers"
+# OR
+# dependency "RedCloth", "> 3.0"
+# OR
+# dependencies "RedCloth" => "> 3.0", "ruby-aes-cext" => "= 1.0"
+
 Merb::BootLoader.after_app_loads do
   ### Add dependencies here that must load after the application loads:
+
   # dependency "magic_admin" # this gem uses the app's model classes
 end
 
-# YAML FILES
-SETTINGS = YAML.load_file("#{Merb.root}/config/settings.yml")[Merb.environment].symbolize_keys
+# MIME TYPES
+Merb.add_mime_type(:rss, :to_xml, %w[application/rss+xml])

config/rack.rb

@@ -0,0 +1 @@
+run Merb::Rack::Application.new

db/.gitignore

@@ -1 +0,0 @@
-*.sqlite3

lib/active_record_extension.rb

@@ -1,5 +1,5 @@
 module Sintaxi
-  module FilteredLight
+  module MerbFilter
 
     def self.included(base)
       base.extend ActMethods
@@ -42,4 +42,4 @@ def sanitize_code(text)
   end    
 end
 
-ActiveRecord::Base.send :include, Sintaxi::FilteredLight
+ActiveRecord::Base.send :include, Sintaxi::MerbFilter

public/merb.fcgi

@@ -1,6 +1,4 @@
 #!/usr/bin/env ruby
 
-ARGV=["-F"]
-require 'merb/server'
-
-Merb::Server.run
+argv = ARGV + %w[-a fcgi]
+Merb.start(argv)