gyoku 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86c09dfdeb5eacb718d25f139c3adfd7ac6689b2
-  data.tar.gz: 1e319e7f75f041a0b4896b2d16985c49a4aa408c
+  metadata.gz: cdaf80a00de09a2fcb18c9dd5ef5b0bcd1491437
+  data.tar.gz: 8ef2ffc7a90fac372189b3968aed3003bde0f7c4
 SHA512:
-  metadata.gz: e81eccda0f368004b95d6a5f6aff630b82d2ac6c677bfa1295cb5eec69a2b41c34a9ff818087a58e77cc20cb4a4ca3397f90e4aa528db97e793f717fa0547c75
-  data.tar.gz: 946a0e3ed65e4eda0b2fb2fef501229cd57f00b548443be5d4d7219ce6d2bfeec04d9b7b6b0d6329386d601d0c1497ddf509ce0e27fbd3587f6bbb84e751fcc0
+  metadata.gz: 26ed05f6ae3fde1a51daf47727454a8b279d5041846662608229a1ea2e82c7a0952101fb0a7828e1878df0df23e675001928d0fbdb702d657d242cb4f1369603
+  data.tar.gz: ccf273c1e402883e71570be64ad57ab7ea0a46e0c8abf7b22d952785a35baa49b0c6fbd6c0db1e6d8d701e711fcec5a0f206c5530d7eb157a3aa40bca5324280

data/.gitignore

@@ -8,3 +8,4 @@ tmp
 *.gem
 .bundle
 Gemfile.lock
+.rvmrc

data/.travis.yml

@@ -1,12 +1,8 @@
 language: "ruby"
 script: "bundle exec rake"
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - jruby-18mode
   - jruby-19mode
-  - rbx-18mode
-  - rbx-19mode
-  - ree
+  - rbx

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.1.1 (2014-01-02)
+
+* Feature: [#38](https://github.com/savonrb/gyoku/pull/38) support for building nested Arrays
+* Feature: [#36](https://github.com/savonrb/gyoku/pull/36) allow setting any objects content with :content!
+* Deprecation:  Support for ree and ruby 1.8.7 will be going away soon.
+
 ## 1.1.0 (2013-07-26)
 
 * Feature: [#30](https://github.com/savonrb/gyoku/pull/30) support for building Arrays

data/Gemfile

@@ -3,3 +3,10 @@ gemspec
 
 gem 'simplecov', :require => false
 gem 'coveralls', :require => false
+
+platform :rbx do
+  gem 'json'
+  gem 'racc'
+  gem 'rubysl'
+  gem 'rubinius-coverage'
+end

data/gyoku.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency "builder", ">= 2.1.2"
 
-  s.add_development_dependency "rake",  "~> 0.9"
-  s.add_development_dependency "rspec", "~> 2.10"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/gyoku/array.rb

@@ -6,6 +6,8 @@ require "gyoku/xml_value"
 module Gyoku
   class Array
 
+    NESTED_ELEMENT_NAME = "element"
+
     # 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 = {})
@@ -17,6 +19,7 @@ module Gyoku
         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) }
           end

data/lib/gyoku/hash.rb

@@ -51,8 +51,9 @@ module Gyoku
           node_attr.merge!(explicit_attr)
           explicit_keys.each{|k| node_value.delete(k) }
 
-          node_value = node_value.delete(:content!) || node_value
-          node_value = "" if node_value.empty?
+          tmp_node_value = node_value.delete(:content!)
+          node_value = tmp_node_value unless tmp_node_value.nil?
+          node_value = "" if node_value.respond_to?(:empty?) && node_value.empty?
         end
 
         yield xml, key, node_value, node_attr

data/lib/gyoku/version.rb

@@ -1,5 +1,5 @@
 module Gyoku
 
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 
 end

data/spec/gyoku/array_spec.rb

@@ -51,6 +51,13 @@ describe Gyoku::Array do
 
       to_xml(array, "value", :escape_xml, :id => [1, 2]).should == result
     end
+
+    it "handles nested Arrays" do
+      array = [["one", "two"]]
+      result = "<value><element>one</element><element>two</element></value>"
+
+      to_xml(array, "value").should == result
+    end
   end
 
   def to_xml(*args)

data/spec/gyoku/hash_spec.rb

@@ -198,6 +198,42 @@ describe Gyoku::Hash do
       to_xml(hash).should == "<category>users</category>"
     end
 
+    it "recognizes :content! => value as tag content with value Fixnum" do
+      hash = {
+        "category" => {
+          :content! => 666
+        }
+      }
+      to_xml(hash).should == "<category>666</category>"
+    end
+
+    it "recognizes :content! => value as tag content with value true" do
+      hash = {
+        "category" => {
+          :content! => true
+        }
+      }
+      to_xml(hash).should == "<category>true</category>"
+    end
+
+    it "recognizes :content! => value as tag content with value false" do
+      hash = {
+        "category" => {
+          :content! => false
+        }
+      }
+      to_xml(hash).should == "<category>false</category>"
+    end
+
+    it "recognizes :content! => value as tag content with value DateTime" do
+      hash = {
+        "before" => {
+          :content! => DateTime.new(2012, 03, 22, 16, 22, 33)
+        }
+      }
+      to_xml(hash).should == "<before>2012-03-22T16:22:33+00:00</before>"
+    end
+
     it "ignores :content! if self-closing mark present" do
       hash = {
         "category/" => {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gyoku
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Daniel Harrington
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2014-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -28,30 +28,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '0'
 description: Gyoku translates Ruby Hashes to XML
 email: me@rubiii.com
 executables: []
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: gyoku
-rubygems_version: 2.0.6
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Translates Ruby Hashes to XML