nori 1.1.2 → 1.1.3

data/CHANGELOG.md

@@ -1,53 +1,14 @@
-## 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)
+## 1.1.3 (2012-07-12)
+
+* Fix: Merged [pull request 21](https://github.com/rubiii/nori/pull/21) to fix an
+  issue with date/time/datetime regexes not matching positive time zone offsets and
+  datetime strings with seconds.
+
+## 1.1.2 (2012-06-30)
 
 * Fix: Reverted `Object#xml_attributes` feature which is planned for version 2.0.
 
-## 1.1.1 (2012-02-29) - yanked
+## 1.1.1 (2012-06-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.

data/lib/nori/version.rb

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

data/lib/nori/xml_utility_node.rb

@@ -23,11 +23,12 @@ module Nori
     # 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:00+02:00    1:20 PM, Central European 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*$/
+    XS_TIME = /^\d{2}:\d{2}:\d{2}[Z\.\-\+]?\d*:?\d*$/
 
     # Simple xs:date Regexp.
     # Valid xs:date formats
@@ -35,18 +36,21 @@ module Nori
     # -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-12+02:00     April 12, 2004, Central European Summer Time, which is 2 hours ahead of 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*$/
+    XS_DATE = /^[-]?\d{4}-\d{2}-\d{2}[Z\-\+]?\d*:?\d*$/
 
     # Simple xs:dateTime Regexp.
     # 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:00+02:00     1:20 pm on April 12, 2004, Central European Summer Time
+    # 2004-04-12T13:20:15.5-05:00   1:20 pm and 15.5 seconds 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*$/
+    XS_DATE_TIME = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[\.Z]?\d*[\-\+]?\d*:?\d*$/
 
     def self.typecasts
       @@typecasts

data/spec/nori/nori_spec.rb

@@ -133,15 +133,33 @@ describe Nori do
           parse("<value>09:33:55Z</value>")["value"].should == Time.parse("09:33:55Z")
         end
 
+        it "should transform Strings matching the xs:time format ahead of utc to Time objects" do
+          parse("<value>09:33:55+02:00</value>")["value"].should == Time.parse("09:33:55+02:00")
+        end
+
         it "should transform Strings matching the xs:date format to Date objects" do
           parse("<value>1955-04-18-05:00</value>")["value"].should == Date.parse("1955-04-18-05:00")
         end
 
+        it "should transform Strings matching the xs:dateTime format ahead of utc to Date objects" do
+          parse("<value>1955-04-18+02:00</value>")["value"].should == Date.parse("1955-04-18+02:00")
+        end
+
         it "should transform Strings matching the xs:dateTime format to DateTime objects" do
           parse("<value>1955-04-18T11:22:33-05:00</value>")["value"].should ==
             DateTime.parse("1955-04-18T11:22:33-05:00")
         end
 
+        it "should transform Strings matching the xs:dateTime format ahead of utc to DateTime objects" do
+          parse("<value>1955-04-18T11:22:33+02:00</value>")["value"].should ==
+            DateTime.parse("1955-04-18T11:22:33+02:00")
+        end
+
+        it "should transform Strings matching the xs:dateTime format with seconds and an offset to DateTime objects" do
+          parse("<value>2004-04-12T13:20:15.5-05:00</value>")["value"].should ==
+            DateTime.parse("2004-04-12T13:20:15.5-05:00")
+        end
+
         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"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nori
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-29 00:00:00 Z
+date: 2012-07-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement