merb_activerecord 0.9.13 → 1.0.0

data/Rakefile

@@ -3,7 +3,6 @@ require 'rake/gempackagetask'
 require "extlib"
 require 'merb-core/tasks/merb_rake_helper'
 require "spec/rake/spectask"
-require "#{File.dirname(__FILE__)}" / ".." / "version"
 
 ##############################################################################
 # Package && release
@@ -18,7 +17,7 @@ GEM_EMAIL  = "canadaduane@gmail.com"
 
 GEM_NAME    = "merb_activerecord"
 PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.9") + PKG_BUILD
+GEM_VERSION = ("1.0.0") + PKG_BUILD
 
 RELEASE_NAME  = "REL #{GEM_VERSION}"
 

data/lib/generators/templates/resource_controller/app/controllers/%file_name%.rb

@@ -55,10 +55,10 @@ class <%= class_name %> < Application
     @<%= singular_model %> = <%= model_class_name %>.find_by_id(params[:id])
     raise NotFound unless @<%= singular_model %>
     if @<%= singular_model %>.destroy
-      redirect url(:<%= (modules.collect{|m| m.downcase} << singular_model).join("_") %>s)
+      redirect url(:<%= (modules.collect{|m| m.downcase} << plural_model).join("_") %>)
     else
       raise BadRequest
     end
   end
 
-end
+end

data/lib/merb/orms/active_record/cleanup.rb

@@ -0,0 +1,6 @@
+# This is the default behavior for ActiveRecord when used
+# in conjunction with ActionPack's request handling cycle.
+# TODO write test
+Merb::Controller.after do
+  ActiveRecord::Base.clear_active_connections!
+end

data/lib/merb/orms/active_record/connection.rb

@@ -60,7 +60,6 @@ module Merb
 
             Thread.new{ loop{ sleep(60*60); ::ActiveRecord::Base.verify_active_connections! } }
 
-            ::ActiveRecord::Base.verification_timeout = 14400
             ::ActiveRecord::Base.logger = Merb.logger
             ::ActiveRecord::Base.configurations = configurations
             ::ActiveRecord::Base.establish_connection config

data/lib/merb_activerecord.rb

@@ -2,11 +2,11 @@ if defined?(Merb::Plugins)
   
   dependency "activerecord"
   
+  require File.join(File.dirname(__FILE__) / "merb" / "orms" / "active_record" / "cleanup" )
   require File.join(File.dirname(__FILE__) / "merb" / "orms" / "active_record" / "connection")
   Merb::Plugins.add_rakefiles(File.join(File.dirname(__FILE__) / "active_record" / "merbtasks"))
   
   class Merb::Orms::ActiveRecord::Connect < Merb::BootLoader
-
     after BeforeAppLoads
 
     def self.run
@@ -22,6 +22,16 @@ if defined?(Merb::Plugins)
 
   end
   
+  class Merb::Orms::ActiveRecord::DisconnectBeforeFork < Merb::BootLoader
+    after AfterAppLoads
+    
+    def self.run      
+      Merb.logger.debug "Disconnecting database connection before forking."
+      ::ActiveRecord::Base.connection.disconnect!
+    end
+    
+  end
+  
   generators = File.join(File.dirname(__FILE__), 'generators')
   Merb.add_generators generators / :migration
   Merb.add_generators generators / :model

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_activerecord
 version: !ruby/object:Gem::Version 
-  version: 0.9.13
+  version: 1.0.0
 platform: ruby
 authors: 
 - Duane Johnson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-03 00:00:00 -08:00
+date: 2009-01-26 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,6 +71,7 @@ files:
 - lib/merb
 - lib/merb/orms
 - lib/merb/orms/active_record
+- lib/merb/orms/active_record/cleanup.rb
 - lib/merb/orms/active_record/connection.rb
 - lib/merb/orms/active_record/database.yml.sample
 - lib/merb/session