gyoku 0.1.1 → 0.2.0

data/gyoku.gemspec

@@ -15,7 +15,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency "builder", ">= 2.1.2"
 
-  s.add_development_dependency "rspec", "2.0.0"
+  s.add_development_dependency "rspec", "~> 2.4.0"
+  s.add_development_dependency "autotest"
   s.add_development_dependency "mocha", "~> 0.9.9"
 
   s.files         = `git ls-files`.split("\n")

data/lib/gyoku/hash.rb

@@ -14,14 +14,16 @@ module Gyoku
       iterate_with_xml hash do |xml, key, attributes|
         attrs = attributes[key] || {}
         value = hash[key]
+        self_closing = key.to_s[-1, 1] == "/"
         escape_xml = key.to_s[-1, 1] != "!"
         key = to_xml_key(key)
         
-        case value
-          when ::Array  then xml << Array.to_xml(value, key, escape_xml, attrs)
-          when ::Hash   then xml.tag!(key, attrs) { xml << Hash.to_xml(value) }
-          when NilClass then xml.tag!(key, "xsi:nil" => "true")
-          else               xml.tag!(key, attrs) { xml << to_xml_value(value, escape_xml) }
+        case
+          when ::Array === value  then xml << Array.to_xml(value, key, escape_xml, attrs)
+          when ::Hash === value   then xml.tag!(key, attrs) { xml << Hash.to_xml(value) }
+          when self_closing       then xml.tag!(key, attrs)
+          when NilClass === value then xml.tag!(key, "xsi:nil" => "true")
+          else                         xml.tag!(key, attrs) { xml << to_xml_value(value, escape_xml) }
         end
       end
     end

data/lib/gyoku/version.rb

@@ -1,5 +1,5 @@
 module Gyoku
 
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 
 end

data/lib/gyoku/xml_key.rb

@@ -6,16 +6,16 @@ module Gyoku
     # Converts a given +object+ to an XML key.
     def to_xml_key(key)
       case key
-        when Symbol then chop_exclamation_mark(key.to_s).lower_camelcase
-        else             chop_exclamation_mark(key.to_s)
+        when Symbol then chop_special_characters(key.to_s).lower_camelcase
+        else             chop_special_characters(key.to_s)
       end
     end
 
   private
 
-    # Chops existing exclamation marks from the end of a given +string+.
-    def chop_exclamation_mark(string)
-      string[-1, 1] == "!" ? string.chop : string
+    # Chops special characters from the end of a given +string+.
+    def chop_special_characters(string)
+      ["!", "/"].include?(string[-1, 1]) ? string.chop : string
     end
 
   end

data/spec/gyoku/hash_spec.rb

@@ -62,6 +62,10 @@ describe Gyoku::Hash do
       to_xml(:some => nil).should == '<some xsi:nil="true"/>'
     end
 
+    it "should create self-closing tags for Hash keys ending with a forward slash" do
+      to_xml("self-closing/" => nil).should == '<self-closing/>'
+    end
+
     it "should call to_s on any other Object" do
       [666, true, false].each do |object|
         to_xml(:some => object).should == "<some>#{object}</some>"

data/spec/gyoku/xml_key_spec.rb

@@ -4,12 +4,19 @@ describe Gyoku::XMLKey do
   include Gyoku::XMLKey
 
   describe "#to_xml_key" do
-    it "removes exclamation marks from the end of a String" do
-      to_xml_key("value").should == "value"
+    it "should remove exclamation marks from the end of a String" do
       to_xml_key("value!").should == "value"
     end
 
-    it "converts snake_case Symbols to lowerCamelCase Strings" do
+    it "should remove forward slashes from the end of a String" do
+      to_xml_key("self-closing/").should == "self-closing"
+    end
+
+    it "should not convert snake_case Strings" do
+      to_xml_key("lower_camel_case").should == "lower_camel_case"
+    end
+
+    it "should convert snake_case Symbols to lowerCamelCase Strings" do
       to_xml_key(:lower_camel_case).should == "lowerCamelCase"
       to_xml_key(:lower_camel_case!).should == "lowerCamelCase"
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gyoku
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-22 00:00:00 +01:00
+date: 2011-01-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,20 +40,34 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 31
         segments: 
         - 2
+        - 4
         - 0
-        - 0
-        version: 2.0.0
+        version: 2.4.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: autotest
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -65,7 +79,7 @@ dependencies:
         - 9
         version: 0.9.9
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 description: Gyoku converts Ruby Hashes to XML
 email: me@rubiii.com
 executables: []
@@ -81,7 +95,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- autotest/discover.rb
 - gyoku.gemspec
 - lib/gyoku.rb
 - lib/gyoku/array.rb
@@ -127,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: gyoku
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Converts Ruby Hashes to XML

data/autotest/discover.rb

@@ -1 +0,0 @@
-Autotest.add_discovery { "rspec2" }