timerage 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 852f05909b0c54b53238eeccad669f7f71afcfd9
-  data.tar.gz: 991234a087b2d382acb900a2869557f764e50d7a
+SHA256:
+  metadata.gz: '07846226e71bd754087bd3b54c49d85a70e9d2f9b809d678351fbd685546fcb4'
+  data.tar.gz: e3be843301a7d7a7ea7cec902c2f4fd8152314a5cbbf4e74d8aad65ede5196ec
 SHA512:
-  metadata.gz: e05d511d2ecec9629e85a8d3db2c5b7e251d084a289f159e1d07843098a398cf46f74cb197c23197c2a3b2748331586f678b1d7810c13aeb3fd5b33fabeea14c
-  data.tar.gz: 8111ba63bf032f12969d21260ad89c9ce1d3ec94139863531ca0bc8811eb0d83c37d7ad8cef1e362edb6ef14253db702fe025cd950adba674c026b7d1d3349ef
+  metadata.gz: 76acc33ddaa358897021f20b82c4f3faffb1867469e410da6566480880c78c9524a84e39edb6c3468bfd5d49cba4d72dfe526dbd749ad6ecff66be839fcb6bc0
+  data.tar.gz: 96e281a1b857a002653629b4289574f4488068609f40f74b85832966a402311c88ea16f9db91080a74566ac502a7bd1468d496bb73b5095dcfbe572d09f2ec06

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 = step * 0
 
       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.2.0"
 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))
@@ -208,6 +214,22 @@ describe Timerage::TimeInterval do
     specify { expect{ |b| subject.step(3_600, &b) }.to yield_control.exactly(2).times }
   end
 
+  context "When given date range" do
+    it "returns date objects when stepping through the range with a day duration" do
+      date_range = Date.new(2020, 1, 1)..Date.new(2020,1,3)
+      described_class.new(date_range).step(1.day) do |date|
+        expect(date).to be_kind_of Date
+      end
+    end
+
+    it "returns Time objects when stepping through the range with an hour duration" do
+      date_range = Date.new(2020, 1, 1)..Date.new(2020,1,2)
+      described_class.new(date_range).step(6.hours) do |date|
+        expect(date).to be_kind_of Time
+      end
+    end
+  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}

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,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: timerage
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Peter Williams
 - Chris Schneider
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2023-11-10 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
@@ -96,7 +96,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -111,9 +111,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Simple refinement to Range to allow Time or Date as arguments
 test_files: