rrule 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 524b148cf5608df2145bb75da8b5bca29867a30a
-  data.tar.gz: d258adb876e71ce558ffa5831d2964ddd9263e00
+  metadata.gz: 1aad8dd06524a47f1d310b7f077db21f41696bc7
+  data.tar.gz: f2e1673c1fd07da16c47fc96e944eeabef43578b
 SHA512:
-  metadata.gz: 47e40a473aaf70514150dc11c6779cb3bb31e2d985324416df60515e678bd111fae56a2ff84529e4deab3572c477fa7cdbcfc1437f1e429db25056e1564f026b
-  data.tar.gz: 02ff7616862c0307a838f04eb4714fb57f9d261991199c09560ef51dd4d0c6cb223f4d2ff584d2ac94d09337b5dbd00c8a4bb96a6a52bdf1f7a02c34e680acab
+  metadata.gz: fa77f6132a2d47a45d8aab0a58af68a1ccd0417e22a9c2fc6ef4a2b14aef90e65040324177893773cba2b06e74373776105a19e078c5d81360f5e894b2cdec3c
+  data.tar.gz: 4fddc6b136db1d57c8d8e89fe099820e572f13fc447647cdd7c43942a74112255c8720ad2b8c82a0cb1586a8a1bdb0e862ec12014f6f05c5982a86ce58207518

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Change Log
 ==========
 
+Version 0.4.1 *(2018-11-28)*
+----------------------------
+Fix bug in SimpleWeekly when ENV['TZ'] was not equal to time zone of rrule
+
+
 Version 0.1.0 *(2017-06-06)*
 ----------------------------
 

data/lib/rrule/rule.rb

@@ -5,8 +5,8 @@ module RRule
     attr_reader :dtstart, :tz, :exdate
 
     def initialize(rrule, dtstart: Time.now, tzid: 'UTC', exdate: [], max_year: nil)
-      @dtstart = floor_to_seconds(dtstart).in_time_zone(tzid)
       @tz = tzid
+      @dtstart = floor_to_seconds_in_timezone(dtstart)
       @exdate = exdate
       @options = parse_options(rrule)
       @frequency_type = Frequency.for_options(options)
@@ -19,8 +19,8 @@ module RRule
     end
 
     def between(start_date, end_date, limit: nil)
-      floored_start_date = floor_to_seconds(start_date)
-      floored_end_date = floor_to_seconds(end_date)
+      floored_start_date = floor_to_seconds_in_timezone(start_date)
+      floored_end_date = floor_to_seconds_in_timezone(end_date)
       all_until(start_date: floored_start_date, end_date: floored_end_date, limit: limit).reject { |instance| instance < floored_start_date }
     end
 
@@ -88,11 +88,11 @@ module RRule
 
     attr_reader :options, :max_year, :max_date, :frequency_type
 
-    def floor_to_seconds(date)
+    def floor_to_seconds_in_timezone(date)
       # This removes all sub-second and floors it to the second level.
       # Sub-second level calculations breaks a lot of assumptions in this
       # library and rounding it may also cause unexpected inequalities.
-      Time.at(date.to_i)
+      Time.at(date.to_i).in_time_zone(tz)
     end
 
     def enumerator

data/rrule.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'rrule'
-  s.version = '0.4.0'
+  s.version = '0.4.1'
   s.date = '2018-04-24'
   s.summary = 'RRule expansion'
   s.description = 'A gem for expanding dates according to the RRule specification'

data/spec/rule_spec.rb

@@ -1789,6 +1789,24 @@ describe RRule::Rule do
   end
 
   describe '#between' do
+    context 'server env timezone is different from the passed timezone' do
+      around do |example|
+        old_tz = ENV['TZ']
+        ENV['TZ'] = 'UTC'
+        example.run
+        ENV['TZ'] = old_tz
+      end
+
+      it 'works when the day in the given timezone is different from the day in the server timezone' do
+        # any time from 17:00 to 23:59:59 broke old code, test all hours of the day
+        0.upto(23) do |hour|
+          dtstart = Time.new(2018, 7, 1, hour, 0, 0, '-07:00')
+          rrule = RRule::Rule.new('FREQ=WEEKLY', dtstart: dtstart, tzid: 'America/Los_Angeles')
+          expect(rrule.between(dtstart, dtstart + 1.second)).to eq([dtstart])
+        end
+      end
+    end
+
     it 'returns the correct result with an rrule of FREQ=WEEKLY;BYSECOND=59;BYMINUTE=59;BYHOUR=23;WKST=SU' do
       rrule = 'FREQ=WEEKLY;BYSECOND=59;BYMINUTE=59;BYHOUR=23;WKST=SU'
       dtstart = DateTime.parse('2018-02-04 04:00:00 +1000')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rrule
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Ryan Mitchell
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: RRule expansion