pk-merb_sequel 1.0.6 → 1.0.7

data/CHANGELOG

@@ -0,0 +1,10 @@
+== 1.0.7
+
+* Add support for ActiveModel via active_model plugin for Sequel > 3.5.0 or
+Merb::Orms::Sequel::Model::ActiveModelCompatibility module. Added
+:load_activemodel_compatibility configuration option to handle ActiveModel
+compatibility loading. See README for
+more information.
+* Removed Merb::Orms::Sequel::ModelExtensions in favour to Merb::Orms::Sequel::Model::ActiveModelCompatibility
+* Added spec.opts
+* Fixing session storage

data/README.rdoc

@@ -53,18 +53,25 @@ use_orm :sequel
 
 == Compatibility
 
-===Ruby 1.8.7:
+=== 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:
+=== 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.
 
+=== ActiveModel compatibility
+In Merb > 1.0.13 we use ActiveModel interface for the ORM plugins. merb_sequel
+now supports this for all versions of Sequel by including compatibilit layers
+by default or loading active model plugin when using Sequel > 3.5.0
+
+You can use configuration to not load compatibility layer:
+Merb::Plugins.config[:merb_sequel][:load_activemodel_compatibility] = false
 
 == RSpec transactional examples
 
@@ -77,7 +84,11 @@ your spec_helper.rb or any spec you want to be transactional:
 Now <b>each example is wrapped in a Sequel transaction and when example finishes
 Sequel::Error::Rollback is raised which cause transaction to rollback</b>.
 
-== Connection options
+== Connection options & Settings
+
+Settings:
+
+* :load_activemodel_compatibility. By default is set to true. If set to false, ActiveModelCompatibility is not loaded.
 
 Merb Sequel plug-in uses config/database.yml for connection configuration.
 

data/Rakefile

@@ -17,7 +17,7 @@ GEM_EMAIL  = "wayneeseguin@gmail.com, lancecarlson@gmail.com, email@loriholden.c
 
 GEM_NAME    = "pk-merb_sequel"
 PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = "1.0.6" + PKG_BUILD
+GEM_VERSION = "1.0.7" + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 
@@ -35,7 +35,7 @@ spec = Gem::Specification.new do |s|
   s.homepage = PROJECT_URL
   s.add_dependency("merb-core", ">= 0.9.9")
   s.add_dependency("sequel",    ">= 1.4.0")
-  s.files = %w(LICENSE README.rdoc Rakefile TODO Generators) + Dir.glob("{lib}/**/*")
+  s.files = %w(CHANGELOG LICENSE README.rdoc Rakefile TODO Generators) + Dir.glob("{lib}/**/*")
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

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

@@ -27,7 +27,7 @@ module Merb
           @config ||= begin
             # Convert string keys to symbols
             full_config = Erubis.load_yaml_file(config_file)
-            config = (Merb::Plugins.config[:merb_sequel] = {})
+            config = Merb::Plugins.config[:merb_sequel]
             (full_config[Merb.environment.to_sym] || full_config[Merb.environment] || full_config[:development]).each do |key, value|
               config[key.to_sym] = value
             end

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

@@ -0,0 +1,38 @@
+module Merb
+  module Orms
+    module Sequel
+      module Model
+
+        # This code has been taken from Sequel 3.5.0
+        # Sequel::Plugins::ActiveModel
+        # http://sequel.rubyforge.org/rdoc-plugins/classes/Sequel/Plugins/ActiveModel.html
+        module ActiveModelCompatibility
+          # Record that an object was destroyed, for later use by
+          # destroyed?
+          def after_destroy
+            super
+            @destroyed = true
+          end
+
+          # Whether the object was destroyed by destroy.  Not true
+          # for objects that were deleted.
+          def destroyed?
+            @destroyed == true
+          end
+
+          # An alias for new?
+          def new_record?
+            new?
+          end
+
+          # With the ActiveModel plugin, Sequel model objects are already
+          # compliant, so this returns self.
+          def to_model
+            self
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/merb/session/sequel_session.rb

@@ -1,11 +1,10 @@
 require 'sequel'
 require 'sequel/extensions/migration' if Merb::Orms::Sequel.new_sequel? 
 require 'merb-core/dispatch/session'
-require 'base64'
 
 module Merb
 
-  Merb::Plugins.config[:merb_sequel][:session_table_name] ||= "sessions"
+  Merb::Plugins.config[:merb_sequel][:session_table_name] ||= 'sessions'
 
   # Default session migration run if a sessions table does not yet exist.
   #
@@ -49,23 +48,26 @@ module Merb
       # ContainerSession:: The session corresponding to the ID.
       def retrieve_session(session_id)
         if item = find(:session_id => session_id)
-          item.data
+          Marshal.load(item.data.unpack('m').first)
         end
       end
 
       # ==== Parameters
       # session_id<String>:: ID of the session to set.
       # data<ContainerSession>:: The session to set.
-      def store_session(session_id, data)
+      def store_session(session_id, session_data)
+        session_data = session_data.empty? ? nil : [Marshal.dump(session_data)].pack('m')
         begin
-          if item = find(:session_id => session_id)
-            item.update(:data => data)
+          if item = self.find(:session_id => session_id)
+            item.update(:data => session_data)
           else
-            item = self.new(:session_id => session_id, :data => data, :created_at => Time.now)
+            item = self.new(:session_id => session_id,
+                            :data => session_data,
+                            :created_at => Time.now)
             item.save
           end
         rescue => e
-          Merb.logger.error("#{e.message} when trying to save #{data}")
+          Merb.logger.error("#{e.message} when trying to save #{session_data}")
         end
       end
 
@@ -76,63 +78,20 @@ module Merb
           item.delete
         end
       end
-    
-      # ==== Returns
-      # Integer:: The maximum length of the 'data' column.
-      def data_column_size_limit
-        512 # TODO - figure out how much space we actually have
-      end
 
       unless Merb::Orms::Sequel.new_sequel?
         alias :create_table! :create_table
         alias :drop_table! :drop_table
       end
     end
-
-    # Lazy-unserialize session state.
-    def data
-      data = (@values[:data] ? Marshal.load(@values[:data]) : {}) if @data.nil?
-      @data
-    end
-    
-    # Virtual attribute writer - override.
-    def data=(hsh)
-      super(hsh) if hsh.is_a?(Hash)
-    end
-
-    # Has the session been loaded yet?
-    def loaded?
-      !!@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
-      @values[:data] = Marshal.dump(self.data)
-      if @values[:data].size > self.class.data_column_size_limit
-        raise Merb::SessionMixin::SessionOverflow
-      end
-    end
-
   end
   
   class SequelSession < SessionStoreContainer
-    
     # The session store type
     self.session_store_type = :sequel
     
     # The store object is the model class itself
     self.store = SequelSessionStore
-    
   end
 
 end

data/lib/merb_sequel.rb

@@ -1,11 +1,12 @@
 if defined?(Merb::Plugins)
-  Merb::Plugins.config[:merb_sequel] = {}
-  require File.join(File.dirname(__FILE__) / "sequel_ext" / "model")
+
+  # Default settings
+  Merb::Plugins.config[:merb_sequel] = { :load_activemodel_compatibility => true }
+
+  require File.join(File.dirname(__FILE__) / "merb" / "orms" / "sequel" / "model")
   require File.join(File.dirname(__FILE__) / "merb" / "orms" / "sequel" / "connection")
   Merb::Plugins.add_rakefiles "merb_sequel" / "merbtasks"
   
-  Sequel::Model.send(:include, Merb::Orms::Sequel::ModelExtensions)
-
   # Connects to the database and handles session
   #
   # Connects to the database and loads sequel sessions if we use them.
@@ -20,7 +21,29 @@ if defined?(Merb::Plugins)
         require File.join(File.dirname(__FILE__) / "merb" / "session" / "sequel_session")
       end
       
+      # Set identifiy to use Sequel primary key field
       Merb::Router.root_behavior = Merb::Router.root_behavior.identify(Sequel::Model => :pk)
+
+      # Load compatibility extensions
+      if Merb::Plugins.config[:merb_sequel][:load_activemodel_compatibility]
+        load_activemodel_compatibility
+      end
+    end
+
+    # Load active model plugin if available
+    #
+    # Merb > 1.0.13 expects models to be ActiveModel compatible
+    # Sequel 3.5.0 added plugin to make Sequel models AtciveModel
+    # compatible.
+    #
+    # We're loading plugin to all models here if plugin is available 
+    # if the plugin is not available we must include compatibility module.
+    def self.load_activemodel_compatibility
+      begin
+        Sequel::Model.plugin :active_model
+      rescue LoadError, NoMethodError
+        Sequel::Model.send(:include, Merb::Orms::Sequel::Model::ActiveModelCompatibility)
+      end
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pk-merb_sequel
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors: 
 - Wayne E. Seguin, Lance Carlson, Lori Holden, Pavel Kunc
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-04 00:00:00 +01:00
+date: 2009-10-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,6 +43,7 @@ extra_rdoc_files:
 - LICENSE
 - TODO
 files: 
+- CHANGELOG
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -62,11 +63,11 @@ files:
 - lib/generators/templates/session_migration/schema/migrations/%version%_sessions.rb
 - lib/merb/orms/sequel/connection.rb
 - lib/merb/orms/sequel/database.yml.sample
+- lib/merb/orms/sequel/model.rb
 - lib/merb/session/sequel_session.rb
 - lib/merb_sequel/merbtasks.rb
 - lib/merb_sequel/rspec/sequel.rb
 - lib/merb_sequel.rb
-- lib/sequel_ext/model.rb
 has_rdoc: true
 homepage: http://github.com/pk/merb_sequel
 licenses: []

data/lib/sequel_ext/model.rb

@@ -1,11 +0,0 @@
-module Merb
-  module Orms
-    module Sequel
-      module ModelExtensions 
-        def new_record?
-          self.new?
-        end
-      end
-    end
-  end
-end