nori 1.1.0 → 1.1.2

data/CHANGELOG.md

@@ -1,4 +1,58 @@
-== 1.1.0 (2012-02-17)
+## 2.0.0 (UPCOMING)
+
+* Major change: Removed attributes from values and moved them to `Object#xml_attributes`.
+  Even though I don't like extending Object, this change solves a lot of problems and confusion
+  with XML attributes and values.
+
+    ``` xml
+    <Contact xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+      <Name xsi:type="xsd:string">Some name in here</Name>
+      <Address xsi:nil="true"></Address>
+    </Contact>
+    ```
+
+  What you got before this change was the "Name" without the attribute
+  and the `xsi` attribute from the "Contact" node prefixed with an @.
+
+    ``` ruby
+    old = {
+      "Contact" => {
+        "Name" => "Some name in here",
+        "Address" => nil,
+        "@xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance"
+      }
+    }
+    ```
+
+  What you get now, is this:
+
+    ``` ruby
+    new = {
+      "Contact" => {
+        "Name" => "Some name in here",
+        "Address" => nil
+      }
+    }
+    ```
+
+  No namespaces in your Hashes. If you need to access the attributes of node,
+  they are now stored on the nodes value.
+
+    ``` ruby
+    new["Contact"].xml_attributes  # => { "xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance" }
+    new["Contact"]["Name"].xml_attributes  # => { "xsi:type" => "xsd:string" }
+    ```
+
+## 1.1.2 (2012-02-30)
+
+* Fix: Reverted `Object#xml_attributes` feature which is planned for version 2.0.
+
+## 1.1.1 (2012-02-29) - yanked
+
+* Fix: Merged [pull request 17](https://github.com/rubiii/nori/pull/17) for improved
+  xs:time/xs:date/xs:dateTime regular expression matchers.
+
+## 1.1.0 (2012-02-17)
 
 * Improvement: Merged [pull request 9](https://github.com/rubiii/nori/pull/9) to
   allow multiple configurations of Nori.
@@ -6,17 +60,17 @@
 * Fix: Merged [pull request 10](https://github.com/rubiii/nori/pull/10) to handle
   date/time parsing errors. Fixes a couple of similar error reports.
 
-== 1.0.2 (2011-07-04)
+## 1.0.2 (2011-07-04)
 
 * Fix: When specifying a custom formula to convert tags, XML attributes were ignored.
   Now, a formula is applied to both XML tags and attributes.
 
-== 1.0.1 (2011-06-21)
+## 1.0.1 (2011-06-21)
 
 * Fix: Make sure to always load both StringWithAttributes and StringIOFile
   to prevent NameError's.
 
-== 1.0.0 (2011-06-20)
+## 1.0.0 (2011-06-20)
 
 * Notice: As of v1.0.0, Nori will follow [Semantic Versioning](http://semver.org).
 
@@ -45,22 +99,22 @@
       end
 
       xml = '<userResponse><accountStatus>active</accountStatus></userResponse>'
-      parse(xml).should == { :user_response => { :account_status => "active" }
+      parse(xml).should ## { :user_response => { :account_status => "active" }
 
-== 0.2.4 (2011-06-21)
+## 0.2.4 (2011-06-21)
 
 * Fix: backported fixes from v1.0.1
 
-== 0.2.3 (2011-05-26)
+## 0.2.3 (2011-05-26)
 
 * Fix: Use extended core classes StringWithAttributes and StringIOFile instead of
   creating singletons to prevent serialization problems.
 
-== 0.2.2 (2011-05-16)
+## 0.2.2 (2011-05-16)
 
 * Fix: namespaced xs:nil values should be nil objects.
 
-== 0.2.1 (2011-05-15)
+## 0.2.1 (2011-05-15)
 
 * Fix: Changed XML attributes converted to Hash keys to be prefixed with an @-sign.  
   This avoids problems with attributes and child nodes having the same name.
@@ -74,7 +128,7 @@
 
       { "multiRef" => { "@id" => "id1", "id" => "76737", "approved" => "true" } }
 
-== 0.2.0 (2011-04-30)
+## 0.2.0 (2011-04-30)
 
 * Removed JSON from the original Crack basis
 * Fixed a problem with Object#blank?
@@ -83,30 +137,30 @@
 
       Nori.parser = :nokogiri
 
-== 0.1.7 2010-02-19
+## 0.1.7 2010-02-19
 * 1 minor patch
   * Added patch from @purp for ISO 8601 date/time format
 
-== 0.1.6 2010-01-31
+## 0.1.6 2010-01-31
 * 1 minor patch
   * Added Crack::VERSION constant - http://weblog.rubyonrails.org/2009/9/1/gem-packaging-best-practices
 
-== 0.1.5 2010-01-27
+## 0.1.5 2010-01-27
 * 1 minor patch
   * Strings that begin with dates shouldn't be parsed as such (sandro)
 
-== 0.1.3 2009-06-22
+## 0.1.3 2009-06-22
 * 1 minor patch
   * Parsing a text node with attributes stores them in the attributes method (tamalw)
 
-== 0.1.2 2009-04-21
+## 0.1.2 2009-04-21
 * 2 minor patches
   * Correct unnormalization of attribute values (der-flo)
   * Fix error in parsing YAML in the case where a hash value ends with backslashes, and there are subsequent values in the hash (deadprogrammer)
 
-== 0.1.1 2009-03-31
+## 0.1.1 2009-03-31
 * 1 minor patch
   * Parsing empty or blank xml now returns empty hash instead of raising error.
 
-== 0.1.0 2009-03-28
+## 0.1.0 2009-03-28
 * Initial release.

data/lib/nori/version.rb

@@ -1,5 +1,5 @@
 module Nori
 
-  VERSION = "1.1.0"
+  VERSION = "1.1.2"
 
 end

data/lib/nori/xml_utility_node.rb

@@ -19,13 +19,34 @@ module Nori
   class XMLUtilityNode
 
     # Simple xs:time Regexp.
-    XS_TIME = /\d{2}:\d{2}:\d{2}/
+    # Valid xs:time formats
+    # 13:20:00          1:20 PM
+    # 13:20:30.5555     1:20 PM and 30.5555 seconds
+    # 13:20:00-05:00    1:20 PM, US Eastern Standard Time
+    # 13:20:00Z         1:20 PM, Coordinated Universal Time (UTC)
+    # 00:00:00          midnight
+    # 24:00:00          midnight
+
+    XS_TIME = /^\d{2}:\d{2}:\d{2}[Z\.\-]?\d*:?\d*$/
 
     # Simple xs:date Regexp.
-    XS_DATE = /\d{4}-\d{2}-\d{2}/
+    # Valid xs:date formats
+    # 2004-04-12           April 12, 2004
+    # -0045-01-01          January 1, 45 BC
+    # 12004-04-12          April 12, 12004
+    # 2004-04-12-05:00     April 12, 2004, US Eastern Standard Time, which is 5 hours behind Coordinated Universal Time (UTC)
+    # 2004-04-12Z          April 12, 2004, Coordinated Universal Time (UTC)
+
+    XS_DATE = /^[-]?\d{4}-\d{2}-\d{2}[Z\-]?\d*:?\d*$/
 
     # Simple xs:dateTime Regexp.
-    XS_DATE_TIME = /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/
+    # Valid xs:dateTime formats
+    # 2004-04-12T13:20:00           1:20 pm on April 12, 2004
+    # 2004-04-12T13:20:15.5         1:20 pm and 15.5 seconds on April 12, 2004
+    # 2004-04-12T13:20:00-05:00     1:20 pm on April 12, 2004, US Eastern Standard Time
+    # 2004-04-12T13:20:00Z          1:20 pm on April 12, 2004, Coordinated Universal Time (UTC)
+
+    XS_DATE_TIME = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[\.Z\-]?\d*:?\d*$/
 
     def self.typecasts
       @@typecasts

data/spec/nori/nori_spec.rb

@@ -144,15 +144,19 @@ describe Nori do
 
         it "should not transform Strings containing an xs:time String and more" do
           parse("<value>09:33:55Z is a time</value>")["value"].should == "09:33:55Z is a time"
+          parse("<value>09:33:55Z_is_a_file_name</value>")["value"].should == "09:33:55Z_is_a_file_name"
         end
 
         it "should not transform Strings containing an xs:date String and more" do
           parse("<value>1955-04-18-05:00 is a date</value>")["value"].should == "1955-04-18-05:00 is a date"
+          parse("<value>1955-04-18-05:00_is_a_file_name</value>")["value"].should == "1955-04-18-05:00_is_a_file_name"
         end
 
         it "should not transform Strings containing an xs:dateTime String and more" do
           parse("<value>1955-04-18T11:22:33-05:00 is a dateTime</value>")["value"].should ==
             "1955-04-18T11:22:33-05:00 is a dateTime"
+          parse("<value>1955-04-18T11:22:33-05:00_is_a_file_name</value>")["value"].should ==
+            "1955-04-18T11:22:33-05:00_is_a_file_name"
         end
 
         ["00-00-00", "0000-00-00", "0000-00-00T00:00:00", "0569-23-0141", "DS2001-19-1312654773", "e6:53:01:00:ce:b4:06"].each do |date_string|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nori
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -17,12 +17,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-17 00:00:00 Z
+date: 2012-06-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -33,12 +31,12 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
-  version_requirements: *id001
   name: rake
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,12 +47,12 @@ dependencies:
         - 4
         - 0
         version: 1.4.0
-  version_requirements: *id002
   name: nokogiri
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -65,12 +63,12 @@ dependencies:
         - 5
         - 0
         version: 2.5.0
-  version_requirements: *id003
   name: rspec
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,8 +77,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id004
   name: autotest
+  type: :development
+  prerelease: false
+  requirement: *id004
 description: XML to Hash translator
 email: me@rubiii.com
 executables: []
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: nori
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: XML to Hash translator