timerage 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 852f05909b0c54b53238eeccad669f7f71afcfd9
-  data.tar.gz: 991234a087b2d382acb900a2869557f764e50d7a
+SHA256:
+  metadata.gz: e2b0e89fc0f24f9a2d8216d867b9d7d8f9477c4b449bc43c9d5287c4e24057c7
+  data.tar.gz: b6a3376136ad56501316b735da77c3ba8667803fd80f3a8812e941cf0f8dbbc3
 SHA512:
-  metadata.gz: e05d511d2ecec9629e85a8d3db2c5b7e251d084a289f159e1d07843098a398cf46f74cb197c23197c2a3b2748331586f678b1d7810c13aeb3fd5b33fabeea14c
-  data.tar.gz: 8111ba63bf032f12969d21260ad89c9ce1d3ec94139863531ca0bc8811eb0d83c37d7ad8cef1e362edb6ef14253db702fe025cd950adba674c026b7d1d3349ef
+  metadata.gz: 157b9c3a249183f8e8b4247332b5be02578899bf1c6d67e84853d161950bd09894d87098676eed4f71ced7a1e23d33e0c27168fdc27570a020e2774110664e75
+  data.tar.gz: 131e7dbf90167eeaf21935d246327283da94371ffa40c27ee36577317daf7a92d91049acde3a4bfe6f48eaa87cdebf2cd596889e68983523fd6992a03e6d1ae9

data/lib/timerage/time_interval.rb

@@ -6,7 +6,7 @@ module Timerage
 
     class << self
       def new(*args)
-        args = [args.first.begin, args.first.end, args.first.exclude_end?] if args.first.respond_to?(:exclude_end?) 
+        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
@@ -135,13 +135,12 @@ module Timerage
     end
 
     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
+      next_offset = 0.seconds
 
       Enumerator.new do |y|
-        (count).times do |offset|
-          y << self.begin + (step * offset)
+        while self.cover?(self.begin + next_offset)
+          y << self.begin + next_offset
+          next_offset += step
         end
       end
     end

data/lib/timerage/version.rb

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

data/spec/timerage/time_interval_spec.rb

@@ -47,7 +47,13 @@ describe Timerage::TimeInterval do
   specify { expect(interval.to_time).to (be >= interval.begin)
       .and (be <= interval.end) }
   specify { expect{|b| interval.step(1200, &b) }
-      .to yield_control.at_least(:once) }
+              .to yield_control.at_least(:once) }
+
+  specify { expect{|b|
+              Timerage(Time.parse("2019-08-01 01:00:00 UTC")...Time.parse("2019-09-01 01:00:00 UTC"))
+                .step(1.month, &b)
+            }.to yield_control.exactly(:once) }
+
   specify { expect(interval.iso8601)
             .to eq "#{interval.begin.iso8601}/#{interval.end.iso8601}" }
   specify { expect(interval.iso8601(3))

data/timerage.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", ["> 3.0.0.a", "< 4"]
   spec.add_development_dependency "activesupport"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timerage
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Peter Williams
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2019-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -111,8 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Simple refinement to Range to allow Time or Date as arguments