icalendar 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1247afeb6249a4562ed23fdf9a01345f10513d8e
-  data.tar.gz: edb231f0a00055c53bafec1e92a4006b741d14fb
+  metadata.gz: 64b02f2d89672803b2833812e128816a6fe5aba3
+  data.tar.gz: 38d46d3ef98ed6cf283f25e4724134947327b648
 SHA512:
-  metadata.gz: 3c93f4624d028b364b42ed6054df4b7bffe2296bdd392985aff5d929be4fff0ebea3ff15ae93799277935497385d28f0f210ff7928309dac9488b42d1c25bc0c
-  data.tar.gz: 59a6178deb2fc347b0487306aff201d64360ed52aae18fe3e905082988f827f7c6f509fdde39d15461cfb38a1b34b506c6caaa821fe3ede4af0eda7259121570
+  metadata.gz: 8fcbf5dfced73f2e73751f153af8a9daf8c8f78e439e01ee14edb3bdc29ea053f02613d8ba56773a0fac6fc2f173f002cf65cb0ef00340a162774540343aca55
+  data.tar.gz: 6ddcb714caeed08fe016cd9b30e07f34c112ed1f7573435af1994537f64a7ad29e0c6cfc843789b8d2a28ed60710107570f0a996a6215ae1633d982f27308a61

data/History.txt

@@ -1,7 +1,12 @@
+=== 2.2.1 2014-12-03
+ * Prevent crashes when using ActiveSupport::TimeWithZone in multi-property DateTime fields - Danny (tdg5)
+ * Ensure TimeWithZone is loaded before using, not just ActiveSupport - Jeremy Evans
+ * Improve error message on unparseable DateTimes - Garry Shutler
+
 === 2.2.0 2014-09-23
  * Default to non-strict parsing
  * Enable sorting events by dtstart - Mark Rickert
- * Better tolerate malformed lines in parser - Gary Shutler
+ * Better tolerate malformed lines in parser - Garry Shutler
  * Deduplicate timezone code - Jan Vlnas
  * Eliminate warnings - rochefort
 

data/lib/icalendar/values/active_support_time_with_zone_adapter.rb

@@ -0,0 +1,12 @@
+module Icalendar
+  module Values
+    class ActiveSupportTimeWithZoneAdapter < ActiveSupport::TimeWithZone
+      # ActiveSupport::TimeWithZone implements a #to_a method that will cause
+      # unexpected behavior in components with multi_property DateTime
+      # properties when the setters for those properties are invoked with an
+      # Icalendar::Values::DateTime that is delegating for an
+      # ActiveSupport::TimeWithZone. To avoid this behavior, undefine #to_a.
+      undef_method :to_a
+    end
+  end
+end

data/lib/icalendar/values/date_time.rb

@@ -12,7 +12,14 @@ module Icalendar
       def initialize(value, params = {})
         if value.is_a? String
           params['tzid'] = 'UTC' if value.end_with? 'Z'
-          super ::DateTime.strptime(value, FORMAT), params
+
+          begin
+            parsed_date = ::DateTime.strptime(value, FORMAT)
+          rescue ArgumentError => e
+            raise ArgumentError.new("Failed to parse \"#{value}\" - #{e.message}")
+          end
+
+          super parsed_date, params
         elsif value.respond_to? :to_datetime
           super value.to_datetime, params
         else

data/lib/icalendar/values/time_with_zone.rb

@@ -1,5 +1,9 @@
 begin
   require 'active_support/time'
+
+  if defined?(ActiveSupport::TimeWithZone)
+    require 'icalendar/values/active_support_time_with_zone_adapter'
+  end
 rescue LoadError
   # tis ok, just a bit less fancy
 end
@@ -12,10 +16,10 @@ module Icalendar
       def initialize(value, params = {})
         @tz_utc = params['tzid'] == 'UTC'
 
-        if defined?(ActiveSupport) && !params['tzid'].nil?
+        if defined?(ActiveSupport::TimeZone) && defined?(ActiveSupportTimeWithZoneAdapter) && !params['tzid'].nil?
           tzid = params['tzid'].is_a?(::Array) ? params['tzid'].first : params['tzid']
           zone = ActiveSupport::TimeZone[tzid]
-          value = ActiveSupport::TimeWithZone.new nil, zone, value unless zone.nil?
+          value = ActiveSupportTimeWithZoneAdapter.new nil, zone, value unless zone.nil?
           super value, params
         else
           super

data/lib/icalendar/version.rb

@@ -1,5 +1,5 @@
 module Icalendar
 
-  VERSION = '2.2.0'
+  VERSION = '2.2.1'
 
 end

data/spec/event_spec.rb

@@ -82,6 +82,18 @@ describe Icalendar::Event do
         expect(subject.comment).to eq ['a comment']
       end
     end
+
+    if defined? ActiveSupport
+      describe '#rdate' do
+        it 'does not convert a DateTime delegating for an ActiveSupport::TimeWithZone into an Array' do
+          timestamp = '20140130T230000Z'
+          expected = [Icalendar::Values::DateTime.new(timestamp)]
+
+          subject.rdate = timestamp
+          expect(subject.rdate).to eq(expected)
+        end
+      end
+    end
   end
 
   describe '#find_alarm' do

data/spec/values/date_time_spec.rb

@@ -76,5 +76,13 @@ describe Icalendar::Values::DateTime do
         expect(subject.to_ical described_class).to eq ":#{value}"
       end
     end
+
+    context 'unparseable time' do
+      let(:value) { 'unparseable_time' }
+
+      it 'raises an error including the unparseable time' do
+        expect { subject }.to raise_error(ArgumentError, %r{Failed to parse \"#{value}\"})
+      end
+    end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icalendar
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Ryan Ahearn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -156,6 +156,7 @@ files:
 - lib/icalendar/todo.rb
 - lib/icalendar/tzinfo.rb
 - lib/icalendar/value.rb
+- lib/icalendar/values/active_support_time_with_zone_adapter.rb
 - lib/icalendar/values/array.rb
 - lib/icalendar/values/binary.rb
 - lib/icalendar/values/boolean.rb