pk-merb_sequel 1.0.1 → 1.0.2

data/README.rdoc

@@ -8,7 +8,7 @@ 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 and incoming <b>3.x</b>.
+higher including 2.x.x and incoming <b>3.0.0</b>.
 
 <b>Any issues please report to http://github.com/pk/merb_sequel/issues</b>.
 
@@ -26,12 +26,12 @@ In Merb, add it as a dependency to your config/dependencies.rb:
 ===Ruby 1.8.7:
 Sequel 2.11.0:: All pass
 Sequel 2.12.0:: All pass
-Sequel 3.::     All pass
+Sequel 3.0.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.::     All pass except session spec failing due to Marshall issues.
+Sequel 3.0.0::  All pass except session spec failing due to Marshall issues.
 
 
 == Connection options

data/Rakefile

@@ -17,7 +17,7 @@ GEM_EMAIL  = "wayneeseguin@gmail.com, lancecarlson@gmail.com, email@loriholden.c
 
 GEM_NAME    = "merb_sequel"
 PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = (Merb::MORE_VERSION rescue "1.0.1") + PKG_BUILD
+GEM_VERSION = (Merb::MORE_VERSION rescue "1.0.2") + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 

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

@@ -10,6 +10,14 @@ module Merb
         def config_file() Merb.dir_for(:config) / "database.yml" end
         def sample_dest() Merb.dir_for(:config) / "database.yml.sample" end
         def sample_source() File.dirname(__FILE__) / "database.yml.sample" end
+
+        # Determine if we use Sequel 3 or not
+        #
+        # ==== Returns
+        # Boolean:: True if using Sequel >= 2.12.0 or False
+        def new_sequel?
+          /^(2.12|3)/ =~ ::Sequel.version
+        end
       
         def copy_sample_config
           FileUtils.cp sample_source, sample_dest unless File.exists?(sample_dest)

data/lib/merb/session/sequel_session.rb

@@ -1,6 +1,5 @@
 require 'sequel'
-# Load extensions if we use new versions of Sequel
-require 'sequel/extensions/migration' if /^(2.12|3)/ =~ Sequel.version
+require 'sequel/extensions/migration' if Merb::Orms::Sequel.new_sequel? 
 require 'merb-core/dispatch/session'
 require 'base64'
 
@@ -79,8 +78,10 @@ module Merb
         512 # TODO - figure out how much space we actually have
       end
 
-      alias :create_table! :create_table
-      alias :drop_table! :drop_table
+      unless Merb::Orms::Sequel.new_sequel?
+        alias :create_table! :create_table
+        alias :drop_table! :drop_table
+      end
     end
 
     # Lazy-unserialize session state.
@@ -98,6 +99,15 @@ module Merb
       !!@data
     end
 
+    if Merb::Orms::Sequel.new_sequel?
+      def before_save 
+        super
+        prepare_data_to_save
+      end
+    else
+      before_save :prepare_data_to_save 
+    end
+    
     private
 
     def prepare_data_to_save
@@ -107,15 +117,6 @@ module Merb
       end
     end
 
-    if /^(2.12|3)/ =~ Sequel.version
-      def before_save 
-        super
-        prepare_data_to_save
-      end
-    else
-      before_save :prepare_data_to_save 
-    end
-    
   end
   
   class SequelSession < SessionStoreContainer

data/lib/merb_sequel/merbtasks.rb

@@ -11,7 +11,7 @@ namespace :sequel do
 
     desc "Perform migration using migrations in schema/migrations"
     task :migrate => :sequel_env do
-      require 'sequel/extensions/migration' if /^(2.12|3)/ =~ Sequel.version
+      require 'sequel/extensions/migration' if Merb::Orms::Sequel.new_sequel?
       Sequel::Migrator.apply(Sequel::Model.db, "schema/migrations", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pk-merb_sequel
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Wayne E. Seguin, Lance Carlson, Lori Holden