praxis-mapper 3.2 → 3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0f5ae2201ca9a681d3f65c4ea8a51d3523e1620
-  data.tar.gz: 5fa2fc72ff6c38fac99fa60a4fd42d3bcadc7aa6
+  metadata.gz: 6846f3a009fa64333abe3cb2ec246739bd51eac6
+  data.tar.gz: 9816dfbed93468cab708a9d7e62184d0ec8dd50b
 SHA512:
-  metadata.gz: 2add48d3bca8c0ce48ee4bf2d66ba02582f0c781bcb45e792af98b500eb0f368b7e6e93fd64c0e1a211fe2e1a02355c1b190130cd2fd750409e44c0a79197b1d
-  data.tar.gz: 13e3428c8129be0d9eb2a3c9c3269ab50cd10545027092e971fcdbc07e6c0f3af67fa51d277c4abfca56a7e19a88ac9b09a63c292a116a64e5a107f300be4bca
+  metadata.gz: 4f60333005ce4fbe58804f91b3641d7e7dee4f82cabb0ae57b1dd910f6f3364a04ab1c2145764ec94c17d75621800be1f140050507dbb8040b4bca3758ece56d
+  data.tar.gz: de0d8e4d594f3059ff204d5b808454ae9c53df667cf2f2b4bb22be58235a7019a687daf910f36cbd5ed7c0bec54bd1f152e350540cd6c7a3816d6cefd843eb1c

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # praxis-mapper changelog
 
+## next
+
+## 3.3.0
+
+* Tightened up handling of missing records in `IdentityMap#all` and `Resource.wrap`. They now will never return `nil` values.
+
+
 ## 3.2.0
 
 * Add `Resource.decorate` for extending/overriding methods on Resource associations. See `PersonResource` in [spec_resources.rb](spec/support/spec_resources.rb) for usage. 

data/lib/praxis-mapper/identity_map.rb

@@ -336,7 +336,7 @@ module Praxis::Mapper
         if @row_keys[model].has_key?(key)
           res = row_by_key(model, key, value)
           if res
-            [row_by_key(model, key, value)]
+            [res]
           else
             []
           end
@@ -347,7 +347,7 @@ module Praxis::Mapper
         if @row_keys[model].has_key?(key)
           values.collect do |value|
             row_by_key(model, key, value)
-          end
+          end.compact
         else
           values.each_with_object(Array.new) do |value, results|
             results.push *index(model, key, value)

data/lib/praxis-mapper/resource.rb

@@ -142,7 +142,7 @@ module Praxis::Mapper
     when nil
       return []
     when Enumerable
-      return records.collect { |record| self.for_record(record) }
+      return records.compact.collect { |record| self.for_record(record) }
     else
       return self.for_record(records)
     end

data/lib/praxis-mapper/version.rb

@@ -1,5 +1,5 @@
 module Praxis
   module Mapper
-    VERSION = "3.2"
+    VERSION = "3.3"
   end
 end

data/praxis-mapper.gemspec

@@ -7,7 +7,6 @@ Gem::Specification.new do |spec|
   spec.name          = "praxis-mapper"
   spec.version       = Praxis::Mapper::VERSION
   spec.authors = ["Josep M. Blanquer","Dane Jensen"]
-  spec.date = "2014-08-18"
   spec.summary       = %q{A multi-datastore library designed for efficiency in loading large datasets.}
   spec.email = ["blanquer@gmail.com","dane.jensen@gmail.com"]
   

data/spec/praxis-mapper/identity_map_spec.rb

@@ -774,6 +774,13 @@ describe Praxis::Mapper::IdentityMap do
         identity_map.all(SimpleModel, :id => [4]).should =~ []
       end
 
+      it 'does not return nil for records that were not found' do
+        results = identity_map.all(SimpleModel, :id => [1,4])
+        results.should have(1).item
+        results.should eq(identity_map.all(SimpleModel, :id => [1]))
+      end
+
+
     end
 
     context '#row_by_key' do

data/spec/praxis-mapper/resource_spec.rb

@@ -182,6 +182,12 @@ describe Praxis::Mapper::Resource do
       wrapped_obj.length.should be(0)
     end
 
+    it 'works array with nil member, returning only existing records' do
+      wrapped_set = SimpleResource.wrap([nil, record])
+      wrapped_set.should be_kind_of(Array)
+      wrapped_set.length.should be(1)
+    end
+
     it 'works regardless of the resource class used' do
       SimpleResource.wrap(record).should be(OtherResource.wrap(record))
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: praxis-mapper
 version: !ruby/object:Gem::Version
-  version: '3.2'
+  version: '3.3'
 platform: ruby
 authors:
 - Josep M. Blanquer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp