livecal 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d86406289be6c6c425aee8a69755f1df4624a6e7077652202ee90c6a42ac4a07
-  data.tar.gz: 6f37956449a13bbeb918f914bfa4ba2937f47b999485e32d08f8a274ae42413c
+  metadata.gz: 2d2f96adba2d6e1568ea3d5fa26c1e3b22e14d6f5422d90896c0d231f8f67d9b
+  data.tar.gz: a79e0d5596ebe6f011c2a2a37c08890226fe56fddbb6ef5843c451872b123cee
 SHA512:
-  metadata.gz: 4dfaf07671741d0f2b46e757aeba5c0c4d3b01c2f1e6b6d46bab68a48bf86bf69525433c2feecd97e2b383878004e3de45bcadc1505b0540641e38487c4dc026
-  data.tar.gz: 8af62306c9741adae686b67b31ec6618c2162459fcdf28aaaf095ff40c6b3017acfb3830e65e07dd8f0bcf2e478ad6973b2ae3dacf89c347617814928a76551e
+  metadata.gz: 3b7e20785fbb7cea46ae843d731be24b665fa651f43561bdbf656e2b15db5038cd369f1af23cc74cc0c3b1489ccffdd1d39649cf71a2086766940537a2a3d0c4
+  data.tar.gz: 5eda9c1782dfa5dd5098d791ed8eac39e70cb39691313d58e2bcb6421d1dbfe280743f1cbaa74b12950788801cbc55c19c4b8f5da483bcb98083d26082ee27b6

data/lib/livecal/parser.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative "./calendar"
-require_relative "./event"
-require_relative "./recurring_events"
+require_relative "calendar"
+require_relative "event"
+require_relative "recurring_events"
 
 module Livecal
   class Parser
@@ -46,7 +46,7 @@ module Livecal
         event,
         from: from,
         to: to,
-        changes: recurring_changes
+        changes: calendar_source.recurring_changes
       )
     end
 

data/lib/livecal/recurring_events.rb

@@ -29,11 +29,13 @@ module Livecal
     attr_reader :source, :from, :to, :changes
 
     def changed?(instance)
-      changes.any? { |change| change.recurrence_id == instance.dtstart }
+      changes.any? do |change|
+        change.recurrence_id&.value_ical == instance.dtstart.value_ical
+      end
     end
 
     def duration
-      @duration ||= source.dtend - source.dtstart
+      @duration ||= source.dtend.to_i - source.dtstart.to_i
     end
 
     def instance_with_start(time)

data/lib/livecal.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative "./livecal/calendar_source"
-require_relative "./livecal/parser"
+require_relative "livecal/calendar_source"
+require_relative "livecal/parser"
 
 module Livecal
   def self.from_url(url, from:, to:)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livecal
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Pat Allan
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-06 00:00:00.000000000 Z
+date: 2024-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: icalendar
@@ -87,25 +87,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".rspec"
-- Gemfile
 - LICENSE.md
 - README.md
-- Rakefile
 - lib/livecal.rb
 - lib/livecal/calendar.rb
 - lib/livecal/calendar_source.rb
 - lib/livecal/event.rb
 - lib/livecal/parser.rb
 - lib/livecal/recurring_events.rb
-- spec/integration/parsing_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/pat/livecal
 licenses:
 - Hippocratic-2.1
 metadata:
   homepage_uri: https://github.com/pat/livecal
   source_code_uri: https://github.com/pat/livecal
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -121,13 +117,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Parses ical/ics files into a live calendar
-test_files:
-- spec/spec_helper.rb
-- spec/integration/parsing_spec.rb
-- ".rspec"
-- Gemfile
-- Rakefile
+test_files: []

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper

data/Gemfile

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-gemspec

data/Rakefile

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task default: :spec

data/spec/integration/parsing_spec.rb

@@ -1,308 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "Parsing ical files" do
-  let(:from) { Time.new 2021, 6, 6, 0, 0, 0, tz }
-  let(:to) { Time.new 2021, 6, 7, 0, 0, 0, tz }
-  let(:tz) { "+10:00" }
-
-  context "handles a single event" do
-    let(:source) do
-      <<~ICAL
-        BEGIN:VCALENDAR
-        PRODID:-//Google Inc//Google Calendar 70.9054//EN
-        VERSION:2.0
-        CALSCALE:GREGORIAN
-        METHOD:PUBLISH
-        X-WR-CALNAME:livecal
-        X-WR-TIMEZONE:Australia/Melbourne
-        BEGIN:VEVENT
-        DTSTART:20210606T020000Z
-        DTEND:20210606T030000Z
-        DTSTAMP:20210606T013959Z
-        UID:6vc8dul781vckb41vh5avkchi3@google.com
-        CREATED:20210606T013948Z
-        DESCRIPTION:
-        LAST-MODIFIED:20210606T013948Z
-        LOCATION:
-        SEQUENCE:0
-        STATUS:CONFIRMED
-        SUMMARY:Appointment
-        TRANSP:OPAQUE
-        END:VEVENT
-        END:VCALENDAR
-      ICAL
-    end
-
-    it "returns the event if in the requested window" do
-      calendars = Livecal.from_string source, from: from, to: to
-
-      expect(calendars.length).to eq(1)
-      expect(calendars.first.events.length).to eq(1)
-
-      event = calendars.first.events.first
-
-      expect(event.summary).to eq("Appointment")
-    end
-
-    it "returns no events if the event is outside the requested window" do
-      from = Time.new 2021, 6, 7, 0, 0, 0, tz
-      to = Time.new 2021, 6, 7, 23, 0, 0, tz
-
-      calendars = Livecal.from_string source, from: from, to: to
-
-      expect(calendars.length).to eq(1)
-      expect(calendars.first.events).to be_empty
-    end
-  end
-
-  context "with recurring events" do
-    let(:source) do
-      <<~ICAL
-        BEGIN:VCALENDAR
-        PRODID:-//Google Inc//Google Calendar 70.9054//EN
-        VERSION:2.0
-        CALSCALE:GREGORIAN
-        METHOD:PUBLISH
-        X-WR-CALNAME:livecal
-        X-WR-TIMEZONE:Australia/Melbourne
-        BEGIN:VTIMEZONE
-        TZID:Australia/Melbourne
-        X-LIC-LOCATION:Australia/Melbourne
-        BEGIN:STANDARD
-        TZOFFSETFROM:+1100
-        TZOFFSETTO:+1000
-        TZNAME:AEST
-        DTSTART:19700405T030000
-        RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
-        END:STANDARD
-        BEGIN:DAYLIGHT
-        TZOFFSETFROM:+1000
-        TZOFFSETTO:+1100
-        TZNAME:AEDT
-        DTSTART:19701004T020000
-        RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
-        END:DAYLIGHT
-        END:VTIMEZONE
-        BEGIN:VEVENT
-        DTSTART;TZID=Australia/Melbourne:20210606T120000
-        DTEND;TZID=Australia/Melbourne:20210606T130000
-        RRULE:FREQ=WEEKLY;BYDAY=SU
-        DTSTAMP:20210606T015535Z
-        UID:6vc8dul781vckb41vh5avkchi3@google.com
-        CREATED:20210606T013948Z
-        DESCRIPTION:
-        LAST-MODIFIED:20210606T015524Z
-        LOCATION:
-        SEQUENCE:1
-        STATUS:CONFIRMED
-        SUMMARY:Appointment
-        TRANSP:OPAQUE
-        END:VEVENT
-        END:VCALENDAR
-      ICAL
-    end
-
-    it "returns the events in the requested window" do
-      from = Time.new 2021, 6, 6, 0, 0, 0, tz
-      to = Time.new 2021, 6, 14, 0, 0, 0, tz
-      calendars = Livecal.from_string source, from: from, to: to
-
-      expect(calendars.length).to eq(1)
-      expect(calendars.first.events.length).to eq(2)
-
-      first, second = calendars.first.events.to_a
-
-      expect(first.summary).to eq("Appointment")
-      expect(first.starts_at).to eq(Time.new(2021, 6, 6, 12, 0, 0, tz))
-      expect(first.ends_at).to eq(Time.new(2021, 6, 6, 13, 0, 0, tz))
-
-      expect(second.summary).to eq("Appointment")
-      expect(second.starts_at).to eq(Time.new(2021, 6, 13, 12, 0, 0, tz))
-      expect(second.ends_at).to eq(Time.new(2021, 6, 13, 13, 0, 0, tz))
-    end
-
-    it "includes events when the initial instance is outside the window" do
-      from = Time.new 2021, 6, 13, 0, 0, 0, tz
-      to = Time.new 2021, 6, 14, 0, 0, 0, tz
-      calendars = Livecal.from_string source, from: from, to: to
-
-      expect(calendars.length).to eq(1)
-      expect(calendars.first.events.length).to eq(1)
-
-      event = calendars.first.events.first
-
-      expect(event.summary).to eq("Appointment")
-      expect(event.starts_at).to eq(Time.new(2021, 6, 13, 12, 0, 0, tz))
-      expect(event.ends_at).to eq(Time.new(2021, 6, 13, 13, 0, 0, tz))
-    end
-  end
-
-  context "recurring events with exclusions" do
-    let(:source) do
-      <<~ICAL
-        BEGIN:VCALENDAR
-        PRODID:-//Google Inc//Google Calendar 70.9054//EN
-        VERSION:2.0
-        CALSCALE:GREGORIAN
-        METHOD:PUBLISH
-        X-WR-CALNAME:livecal
-        X-WR-TIMEZONE:Australia/Melbourne
-        BEGIN:VTIMEZONE
-        TZID:Australia/Melbourne
-        X-LIC-LOCATION:Australia/Melbourne
-        BEGIN:STANDARD
-        TZOFFSETFROM:+1100
-        TZOFFSETTO:+1000
-        TZNAME:AEST
-        DTSTART:19700405T030000
-        RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
-        END:STANDARD
-        BEGIN:DAYLIGHT
-        TZOFFSETFROM:+1000
-        TZOFFSETTO:+1100
-        TZNAME:AEDT
-        DTSTART:19701004T020000
-        RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
-        END:DAYLIGHT
-        END:VTIMEZONE
-        BEGIN:VEVENT
-        DTSTART;TZID=Australia/Melbourne:20210606T120000
-        DTEND;TZID=Australia/Melbourne:20210606T130000
-        RRULE:FREQ=WEEKLY;BYDAY=SU
-        EXDATE;TZID=Australia/Melbourne:20210613T120000
-        DTSTAMP:20210606T031826Z
-        UID:6vc8dul781vckb41vh5avkchi3@google.com
-        CREATED:20210606T013948Z
-        DESCRIPTION:
-        LAST-MODIFIED:20210606T015524Z
-        LOCATION:
-        SEQUENCE:1
-        STATUS:CONFIRMED
-        SUMMARY:Appointment
-        TRANSP:OPAQUE
-        END:VEVENT
-        END:VCALENDAR
-      ICAL
-    end
-
-    it "returns the events in the requested window" do
-      from = Time.new 2021, 6, 6, 0, 0, 0, tz
-      to = Time.new 2021, 6, 21, 0, 0, 0, tz
-      calendars = Livecal.from_string source, from: from, to: to
-
-      expect(calendars.length).to eq(1)
-      expect(calendars.first.events.length).to eq(2)
-
-      first, second = calendars.first.events.to_a
-
-      expect(first.summary).to eq("Appointment")
-      expect(first.starts_at).to eq(Time.new(2021, 6, 6, 12, 0, 0, tz))
-      expect(first.ends_at).to eq(Time.new(2021, 6, 6, 13, 0, 0, tz))
-
-      expect(second.summary).to eq("Appointment")
-      expect(second.starts_at).to eq(Time.new(2021, 6, 20, 12, 0, 0, tz))
-      expect(second.ends_at).to eq(Time.new(2021, 6, 20, 13, 0, 0, tz))
-    end
-  end
-
-  context "recurring events with changes" do
-    let(:source) do
-      <<~ICAL
-        BEGIN:VCALENDAR
-        PRODID:-//Google Inc//Google Calendar 70.9054//EN
-        VERSION:2.0
-        CALSCALE:GREGORIAN
-        METHOD:PUBLISH
-        X-WR-CALNAME:livecal
-        X-WR-TIMEZONE:Australia/Melbourne
-        BEGIN:VTIMEZONE
-        TZID:Australia/Melbourne
-        X-LIC-LOCATION:Australia/Melbourne
-        BEGIN:STANDARD
-        TZOFFSETFROM:+1100
-        TZOFFSETTO:+1000
-        TZNAME:AEST
-        DTSTART:19700405T030000
-        RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
-        END:STANDARD
-        BEGIN:DAYLIGHT
-        TZOFFSETFROM:+1000
-        TZOFFSETTO:+1100
-        TZNAME:AEDT
-        DTSTART:19701004T020000
-        RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
-        END:DAYLIGHT
-        END:VTIMEZONE
-        BEGIN:VEVENT
-        DTSTART;TZID=Australia/Melbourne:20210606T120000
-        DTEND;TZID=Australia/Melbourne:20210606T130000
-        RRULE:FREQ=WEEKLY;BYDAY=SU
-        DTSTAMP:20210606T032058Z
-        UID:60oght30b0avdekvlsg2bkfi7p@google.com
-        CREATED:20210606T032036Z
-        DESCRIPTION:
-        LAST-MODIFIED:20210606T032036Z
-        LOCATION:
-        SEQUENCE:0
-        STATUS:CONFIRMED
-        SUMMARY:Appointment
-        TRANSP:OPAQUE
-        END:VEVENT
-        BEGIN:VEVENT
-        DTSTART;TZID=Australia/Melbourne:20210614T130000
-        DTEND;TZID=Australia/Melbourne:20210614T140000
-        DTSTAMP:20210606T032058Z
-        UID:60oght30b0avdekvlsg2bkfi7p@google.com
-        RECURRENCE-ID;TZID=Australia/Melbourne:20210613T120000
-        CREATED:20210606T032036Z
-        DESCRIPTION:
-        LAST-MODIFIED:20210606T032050Z
-        LOCATION:
-        SEQUENCE:1
-        STATUS:CONFIRMED
-        SUMMARY:Appointment
-        TRANSP:OPAQUE
-        END:VEVENT
-        END:VCALENDAR
-      ICAL
-    end
-
-    it "returns the events in the requested window" do
-      from = Time.new 2021, 6, 6, 0, 0, 0, tz
-      to = Time.new 2021, 6, 21, 0, 0, 0, tz
-      calendars = Livecal.from_string source, from: from, to: to
-
-      expect(calendars.length).to eq(1)
-      expect(calendars.first.events.length).to eq(3)
-
-      first, second, third = calendars.first.events.to_a
-
-      expect(first.summary).to eq("Appointment")
-      expect(first.starts_at).to eq(Time.new(2021, 6, 6, 12, 0, 0, tz))
-      expect(first.ends_at).to eq(Time.new(2021, 6, 6, 13, 0, 0, tz))
-
-      expect(second.summary).to eq("Appointment")
-      expect(second.starts_at).to eq(Time.new(2021, 6, 14, 13, 0, 0, tz))
-      expect(second.ends_at).to eq(Time.new(2021, 6, 14, 14, 0, 0, tz))
-
-      expect(third.summary).to eq("Appointment")
-      expect(third.starts_at).to eq(Time.new(2021, 6, 20, 12, 0, 0, tz))
-      expect(third.ends_at).to eq(Time.new(2021, 6, 20, 13, 0, 0, tz))
-    end
-
-    it "factors in changes outside the requested window" do
-      from = Time.new 2021, 6, 6, 0, 0, 0, tz
-      to = Time.new 2021, 6, 13, 0, 0, 0, tz
-      calendars = Livecal.from_string source, from: from, to: to
-
-      expect(calendars.length).to eq(1)
-      expect(calendars.first.events.length).to eq(1)
-
-      event = calendars.first.events.first
-
-      expect(event.summary).to eq("Appointment")
-      expect(event.starts_at).to eq(Time.new(2021, 6, 6, 12, 0, 0, tz))
-      expect(event.ends_at).to eq(Time.new(2021, 6, 6, 13, 0, 0, tz))
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/setup"
-require "livecal"
-
-RSpec.configure do |config|
-  config.disable_monkey_patching!
-
-  config.expect_with :rspec do |c|
-    c.syntax = :expect
-  end
-end