icalendar 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 144e7b7601ab22b7de6b32db6da271ca7f2e487d
-  data.tar.gz: 36fe6e7a0bc064ff6d989dbbc40b56a87c42508d
+  metadata.gz: 3ed623b569af5c7f68aa5917f19acedb5a11f7e8
+  data.tar.gz: 3293337f990892e2c07cc9c8d23f5bf4b86e5a37
 SHA512:
-  metadata.gz: 053e06312ce27ff2b6e964396171c15b3808a4954f9dc42330d6febde5d0e5339144fe5521088f446db652fa6f12a61718f7585b1025f31f26ca21cd95f1cbef
-  data.tar.gz: 4a22eaa229789f42b8584a1a8bc707846ee4f24b0ee34851583fc8c0f2c2fdcbf4aacf34c4fdab9dc82183a64ca8cd51ed9b899837bf26a2cae5e8f54b6a5fd4
+  metadata.gz: 4a95ab23132eeffa95b42b1c2da033aa46b92775caf43928458ffd048685f66095855235b1b951f1bb18a1a33b7fb817cc1e4fc3f1b4917a277a3f18306dc592
+  data.tar.gz: 8d77c499752d3f589b9dca961d61df24f9b67a89f4764c462e71bcedd313a0f8d3b1aace26849bbe183a415235e4c6b159b8ea4b194b37cf9b202a73f001c568

data/History.txt

@@ -1,3 +1,9 @@
+=== 2.3.0 2015-04-26
+ * fix value parameter for properties with multiple values
+ * fix error when assigning Icalendar::Values::Array to a component
+ * Fall back to Icalendar::Values::Date if Icalendar::Values::DateTime is not given a properly formatted value
+ * Downcase the keys in ical_params to ensure we aren't assigning both tzid and TZID
+
 === 2.2.2 2014-12-27
  * add a `has_#{component}?` method for testing if component exists - John Hope
  * add documentation & tests for organizer attribute - Ben Walding

data/lib/icalendar/downcased_hash.rb

@@ -0,0 +1,40 @@
+require 'delegate'
+
+module Icalendar
+  class DowncasedHash < ::SimpleDelegator
+
+    def initialize(base)
+      super Hash.new
+      base.each do |key, value|
+        self[key] = value
+      end
+    end
+
+    def []=(key, value)
+      __getobj__[key.to_s.downcase] = value
+    end
+
+    def [](key)
+      __getobj__[key.to_s.downcase]
+    end
+
+    def has_key?(key)
+      __getobj__.has_key? key.to_s.downcase
+    end
+    alias_method :include?, :has_key?
+    alias_method :member?, :has_key?
+
+    def delete(key, &block)
+      __getobj__.delete key.to_s.downcase, &block
+    end
+  end
+
+  def self.DowncasedHash(base)
+    case base
+    when Icalendar::DowncasedHash then base
+    when Hash then Icalendar::DowncasedHash.new(base)
+    else
+      fail ArgumentError
+    end
+  end
+end

data/lib/icalendar/has_components.rb

@@ -62,7 +62,7 @@ module Icalendar
               klass ||= Icalendar.const_get singular_name.capitalize
               klass.new
             rescue NameError => ne
-              puts "WARN: #{ne.message}"
+              Icalendar.logger.warn ne.message
               Component.new singular_name
             end
           end

data/lib/icalendar/parser.rb

@@ -32,23 +32,7 @@ module Icalendar
 
     def parse_property(component, fields = nil)
       fields = next_fields if fields.nil?
-      klass = component.class.default_property_types[fields[:name]]
-      if !fields[:params]['value'].nil?
-        klass_name = fields[:params].delete('value').first
-        unless klass_name.upcase == klass.value_type
-          klass_name = klass_name.downcase.gsub(/(?:\A|-)(.)/) { |m| m[-1].upcase }
-          klass = Icalendar::Values.const_get klass_name if Icalendar::Values.const_defined?(klass_name)
-        end
-      end
-      if klass.value_type != 'RECUR' && fields[:value] =~ /(?<!\\)([,;])/
-        delimiter = $1
-        prop_value = Icalendar::Values::Array.new fields[:value].split(/(?<!\\)[;,]/),
-                                                  klass,
-                                                  fields[:params],
-                                                  delimiter: delimiter
-      else
-        prop_value = klass.new fields[:value], fields[:params]
-      end
+      prop_value = wrap_property_value component, fields
       prop_name = %w(class method).include?(fields[:name]) ? "ip_#{fields[:name]}" : fields[:name]
       begin
         method_name = if component.class.multiple_properties.include? prop_name
@@ -68,6 +52,35 @@ module Icalendar
       end
     end
 
+    def wrap_property_value(component, fields)
+      klass = get_wrapper_class component, fields
+      if klass.value_type != 'RECUR' && fields[:value] =~ /(?<!\\)([,;])/
+        delimiter = $1
+        Icalendar::Values::Array.new fields[:value].split(/(?<!\\)[;,]/),
+                                     klass,
+                                     fields[:params],
+                                     delimiter: delimiter
+      else
+        klass.new fields[:value], fields[:params]
+      end
+    rescue Icalendar::Values::DateTime::FormatError => fe
+      raise fe if strict?
+      fields[:params]['value'] = ['DATE']
+      retry
+    end
+
+    def get_wrapper_class(component, fields)
+      klass = component.class.default_property_types[fields[:name]]
+      if !fields[:params]['value'].nil?
+        klass_name = fields[:params].delete('value').first
+        unless klass_name.upcase == klass.value_type
+          klass_name = klass_name.downcase.gsub(/(?:\A|-)(.)/) { |m| m[-1].upcase }
+          klass = Icalendar::Values.const_get klass_name if Icalendar::Values.const_defined?(klass_name)
+        end
+      end
+      klass
+    end
+
     def strict?
       !!@strict
     end

data/lib/icalendar/value.rb

@@ -1,4 +1,5 @@
 require 'delegate'
+require 'icalendar/downcased_hash'
 
 module Icalendar
 
@@ -7,12 +8,12 @@ module Icalendar
     attr_accessor :ical_params
 
     def initialize(value, params = {})
-      @ical_params = params.dup
+      @ical_params = Icalendar::DowncasedHash(params)
       super value
     end
 
     def ical_param(key, value)
-      @ical_params[key.to_s] = value
+      @ical_params[key] = value
     end
 
     def value
@@ -20,7 +21,7 @@ module Icalendar
     end
 
     def to_ical(default_type)
-      ical_param 'value', self.class.value_type if needs_value_type?(default_type)
+      ical_param 'value', self.value_type if needs_value_type?(default_type)
       "#{params_ical}:#{value_ical}"
     end
 
@@ -34,6 +35,10 @@ module Icalendar
       name.gsub(/\A.*::/, '').gsub(/(?<!\A)[A-Z]/, '-\0').upcase
     end
 
+    def value_type
+      self.class.value_type
+    end
+
     private
 
     def needs_value_type?(default_type)
@@ -77,4 +82,4 @@ require_relative 'values/uri'
 require_relative 'values/utc_offset'
 
 # further refine above classes
-require_relative 'values/cal_address'
+require_relative 'values/cal_address'

data/lib/icalendar/values/array.rb

@@ -3,10 +3,18 @@ module Icalendar
 
     class Array < Value
 
+      attr_reader :value_delimiter
+
       def initialize(value, klass, params = {}, options = {})
         @value_delimiter = options[:delimiter] || ','
         mapped = if value.is_a? ::Array
-                   value.map { |v| klass.new v, params }
+                   value.map do |v|
+                     if v.is_a? Icalendar::Values::Array
+                       Icalendar::Values::Array.new v.value, klass, v.ical_params, delimiter: v.value_delimiter
+                     else
+                       klass.new v, params
+                     end
+                   end
                  else
                    [klass.new(value, params)]
                  end
@@ -23,7 +31,7 @@ module Icalendar
       def value_ical
         value.map do |v|
           v.value_ical
-        end.join @value_delimiter
+        end.join value_delimiter
       end
 
       def valid?
@@ -31,6 +39,10 @@ module Icalendar
         !value.all? { |v| v.class == klass }
       end
 
+      def value_type
+        value.first.value_type
+      end
+
       private
 
       def needs_value_type?(default_type)
@@ -40,4 +52,4 @@ module Icalendar
     end
 
   end
-end
+end

data/lib/icalendar/values/date_time.rb

@@ -16,7 +16,7 @@ module Icalendar
           begin
             parsed_date = ::DateTime.strptime(value, FORMAT)
           rescue ArgumentError => e
-            raise ArgumentError.new("Failed to parse \"#{value}\" - #{e.message}")
+            raise FormatError.new("Failed to parse \"#{value}\" - #{e.message}")
           end
 
           super parsed_date, params
@@ -43,6 +43,8 @@ module Icalendar
         end
       end
 
+      class FormatError < ArgumentError
+      end
     end
 
   end

data/lib/icalendar/values/time_with_zone.rb

@@ -14,6 +14,7 @@ module Icalendar
       attr_reader :tz_utc
 
       def initialize(value, params = {})
+        params = Icalendar::DowncasedHash(params)
         @tz_utc = params['tzid'] == 'UTC'
 
         if defined?(ActiveSupport::TimeZone) && defined?(ActiveSupportTimeWithZoneAdapter) && !params['tzid'].nil?
@@ -22,7 +23,7 @@ module Icalendar
           value = ActiveSupportTimeWithZoneAdapter.new nil, zone, value unless zone.nil?
           super value, params
         else
-          super
+          super value, params
         end
       end
 

data/lib/icalendar/version.rb

@@ -1,5 +1,5 @@
 module Icalendar
 
-  VERSION = '2.2.2'
+  VERSION = '2.3.0'
 
 end

data/spec/downcased_hash_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe Icalendar::DowncasedHash do
+
+  subject { described_class.new base }
+  let(:base) { {'hello' => 'world'} }
+
+  describe '#[]=' do
+    it 'sets a new value' do
+      subject['FOO'] = 'bar'
+      expect(subject['foo']).to eq 'bar'
+    end
+  end
+
+  describe '#[]' do
+    it 'gets an already set value' do
+      subject['foo'] = 'bar'
+      expect(subject['FOO']).to eq 'bar'
+    end
+  end
+
+  describe '#has_key?' do
+    it 'correctly identifies keys in the hash' do
+      expect(subject.has_key? 'hello').to be true
+      expect(subject.has_key? 'HELLO').to be true
+    end
+  end
+
+  describe '#delete' do
+    context 'no block' do
+      it 'removes the key' do
+        subject.delete 'HELLO'
+        expect(subject.has_key? 'hello').to be false
+      end
+    end
+    context 'with a block' do
+      it 'calls the block when the key is not found' do
+        expect { |b| subject.delete 'nokey', &b }.to yield_with_args('nokey')
+      end
+    end
+  end
+
+  describe 'DowncasedHash()' do
+    it 'returns self when passed an DowncasedHash' do
+      expect(Icalendar::DowncasedHash(subject)).to be subject
+    end
+
+    it 'wraps a hash in an downcased hash' do
+      expect(Icalendar::DowncasedHash(base)).to be_kind_of Icalendar::DowncasedHash
+    end
+  end
+end

data/spec/fixtures/recurrence.ics

@@ -0,0 +1,18 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:bsprodidfortestabc123
+CALSCALE:GREGORIAN
+BEGIN:VEVENT
+DTSTAMP:20050118T211523Z
+UID:bsuidfortestabc123
+DTSTART;VALUE=DATE:20050323
+DTEND;VALUE=DATE:20050323
+CLASS:PRIVATE
+ORGANIZER:mailto:joebob@random.net
+PRIORITY:2
+SUMMARY:This is a really long summary to test the method of unfolding lines
+ \, so I'm just going to make it a whole bunch of lines.
+EXDATE;VALUE=DATE:20120323,20130323
+RRULE:FREQ=YEARLY
+END:VEVENT
+END:VCALENDAR

data/spec/fixtures/single_event_bad_dtstart.ics

@@ -0,0 +1,21 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:bsprodidfortestabc123
+CALSCALE:GREGORIAN
+BEGIN:VEVENT
+DTSTAMP:20050118T211523Z
+UID:bsuidfortestabc123
+DTSTART:20050120
+DTEND;TZID=US-Mountain:20050120T184500
+CLASS:PRIVATE
+GEO:37.386013;-122.0829322
+ORGANIZER:mailto:joebob@random.net
+PRIORITY:2
+SUMMARY:This is a really long summary to test the method of unfolding lines
+ \, so I'm just going to make it a whole bunch of lines.
+ATTACH:http://bush.sucks.org/impeach/him.rhtml
+ATTACH:http://corporations-dominate.existence.net/why.rhtml
+RDATE;TZID=US-Mountain:20050121T170000,20050122T170000
+X-TEST-COMPONENT;QTEST="Hello, World":Shouldn't double double quotes
+END:VEVENT
+END:VCALENDAR

data/spec/parser_spec.rb

@@ -2,29 +2,40 @@ require 'spec_helper'
 
 describe Icalendar::Parser do
   subject { described_class.new source, false }
+  let(:source) { File.read File.join(File.dirname(__FILE__), 'fixtures', fn) }
 
   describe '#parse' do
-    let(:source) { File.read File.join(File.dirname(__FILE__), 'fixtures', 'single_event.ics') }
+    context 'single_event.ics' do
+      let(:fn) { 'single_event.ics' }
 
-    it 'returns an array of calendars' do
-      expect(subject.parse).to be_instance_of Array
-      expect(subject.parse.count).to eq 1
-      expect(subject.parse[0]).to be_instance_of Icalendar::Calendar
-    end
+      it 'returns an array of calendars' do
+        expect(subject.parse).to be_instance_of Array
+        expect(subject.parse.count).to eq 1
+        expect(subject.parse[0]).to be_instance_of Icalendar::Calendar
+      end
 
-    it 'properly splits multi-valued lines' do
-      event = subject.parse.first.events.first
-      expect(event.geo).to eq [37.386013,-122.0829322]
-    end
+      it 'properly splits multi-valued lines' do
+        event = subject.parse.first.events.first
+        expect(event.geo).to eq [37.386013,-122.0829322]
+      end
 
-    it 'saves params' do
-      event = subject.parse.first.events.first
-      expect(event.dtstart.ical_params).to eq('tzid' => ['US-Mountain'])
+      it 'saves params' do
+        event = subject.parse.first.events.first
+        expect(event.dtstart.ical_params).to eq('tzid' => ['US-Mountain'])
+      end
+    end
+    context 'recurrence.ics' do
+      let(:fn) { 'recurrence.ics' }
+      it 'correctly parses the exdate array' do
+        event = subject.parse.first.events.first
+        ics = event.to_ical
+        expect(ics).to match 'EXDATE;VALUE=DATE:20120323,20130323'
+      end
     end
   end
 
   describe '#parse with bad line' do
-    let(:source) { File.read File.join(File.dirname(__FILE__), 'fixtures', 'single_event_bad_line.ics') }
+    let(:fn) { 'single_event_bad_line.ics' }
 
     it 'returns an array of calendars' do
       expect(subject.parse).to be_instance_of Array
@@ -42,4 +53,13 @@ describe Icalendar::Parser do
       expect(event.dtstart.ical_params).to eq('tzid' => ['US-Mountain'])
     end
   end
+
+  describe 'missing date value parameter' do
+    let(:fn) { 'single_event_bad_dtstart.ics' }
+
+    it 'falls back to date type for dtstart' do
+      event = subject.parse.first.events.first
+      expect(event.dtstart).to be_kind_of Icalendar::Values::Date
+    end
+  end
 end

data/spec/roundtrip_spec.rb

@@ -8,6 +8,14 @@ describe Icalendar do
     it 'will generate the same file as is parsed' do
       expect(Icalendar.parse(source, true).to_ical).to eq source
     end
+
+    it 'array properties can be assigned to a new event' do
+      event = Icalendar::Event.new
+      parsed = Icalendar.parse source, true
+      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']
+    end
   end
 
   describe 'timezone round trip' do

data/spec/values/date_time_spec.rb

@@ -56,6 +56,15 @@ describe Icalendar::Values::DateTime do
       expect(subject.to_ical described_class).to eq ":#{value}"
     end
 
+    context 'manually set UTC' do
+      let(:value) { '20140209T194355' }
+      let(:params) { {'TZID' => 'UTC'} }
+
+      it 'does not add a tzid parameter, but does add a Z' do
+        expect(subject.to_ical described_class).to eq ":#{value}Z"
+      end
+    end
+
     context 'local time' do
       let(:value) { '20140209T160652' }
       let(:params) { {'tzid' => 'America/Denver'} }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icalendar
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Ryan Ahearn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-27 00:00:00.000000000 Z
+date: 2015-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -159,6 +159,7 @@ files:
 - lib/icalendar/alarm.rb
 - lib/icalendar/calendar.rb
 - lib/icalendar/component.rb
+- lib/icalendar/downcased_hash.rb
 - lib/icalendar/event.rb
 - lib/icalendar/freebusy.rb
 - lib/icalendar/has_components.rb
@@ -190,10 +191,13 @@ files:
 - lib/icalendar/version.rb
 - spec/alarm_spec.rb
 - spec/calendar_spec.rb
+- spec/downcased_hash_spec.rb
 - spec/event_spec.rb
 - spec/fixtures/nondefault_values.ics
 - spec/fixtures/nonstandard.ics
+- spec/fixtures/recurrence.ics
 - spec/fixtures/single_event.ics
+- spec/fixtures/single_event_bad_dtstart.ics
 - spec/fixtures/single_event_bad_line.ics
 - spec/fixtures/timezone.ics
 - spec/fixtures/two_date_time_events.ics
@@ -238,17 +242,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A ruby implementation of the iCalendar specification (RFC-5545).
 test_files:
 - spec/alarm_spec.rb
 - spec/calendar_spec.rb
+- spec/downcased_hash_spec.rb
 - spec/event_spec.rb
 - spec/fixtures/nondefault_values.ics
 - spec/fixtures/nonstandard.ics
+- spec/fixtures/recurrence.ics
 - spec/fixtures/single_event.ics
+- spec/fixtures/single_event_bad_dtstart.ics
 - spec/fixtures/single_event_bad_line.ics
 - spec/fixtures/timezone.ics
 - spec/fixtures/two_date_time_events.ics