almanack 1.2.1 → 1.3.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1134806012a13b60c1ddb18ef4d5e307e0ca00af4fd751f15ba4bbc384b8ef5d
-  data.tar.gz: 4a22cd08e2bd7c67b612023cb1b6e33cc1cf5ae45e2bab24a41385c40f5a682e
+  metadata.gz: cfc9136fa4680e8bd391dca4a764592d27ec9fb41bde609986ccc47c5476306f
+  data.tar.gz: 87e47bcb6900fba580099c083e01f09bd3681e4fec89cc4b1a000d114d2f04af
 SHA512:
-  metadata.gz: ff81548baa2fe195e492474bf5532bf56f5018a50b0aacd842830cf7a321b2f343bd8a18aeccba5cceb321b5e7ace07a47c4f76f5d74b9117150036558415809
-  data.tar.gz: 980be5514e9c8a81a92c5a81d209ec17fc339bb282ae81eb5ccdb6f34bf1613f45012bb68d2f3a1613084da0cbb72c937fd00720eaf6d27676869976d8ddbb07
+  metadata.gz: e53e216b45cfc1038370d30bbba67e53bc0de9cd59a223b1125a9b77caa1a43a20a2ba4506d22b0edffbe3f0b9c1208c1ffdb4783d5086b4d8594b7faacad7c4
+  data.tar.gz: ecb5487daa8ffe180b8e88f92304354d68bcad2373c17bdacc6f2bba5f946954770206c433cca92498dfd607e66b14cd7cc29b7599f159abbc5f9f329d843175

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    almanack (1.2.1)
+    almanack (1.3.0.rc1)
       activesupport
       addressable
       faraday
       faraday_middleware
+      icalendar
+      icalendar-recurrence
       rack-contrib
-      ri_cal
       sassc
       sinatra
       sinatra-contrib
@@ -41,6 +42,12 @@ GEM
     hashdiff (1.0.0)
     i18n (1.7.0)
       concurrent-ruby (~> 1.0)
+    icalendar (2.6.1)
+      ice_cube (~> 0.16)
+    icalendar-recurrence (1.1.3)
+      icalendar (~> 2.0)
+      ice_cube (~> 0.16)
+    ice_cube (0.16.3)
     method_source (0.9.2)
     mini_portile2 (2.4.0)
     minitest (5.13.0)
@@ -62,7 +69,6 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rake (10.5.0)
-    ri_cal (0.8.8)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)

data/almanack.gemspec

@@ -29,7 +29,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sinatra"
   spec.add_dependency "sinatra-contrib"
   spec.add_dependency "sassc"
-  spec.add_dependency "ri_cal"
+  spec.add_dependency "icalendar"
+  spec.add_dependency "icalendar-recurrence"
   spec.add_dependency "addressable"
   spec.add_dependency "thor"
   spec.add_dependency "faraday"

data/checksums/almanack-1.2.1.gem.sha256

@@ -0,0 +1 @@
+42e774ae07cdb707781beb8bf467ac386e66e2b89b4ab17b7a67af9c30429da7

data/checksums/almanack-1.2.1.gem.sha512

@@ -0,0 +1 @@
+af8d056cf0c25db508f57d4fa3c93525d560345092893cf788a0ac2a4f8093229894dd866e7eb0cb60ef8061e4ae789d1bd920dee251f787ee8cd626647f9330

data/lib/almanack.rb

@@ -1,7 +1,8 @@
 require "pathname"
 require "forwardable"
 require "json"
-require "ri_cal"
+require "icalendar"
+require "icalendar/recurrence"
 require "addressable/uri"
 require "faraday"
 require "faraday_middleware"

data/lib/almanack/event_source/ical.rb

@@ -8,7 +8,21 @@ module Almanack
       end
 
       def events_between(date_range)
-        occurrences_between(date_range).map(&method(:event_from))
+        return enum_for(__method__, date_range).to_a unless block_given?
+
+        from, to = [date_range.min, date_range.max]
+
+        each_ical_event do |ical_event|
+          if ical_event.rrule.empty?
+            if from < ical_event.dtend
+              yield event_from(ical_event)
+            end
+          else
+            ical_event.occurrences_between(from, to).each do |occurrence|
+              yield event_from(ical_event, occurrence: occurrence)
+            end
+          end
+        end
       end
 
       def serialized_between(date_range)
@@ -21,23 +35,13 @@ module Almanack
 
       private
 
-      def occurrences_between(date_range, &block)
-        return enum_for(__method__, date_range) unless block_given?
-
-        query = { starting: date_range.min, before: date_range.max }
-
-        each_event do |ical_event|
-          ical_event.occurrences(query).each(&block)
-        end
-      end
-
-      def event_from(occurrence)
+      def event_from(ical_event, occurrence: nil)
         Event.new(
-          title: occurrence.summary,
-          start_time: occurrence.dtstart,
-          end_time: occurrence.dtend,
-          description: occurrence.description,
-          location: occurrence.location
+          title: ical_event.summary,
+          start_time: occurrence&.start_time || ical_event.dtstart,
+          end_time: occurrence&.end_time || ical_event.dtend,
+          description: ical_event.description,
+          location: ical_event.location
         )
       end
 
@@ -45,13 +49,9 @@ module Almanack
         io.respond_to?(:read) ? io.read : io
       end
 
-      def entities
-        RiCal.parse_string(read_io)
-      end
-
-      def each_event(&block)
-        entities.each do |entity|
-          entity.events.each(&block) if entity.respond_to?(:events)
+      def each_ical_event(&block)
+        Icalendar::Calendar.parse(read_io).each do |calendar|
+          calendar.events.each(&block)
         end
       end
     end

data/lib/almanack/representation/built_ical_event.rb

@@ -18,7 +18,7 @@ module Almanack
       private
 
       def build!
-        @ical_event = RiCal.Event
+        @ical_event = Icalendar::Event.new
         set_summary
         set_start_time
         set_end_time
@@ -32,7 +32,7 @@ module Almanack
       end
 
       def set_start_time
-        if event.start_time.is_a?(Date)
+        if event.start_time.is_a?(Icalendar::Values::Date)
           ical_event.dtstart = event.start_time
         else
           ical_event.dtstart = event.start_time.utc
@@ -40,7 +40,7 @@ module Almanack
       end
 
       def set_end_time
-        if event.end_time.is_a?(Date)
+        if event.end_time.is_a?(Icalendar::Values::Date)
           ical_event.dtend = event.end_time
         else
           ical_event.dtend = (event.end_time || event.start_time + default_event_duration ).utc

data/lib/almanack/representation/ical_feed.rb

@@ -12,7 +12,7 @@ module Almanack
       end
 
       def to_s
-        ical.to_s
+        ical.to_ical
       end
 
       def self.from(calendar)
@@ -26,8 +26,8 @@ module Almanack
       end
 
       def ical_calendar
-        events.each_with_object(RiCal.Calendar) do |event, calendar_component|
-          calendar_component.add_subcomponent ical_event_for(event)
+        events.each_with_object(Icalendar::Calendar.new) do |event, calendar|
+          calendar.add_event ical_event_for(event)
         end
       end
 

data/lib/almanack/version.rb

@@ -1,6 +1,6 @@
 module Almanack
   CODENAME = "Garlick"
-  VERSION  = "1.2.1"
+  VERSION  = "1.3.0.rc1"
   HOMEPAGE = "https://github.com/Aupajo/almanack"
   ISSUES   = "https://github.com/Aupajo/almanack/issues"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: almanack
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0.rc1
 platform: ruby
 authors:
 - Pete Nicholls
@@ -79,7 +79,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ri_cal
+  name: icalendar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: icalendar-recurrence
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -351,6 +365,8 @@ files:
 - checksums/almanack-1.1.5.gem.sha512
 - checksums/almanack-1.2.0.gem.sha256
 - checksums/almanack-1.2.0.gem.sha512
+- checksums/almanack-1.2.1.gem.sha256
+- checksums/almanack-1.2.1.gem.sha512
 - example.ru
 - exe/almanack
 - lib/almanack.rb
@@ -398,9 +414,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: