timerage 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0365b44846200c067bdec2f0f12e0c37f6619896
-  data.tar.gz: 6c2b0ea9a6fe86a7f163914ab1b4b4879c21f0dd
+  metadata.gz: 91d9b9ff2e0b26e78e0c666e25f0e43ed2d7e63f
+  data.tar.gz: 41b7873004e11a260af8280958e0353647473681
 SHA512:
-  metadata.gz: 73b6ee091ef7fc1994aa0436b277daaada95ed0f1f07360e4c3eda3da8311ff0005661534993dfdf614b1a86441a47fac41f824d81c1537c085c57c0cc8de0a2
-  data.tar.gz: be398eac47d357eba8e1aa05c584aa872924fb639bf462745db0f6a6f19a014ca9e1549904cb9cdaa8f9ac1d33060464f699eae3c8e634535f503fa96f59ba24
+  metadata.gz: 842c1c4c4c6b4172de92d1f77d10a79f487596bd4334088dc239d8afefad62cacc82b2ad361de1cd69b3c0bd710691ccb19574ae4319a62919ecfa9bacab16a0
+  data.tar.gz: d3b1a9f064a1d73ddb4ea54fe10b9fd1f31f2fffa965206f5bccc60fa053e7103b62ce6f8a0f913faecbce2b0d0e307b6435571d49b0ecceacf53ad74cb50a72

data/lib/timerage/time_interval.rb

@@ -41,8 +41,8 @@ module Timerage
     # 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)
-      count += 1 if !exclude_end? and (self.end - self.begin) % step == 0
+      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|

data/lib/timerage/version.rb

@@ -1,3 +1,3 @@
 module Timerage
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/spec/timerage/time_interval_spec.rb

@@ -1,6 +1,9 @@
 require_relative "../spec_helper"
 
 describe Timerage::TimeInterval do
+  let(:now) { Time.now }
+  let(:duration) { 3600 }
+
   describe "creation" do
     specify { expect(described_class.new(now-1..now)).to be_kind_of described_class }
     specify { expect(described_class.new(now-1, now)).to be_kind_of described_class }
@@ -30,6 +33,10 @@ describe Timerage::TimeInterval do
     specify { expect{|b| interval.step(1200, &b) }
         .to yield_successive_args now-duration, now-(duration-1200), now-(duration-2400), now }
 
+    context "duration of non-integer steps" do
+      specify { expect{|b| interval.step(1000, &b) }
+          .to yield_successive_args now-duration, now-(duration-1000), now-(duration-2000), now-(duration-3000) }
+    end
   end
 
   context "interval exclude end" do
@@ -47,9 +54,6 @@ describe Timerage::TimeInterval do
 
   end
 
-  let(:now) { Time.now }
-  let(:duration) { 3600 }
-
   matcher :behave_like_a do |expected|
     match do |actual|
       Set[*expected.instance_methods].subset? Set[*actual.methods]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timerage
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Peter Williams
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler