timerage 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f82bbd7083065080ca7d80bf905a6f77d8bf2e7f
-  data.tar.gz: fbbcc51556bbdcf68e000937cb0d219c78f942e1
+  metadata.gz: 852f05909b0c54b53238eeccad669f7f71afcfd9
+  data.tar.gz: 991234a087b2d382acb900a2869557f764e50d7a
 SHA512:
-  metadata.gz: 0f3d81194d057830e4fe1743df1b8fe65c79af78ebf71f406792d1d26f513aac2f42321dea5cc58633c9733aa043321b091f96e6fc6244d99952b9bc81c8ea66
-  data.tar.gz: 04d3101baf65ab9eef0b4ffd3ccd7b6081016debe211e69cdf40c7f26395809f2efb29e66fbd785cbb94749da93fb5d2ae7a8cdcd9ec79f67b6865a1f9edb3d2
+  metadata.gz: e05d511d2ecec9629e85a8d3db2c5b7e251d084a289f159e1d07843098a398cf46f74cb197c23197c2a3b2748331586f678b1d7810c13aeb3fd5b33fabeea14c
+  data.tar.gz: 8111ba63bf032f12969d21260ad89c9ce1d3ec94139863531ca0bc8811eb0d83c37d7ad8cef1e362edb6ef14253db702fe025cd950adba674c026b7d1d3349ef

data/lib/timerage/time_interval.rb

@@ -2,15 +2,15 @@ require "delegate"
 
 module Timerage
   # A range of time. The exposes the Range like interface.
-  class TimeInterval < DelegateClass(Range)
-    def initialize(*args)
-      rng = if rangeish?(args.first)
-              args.first
-            else
-              Range.new(*args)
-            end
-
-      super rng
+  class TimeInterval < Range
+
+    class << self
+      def new(*args)
+        args = [args.first.begin, args.first.end, args.first.exclude_end?] if args.first.respond_to?(:exclude_end?) 
+        new_obj = allocate
+        new_obj.send(:initialize, *args)
+        new_obj
+      end
     end
 
     def to_time_interval
@@ -81,11 +81,11 @@ module Timerage
     end
 
     def overlap?(other)
-      earliest, latest = if self.begin <= other.begin
-                           [self, other]
-                         else
-                           [other, self]
-                         end
+      if self.begin <= other.begin
+        earliest, latest = self, other
+      else
+        earliest, latest = other, self
+      end
 
       latest_begin, earliest_end = latest.begin, earliest.end
       return true  if latest_begin < earliest_end
@@ -134,26 +134,14 @@ module Timerage
         an_obj.respond_to?(:end)
     end
 
-    # ---
-    #
-    # This is implemented in a slightly more procedural style than i
-    # prefer because we want to work well with ActiveSupport::Duration
-    # steps. Adding a Duration to a time uses the timezone (dst, etc),
-    # leap second and leap day aware `#advance` method in
-    # ActiveSupport. However, multiplying a Duration by a number
-    # returns a number, rather than a duration. This, in turn, means
-    # that adding a duration times a number to a time results in
-    # Timely incorrect results. So we do it the hard way.
     def time_enumerator(step)
       count = (self.end - self.begin).div(step) + 1
       count -= 1 if exclude_end? and (self.end - self.begin) % step == 0
       # We've included our end if it should be
 
       Enumerator.new do |y|
-        y << last = self.begin
-
-        (count-1).times do
-          y << last = last + step
+        (count).times do |offset|
+          y << self.begin + (step * offset)
         end
       end
     end

data/lib/timerage/version.rb

@@ -1,3 +1,3 @@
 module Timerage
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/spec/timerage/time_interval_spec.rb

@@ -1,4 +1,5 @@
 require_relative "../spec_helper"
+require "active_support/all"
 
 describe Timerage::TimeInterval do
   let(:now) { Time.now }
@@ -179,6 +180,41 @@ describe Timerage::TimeInterval do
     specify { expect( interval.duration).to eq duration }
   end
 
+  context "exclusive 0 length interval" do
+    subject(:interval) { described_class.new(now...now) }
+    specify { expect{ |b| subject.step(1, &b) }.not_to yield_control }
+  end
+
+  context "inclusive 0 length interval" do
+    subject(:interval) { described_class.new(now..now) }
+    specify { expect{ |b| subject.step(1, &b) }.to yield_control.once }
+  end
+
+  context "includes leap day" do
+    subject(:interval) { described_class.new(before_leap_day..after_leap_day) }
+    specify { expect{ |b| subject.step(1.day, &b) }.to yield_control.exactly(3).times }
+    specify { expect{ |b| subject.step(86_400, &b) }.to yield_control.exactly(3).times }
+  end
+
+  context "transition into dst with explicit time zone" do
+    subject(:interval) { described_class.new(before_dst..after_dst) }
+    specify { expect{ |b| subject.step(1.hour, &b) }.to yield_control.exactly(2).times }
+    specify { expect{ |b| subject.step(3_600, &b) }.to yield_control.exactly(2).times }
+  end
+
+  context "transition into dst without explicit time zone" do
+    subject(:interval) { described_class.new(before_dst..(before_dst + 1.hour)) }
+    specify { expect{ |b| subject.step(1.hour, &b) }.to yield_control.exactly(2).times }
+    specify { expect{ |b| subject.step(3_600, &b) }.to yield_control.exactly(2).times }
+  end
+
+  let(:leap_day) { Time.parse("2016-02-29 12:00:00 UTC") }
+  let(:before_leap_day) { leap_day - 1.day }
+  let(:after_leap_day) { leap_day + 1.day}
+
+  let(:before_dst) { Time.parse("2016-03-13 01:30:00 MST") }
+  let(:after_dst) { Time.parse("2016-03-13 03:30:00 MDT") }
+
   matcher :behave_like_a do |expected|
     match do |actual|
       Set[*expected.instance_methods].subset? Set[*actual.methods]

data/timerage.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", ["> 3.0.0.a", "< 4"]
+  spec.add_development_dependency "activesupport"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timerage
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Peter Williams
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-18 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,6 +59,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple refinement to Range to allow Time or Date as arguments
 email:
 - cschneider@comverge.com