pk-merb_sequel 1.0.5 → 1.0.6

data/README.rdoc

@@ -7,44 +7,63 @@ This is fork of the code in the official merb-plugins
 and Gem to allow faster and more independent release cycle to keep up with the 
 Sequel monthly releases.
 
-Plug-in should be compatible with Merb 0.9.9 and higher and Sequel 1.4.0 and 
-higher including 2.x.x and incoming <b>3.0.0</b>.
+Plug-in is compatible with Merb 0.9.9 and higher and Sequel 1.4.0 and 
+higher including 2.x.x and <b>3.x.x</b>.
 
 <b>Any issues please report to http://github.com/pk/merb_sequel/issues</b>.
 
 
 == Install
+Since version 1.0.6 I've moved gem hosting to Gemcutter. So now you need 
+to install gem with:
 
-    gem install pk-merb_sequel --source http://gems.github.com
+gem install pk-merb_sequel --source http://gemcutter.org
 
-In Merb, add it as a dependency to your config/dependencies.rb:
-    
-    dependency 'pk-merb_sequel', :require_as => 'merb_sequel'
+For versions <= 1.0.5 I used GitHub:
+
+gem install pk-merb_sequel --source http://gems.github.com
+
+
+=== Merb < 1.1
+Add pk-merb_sequel as a dependency to your <b>config/dependencies.rb</b>:
+
+dependency 'pk-merb_sequel', :require_as => 'merb_sequel'
 
-<b>Because of Merb ORM plugin loading mechanism you neeed to change init.rb</b>:
+<b>Because of Merb < 1.1 ORM plugin loading mechanism you neeed to change init.rb</b>:
 
-    use_orm :sequel
+use_orm :sequel
 
 to
 
-    Merb.orm = :sequel
+Merb.orm = :sequel
 
 If you don't do this Merb will complain that there is no merb_sequel gem also 
 if you have merb_sequel installed it will load your system wide gem instead of
 the pk-merb_sequel gem.
 
 
+=== Merb >= 1.1, add it as a dependency to your <b>Gemfile</b>:
+    
+gem 'pk-merb_sequel', :require_as => 'merb_sequel'
+
+Add Sequel as you ORM of choice to init.rb:
+
+use_orm :sequel
+
+
 == Compatibility
 
 ===Ruby 1.8.7:
 Sequel 2.11.0:: All pass
 Sequel 2.12.0:: All pass
 Sequel 3.0.0::  All pass
+Sequel 3.5.0::  All pass
 
 ===Ruby 1.9.1:
 Sequel 2.11.0:: All pass except session spec failing due to Marshall issues.
 Sequel 2.12.0:: All pass except session spec failing due to Marshall issues.
 Sequel 3.0.0::  All pass except session spec failing due to Marshall issues.
+Sequel 3.5.0::  All pass except session spec failing due to Marshall issues.
 
 
 == RSpec transactional examples
@@ -65,13 +84,13 @@ Merb Sequel plug-in uses config/database.yml for connection configuration.
 Options are:
 
 * adapter. :sqlite is assumed by default.
-* database, default is "hey_dude_configure_your_database". This should be
-  either :memory: or file path for SQLite.
+* database, default is "hey_dude_configure_your_database". In case of SQLite this 
+  should be either :memory: or file path for SQLite.
 * db_type: default is nil. Use "mssql" to connect to MSSQL using ODBC.
 * encoding or charset, default is utf8.
 * host. localhost is assumed by default.
 * logger default is Merb.logger
-* password. WARNING: default password is an empty string.
+* password. <b>WARNING: default password is an empty string</b>.
 * socket Use socket to connect to DB. 
 * username or user, default is an empty string
 

data/Rakefile

@@ -7,7 +7,7 @@ require "spec/rake/spectask"
 ##############################################################################
 # Package && release
 ##############################################################################
-RUBY_FORGE_PROJECT  = "merb_sequel"
+RUBY_FORGE_PROJECT  = "pk-merb_sequel"
 PROJECT_URL         = "http://github.com/pk/merb_sequel"
 PROJECT_SUMMARY     = "Merb plugin that provides support for Sequel and Sequel::Model"
 PROJECT_DESCRIPTION = PROJECT_SUMMARY
@@ -15,9 +15,9 @@ PROJECT_DESCRIPTION = PROJECT_SUMMARY
 GEM_AUTHOR = "Wayne E. Seguin, Lance Carlson, Lori Holden, Pavel Kunc"
 GEM_EMAIL  = "wayneeseguin@gmail.com, lancecarlson@gmail.com, email@loriholden.com, pavel.kunc@gmail.com"
 
-GEM_NAME    = "merb_sequel"
+GEM_NAME    = "pk-merb_sequel"
 PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = "1.0.5" + PKG_BUILD
+GEM_VERSION = "1.0.6" + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 

data/lib/merb_sequel.rb

@@ -24,11 +24,28 @@ if defined?(Merb::Plugins)
     end
 
   end
+
+  # Disconnects from DB before reaping workers
+  #
+  # We must disconnect from the DB before the worker process dies to be nice 
+  # and not cause IO blocking.
+  #
+  # Disconnect only when fork_for_class_relaod is set and we're not in
+  # testing mode.
+  Merb::BootLoader.before_worker_shutdown do
+    if Merb::Config[:fork_for_class_load] && !Merb.testing?
+      Merb.logger.info "Disconnecting database connection before worker shutdown..."
+      dbs = []
+      ::Sequel::DATABASES.each { |db| db.disconnect; dbs << db } 
+      # Cleanup disconnected databases so they can be GCed
+      dbs.each {|db| ::Sequel::DATABASES.delete(db) }
+    end
+  end
   
   # Disconnects from DB before starting reloading classes
   #
-  # There is a problem with the pg gem driver wich causes infinite loop
-  # duing reloading process.
+  # We must disconnect from the DB before the worker process dies to be nice 
+  # and not cause IO blocking.
   #
   # Disconnect only when fork_for_class_relaod is set and we're not in
   # testing mode.
@@ -37,7 +54,7 @@ if defined?(Merb::Plugins)
 
     def self.run
       if Merb::Config[:fork_for_class_load] && !Merb.testing?
-        Merb.logger.debug "Disconnecting database connection before starting transaction."
+        Merb.logger.info "Disconnecting database connection before starting transaction."
         ::Sequel::DATABASES.each { |db| db.disconnect }
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pk-merb_sequel
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors: 
 - Wayne E. Seguin, Lance Carlson, Lori Holden, Pavel Kunc
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-23 00:00:00 -07:00
+date: 2009-10-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,51 +48,29 @@ files:
 - Rakefile
 - TODO
 - Generators
-- lib/generators
 - lib/generators/migration.rb
 - lib/generators/model.rb
 - lib/generators/resource_controller.rb
 - lib/generators/session_migration.rb
-- lib/generators/templates
-- lib/generators/templates/migration
-- lib/generators/templates/migration/schema
-- lib/generators/templates/migration/schema/migrations
 - lib/generators/templates/migration/schema/migrations/%file_name%.rb
-- lib/generators/templates/model
-- lib/generators/templates/model/app
-- lib/generators/templates/model/app/models
 - lib/generators/templates/model/app/models/%file_name%.rb
-- lib/generators/templates/resource_controller
-- lib/generators/templates/resource_controller/app
-- lib/generators/templates/resource_controller/app/controllers
 - lib/generators/templates/resource_controller/app/controllers/%file_name%.rb
-- lib/generators/templates/resource_controller/app/views
-- lib/generators/templates/resource_controller/app/views/%file_name%
 - lib/generators/templates/resource_controller/app/views/%file_name%/edit.html.erb
 - lib/generators/templates/resource_controller/app/views/%file_name%/index.html.erb
 - lib/generators/templates/resource_controller/app/views/%file_name%/new.html.erb
 - lib/generators/templates/resource_controller/app/views/%file_name%/show.html.erb
-- lib/generators/templates/session_migration
-- lib/generators/templates/session_migration/schema
-- lib/generators/templates/session_migration/schema/migrations
 - lib/generators/templates/session_migration/schema/migrations/%version%_sessions.rb
-- lib/merb
-- lib/merb/orms
-- lib/merb/orms/sequel
 - lib/merb/orms/sequel/connection.rb
 - lib/merb/orms/sequel/database.yml.sample
-- lib/merb/session
 - lib/merb/session/sequel_session.rb
-- lib/merb_sequel
 - lib/merb_sequel/merbtasks.rb
-- lib/merb_sequel/rspec
 - lib/merb_sequel/rspec/sequel.rb
 - lib/merb_sequel.rb
-- lib/sequel_ext
 - lib/sequel_ext/model.rb
 has_rdoc: true
 homepage: http://github.com/pk/merb_sequel
-licenses: 
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -112,10 +90,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: merb_sequel
+rubyforge_project: pk-merb_sequel
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Merb plugin that provides support for Sequel and Sequel::Model
 test_files: []