datet 0.0.23 → 0.0.24

data/VERSION

@@ -1 +1 @@
-0.0.23
+0.0.24

data/datet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "datet"
-  s.version = "0.0.23"
+  s.version = "0.0.24"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = "2013-03-27"
+  s.date = "2013-04-08"
   s.description = "A framework for handeling date- and time-related stuff in Ruby."
   s.email = "k@spernj.org"
   s.extra_rdoc_files = [

data/lib/datet.rb

@@ -1122,11 +1122,13 @@ class Datet
       return Datet.new(match[1].to_i, match[2].to_i, match[3].to_i, match[5].to_i, match[6].to_i, match[7].to_i)
     elsif match = timestr_t.match(/^([A-z]+),\s*(\d+)\s+([A-z]+)\s+(\d+)\s+(\d+):(\d+):(\d+)\s*([A-z]+)$/)
       return Datet.new(match[4].to_i, Datet.month_str_to_no(match[3]), match[2].to_i, match[5].to_i, match[6].to_i, match[7].to_i)
-    elsif match = timestr_t.match(/^(\d{4})-(\d{2})-(\d{2})t(\d{2}):(\d{2}):(\d{2})\+(\d{4}$)$/i)
+    elsif match = timestr_t.match(/^(\d{4})-(\d{2})-(\d{2})t(\d{2}):(\d{2}):(\d{2})\+(\d{4})$/i)
       return Datet.new(match[1].to_i, match[2].to_i, match[3].to_i, match[4].to_i, match[5].to_i, match[6].to_i)
-    elsif match = timestr_t.match(/^(\d{4})-(\d{2})-(\d{2})t(\d{2}):(\d{2}):(\d{2})\.(\d+)$/)
+    elsif match = timestr_t.match(/^(\d{4})-(\d{2})-(\d{2})(t|\s+)(\d{2}):(\d{2}):(\d{2})\.(\d+)(z|)$/i)
       #FIXME: Parse the weird usec at the end.
-      return Datet.new(match[1].to_i, match[2].to_i, match[3].to_i, match[4].to_i, match[5].to_i, match[6].to_i)
+      return Datet.new(match[1].to_i, match[2].to_i, match[3].to_i, match[5].to_i, match[6].to_i, match[7].to_i)
+    elsif match = timestr_t.match(/^(\d{4})-(\d{2})-(\d{2})(t|\s+)(\d{2}):(\d{2}):(\d{2})(z|)$/i)
+      return Datet.new(match[1].to_i, match[2].to_i, match[3].to_i, match[5].to_i, match[6].to_i, match[7].to_i)
     end
     
     raise ArgumentError, "Wrong format: '#{timestr}', class: '#{timestr.class.name}'"

data/spec/datet_spec.rb

@@ -563,5 +563,8 @@ describe "Datet" do
   it "should handle a format form mssql" do
     datet = Datet.in("2010-10-31T18:21:45.8770000")
     datet.dbstr.should eql("2010-10-31 18:21:45")
+    
+    datet = Datet.in("2010-10-31T18:21:45Z")
+    datet.dbstr.should eql("2010-10-31 18:21:45")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datet
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -110,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3509118619356449614
+      hash: 4532058298207669716
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: