smacks-apricoteatsgorilla 0.3.91 → 0.4.0

data/lib/apricoteatsgorilla.rb

@@ -229,23 +229,23 @@ class ApricotEatsGorilla
     # * +item+ - A Hash value to translate into an XML String.
     def nested_data_to_xml(name, item)
       case item
-      when String, Symbol
-        tag(name) { item.to_s }
       when Array
         item.map { |subitem| nested_data_to_xml(name, subitem) }.join
       when Hash
         tag(name) do
           opt_order(item).map { |tag, value|
             case value
-            when String, Symbol
-              tag(tag) { value.to_s }
             when Array
               value.map { |subitem| nested_data_to_xml(tag, subitem) }.join
             when Hash
               nested_data_to_xml(tag, value)
+            else
+              tag(tag) { value.to_s } if item.respond_to? :to_s
             end
           }.join
         end
+      else
+        tag(name) { item.to_s } if item.respond_to? :to_s
       end
     end
 
@@ -293,7 +293,7 @@ class ApricotEatsGorilla
     # Returns a sorted version of a given +hash+ if :sort_keys was enabled.
     def opt_order(hash)
       return hash unless sort_keys
-      hash.sort_by { |kv| kv.first }
+      hash.keys.sort_by { |s| s.to_s }.map { |key| [key, hash[key]] }
     end
 
   end

data/test/apricoteatsgorilla/hash_to_xml_test.rb

@@ -86,6 +86,23 @@ class HashToXmlTest < Test::Unit::TestCase
         end
       end
     end
+
+    context "with a Hash different types of values" do
+      should "convert values responding to 'to_s' to Strings" do
+        date_time = DateTime.now
+        hash = { :apricot => {
+          :at => date_time,
+          :with => 100.01,
+          :when => nil,
+          :what => :gorillas
+        } }
+        expected = "<apricot><at>#{date_time}</at><what>gorillas</what>" <<
+          "<when></when><with>100.01</with></apricot>"
+
+        result = ApricotEatsGorilla.hash_to_xml(hash)
+        assert_equal expected, result
+      end
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smacks-apricoteatsgorilla
 version: !ruby/object:Gem::Version 
-  version: 0.3.91
+  version: 0.4.0
 platform: ruby
 authors: 
 - Daniel Harrington