timerage 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3acb06877cbd9dfa9823c54c3b8e4fd11270db92
-  data.tar.gz: ed5a9339c042aacd06fb2cb1edbe937b60dee29c
+  metadata.gz: 5d2ce967a8b55c69a7296b30f83b8e4cbf187926
+  data.tar.gz: fac80cd77fdacd79a53c76f54c7c15943da8b932
 SHA512:
-  metadata.gz: 9d814211ed6c43433c550de50ba581eb85d87bbc29dfcd59acc15199092fcce343b6fb59729306fc33a0ef0593bdd0670774b9d2540d1b6072164a8be74b4db9
-  data.tar.gz: ae499db68b130aed3f9e640b1f439191a6ed723f15d2332007ae90f1176e1ed483933c0edbad3895652d1b250a51be858d7989c7ac7d59aa38f8a49b11e9d2c1
+  metadata.gz: a4eafa5361792a724815d1c90a1c44f7f63b37bfe82ee08015310c98205bb87bbb6d5984802372b8c2adfedd3d5feafc711ea5a9f29437fc8fb4eed692540465
+  data.tar.gz: 9049a7ddff2190f712eadea970f727fa0d9ca9fcd4c1e04f65d37d7a82506e56b2b8ef97ee874c4b40e7961466062ab2c89ba27f94483df4e9d878a9107e43f0

data/lib/timerage/time_interval.rb

@@ -23,7 +23,7 @@ module Timerage
       end
     end
 
-    # Returns and ISO8601 interval representation of self
+    # Returns an ISO8601 interval representation of self
     # Takes same args as Time#iso8601
     def iso8601(*args)
       "#{self.begin.iso8601(*args)}/#{self.end.iso8601(*args)}"
@@ -59,5 +59,21 @@ module Timerage
         end
       end
     end
+
+    # class methods
+    # =============
+
+    # Returns a new TimeInterval representation of the iso8601 interval
+    # represented by the specified string.
+    #
+    # --
+    #
+    # Currently this only supports `<begin>/<end>` style time intervals.
+    def self.iso8601(str)
+      new *str.split("/").map{|s| Time.iso8601(s)}
+
+    rescue ArgumentError
+      raise ArgumentError, "Invalid iso8601 interval: #{str.inspect}"
+    end
   end
 end

data/lib/timerage/version.rb

@@ -1,3 +1,3 @@
 module Timerage
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/lib/timerage.rb

@@ -1,8 +1,21 @@
 require "timerage/version"
+require "time"
 
 module Timerage
   autoload :TimeInterval, "timerage/time_interval"
 
+  # Returns a Time or Timerage::TimeInterval representation of the
+  # iso8601 str.
+  #
+  # --
+  #
+  # Currently this only supports `<begin>/<end>` style time intervals.
+  def self.parse_iso8601(str)
+    TimeInterval.iso8601(str)
+  rescue ArgumentError
+    Time.iso8601(str)
+  end
+
   refine Range do
     def step(n, &blk)
       if self.begin.kind_of?(Time) || self.begin.kind_of?(Date)

data/spec/timerage/time_interval_spec.rb

@@ -11,6 +11,14 @@ describe Timerage::TimeInterval do
     specify { expect(described_class.new(now-1, now, false )).to be_kind_of described_class }
   end
 
+  describe ".iso8601" do
+    specify { expect(described_class
+                      .iso8601("2001-01-01T00:00:00Z/2001-01-02T00:00:00-06:00"))
+                .to be_kind_of described_class }
+    specify { expect{described_class.iso8601("2001-01-01T00:00:00Z")}
+                .to raise_error ArgumentError }
+  end
+
   subject(:interval) { described_class.new(now-duration, now) }
 
   it { is_expected.to behave_like_a Range }

data/spec/timerage_spec.rb

@@ -9,11 +9,19 @@ describe Timerage do
     specify { expect(range.to_time_interval).to be_kind_of Timerage::TimeInterval }
     specify { expect{|b| range.step(1200, &b) }.to yield_control.at_least(:once) }
 
+    describe ".iso8601" do
+      specify { expect(described_class
+                        .parse_iso8601("2001-01-01T00:00:00Z/2001-01-02T00:00:00-06:00"))
+                .to be_kind_of Timerage::TimeInterval }
+      specify { expect(described_class.parse_iso8601("2001-01-01T00:00:00Z"))
+                .to be_kind_of Time }
+    end
+
     context "interval include end" do
       specify { expect{|b| range.step(1200, &b) }
           .to yield_successive_args now-duration, now-(duration-1200), now-(duration-2400), now }
 
-  end
+    end
 
     context "interval exclude end" do
       subject (:range) { Range.new(now-duration, now, true) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timerage
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Peter Williams
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler