icalendar 2.5.1 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a5b21473741cf53f97e0855df7898df74760fd9c4941dea1a9876cb91dfdc95
-  data.tar.gz: 743ad24dbf1057eee1a676c3de5184a52e481d5c88a8d96bb16bccb8fc002a12
+  metadata.gz: 8d8af55548918f31a965cd6bb855b7a85ed23ebf64a3387ea10f7ef83c4df0b5
+  data.tar.gz: 85a6ce28d96b1e7c830091b0782e15e515a41cea1556af30d0d29cadac215ec2
 SHA512:
-  metadata.gz: 3e139149e08d9d8bc25dfb0fd03a6e0e029ecfc31112751128f2f020767207ee8b17b2d9e000f9197dbca0650171836e1ef5c470e8f613684ba6dea88013dda6
-  data.tar.gz: 4a9ff7fcdc3f81b9252cef04f8211a90e71142b94e093b2b95dcbf15b631b576fbcd5ef937cb38ba62a94e22565d8d6f8583b42ceee34d51fc8e42de139ca932
+  metadata.gz: 37c2b1f00e479da82a795b52fe82e635ef46f3ea5e62552860107f0d61ec0f5866871334c31b14034e59f29498086eb338f6198313366877bc9b01cd7e9206f3
+  data.tar.gz: 7338852a7e3dd937c01547b6ed431bfc9ac142deb8238d1cded8d5ae37f23b1dcb61b412e21308bd40788fa497ddd13bc0bb89d36ae56587c9cbd0f6cf3b107c

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.5.2 2018-12-08
+ * Remove usage of the global TimezoneStore instance, in favor of a local variable in the parser
+ * Deprecate TimezoneStore class methods
+
 === 2.5.1 2018-10-30
  * Fix usage without ActiveSupport installed.
 

data/lib/icalendar.rb

@@ -13,7 +13,7 @@ module Icalendar
   end
 
   def self.parse(source, single = false)
-    warn "**** DEPRECATION WARNING ****\nIcalendar.parse will be removed. Please switch to Icalendar::Calendar.parse."
+    warn "**** DEPRECATION WARNING ****\nIcalendar.parse will be removed in 3.0. Please switch to Icalendar::Calendar.parse."
     calendars = Parser.new(source).parse
     single ? calendars.first : calendars
   end

data/lib/icalendar/parser.rb

@@ -4,7 +4,7 @@ module Icalendar
 
   class Parser
     attr_writer :component_class
-    attr_reader :source, :strict
+    attr_reader :source, :strict, :timezone_store
 
     def initialize(source, strict = false)
       if source.respond_to? :gets
@@ -18,6 +18,7 @@ module Icalendar
       end
       read_in_data
       @strict = strict
+      @timezone_store = TimezoneStore.new
     end
 
     def parse
@@ -102,7 +103,7 @@ module Icalendar
       while (fields = next_fields)
         if fields[:name] == 'end'
           klass_name = fields[:value].gsub(/\AV/, '').downcase.capitalize
-          TimezoneStore.store(component) if klass_name == 'Timezone'
+          timezone_store.store(component) if klass_name == 'Timezone'
           break
         elsif fields[:name] == 'begin'
           klass_name = fields[:value].gsub(/\AV/, '').downcase.capitalize
@@ -162,7 +163,13 @@ module Icalendar
         param_name = match[0].downcase
         params[param_name] ||= []
         match[1].scan %r{#{PVALUE}} do |param_value|
-          params[param_name] << param_value.gsub(/\A"|"\z/, '') if param_value.size > 0
+          if param_value.size > 0
+            param_value = param_value.gsub(/\A"|"\z/, '')
+            params[param_name] << param_value
+            if param_name == 'tzid'
+              params['x-tz-info'] = timezone_store.retrieve param_value
+            end
+          end
         end
       end
       Icalendar.logger.debug "Found fields: #{parts.inspect} with params: #{params.inspect}"

data/lib/icalendar/timezone.rb

@@ -80,7 +80,7 @@ module Icalendar
             s.add_recurrence_rule IceCube::Rule.from_ical(rule.value_ical)
           end
           std.rdate.each do |date|
-            s.add_recurrence_date date
+            s.add_recurrence_time date.to_time
           end
         end
         [schedule.previous_occurrence(local.to_time), std]
@@ -95,7 +95,7 @@ module Icalendar
             s.add_recurrence_rule IceCube::Rule.from_ical(rule.value_ical)
           end
           day.rdate.each do |date|
-            s.add_recurrence_date date
+            s.add_recurrence_time date.to_time
           end
         end
         [schedule.previous_occurrence(local.to_time), day]

data/lib/icalendar/timezone_store.rb

@@ -9,14 +9,17 @@ module Icalendar
     end
 
     def self.instance
+      warn "**** DEPRECATION WARNING ****\nTimezoneStore.instance will be removed in 3.0. Please instantiate a TimezoneStore object."
       @instance ||= new
     end
 
     def self.store(timezone)
+      warn "**** DEPRECATION WARNING ****\nTimezoneStore.store will be removed in 3.0. Please use instance methods."
       instance.store timezone
     end
 
     def self.retrieve(tzid)
+      warn "**** DEPRECATION WARNING ****\nTimezoneStore.retrieve will be removed in 3.0. Please use instance methods."
       instance.retrieve tzid
     end
 

data/lib/icalendar/values/array.rb

@@ -22,7 +22,7 @@ module Icalendar
                  else
                    [klass.new(value, params)]
                  end
-        super mapped, params
+        super mapped
       end
 
       def params_ical

data/lib/icalendar/values/date.rb

@@ -7,6 +7,8 @@ module Icalendar
       FORMAT = '%Y%m%d'
 
       def initialize(value, params = {})
+        params.delete 'tzid'
+        params.delete 'x-tz-info'
         if value.is_a? String
           begin
             parsed_date = ::Date.strptime(value, FORMAT)

data/lib/icalendar/values/time_with_zone.rb

@@ -18,6 +18,7 @@ module Icalendar
       def initialize(value, params = {})
         params = Icalendar::DowncasedHash(params)
         @tz_utc = params['tzid'] == 'UTC'
+        x_tz_info = params.delete 'x-tz-info'
 
         offset_value = unless params['tzid'].nil?
           tzid = params['tzid'].is_a?(::Array) ? params['tzid'].first : params['tzid']
@@ -25,12 +26,12 @@ module Icalendar
               defined?(ActiveSupportTimeWithZoneAdapter) &&
               (tz = ActiveSupport::TimeZone[tzid])
             ActiveSupportTimeWithZoneAdapter.new(nil, tz, value)
-          elsif (tz = TimezoneStore.retrieve(tzid))
-            offset = tz.offset_for_local(value).to_s
+          elsif !x_tz_info.nil?
+            offset = x_tz_info.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)
+              ::Time.new value.year, value.month, value.day, value.hour, value.min, value.sec, offset
             end
           end
         end

data/lib/icalendar/version.rb

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

data/spec/roundtrip_spec.rb

@@ -15,7 +15,7 @@ describe Icalendar do
       parsed = Icalendar::Calendar.parse(source).first
       event.rdate = parsed.events.first.rdate
       expect(event.rdate.first).to be_kind_of Icalendar::Values::Array
-      expect(event.rdate.first.ical_params).to eq 'tzid' => ['US-Mountain']
+      expect(event.rdate.first.params_ical).to eq ";TZID=US-Mountain"
     end
   end
 

data/spec/tzinfo_spec.rb

@@ -29,7 +29,6 @@ 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

metadata

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