pump 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b23d242fff172d8de112af6c2fc6f326e101bd14
-  data.tar.gz: 4e369b0d6f692526571a487c1e692199b21d1efb
+  metadata.gz: 27f8a3e058da84aed35138707b6be1836abb45e8
+  data.tar.gz: 7d4e25c6424008b13f67aef733eb6bddbc586afd
 SHA512:
-  metadata.gz: 3593cfcda6c0a33bd2f1cdf0d7010fb6f1b627a11a33c675fa2ab0854771e8b3cd109137d26bb8cf557e41ea21345b4c2b018f0b6a0b3105fa73bfc1c16917e3
-  data.tar.gz: 6c366d3a85852a28c5bb536bd2daed8eaf23f1e2d14972e73fd3c951c00d0dd8dd1895450b65a21d6ab33d1d2ad13529fa0ebc5e949616c7e42969f4019d3c24
+  metadata.gz: dbede9b7e563335f30ed7682644ce43eb974dc21ce2bae10257d44b9520cd29a63523f3b2e87f9b61bc9a662d3ec8bf83ec7d53d8da08a8e0c5b7c86f61f368e
+  data.tar.gz: 32020a5f3bc48ca51f9cb1e2b6872547e8dbfff045607549ce431076a7d11d503e1369714d5b99f7f6eb4a285c95df495147002265b3a6036ffaccbfd41e393d

data/CHANGES.md

@@ -1,8 +1,14 @@
 ### dev
 
-[full changelog](http://github.com/yolk/pump/compare/v0.6.3...master)
+[full changelog](http://github.com/yolk/pump/compare/v0.6.4...master)
 
-### 0.6.3 / 2013-07-26
+### 0.6.4 / 2013-11-08
+
+[full changelog](http://github.com/yolk/valvat/compare/v0.6.3...v0.6.4)
+
+* :fields option is now supported on array in JSON and XML
+
+### 0.6.3 / 2013-11-08
 
 [full changelog](http://github.com/yolk/valvat/compare/v0.6.2...v0.6.3)
 

data/lib/pump/encoder.rb

@@ -56,7 +56,11 @@ module Pump
       object = object.to_a if defined?(ActiveRecord::Relation) && object.is_a?(ActiveRecord::Relation)
       fields_to_hash(options)
       if object.is_a?(Array)
-        encode_array(object, options)
+        if options[:fields]
+          encode_partial_array(object, options)
+        else
+          encode_array(object, options)
+        end
       elsif options[:fields]
         encode_partial_single(object, options)
       else

data/lib/pump/json.rb

@@ -47,6 +47,20 @@ module Pump
             end
           end, OJ_OPTIONS)
         end
+
+        def encode_partial_array(objects, options)
+          Oj.dump(if options[:exclude_root_in_json]
+            objects.map do |object|
+              #{partial_main}
+              json
+            end
+          else
+            objects.map do |object|
+              #{partial_main}
+              { :'#{format_name(root_name)}' => json }
+            end
+          end, OJ_OPTIONS)
+        end
       EOV
     end
 

data/lib/pump/version.rb

@@ -1,3 +1,3 @@
 module Pump
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/lib/pump/xml.rb

@@ -20,6 +20,11 @@ module Pump
           field_hash = options[:fields]
           "#{Tag.new(root_name, {}, sub_tags(true), tag_options)}"
         end
+
+        def encode_partial_array(objects, options)
+          field_hash = options[:fields]
+          "#{TagArray.new(root_name, {}, sub_tags(true), tag_options)}"
+        end
       EOV
     end
 

data/spec/pump/json_spec.rb

@@ -291,6 +291,21 @@ describe Pump::Json do
           )
         end
       end
+
+      context "with array of objects" do
+        let(:people) {
+          [
+            Struct.new(:name, :age, :children).new('Gustav', 2),
+            Struct.new(:name, :age, :children).new('Mary', 1)
+          ]
+        }
+
+        let(:json) { Pump::Json.new('person', [{:name => :name}, {:age => :age}]) }
+
+        it "returns only specified fields" do
+          json.encode(people, :fields => ['name']).should eql("[{\"person\":{\"name\":\"Gustav\"}},{\"person\":{\"name\":\"Mary\"}}]")
+        end
+      end
     end
   end
 end

data/spec/pump/xml_spec.rb

@@ -378,6 +378,21 @@ describe Pump::Xml do
           )
         end
       end
+
+      context "with array of objects" do
+        let(:people) {
+          [
+            Struct.new(:name, :age, :children).new('Gustav', 2),
+            Struct.new(:name, :age, :children).new('Mary', 1)
+          ]
+        }
+
+        let(:xml) { Pump::Xml.new('person', [{:name => :name}, {:age => :age}]) }
+
+        it "returns only specified fields" do
+          xml.encode(people, :fields => ['name']).should eql("#{XML_INSTRUCT}<people type=\"array\">\n  <person>\n    <name>Gustav</name>\n  </person>\n  <person>\n    <name>Mary</name>\n  </person>\n</people>\n")
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pump
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Sebastian Munz