bsm-models 0.5.6 → 0.6.3

data/lib/bsm/model/eager_descendants.rb

@@ -4,7 +4,7 @@ module Bsm::Model::EagerDescendants
   module ClassMethods
 
     def descendants
-      eager_constantize!
+      eager_constantize! 
       super
     end
 
@@ -22,5 +22,5 @@ module Bsm::Model::EagerDescendants
         @__eagerly_constantized__ = true
       end
 
-  end
+  end unless Rails.application.config.respond_to?(:eager_load) && Rails.application.config.eager_load
 end

data/lib/bsm/model/has_many_serialized.rb

@@ -6,7 +6,7 @@ module Bsm::Model::HasManySerialized
   module ClassMethods
 
     def has_many_serialized(name, options = {})
-      Builder.build(self, name.to_sym, options)
+      ActiveRecord::VERSION::STRING < '4.0.0' ? Builder.build(self, name.to_sym, options) : Builder.build(self, name.to_sym, options, {})
     end
 
   end

data/lib/bsm/model/sti_convertable.rb

@@ -10,6 +10,15 @@ module Bsm::Model::StiConvertable
     METHOD
   end
 
+  def self.scoping(*)
+    yield
+  end
+
+  # AR <4.0 compatibility
+  def self.scoping(klass, current_scope, &block)
+    klass.send(:with_scope, current_scope, &block)
+  end if ActiveRecord::VERSION::MAJOR < 4
+
   module ClassMethods
 
     # @Override: Allow to specify a kind
@@ -20,9 +29,7 @@ module Bsm::Model::StiConvertable
       klass = real_descendants.find {|k| k.kind == kind } || fallback_descendant
       return super if klass == self
 
-      klass.with_scope(methods.include?(:current_scope) ? current_scope : current_scoped_methods) do # AR 3.0 compatibility
-        klass.new(attributes, *args, &block)
-      end
+      Bsm::Model::StiConvertable.scoping(klass, current_scope) { klass.new(attributes, *args, &block) }
     end
 
     def real_descendants

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bsm-models
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abstract
@@ -76,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3-ruby
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements: