scoped_serializer 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bac41027d295a52498d1966920f57e030b78c547
-  data.tar.gz: e497b8660c9951ea614f2b8c97d2692b92977bc3
+  metadata.gz: 68d1d14432e7ba33ed7f794ee9a9d37a74404e43
+  data.tar.gz: f26d981f83d3028c879021e93fbe3083da6fa4ce
 SHA512:
-  metadata.gz: ed509d7a7c1e4fc986da5420865be2386724ed6ee3643c9c0e4c3c76502e99c49c1c7e87bee3a672d0eb1e18fface9be124a41d2fde1f799dbb716df16747b19
-  data.tar.gz: 82f0ea3dcf619cb739f93bff8d8385459563b32b705769bc8e18f472b915a55e5eaf32f24bff6d347cf86a5dc77c6816251c4f02ae59795bb9e87fb191f9eeb6
+  metadata.gz: e9822c56d6644e6975872262f69bf1cd9d14a7b86b93ac93dedbe258cdc44cd1793ff31d28bd0573befaf23683f40d8871356c07bf50b1e8bb3b074558e7009e
+  data.tar.gz: de934c5af2199e936bf0e58868530f26543d41122d8b1ef5f2590342e8fc0eff4e047aac2975b37fc5ade48354d0ec18fc1e179cd9207469b53c4acb1efcee68

data/lib/scoped_serializer/array_serializer.rb

@@ -6,6 +6,7 @@ module ScopedSerializer
     def initialize(array, options={})
       @array = array
       @options = options || {}
+      @options[:each_serializer] ||= @options.delete(:serializer)
     end
 
     def serializable_hash(options={})
@@ -41,7 +42,7 @@ module ScopedSerializer
 
       def serializable_objects
         @serializable_objects ||= array.collect do |object|
-          ScopedSerializer.for(object, @options.merge(:root => false))
+          ScopedSerializer.for(object, @options.merge(:root => false, :serializer => @options[:each_serializer]))
         end
       end
 

data/lib/scoped_serializer/serializer.rb

@@ -142,10 +142,10 @@ module ScopedSerializer
           includes = options[:preload] == true ? options[:include] : options[:preload]
         end
 
-        object  = fetch_association(association_data, includes)
-        data    = ScopedSerializer.for(object, options.merge(:associations => options[:include])).as_json
-
-        hash.merge!(data) if data
+        if (object = fetch_association(association_data, includes))
+          data = ScopedSerializer.for(object, options.merge(:associations => options[:include])).as_json
+          hash.merge!(data) if data
+        end
       end
 
       hash

data/lib/scoped_serializer/version.rb

@@ -1,3 +1,3 @@
 module ScopedSerializer
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scoped_serializer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Arjen Oosterkamp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails