bsm-models 0.6.3 → 0.7.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e2ceca071140a27ffd3ec6767e726b890491f726
+  data.tar.gz: 51536dee838ad39c97905a1950303a2ca11c9fd3
+SHA512:
+  metadata.gz: fc905253548fa5946306ae4936bce3d38ecacd687fc2891ee4b9aa0f7da0f39c3ff837baef8312cf5f696b36e1dae690f1ca2aa058968a926202d180f0c552fd
+  data.tar.gz: 306c540b9ab2615aec5aed158f01c3fe2502e093bd19b3509686699c89b4afc818367b88d4ca3f9e115b0057db2c0b4a784531bd3c981c2fc778801c4fe499b3

data/lib/bsm/model/has_many_serialized.rb

@@ -5,18 +5,27 @@ module Bsm::Model::HasManySerialized
 
   module ClassMethods
 
-    def has_many_serialized(name, options = {})
-      ActiveRecord::VERSION::STRING < '4.0.0' ? Builder.build(self, name.to_sym, options) : Builder.build(self, name.to_sym, options, {})
+    def has_many_serialized(name, scope = nil, options = {})
+      Builder.build(self, name, scope, options)
     end
 
   end
 
-  class Builder < ActiveRecord::Associations::Builder::Association
+  class Builder < ActiveRecord::Associations::Builder::CollectionAssociation
 
     def build
-      validate_options
       serialize_attribute
-      define_accessors
+      super.tap do
+        define_accessors
+      end
+    end
+
+    def macro
+      :has_many
+    end
+
+    def valid_dependent_options
+      []
     end
 
     protected
@@ -25,20 +34,20 @@ module Bsm::Model::HasManySerialized
         model.serialize attribute_name, ::Bsm::Model::Coders::JsonColumn.new(Array)
       end
 
+      def define_accessors
+        super if reflection
+      end
+
       def define_readers
-        name, attribute_name, klass = self.name, self.attribute_name, self.klass
+        name, attribute_name, klass = self.name, self.attribute_name, reflection.klass
 
         model.redefine_method(name) do
           klass.where(klass.primary_key => send(attribute_name))
         end
-
-        model.redefine_method(attribute_name) do
-          read_attribute(attribute_name)
-        end if ActiveRecord::VERSION::STRING < "3.2.0"
       end
 
       def define_writers
-        name, attribute_name, klass = self.name, self.attribute_name, self.klass
+        name, attribute_name, klass = self.name, self.attribute_name, reflection.klass
 
         model.redefine_method("#{name}=") do |records|
           records = Array.wrap(records)
@@ -58,13 +67,5 @@ module Bsm::Model::HasManySerialized
         @attribute_name ||= "#{name.to_s.singularize}_ids"
       end
 
-      def klass
-        @klass ||= class_name.constantize
-      end
-
-      def class_name
-        @class_name ||= options[:class_name] || name.to_s.singularize.camelize
-      end
-
   end
-end
+end

metadata

@@ -1,110 +1,109 @@
 --- !ruby/object:Gem::Specification
 name: bsm-models
 version: !ruby/object:Gem::Version
-  version: 0.6.3
-  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abstract
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: ''
@@ -113,43 +112,41 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/bsm-models.rb
 - lib/bsm/model.rb
-- lib/bsm/model/editable.rb
-- lib/bsm/model/locale/en.yml
 - lib/bsm/model/abstract.rb
 - lib/bsm/model/coders.rb
+- lib/bsm/model/coders/abstract_column.rb
+- lib/bsm/model/coders/json_column.rb
+- lib/bsm/model/coders/marshal_column.rb
 - lib/bsm/model/deletable.rb
 - lib/bsm/model/eager_descendants.rb
+- lib/bsm/model/editable.rb
 - lib/bsm/model/has_many_serialized.rb
+- lib/bsm/model/locale/en.yml
 - lib/bsm/model/sti_convertable.rb
-- lib/bsm/model/coders/marshal_column.rb
-- lib/bsm/model/coders/abstract_column.rb
-- lib/bsm/model/coders/json_column.rb
-- lib/bsm-models.rb
 - lib/bsm_models.rb
 homepage: https://github.com/bsm/models
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: 1.8.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: BSM's very custom model extensions
 test_files: []
-has_rdoc: