praxis-mapper 4.1 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 534dfb921f690285f07345acfe42725bdc8cef94
-  data.tar.gz: 603a6f23b61c9734595fc2358bc01f2d08de439f
+  metadata.gz: 0d6680ca8a7a141d49b78517c33a45305cba5ac1
+  data.tar.gz: c9fe79656d4ae8d65b00d91a8aa1f31f8c43c264
 SHA512:
-  metadata.gz: 09b91f6256a04bc776a3aabc82e1b070182c2a03ecdfd9d86edb5abcee01f06529d99f0bb5667a2fc202d5089370799f19f226f5e869ae676339802b385f1f88
-  data.tar.gz: 88dec0ce7600e96e87bc08963f8228c18e0b963ebbaa2da448a550e5287bc6331c330559d75d574b681052f5de4d67a5cb64f614b5067bb2e4b743e09f3d9357
+  metadata.gz: b194a3a75bc1a36cb1d62b977ba63fef76c968c1c2927b6c2e2404925a89a82a49defd02d355b8e0578fc5f6126d3602cb9339d840d69ad3e31e19831f1e1031
+  data.tar.gz: 0c7f61c1b671de5ed918c3e2591b2dbdd1bfd6867353a88fc66784e4e347d9b3fc94b3698b5f3a46a003f00c8e64283429a4bc3be9025ba0732c7ee79353319c

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## next
 
+## 4.1.1
+
+* Fixed critical bug in `IdentityMap#finalize!`=
+
+
 ## 4.1
 
 * Added instrumentation through `ActiveSupport::Notifications`

data/lib/praxis-mapper/identity_map.rb

@@ -5,7 +5,7 @@
 module Praxis::Mapper
   class IdentityMap
     include IdentityMapExtensions::Persistence
-    
+
     class UnloadedRecordException < StandardError; end;
     class UnsupportedModel < StandardError; end;
     class UnknownIdentity < StandardError; end;
@@ -185,7 +185,20 @@ module Praxis::Mapper
       end
     end
 
-    def finalize!(*models, instrument: true)
+    # Last parameter in array can be a hash of objects
+    # It is implemented this way (instead of (*models, instrument: true)) because when passing in
+    # Sequel models, ruby will invoke the ".to_hash" on them, causing a "load" when trying to restructure the args
+    def finalize!(*models_and_opts)
+
+      models, instrument = if models_and_opts.last.kind_of?(::Hash)
+        ins = models_and_opts.last.fetch(:instrument) do
+          true
+        end
+        [ models_and_opts[0..-2], ins ]
+      else
+        [ models_and_opts, true ]
+      end
+
       if instrument
         ActiveSupport::Notifications.instrument 'praxis.mapper.finalize' do
           _finalize!(*models)
@@ -349,7 +362,7 @@ module Praxis::Mapper
         value = values[0]
         if @row_keys[model].has_key?(key)
           res = @row_keys[model][key][value]
-          
+
           if res
             [res]
           else

data/lib/praxis-mapper/version.rb

@@ -1,5 +1,5 @@
 module Praxis
   module Mapper
-    VERSION = "4.1"
+    VERSION = "4.1.1"
   end
 end

data/spec/praxis-mapper/identity_map_spec.rb

@@ -304,6 +304,24 @@ describe Praxis::Mapper::IdentityMap do
       identity_map.finalize!(instrument: false)
     end
 
+    context 'plays well with Sequel models' do
+      # The reason to test agains Sequel models is that the destructuring of args
+      # for the _finalize! call caused unexpecting "loads" due to invoking .to_hash on them, see function for details
+      it 'calls the _finalize! with just the one model passed' do
+        identity_map.should_receive(:_finalize!).with(UserModel)
+         identity_map.finalize!(UserModel)
+      end
+
+      it 'calls the _finalize! with just the models passed' do
+        identity_map.should_receive(:_finalize!).with(UserModel,PostModel)
+         identity_map.finalize!(UserModel,PostModel)
+      end
+
+      it 'calls the _finalize! discarding instrument opts' do
+        identity_map.should_receive(:_finalize!).with(UserModel)
+        identity_map.finalize!(UserModel, instrument: false)
+      end
+    end
   end
 
   context "#finalize_model!" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: praxis-mapper
 version: !ruby/object:Gem::Version
-  version: '4.1'
+  version: 4.1.1
 platform: ruby
 authors:
 - Josep M. Blanquer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -316,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A multi-datastore library designed for efficiency in loading large datasets.