bsm-models 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2ceca071140a27ffd3ec6767e726b890491f726
-  data.tar.gz: 51536dee838ad39c97905a1950303a2ca11c9fd3
+  metadata.gz: 8c6172daeb49538b3218a2977257687578c67f8c
+  data.tar.gz: 28fde20a2ea86841f93eff4fb13558567af21d54
 SHA512:
-  metadata.gz: fc905253548fa5946306ae4936bce3d38ecacd687fc2891ee4b9aa0f7da0f39c3ff837baef8312cf5f696b36e1dae690f1ca2aa058968a926202d180f0c552fd
-  data.tar.gz: 306c540b9ab2615aec5aed158f01c3fe2502e093bd19b3509686699c89b4afc818367b88d4ca3f9e115b0057db2c0b4a784531bd3c981c2fc778801c4fe499b3
+  metadata.gz: 43d9390c4e4de157ae7d6c26f259071ee027790c9a49c1ffd31e3c5e16b163e4903bbc412dcc2e670e0fcd0cd44b42da5469a41ae82c725b484f7bad0291c7d6
+  data.tar.gz: 9169146d166a892a713002a2ec0ea8f0e31ef107f8511a0c8b7c0c7ed16887d305bd7ae6e8ae89dc3e132f41616f12ecf4b87204bc230bd0bd8293ae2ab12ad0

data/lib/bsm/model/coders/json_column.rb

@@ -1,7 +1,7 @@
 class Bsm::Model::Coders::JsonColumn < Bsm::Model::Coders::AbstractColumn
 
   def self.rescue_errors
-    [ MultiJson::DecodeError ]
+    [ ::JSON::ParserError ]
   end
 
   def dump(obj)

data/lib/bsm/model/has_many_serialized.rb

@@ -13,59 +13,43 @@ module Bsm::Model::HasManySerialized
 
   class Builder < ActiveRecord::Associations::Builder::CollectionAssociation
 
-    def build
-      serialize_attribute
-      super.tap do
-        define_accessors
+    def self.build(model, name, *)
+      model.serialize "#{name.to_s.singularize}_ids", ::Bsm::Model::Coders::JsonColumn.new(Array)
+      super.tap do |reflection|
       end
     end
 
-    def macro
-      :has_many
-    end
-
-    def valid_dependent_options
-      []
-    end
-
-    protected
-
-      def serialize_attribute
-        model.serialize attribute_name, ::Bsm::Model::Coders::JsonColumn.new(Array)
-      end
+    def self.define_accessors(model, reflection)
+      mixin = model.generated_association_methods
+      name  = reflection.name
+      klass = reflection.klass
+      attribute_name = "#{name.to_s.singularize}_ids"
 
-      def define_accessors
-        super if reflection
+      mixin.redefine_method(name) do
+        klass.where(klass.primary_key => send(attribute_name))
       end
 
-      def define_readers
-        name, attribute_name, klass = self.name, self.attribute_name, reflection.klass
-
-        model.redefine_method(name) do
-          klass.where(klass.primary_key => send(attribute_name))
+      model.redefine_method("#{name}=") do |records|
+        records = Array.wrap(records)
+        records.each do |record|
+          next if record.is_a?(klass)
+          raise ActiveRecord::AssociationTypeMismatch, "#{klass.name} expected, got #{record.class}"
         end
+        write_attribute attribute_name, records.map(&:id).sort
       end
 
-      def define_writers
-        name, attribute_name, klass = self.name, self.attribute_name, reflection.klass
-
-        model.redefine_method("#{name}=") do |records|
-          records = Array.wrap(records)
-          records.each do |record|
-            next if record.is_a?(klass)
-            raise ActiveRecord::AssociationTypeMismatch, "#{klass.name} expected, got #{record.class}"
-          end
-          write_attribute attribute_name, records.map(&:id).sort
-        end
-
-        model.redefine_method("#{attribute_name}=") do |values|
-          send "#{name}=", klass.where(klass.primary_key => Array.wrap(values)).select(:id).to_a.sort
-        end
+      model.redefine_method("#{attribute_name}=") do |values|
+        send "#{name}=", klass.where(klass.primary_key => Array.wrap(values)).select(:id).to_a.sort
       end
+    end
 
-      def attribute_name
-        @attribute_name ||= "#{name.to_s.singularize}_ids"
-      end
+    def macro
+      :has_many
+    end
+
+    def valid_dependent_options
+      []
+    end
 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bsm-models
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Dimitrij Denissenko
@@ -30,40 +30,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement