icalendar 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f6d533875d40bbe7fe5f4ceedffb05f31207bf5e54fa9680f395c206c0e9a88
-  data.tar.gz: 85a0ddde7183fe00d00b3d71cb92ed2678ac7b34f63d9ffbbad20f03cc4adf6e
+  metadata.gz: 1a5b21473741cf53f97e0855df7898df74760fd9c4941dea1a9876cb91dfdc95
+  data.tar.gz: 743ad24dbf1057eee1a676c3de5184a52e481d5c88a8d96bb16bccb8fc002a12
 SHA512:
-  metadata.gz: f645517ee3cb6960432f420c76edf0592c98b066d38ca893f66d04eb97d38e72853cdafe31835609750011dc0939dafbeaa0dc96337396418edbe9a830462ccf
-  data.tar.gz: b99f6e61e505a27b275c3da7555cf2017e891be6debcff89d045c5852d9e7ae0e88192c66b8134b221db6e8d3bb0c502f3b0c4cfa1186bdb0e3e280a11f56383
+  metadata.gz: 3e139149e08d9d8bc25dfb0fd03a6e0e029ecfc31112751128f2f020767207ee8b17b2d9e000f9197dbca0650171836e1ef5c470e8f613684ba6dea88013dda6
+  data.tar.gz: 4a9ff7fcdc3f81b9252cef04f8211a90e71142b94e093b2b95dcbf15b631b576fbcd5ef937cb38ba62a94e22565d8d6f8583b42ceee34d51fc8e42de139ca932

data/History.txt

@@ -1,3 +1,6 @@
+=== 2.5.1 2018-10-30
+ * Fix usage without ActiveSupport installed.
+
 === 2.5.0 2018-09-10
  * Set timezone information from VTIMEZONE components in cases that ActiveSupport can't figure it out (or isn't installed)
  * Prevent rewinding the Parser IO input during parsing - Niels Laukens

data/lib/icalendar/timezone.rb

@@ -75,7 +75,7 @@ module Icalendar
 
     def standard_for(local)
       possible = standards.map do |std|
-        schedule = IceCube::Schedule.new(std.dtstart) do |s|
+        schedule = IceCube::Schedule.new(std.dtstart.to_time) do |s|
           std.rrule.each do |rule|
             s.add_recurrence_rule IceCube::Rule.from_ical(rule.value_ical)
           end
@@ -90,7 +90,7 @@ module Icalendar
 
     def daylight_for(local)
       possible = daylights.map do |day|
-        schedule = IceCube::Schedule.new(day.dtstart) do |s|
+        schedule = IceCube::Schedule.new(day.dtstart.to_time) do |s|
           day.rrule.each do |rule|
             s.add_recurrence_rule IceCube::Rule.from_ical(rule.value_ical)
           end

data/lib/icalendar/values/date_time.rb

@@ -43,6 +43,10 @@ module Icalendar
         end
       end
 
+      def utc?
+        value.respond_to?(:utc?) ? value.utc? : value.to_time.utc?
+      end
+
       class FormatError < ArgumentError
       end
     end

data/lib/icalendar/values/time_with_zone.rb

@@ -19,14 +19,19 @@ module Icalendar
         params = Icalendar::DowncasedHash(params)
         @tz_utc = params['tzid'] == 'UTC'
 
-        offset_value = if params['tzid'].present?
+        offset_value = unless params['tzid'].nil?
           tzid = params['tzid'].is_a?(::Array) ? params['tzid'].first : params['tzid']
           if defined?(ActiveSupport::TimeZone) &&
               defined?(ActiveSupportTimeWithZoneAdapter) &&
               (tz = ActiveSupport::TimeZone[tzid])
             ActiveSupportTimeWithZoneAdapter.new(nil, tz, value)
           elsif (tz = TimezoneStore.retrieve(tzid))
-            value.change offset: tz.offset_for_local(value).to_s
+            offset = tz.offset_for_local(value).to_s
+            if value.respond_to?(:change)
+              value.change offset: offset
+            else
+              ::Time.new(value.year, value.month, value.day, value.hour, value.min, value.sec, offset)
+            end
           end
         end
         super((offset_value || value), params)

data/lib/icalendar/version.rb

@@ -1,5 +1,5 @@
 module Icalendar
 
-  VERSION = '2.5.0'
+  VERSION = '2.5.1'
 
 end

data/spec/roundtrip_spec.rb

@@ -81,18 +81,18 @@ describe Icalendar do
     it 'sorts time events by start time' do
       events = subject.sort_by(&:dtstart)
 
-      expect(events.first.dtstart).to eq ::DateTime.new(2014, 7, 14, 9, 0, 0, '-4')
+      expect(events.first.dtstart.to_datetime).to eq ::DateTime.new(2014, 7, 14, 9, 0, 0, '-4')
 
-      expect(events.last.dtstart).to eq ::DateTime.new(2014, 7, 14, 9, 1, 0, '-4')
-      expect(events.last.dtend).to eq ::DateTime.new(2014, 7, 14, 9, 59, 0, '-4')
+      expect(events.last.dtstart.to_datetime).to eq ::DateTime.new(2014, 7, 14, 9, 1, 0, '-4')
+      expect(events.last.dtend.to_datetime).to eq ::DateTime.new(2014, 7, 14, 9, 59, 0, '-4')
     end
 
     it 'sorts time events by end time' do
       events = subject.sort_by(&:dtend)
 
-      expect(events.first.dtstart).to eq ::DateTime.new(2014, 7, 14, 9, 1, 0, '-4')
-      expect(events.first.dtend).to eq ::DateTime.new(2014, 7, 14, 9, 59, 0, '-4')
-      expect(events.last.dtstart).to eq ::DateTime.new(2014, 7, 14, 9, 0, 0, '-4')
+      expect(events.first.dtstart.to_datetime).to eq ::DateTime.new(2014, 7, 14, 9, 1, 0, '-4')
+      expect(events.first.dtend.to_datetime).to eq ::DateTime.new(2014, 7, 14, 9, 59, 0, '-4')
+      expect(events.last.dtstart.to_datetime).to eq ::DateTime.new(2014, 7, 14, 9, 0, 0, '-4')
     end
   end
 
@@ -103,8 +103,8 @@ describe Icalendar do
     it 'sorts time events' do
       events = subject.sort_by(&:dtstart)
 
-      expect(events.first.dtstart).to eq ::Date.new(2014, 7, 14)
-      expect(events.last.dtstart).to eq ::DateTime.new(2014, 7, 14, 9, 0, 0, '-4')
+      expect(events.first.dtstart.to_date).to eq ::Date.new(2014, 7, 14)
+      expect(events.last.dtstart.to_datetime).to eq ::DateTime.new(2014, 7, 14, 9, 0, 0, '-4')
     end
   end
 

data/spec/tzinfo_spec.rb

@@ -29,12 +29,13 @@ describe 'TZInfo::Timezone' do
     let(:tz) { TZInfo::Timezone.get 'Asia/Shanghai' }
     let(:date) { DateTime.now }
 
+    # TODO only run this test with tzinfo ≥ 1.0
     it 'only creates a standard component' do
       expect(subject.to_ical).to eq <<-EXPECTED.gsub "\n", "\r\n"
 BEGIN:VTIMEZONE
 TZID:Asia/Shanghai
 BEGIN:STANDARD
-DTSTART:19910914T230000
+DTSTART:19910915T010000
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
 TZNAME:CST

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icalendar
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Ryan Ahearn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-10 00:00:00.000000000 Z
+date: 2018-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_cube