Merge branch 'master' into master

Author: pacso

.github/workflows/tests.yaml

@@ -19,11 +19,11 @@ jobs:
   changelog:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v2
       - id: read-version
         run: |
-          echo "::set-output name=VERSION::$(cat ./lib/ice_cube/version.rb | grep VERSION | awk '{ print $3 }' | sed -e 's/\"//g')"
-      - uses: actions/checkout@v2
-      - uses: dangoslen/changelog-enforcer@v2.2.0
+          echo "::set-output name=VERSION::`cat lib/ice_cube/version.rb | grep -i version | awk '{ print $3 }' | sed -e 's/\"//g'`"
+      - uses: dangoslen/changelog-enforcer@v2.3.1
         with:
           skipLabels: 'skip-changelog'
           expectedLatestVersion: ${{ steps.read-version.outputs.VERSION }}

CHANGELOG.md

@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Indonesian translations. ([#505](https://github.com/seejohnrun/ice_cube/pull/505)) by [@achmiral](https://github.com/achmiral)
 
+### Fixed
+- Fix for weekly interval results when requesting `occurrences_between` on a narrow range ([#487](https://github.com/seejohnrun/ice_cube/pull/487)) by [@jakebrady5](https://github.com/jakebrady5)
+- When using a rule with hour_of_day validations, and asking for occurrences on the day that DST skips forward, valid occurrences would be missed. ([#464](https://github.com/seejohnrun/ice_cube/pull/464)) by [@jakebrady5](https://github.com/jakebrady5)
+
 ## [0.16.4] - 2021-10-21
 ### Added
 - Italian translations
@@ -84,7 +88,7 @@ NOTE: the commit for the _v0.13.0_ release tag incorrectly says _Release 0.13.1_
 - Fix whole-day skip with date inputs
 - Missed times selected from gap week with weekly interval > 1 ([#241](https://github.com/seejohnrun/ice_cube/pull/241))
 - Fix `occurs_on?` miss near midnight for DST ([#245](https://github.com/seejohnrun/ice_cube/pull/245))
- 
+
 ## [0.12.1] - 2014-07-04
 ### Added
 - Support for deserialization of times via Time.parse

README.md

@@ -91,17 +91,17 @@ schedule.previous_occurrence(from_time)
 schedule.previous_occurrences(4, from_time)
 
 # or include prior occurrences with a duration overlapping from_time
-schedule.next_occurrences(4, from_time, :spans => true)
-schedule.occurrences_between(from_time, to_time, :spans => true)
+schedule.next_occurrences(4, from_time, spans: true)
+schedule.occurrences_between(from_time, to_time, spans: true)
 
 # or give the schedule a duration and ask if occurring_at?
-schedule = IceCube::Schedule.new(now, :duration => 3600)
+schedule = IceCube::Schedule.new(now, duration: 3600)
 schedule.add_recurrence_rule IceCube::Rule.daily
 schedule.occurring_at?(now + 1800) # true
 schedule.occurring_between?(t1, t2)
 
 # using end_time also sets the duration
-schedule = IceCube::Schedule.new(start = Time.now, :end_time => start + 3600)
+schedule = IceCube::Schedule.new(start = Time.now, end_time: start + 3600)
 schedule.add_recurrence_rule IceCube::Rule.daily
 schedule.occurring_at?(start + 3599) # true
 schedule.occurring_at?(start + 3600) # false
@@ -162,7 +162,7 @@ ice_cube can provide ical or string representations of individual rules, or the
 whole schedule.
 
 ```ruby
-rule = IceCube::Rule.daily(2).day_of_week(:tuesday => [1, -1], :wednesday => [2])
+rule = IceCube::Rule.daily(2).day_of_week(tuesday: [1, -1], wednesday: [2])
 
 rule.to_ical # 'FREQ=DAILY;INTERVAL=2;BYDAY=1TU,-1TU,2WE'
 
@@ -218,12 +218,12 @@ month (e.g. no occurrences in February for `day_of_month(31)`).
 
 ```ruby
 # every month on the first and last tuesdays of the month
-schedule.add_recurrence_rule IceCube::Rule.monthly.day_of_week(:tuesday => [1, -1])
+schedule.add_recurrence_rule IceCube::Rule.monthly.day_of_week(tuesday: [1, -1])
 
 # every other month on the first monday and last tuesday
 schedule.add_recurrence_rule IceCube::Rule.monthly(2).day_of_week(
-  :monday => [1],
-  :tuesday => [-1]
+  monday: [1],
+  tuesday: [-1]
 )
 
 # for programmatic convenience (same as above)
@@ -270,7 +270,7 @@ schedule.add_recurrence_rule IceCube::Rule.hourly(2).day(:monday)
 schedule.add_recurrence_rule IceCube::Rule.minutely(10)
 
 # every hour and a half, on the last tuesday of the month
-schedule.add_recurrence_rule IceCube::Rule.minutely(90).day_of_week(:tuesday => [-1])
+schedule.add_recurrence_rule IceCube::Rule.minutely(90).day_of_week(tuesday: [-1])
 ```
 
 ### Secondly (every N seconds)
@@ -298,10 +298,7 @@ https://github.com/GetJobber/recurring_select
 
 ## Contributors
 
-* Andrew Vit ([@avit][github-avit])
-* Mat Brown - mat@patch.com
-* Philip Roberts
-* @sakrafd
+https://github.com/seejohnrun/ice_cube/graphs/contributors
 
 ---
 

ice_cube.gemspec

@@ -8,9 +8,12 @@ Gem::Specification.new do |s|
   s.description = "ice_cube is a recurring date library for Ruby.  It allows for quick, programatic expansion of recurring date rules."
   s.author = "John Crepezzi"
   s.email = "john@crepezzi.com"
-  s.homepage = "http://seejohnrun.github.com/ice_cube/"
+  s.homepage = "https://seejohnrun.github.io/ice_cube/"
   s.license = "MIT"
 
+  s.metadata["changelog_uri"] = "https://github.com/seejohnrun/ice_cube/blob/master/CHANGELOG.md"
+  s.metadata["wiki_uri"] = "https://github.com/seejohnrun/ice_cube/wiki"
+
   s.version = IceCube::VERSION
   s.platform = Gem::Platform::RUBY
   s.files = Dir["lib/**/*.rb", "config/**/*.yml"]

lib/ice_cube/validated_rule.rb

@@ -46,10 +46,8 @@ def other_interval_validations
     # to the given start time
     def next_time(time, start_time, closing_time)
       @time = time
-      unless @start_time
-        @start_time = realign(time, start_time)
-        @time = @start_time if @time < @start_time
-      end
+      @start_time ||= realign(time, start_time)
+      @time = @start_time if @time < @start_time
 
       return nil unless find_acceptable_time_before(closing_time)
 

lib/ice_cube/validations/hour_of_day.rb

@@ -20,7 +20,7 @@ def realign(opening_time, start_time)
       freq = base_interval_validation.interval
 
       first_hour = Array(validations[:hour_of_day]).min_by(&:value)
-      time = TimeUtil::TimeWrapper.new(start_time, false)
+      time = TimeUtil::TimeWrapper.new(start_time, true)
       if freq > 1 && base_interval_validation.type == :hour
         offset = first_hour.validate(opening_time, start_time)
         time.add(:hour, offset - freq)

spec/examples/daily_rule_spec.rb

@@ -56,6 +56,15 @@ module IceCube
           Time.local(2013, 3, 11, 2, 0, 0) # -0700
         ])
       end
+
+      it "should not skip days where DST changes" do
+        start_time = Time.local(2013, 3, 10, 0, 0, 0)
+        schedule = Schedule.new(start_time)
+        schedule.add_recurrence_rule Rule.daily.hour_of_day(19)
+        expect(schedule.occurrences_between(start_time, start_time + ONE_DAY)).to eq([
+          Time.local(2013, 3, 10, 19, 0, 0)
+        ])
+      end
     end
 
     it "should update previous interval" do

spec/examples/weekly_rule_spec.rb

@@ -288,6 +288,19 @@ module IceCube
         expect(schedule.next_occurrence(sample[2] - 1)).to eq(sample[2])
       end
 
+      it "should respect weekly intervals within narrow occurrence ranges" do
+        start_time = Time.utc(2020, 10, 27, 7, 0, 0)
+        schedule = Schedule.new(start_time, end_time: start_time + ONE_HOUR)
+        occurrence_start = Time.utc(2020, 11, 5, 0, 0, 0)
+        occurrence_end = Time.utc(2020, 11, 5, 23, 59, 59)
+
+        schedule.add_recurrence_rule IceCube::Rule.weekly(2).day(:thursday).hour_of_day(13)
+        schedule.add_recurrence_rule IceCube::Rule.weekly(1).day(:thursday).hour_of_day(12)
+        expect(schedule.occurrences_between(occurrence_start, occurrence_end)).to eq([
+          Time.utc(2020, 11, 5, 12, 0, 0)
+        ])
+      end
+
       it "should align next_occurrence with first valid weekday when schedule starts on a Wednesday" do
         t0 = Time.utc(2017, 6, 7)
         schedule = IceCube::Schedule.new(t0)