timerage 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ceefa4559c94982a16c483de5def25fecf657c0
-  data.tar.gz: 90f35a70852bc552f75e78c4af721bdcb7297838
+  metadata.gz: 0365b44846200c067bdec2f0f12e0c37f6619896
+  data.tar.gz: 6c2b0ea9a6fe86a7f163914ab1b4b4879c21f0dd
 SHA512:
-  metadata.gz: 02599aeffd1a812a3b0404b0f101946bdbd6fa6815dec2aa2611ed1b02f2958a0468b0adb1d03333233e7d7922aa9cd9a4958e4746636f80f0a4295b3289bc7e
-  data.tar.gz: cb0c22a9074efbce775c0b50688121981727028ca1af332ec8c2b70980fe3ad515d5733251e1a1d3924d9b2be0faa1295f3905e18dca63e522a3f2de3f72ca7d
+  metadata.gz: 73b6ee091ef7fc1994aa0436b277daaada95ed0f1f07360e4c3eda3da8311ff0005661534993dfdf614b1a86441a47fac41f824d81c1537c085c57c0cc8de0a2
+  data.tar.gz: be398eac47d357eba8e1aa05c584aa872924fb639bf462745db0f6a6f19a014ca9e1549904cb9cdaa8f9ac1d33060464f699eae3c8e634535f503fa96f59ba24

data/lib/timerage/time_interval.rb

@@ -30,20 +30,26 @@ 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)
-      not_done = if exclude_end?
-                   ->(nxt) { nxt < self.end }
-                 else
-                   ->(nxt) { nxt <= self.end }
-                 end
+      count = (self.end - self.begin).div(step)
+      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|
-        nxt = self.begin
+        y << last = self.begin
 
-        while not_done.call(nxt) do
-          y << nxt
-
-          nxt += step
+        (count-1).times do
+          y << last = last + step
         end
       end
     end

data/lib/timerage/version.rb

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

metadata

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