icalendar-recurrence 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a2ae1e548eb6c46fa2693f5951f3528e99b8abb
-  data.tar.gz: 0aaecc9ba2d1c7aa887f820d9dfe94348c472f28
+  metadata.gz: ea618af19f9205cd550cdfcdd8838cc58f07ba60
+  data.tar.gz: ba7cfe8c164538af1dd10c2b9153f7b9455bc11c
 SHA512:
-  metadata.gz: f28af3cd81e7afde47cee2c16032ad1c6eee436064081fb3280355007ab0e063c60dceb2a7383e4c11df26ca347b6487bde78670ac1c34f508fef7a538178fdd
-  data.tar.gz: ff86db8785368cd0d38f84f06dc5c371298eeb6b642ce8331d3b5bd43645151eaba17475d1b25e92aedb16b8604842c10689ba571e0f40bed7a770ea28c74ccf
+  metadata.gz: 220f7c2227eda41a360182574d44187dbb45398534a84b743b7a889d664e40305d561c13f9e65f5248cf43682b0d65c917e9398d2faba82c2c332a8be1003f22
+  data.tar.gz: 626d4958cbe0a0abf12e35b8c67e5559c0314649ec8dafdf9f1296431f1d3933f1b9d0d87cbc4364067c116dd0e4f883f8c3dbae3abdf1e35b9897b0469eb54a

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 *.rbc
+.DS_Store
 .bundle
 .config
 .yardoc
@@ -14,4 +15,4 @@ rdoc
 spec/reports
 test/tmp
 test/version_tmp
-tmp
+tmp

data/.travis.yml

@@ -1,9 +1,8 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.4.1
-  - 2.3.4
-  - 2.1.7
-  - 2.0.0
-  - 1.9.3
+  - 2.5
+  - 2.4
+  - 2.1
+  - 2.0
 script: bundle exec rspec

data/icalendar-recurrence.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency 'icalendar', '~> 2.0'
-  spec.add_runtime_dependency 'ice_cube', '~> 0.13'
+  spec.add_runtime_dependency 'ice_cube', '~> 0.16'
 
   spec.add_development_dependency 'activesupport', '~> 4.0'
   spec.add_development_dependency 'awesome_print'

data/lib/icalendar/recurrence/event_extensions.rb

@@ -13,8 +13,8 @@ module Icalendar
         dtend
       end
 
-      def occurrences_between(begin_time, closing_time)
-        schedule.occurrences_between(begin_time, closing_time)
+      def occurrences_between(begin_time, closing_time, spans: false)
+        schedule.occurrences_between(begin_time, closing_time, spans: spans)
       end
 
       def schedule
@@ -33,4 +33,4 @@ module Icalendar
   class Event
     include Icalendar::Recurrence::EventExtensions
   end
-end
+end

data/lib/icalendar/recurrence/schedule.rb

@@ -32,8 +32,8 @@ module Icalendar
         end
       end
 
-      def occurrences_between(begin_time, closing_time)
-        ice_cube_occurrences = ice_cube_schedule.occurrences_between(TimeUtil.to_time(begin_time), TimeUtil.to_time(closing_time))
+      def occurrences_between(begin_time, closing_time, spans: false)
+        ice_cube_occurrences = ice_cube_schedule.occurrences_between(TimeUtil.to_time(begin_time), TimeUtil.to_time(closing_time), spans: spans)
 
         ice_cube_occurrences.map do |occurrence|
           convert_ice_cube_occurrence(occurrence)
@@ -75,14 +75,15 @@ module Icalendar
           schedule.add_recurrence_rule(ice_cube_recurrence_rule)
         end
 
-        event.exdate.each do |exception_date|
-          exception_date = Time.parse(exception_date) if exception_date.is_a?(String)
-          schedule.add_exception_time(TimeUtil.to_time(exception_date))
+        event.exdate.each do |exception_date_or_dates|
+          Array(exception_date_or_dates).each do |exception_date|
+            schedule.add_exception_time(TimeUtil.to_time(exception_date))
+          end
         end
 
         schedule
       end
-      
+
       def convert_duration_to_seconds(ical_duration)
         return 0 unless ical_duration
 

data/lib/icalendar/recurrence/version.rb

@@ -1,5 +1,5 @@
 module Icalendar
   module Recurrence
-    VERSION = "1.1.2"
+    VERSION = "1.1.3"
   end
 end

data/spec/lib/recurrence_spec.rb

@@ -52,9 +52,31 @@ describe "Event#occurrences_between" do
     end
   end
 
+  context "event repeating every thursday with multiple exceptions" do
+    context "exclusions are on a single line" do
+      let(:event) { example_event :multiple_exception } # has exclusions in array form
+      it "properly calculates recurrence, including exclusion dates" do
+        occurrences = event.occurrences_between(start_time, start_time + 1.months)
+
+        expect(occurrences.length).to eq(1)
+        expect(occurrences.first.start_time).to eq(Time.parse("2017-11-16 13:40:00 UTC"))
+      end
+    end
+
+    context "exclusions are on multiple lines" do
+      let(:event) { example_event :multiple_exception_multiple_line } # has multiple single exclusions
+      it "properly calculates recurrence, including exclusion dates" do
+        occurrences = event.occurrences_between(start_time, start_time + 1.months)
+
+        expect(occurrences.length).to eq(1)
+        expect(occurrences.first.start_time).to eq(Time.parse("2017-11-16 13:40:00 UTC"))
+      end
+    end
+  end
+
   context "event repeating bimonthly (DST example)" do
     let(:event) { example_event :on_third_every_two_months }
-    
+
     it "occurs twice over 60 days" do
       occurrences = event.occurrences_between(start_time, start_time + 60.days)
 
@@ -81,7 +103,7 @@ describe "Event#occurrences_between" do
 
     it "occurrs 10 times over two weeks" do
       occurrences = event.occurrences_between(start_time, start_time + 13.days)
-      
+
       expect(occurrences.length).to eq(10)
       expect(occurrences.map(&:start_time)).to include(Time.parse("2014-01-10"))
       expect(occurrences.map(&:start_time)).to_not include(Time.parse("2014-01-11"))
@@ -118,7 +140,7 @@ describe "Event#occurrences_between" do
 
   context "event repeating on first saturday of month event" do
     let(:event) { example_event :first_saturday_of_month }
-    
+
     it "occurs twice over two months" do
       occurrences = event.occurrences_between(start_time, start_time + 55.days)
 
@@ -151,4 +173,4 @@ describe "Event#occurrences_between" do
       expect(occurrences.first.start_time).to eq(Time.parse("20140114T180000Z"))
     end
   end
-end
+end

data/spec/lib/schedule_spec.rb

@@ -13,6 +13,14 @@ describe Icalendar::Recurrence::Schedule do
       expect(example_occurrence).to respond_to :end_time
     end
 
+    it "returns occurrences within range, including duration spanning #start_time " do
+      schedule = Schedule.new(example_event(:week_long))
+      occurrences = schedule.occurrences_between(Time.parse("2014-01-13T09:00:00-08:00"), Date.parse("2014-01-20"), spans: true)
+
+      expect(schedule.start_time).to eq(Time.parse("2014-01-13T08:00:00-08:00"))
+      expect(occurrences.count).to eq(7)
+    end
+
     context "timezoned event" do
       let(:example_occurrence) do
         timezoned_event = example_event :first_saturday_of_month
@@ -20,7 +28,7 @@ describe Icalendar::Recurrence::Schedule do
         example_occurrence = schedule.occurrences_between(Date.parse("2014-02-01"), Date.parse("2014-03-01")).first
       end
 
-      it "#occurrences_between return object that responds to #start_time and #end_time (timezoned example)" do
+      it "returns object that responds to #start_time and #end_time (timezoned example)" do
         expect(example_occurrence).to respond_to :start_time
         expect(example_occurrence).to respond_to :end_time
       end

data/spec/support/fixtures/multiple_exception_event.ics

@@ -0,0 +1,20 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Apple Inc.//Mac OS X 10.12.6//EN
+BEGIN:VEVENT
+UID:AA000000-AAAA-CCCC-DDDD-CC7176000000
+DTSTART;TZID=Asia/Dubai:20171019T174000
+DTEND;TZID=Asia/Dubai:20171019T181000
+CREATED:20170830T130728Z
+DTSTAMP:20171016T185512Z
+EXDATE;TZID=Asia/Dubai:20171102T174000,20171026T174000,20171019T174000,20
+ 171109T174000
+LAST-MODIFIED:20171016T185511Z
+RRULE:FREQ=WEEKLY;UNTIL=20171215T195959Z;BYDAY=TH
+SEQUENCE:0
+SUMMARY:Exception with timezone
+TRANSP:OPAQUE
+X-APPLE-TRAVEL-ADVISORY-BEHAVIOR:AUTOMATIC
+END:VEVENT
+END:VCALENDAR

data/spec/support/fixtures/multiple_exception_multiple_line_event.ics

@@ -0,0 +1,22 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Apple Inc.//Mac OS X 10.12.6//EN
+BEGIN:VEVENT
+UID:AA000000-AAAA-CCCC-DDDD-CC7176000000
+DTSTART;TZID=Asia/Dubai:20171019T174000
+DTEND;TZID=Asia/Dubai:20171019T181000
+CREATED:20170830T130728Z
+DTSTAMP:20171016T185512Z
+EXDATE;TZID=Asia/Dubai:20171102T174000
+EXDATE;TZID=Asia/Dubai:20171026T174000
+EXDATE;TZID=Asia/Dubai:20171019T174000
+EXDATE;TZID=Asia/Dubai:20171109T174000
+LAST-MODIFIED:20171016T185511Z
+RRULE:FREQ=WEEKLY;UNTIL=20171215T195959Z;BYDAY=TH
+SEQUENCE:0
+SUMMARY:Exception with timezone
+TRANSP:OPAQUE
+X-APPLE-TRAVEL-ADVISORY-BEHAVIOR:AUTOMATIC
+END:VEVENT
+END:VCALENDAR

data/spec/support/fixtures/week_long_event.ics

@@ -0,0 +1,23 @@
+BEGIN:VCALENDAR
+X-WR-CALNAME:Example Calendar
+X-WR-CALID:f512e378-050c-4366-809a-ef471ce45b09:297138
+PRODID:Zimbra-Calendar-Provider
+VERSION:2.0
+METHOD:PUBLISH
+BEGIN:VEVENT
+UID:28aad2ac-af09-44d0-b07d-6f49177c086f
+RRULE:FREQ=DAILY;UNTIL=20140120T075959Z;INTERVAL=1
+SUMMARY:All week\, then done
+X-ALT-DESC;FMTTYPE=text/html:<html><body></body></html>
+ORGANIZER;CN=Jordan Raine:mailto:jraine@sfu.ca
+DTSTART;TZID="America/Los_Angeles":20140113T080000
+DTEND;TZID="America/Los_Angeles":20140113T120000
+STATUS:CONFIRMED
+CLASS:PUBLIC
+X-MICROSOFT-CDO-INTENDEDSTATUS:BUSY
+TRANSP:OPAQUE
+LAST-MODIFIED:20140117T200033Z
+DTSTAMP:20140117T200033Z
+SEQUENCE:0
+END:VEVENT
+END:VCALENDAR

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icalendar-recurrence
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Jordan Raine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2019-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: icalendar
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -189,9 +189,12 @@ files:
 - spec/support/fixtures/first_sunday_of_january_yearly_event.ics
 - spec/support/fixtures/monday_until_friday_event.ics
 - spec/support/fixtures/multi_day_weekly_event.ics
+- spec/support/fixtures/multiple_exception_event.ics
+- spec/support/fixtures/multiple_exception_multiple_line_event.ics
 - spec/support/fixtures/on_third_every_two_months_event.ics
 - spec/support/fixtures/one_day_a_month_for_three_months_event.ics
 - spec/support/fixtures/utc_event.ics
+- spec/support/fixtures/week_long_event.ics
 - spec/support/fixtures/weekly_with_count_event.ics
 - spec/support/helpers.rb
 homepage: https://github.com/icalendar/icalendar-recurrence
@@ -214,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Provides recurrence to icalendar gem.
@@ -234,8 +237,11 @@ test_files:
 - spec/support/fixtures/first_sunday_of_january_yearly_event.ics
 - spec/support/fixtures/monday_until_friday_event.ics
 - spec/support/fixtures/multi_day_weekly_event.ics
+- spec/support/fixtures/multiple_exception_event.ics
+- spec/support/fixtures/multiple_exception_multiple_line_event.ics
 - spec/support/fixtures/on_third_every_two_months_event.ics
 - spec/support/fixtures/one_day_a_month_for_three_months_event.ics
 - spec/support/fixtures/utc_event.ics
+- spec/support/fixtures/week_long_event.ics
 - spec/support/fixtures/weekly_with_count_event.ics
 - spec/support/helpers.rb