timeliness 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9692d6a370b0240cc872d67dbc79deaf5429b276ba3a8aa45049f9b77a70456c
-  data.tar.gz: c63f8a093f2e85909a7ecd4a894bc59d6929da07c3fd3ed445932a9e8474f535
+  metadata.gz: 22c5b15397d7f945442d9768efb71ebbb243e7d44b8948d8ccf03e31c70858b3
+  data.tar.gz: 96ac6e12fd20b0b5530e3ae99e60b2df81c9014bd7cedba26fa6e9395268d8b5
 SHA512:
-  metadata.gz: ff9b6afda36bd0829dca9b8133e4db5f2a6eeff6d076cec28a12c8a83fd5e1c2b0973cdb7b1b328bf6556755232a4d8c82ecaa362d5224806f8eefd185d5bee5
-  data.tar.gz: ffa9fd84e51518e61e4689ddb31bda87f4d297d6ed56a99e20e34563ba18a97412d6e95af2d2c5843498fa75fd3a26d7a82357405e56bfc99cfe314a3b5d67d3
+  metadata.gz: d3c968646a9f6bc9d867d31c062724e162c8824fd4feb9f76a682f46cfd20cf817948b06bb1f14731eb2f3bb2be5d433edcb39d51ee8655e863898940f9ebf08
+  data.tar.gz: 5eb2af292e5248ee58cfd539bad3491c668adf8c564579c1694ebffd0163e27d0353aec2bd0d478923d930d796d878ca8e99861ea15c9ea86d4bac9089ce16f8

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+= 0.4.1 - 2019-06-11
+* Add format for ISO 8601 with usec and 'Z' UTC zone offset (jartek)
+* Fix ISO 8601 parsing bug where Z was not recognised as UTC
+* Add 'zt' format token to support 'Z' (Zulu time) zone offset i.e. +00:00 or UTC
+
 = 0.4.0 - 2019-02-09
 * Add threadsafety for use_euro_formats & use_us_formats to allow runtime
   switching (andruby, timdiggins) 

data/lib/timeliness/definitions.rb

@@ -75,10 +75,12 @@ module Timeliness
       'ddd, dd mmm yyyy hh:nn:ss tz', # RFC 822
       'ddd, dd mmm yyyy hh:nn:ss zo', # RFC 822
       'ddd mmm d hh:nn:ss zo yyyy', # Ruby time string
-      'yyyy-mm-ddThh:nn:ssZ', # ISO 8601 without zone offset
+      'yyyy-mm-ddThh:nn:ss', # ISO 8601
       'yyyy-mm-ddThh:nn:sszo', # ISO 8601 with zone offset
+      'yyyy-mm-ddThh:nn:sszt', # ISO 8601 with 'Zulu time' (i.e. Z) UTC zone designator
       'yyyy-mm-ddThh:nn:ss.u', # ISO 8601 with usec
       'yyyy-mm-ddThh:nn:ss.uzo', # ISO 8601 with usec and offset
+      'yyyy-mm-ddThh:nn:ss.uzt', # ISO 8601 with usec and 'Zulu time' (i.e. Z) UTC zone designator 
       'yyyy-mm-dd hh:nn:ss zo', # Ruby time string in later versions
       'yyyy-mm-dd hh:nn:ss tz', # Ruby time string for UTC in later versions
     ]
@@ -105,6 +107,7 @@ module Timeliness
       'ampm' => [ '[aApP]\.?[mM]\.?', :meridian ],
       'zo'   => [ '[+-]\d{2}:?\d{2}', :offset ],
       'tz'   => [ '[A-Z]{1,5}', :zone ],
+      'zt'   => [ '[Z]{1}',  :zulu],
       '_'    => [ '\s?' ]
     }
 
@@ -127,6 +130,7 @@ module Timeliness
       :usec     => [ 6, 'microseconds(usec)'],
       :offset   => [ 7, 'offset_in_seconds(offset)'],
       :zone     => [ 7, 'zone'],
+      :zulu     => [ 7, 'offset_in_seconds("00:00")'],
       :meridian => [ nil ]
     }
 

data/lib/timeliness/version.rb

@@ -1,3 +1,3 @@
 module Timeliness
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/spec/timeliness/format_set_spec.rb

@@ -57,8 +57,10 @@ describe Timeliness::FormatSet do
 
     context "for datetime formats" do
       format_tests = {
-        'ddd mmm d hh:nn:ss zo yyyy'  => {:pass => ['Sat Jul 19 12:00:00 +1000 2008'], :fail => []},
-        'yyyy-mm-ddThh:nn:ss(?:Z|zo)' => {:pass => ['2008-07-19T12:00:00+10:00', '2008-07-19T12:00:00Z'], :fail => ['2008-07-19T12:00:00Z+10:00']},
+        'ddd mmm d hh:nn:ss zo yyyy' => {:pass => ['Sat Jul 19 12:00:00 +1000 2008'], :fail => []},
+        'ddd mmm d hh:nn:ss tz yyyy' => {:pass => ['Sat Jul 19 12:00:00 EST 2008'], :fail => []},
+        'yyyy-mm-ddThh:nn:sszo' => {:pass => ['2008-07-19T12:00:00+10:00'], :fail => ['2008-07-19T12:00:00Z+10:00']},
+        'yyyy-mm-ddThh:nn:ss.uzt' => {:pass => ['2019-06-07T03:35:55.100000Z'], :fail => []},
       }
       format_tests.each do |format, values|
         it "should correctly match datetimes in format '#{format}'" do
@@ -68,7 +70,6 @@ describe Timeliness::FormatSet do
         end
       end
     end
-
   end
 
   context "#match" do

data/spec/timeliness/format_spec.rb

@@ -55,10 +55,18 @@ describe Timeliness::Format do
       expect(format_for('yyyy-mm-dd hh:nn:ss.u zo').process('2001', '02', '03', '04', '05', '06', '99', '+10:00')).to eq [2001,2,3,4,5,6,990000,36000]
     end
 
+    it "should define method which outputs datetime array with zone offset" do
+      expect(format_for('yyyy-mm-dd hh:nn:ss.u zo').process('2001', '02', '03', '04', '05', '06', '99', '+10:00')).to eq [2001,2,3,4,5,6,990000,36000]
+    end
+
     it "should define method which outputs datetime array with timezone string" do
       expect(format_for('yyyy-mm-dd hh:nn:ss.u tz').process('2001', '02', '03', '04', '05', '06', '99', 'EST')).to eq [2001,2,3,4,5,6,990000,'EST']
     end
 
+    it "should define method which outputs datetime array with 0 offset for zulu time ('Z')" do
+      expect(format_for('yyyy-mm-dd hh:nn:ss.uzt').process('2001', '02', '03', '04', '05', '06', '99', 'Z')).to eq [2001,2,3,4,5,6,990000,0]
+    end
+
     context "with long month" do
       let(:format) { format_for('dd mmm yyyy') }
 

data/spec/timeliness/parser_spec.rb

@@ -1,4 +1,19 @@
 describe Timeliness::Parser do
+  around(:all) do |example|
+    current_default = Timeliness.default_timezone
+    current_zone = Time.zone
+    example.call
+    Time.zone = current_zone
+    Timeliness.default_timezone = current_default
+  end
+
+  def self.timezone_settings(zone: nil, output: nil)
+    before do
+      Time.zone = zone if zone
+      Timeliness.default_timezone = output if output 
+    end
+  end
+
   before(:all) do
     Timecop.freeze(2010,1,1,0,0,0)
   end
@@ -70,10 +85,7 @@ describe Timeliness::Parser do
 
     context "string with zone offset value" do
       context "when current timezone is earler than string zone" do
-        before(:all) do
-          Timeliness.default_timezone = :current
-          Time.zone = 'Australia/Melbourne'
-        end
+        timezone_settings zone: 'Australia/Melbourne', output: :current
 
         it 'should return value shifted by positive offset in default timezone' do
           value = parse("2000-06-01T12:00:00+02:00")
@@ -86,18 +98,10 @@ describe Timeliness::Parser do
           expect(value).to eq Time.zone.local(2000,6,1,23,0,0)
           expect(value.utc_offset).to eq 10.hours
         end
-
-        after(:all) do
-          Time.zone = nil
-          Timeliness.default_timezone = :local
-        end
       end
 
       context "when current timezone is later than string zone" do
-        before(:all) do
-          Timeliness.default_timezone = :current
-          Time.zone = 'America/Phoenix'
-        end
+        timezone_settings zone: 'America/Phoenix', output: :current
 
         it 'should return value shifted by positive offset in default timezone' do
           value = parse("2000-06-01T12:00:00+02:00")
@@ -110,18 +114,11 @@ describe Timeliness::Parser do
           expect(value).to eq Time.zone.local(2000,6,1,6,0,0)
           expect(value.utc_offset).to eq -7.hours
         end
-
-        after(:all) do
-          Time.zone = nil
-          Timeliness.default_timezone = :local
-        end
       end
     end
 
     context "string with zone abbreviation" do
-      before(:all) do
-        Time.zone = 'Australia/Melbourne'
-      end
+      timezone_settings zone: 'Australia/Melbourne'
 
       it 'should return value using string zone adjusted to default :local timezone' do
         Timeliness.default_timezone = :local
@@ -144,9 +141,17 @@ describe Timeliness::Parser do
         expect(value).to eq Time.use_zone('Perth') { Time.zone.local(2000,6,1,18,0,0) }
         expect(value.utc_offset).to eq 8.hours
       end
+    end
+
+    context "string with zulu time abbreviation 'Z'" do
+      timezone_settings zone: 'Australia/Melbourne'
+      
+      it 'should return value using string zone adjusted to default :current timezone' do
+        Timeliness.default_timezone = :current
 
-      after(:all) do
-        Time.zone = nil
+        value = parse("2000-06-01T12:00:00Z")
+        expect(value).to eq Time.zone.local(2000,6,1,22,0,0)
+        expect(value.utc_offset).to eq 10.hours
       end
     end
 
@@ -226,8 +231,9 @@ describe Timeliness::Parser do
       end
 
       context ":current" do
+        timezone_settings zone: 'Adelaide'
+
         it "should return time object in current timezone" do
-          Time.zone = 'Adelaide'
           time = parse("2000-06-01 12:13:14", :datetime, :zone => :current)
           expect(time.utc_offset).to eq 9.5.hours
         end
@@ -469,19 +475,11 @@ describe Timeliness::Parser do
     end
 
     context "default timezone" do
-      before do
-        @default_timezone = Timeliness.default_timezone
-      end
-
       it "should be used if no zone value" do
         Timeliness.default_timezone = :utc
         time = parser.make_time([2000,6,1,12,0,0])
         expect(time.utc_offset).to eq 0
       end
-
-      after do
-       Timeliness.default_timezone = @default_timezone
-      end
     end
 
     context "with zone value" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timeliness
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Adam Meehan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-09 00:00:00.000000000 Z
+date: 2019-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: timeliness
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Date/time parsing for the control freak.