gyoku 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e3d735bc992848923596d14a5a8538857a2d60f
-  data.tar.gz: 57e7d9bae3d6782dc24a4bbb60e5b8d7f73dc089
+  metadata.gz: 13b8f36b7b0fbf447618133dfca642eed65bd43e
+  data.tar.gz: 74f77f34a0f65549ba932116050cb7a5ad3cf051
 SHA512:
-  metadata.gz: a76520a35722177de93142da9b2f8ab286cfa872ceff5973dd840c3ba4e88763b2aed87c5e752f9b9b88f09a6ef5c57bf8eda75727d0153518e775ff29121643
-  data.tar.gz: 34ca8dc2c753034119387014ccdd2ce4e7fccf50818154c3e43b6da656bc697c6b1c9f1f6c68f2336e0bb2d2e6966419ba081df0bf1b22813d5c66cb07d6d576
+  metadata.gz: a4464ca9e188003c44b77c40700da2b89f83c65141b22db3a9fff009509008dc8cddec709d0f05a2f6bfb6dc511ac64a6517f54a018c40f1454246e91b2c0beb
+  data.tar.gz: 63f77e214d1db43125511d44a766b96fc8b373e98fcdae3ea1201361c53c9227a72b6cdfe18d3efd01246082fd3df4b22cdeaefd60de9017170d5763b7c3ab53

data/.travis.yml

@@ -1,9 +1,9 @@
 language: "ruby"
 script: "bundle exec rake"
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - 2.1
+  - 2.2
   - jruby-19mode
   - rbx-2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.2.3 (2015-03-10)
+
+# Feature: [#52](https://github.com/savonrb/gyoku/pull/52) Adds an :unwrap option that allows an array of hashes to be unwrapped into a single array xml node, rather than one per hash.
+
 ## 1.2.2 (2014-09-22)
 
 * Fixed a bug introduced by making Gyoku threadsafe. Who knew that `$1` and the block variable that `#gsub` provides are not the same?

data/lib/gyoku/array.rb

@@ -11,17 +11,27 @@ module Gyoku
     # Translates a given +array+ to XML. Accepts the XML +key+ to add the elements to,
     # whether to +escape_xml+ and an optional Hash of +attributes+.
     def self.to_xml(array, key, escape_xml = true, attributes = {}, options = {})
+
       self_closing = options.delete(:self_closing)
-      iterate_with_xml array, attributes do |xml, item, attrs, index|
+      unwrap = options[:unwrap] || false 
+
+      iterate_with_xml array, key, attributes, options do |xml, item, attrs, index|
         if self_closing
           xml.tag!(key, attrs)
-
         else
           case item
-            when ::Hash       then xml.tag!(key, attrs) { xml << Hash.to_xml(item, options) }
-            when ::Array      then xml.tag!(key, attrs) { xml << Array.to_xml(item, NESTED_ELEMENT_NAME) }
-            when NilClass     then xml.tag!(key, "xsi:nil" => "true")
-            else              xml.tag!(key, attrs) { xml << XMLValue.create(item, escape_xml) }
+            when ::Hash       then 
+              if unwrap
+                xml << Hash.to_xml(item, options)
+              else
+                xml.tag!(key, attrs) { xml << Hash.to_xml(item, options) }
+              end
+            when ::Array      then 
+              xml.tag!(key, attrs) { xml << Array.to_xml(item, NESTED_ELEMENT_NAME) }
+            when NilClass     then 
+              xml.tag!(key, "xsi:nil" => "true")
+            else              
+              xml.tag!(key, attrs) { xml << XMLValue.create(item, escape_xml) }
           end
         end
       end
@@ -31,8 +41,24 @@ module Gyoku
 
     # Iterates over a given +array+ with a Hash of +attributes+ and yields a builder +xml+
     # instance, the current +item+, any XML +attributes+ and the current +index+.
-    def self.iterate_with_xml(array, attributes)
+    def self.iterate_with_xml(array, key, attributes, options, &block)
+
       xml = Builder::XmlMarkup.new
+      unwrap = options[:unwrap] || false
+
+      if (unwrap)
+        xml.tag!(key) { iterate_array(xml, array, attributes, &block) }
+      else
+        iterate_array(xml, array, attributes, &block)
+      end
+
+      xml.target!
+    end
+
+
+    # Iterates over a given +array+ with a Hash of +attributes+ and yields a builder +xml+
+    # instance, the current +item+, any XML +attributes+ and the current +index+.
+    def self.iterate_array(xml, array, attributes, &block)
       array.each_with_index do |item, index|
         if item.respond_to?(:keys)
           attrs = item.reduce({}) do |st, v|
@@ -45,9 +71,9 @@ module Gyoku
         end
         yield xml, item, tag_attributes(attributes, index).merge(attrs), index
       end
-      xml.target!
     end
 
+
     # Takes a Hash of +attributes+ and the +index+ for which to return attributes
     # for duplicate tags.
     def self.tag_attributes(attributes, index)

data/lib/gyoku/version.rb

@@ -1,3 +1,3 @@
 module Gyoku
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 end

data/lib/gyoku/xml_key.rb

@@ -34,6 +34,8 @@ module Gyoku
 
       # Returns the formula for converting Symbol keys.
       def key_converter(options, xml_key)
+        return options[:key_converter] if options[:key_converter].is_a? Proc
+
         defined_key = options[:key_to_convert]
         if (defined_key != nil) && (defined_key == xml_key)
           key_converter = options[:key_converter]

data/spec/gyoku/array_spec.rb

@@ -10,6 +10,13 @@ describe Gyoku::Array do
       expect(to_xml(array, "user")).to eq(result)
     end
 
+    it "returns the XML for an Array of Hashes unwrapped" do
+      array = [{ :name => "adam" }, { :name => "eve" }]
+      result = "<user><name>adam</name><name>eve</name></user>"
+
+      expect(to_xml(array, "user", true, {}, :unwrap => true)).to eq(result)
+    end
+
     it "returns the XML for an Array of different Objects" do
       array = [:symbol, "string", 123]
       result = "<value>symbol</value><value>string</value><value>123</value>"

data/spec/gyoku/xml_key_spec.rb

@@ -20,7 +20,19 @@ describe Gyoku::XMLKey do
       expect(create(:lower_camel_case!)).to eq("lowerCamelCase")
     end
 
+    context "when the converter option is set to camelcase" do
+      it "should replace / with ::, and turn snake case into camel case" do
+        input = "hello_world_bob/how_are_you|there:foo^bar".to_sym
+        expected_output = "HelloWorldBob::HowAreYou|there:foo^bar"
+        expect(create(input, {key_converter: :camelcase})).to eq(expected_output)
+      end
+    end
+
     context "with key_converter" do
+      it "accepts lambda converters" do
+        expect(create(:some_text, {key_converter: lambda { |k| k.reverse }})).to eq("txet_emos")
+      end
+
       it "convert symbol to the specified type" do
         expect(create(:some_text, {key_converter: :camelcase})).to eq("SomeText")
         expect(create(:some_text, {key_converter: :upcase})).to eq("SOME_TEXT")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gyoku
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Daniel Harrington
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder