icalendar 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a1a061b2cdba8b3b5058a77d5a3f6c06a795c34
-  data.tar.gz: a404fedca32cb195c8f939b42e384114a227611d
+  metadata.gz: 3bb514e630455e28b49f977bb6c316dc470cb98f
+  data.tar.gz: 02953a2e8e74af0680d02e6ae889dd30fee8cedb
 SHA512:
-  metadata.gz: 825777c1bd1bd283931d9ed8b81305ba0bfa2ffc6114054452b2ea47f300114d3c1704cf53a15a21abbb81ba5b2ff5190c14797aece6d0f56de6288194f45967
-  data.tar.gz: 6f568404d5a15e36d83294552076135504b964516780f856aa60e3d7a3ba40f6a93dde4bd1e95c658d8c3cb00818d2ae761e3aae21a0d7d6b11073ddb1c82fbb
+  metadata.gz: 107461d20bf35d2f4df715e52605126a55a532c8dabb51c6b35eda16828fe50220a073b7c76b09dda00165c34745414b5172206a422aeeee4e9fc2ba7df46cef
+  data.tar.gz: 66694d2dd3cc7f70d3ddcbd81d6682fca411dffe57bd76afacc015f6c1328b0f6f67ffed512c42b08d500644d8d8e514502c2c438e32644b43c66f9c2976bde9

data/.gitignore

@@ -3,3 +3,5 @@
 .ruby-gemset
 Gemfile.lock
 pkg/
+.bundle
+vendor/

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 1.9.3
+script: bundle exec rake test

data/History.txt

@@ -1,3 +1,10 @@
+=== 1.4.4 2013-11-05
+ * Allow user to handle TZInfo::AmbiguousTime error - David Bradford
+ * Better handling of multiple exdate and rdate values
+
+=== 1.4.3 2013-09-18
+ * Fix concatenation of multiple BYWEEK or BYMONTH recurrence rules
+
 === 1.4.2 2013-09-11
  * Double Quote parameter values that contain forbidden characters
  * Update Component#respond_to? to match Ruby 2.0 - Keith Marcum

data/README.md

@@ -1,6 +1,8 @@
 iCalendar -- Internet calendaring, Ruby style
 ===
 
+[![Build Status](https://travis-ci.org/icalendar/icalendar.png)](https://travis-ci.org/icalendar/icalendar)
+
 <http://github.com/icalendar/icalendar>
 
 DESCRIPTION

data/icalendar.gemspec

@@ -25,5 +25,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake', '~> 10.0'
   s.add_development_dependency 'bundler', '~> 1.3'
   s.add_development_dependency 'tzinfo', '~> 0.3'
+  s.add_development_dependency 'timecop', '~> 0.6.3'
 end
 

data/lib/icalendar/base.rb

@@ -11,7 +11,7 @@ require 'logger'
 
 module Icalendar #:nodoc:
 
-  VERSION = '1.4.3'
+  VERSION = '1.4.4'
 
   # A simple error class to differentiate iCalendar library exceptions
   # from ruby language exceptions or others.

data/lib/icalendar/component.rb

@@ -314,16 +314,24 @@ module Icalendar
       # Getter for whole array
       unless instance_methods.include? plural
         code = <<-code
-            def #{plural}(a = nil)
+            def #{plural}(a = nil, params = nil)
               if a.nil?
                 @properties["#{property}"] || []
               else
-                self.#{plural}=(a)
+                self.#{plural}=(a).tap do |val|
+                  unless params.nil?
+                    unless val.respond_to?(:ical_params)
+                      val.class.class_eval { attr_accessor :ical_params }
+                    end
+                    val.ical_params = params
+                  end
+                end
               end
             end
         code
 
         class_eval code, "component.rb", 186
+        alias_method property, plural
       end
     end
 
@@ -333,13 +341,9 @@ module Icalendar
         code = <<-code
             def #{plural}=(a)
               if a.respond_to?(:to_ary)
-                a.to_ary.each do |val|
-                  unless val.respond_to?(:to_ical)
-                    raise(NotImplementedError, "Property values do not support to_ical method!")
-                  end
-                end
-
                 @properties["#{property}"] = a.to_ary
+              elsif a =~ /^[^"].*(?<!\\\\),.*[^"]$/
+                @properties["#{property}"] = a.split(/(?<!\\\\),/).to_ary
               else
                 raise ArgumentError, "#{plural} is a multi-property that must be an array! Use the add_[property] method to add single entries."
               end

data/lib/icalendar/parser.rb

@@ -176,7 +176,7 @@ module Icalendar
           # Replace dashes with underscores
           name = name.gsub('-', '_')
 
-          if component.multi_property?(name)
+          if component.multiline_property?(name)
             adder = "add_" + name
             if component.respond_to?(adder)
               component.send(adder, value, params)
@@ -286,13 +286,15 @@ module Icalendar
       @parsers["DUE"] = m
       @parsers["DTSTART"] = m
       @parsers["RECURRENCE-ID"] = m
-      @parsers["EXDATE"] = m
-      @parsers["RDATE"] = m
       @parsers["CREATED"] = m
       @parsers["DTSTAMP"] = m
       @parsers["LAST-MODIFIED"] = m
       @parsers["ACKNOWLEDGED"] = m
 
+      m = self.method(:parse_multi_datetime)
+      @parsers["EXDATE"] = m
+      @parsers["RDATE"] = m
+
       # URI's
       m = self.method(:parse_uri)
       @parsers["TZURL"] = m
@@ -331,26 +333,48 @@ module Icalendar
     # Dates, Date-Times & Times
     # NOTE: invalid dates & times will be returned as strings...
     def parse_datetime(name, params, value)
-      begin
-        if params["VALUE"] && params["VALUE"].first == "DATE"
-          result = Date.parse(value)
+      if params["VALUE"] && params["VALUE"].first == "DATE"
+        result = Date.parse(value)
+      else
+        result = DateTime.parse(value)
+        if /Z$/ =~ value
+          timezone = "UTC"
+        else
+          timezone = params["TZID"].first if params["TZID"]
+        end
+        result.icalendar_tzid = timezone
+      end
+      result
+    rescue Exception
+      value
+    end
+
+    # Multiple valued Dates
+    def parse_multi_datetime(name, params, value)
+      use_date = params['VALUE'] && params['VALUE'].first == 'DATE'
+      tzid = params['TZIID'].first if params['TZID']
+      result = []
+      value.split(/,/).each do |val|
+        if use_date
+          result << Date.parse(val)
         else
-          result = DateTime.parse(value)
-          if /Z$/ =~ value
-            timezone = "UTC"
+          dt = DateTime.parse val
+          if /Z$/ =~ val
+            timezone = 'UTC'
           else
-            timezone = params["TZID"].first if params["TZID"]
+            timezone = tzid
           end
-          result.icalendar_tzid = timezone
+          dt.icalendar_tzid = timezone
+          result << dt
         end
-        result
-      rescue Exception
-        value
       end
+      result
+    rescue Exception
+      [value]
     end
-    
+
     def parse_recur(name, params, value)
-      ::Icalendar::RRule.new(name, params, value)
+      [::Icalendar::RRule.new(name, params, value)]
     end
 
     # Durations

data/lib/icalendar/rrule.rb

@@ -75,8 +75,12 @@ module Icalendar
     end
 
     def parse_date_val(name, string)
-      match = string.match(/;#{name}=(.*?)(;|$)/)
-      match ? DateTime.parse(match[1]) : nil
+      match = string.match(/;#{name}=(.*?)(Z)?(;|$)/)
+      if match
+        DateTime.parse(match[1]).tap do |dt|
+          dt.icalendar_tzid = 'UTC' unless match[2].nil?
+        end
+      end
     end
 
     def parse_int_val(name, string)

data/lib/icalendar/tzinfo.rb

@@ -43,8 +43,8 @@
 
 module TZInfo
   class Timezone
-    def ical_timezone(date)
-      period = period_for_local(date)
+    def ical_timezone(date, dst = Timezone.default_dst)
+      period = period_for_local(date, dst)
       timezone = Icalendar::Timezone.new
       timezone.timezone_id = identifier
       if period.start_transition.nil?

data/test/test_conversions.rb

@@ -8,7 +8,7 @@ require 'date'
 class TestConversions < Test::Unit::TestCase
   include Icalendar
 
-  RESULT = <<EOS
+  RESULT = <<EOS.gsub("\n", "\r\n")
 BEGIN:VCALENDAR
 VERSION:2.0
 CALSCALE:GREGORIAN
@@ -17,8 +17,8 @@ BEGIN:VEVENT
 CATEGORIES:foo,bar,baz
 DESCRIPTION:desc
 DTSTAMP:20060720T174052
-DTSTART:20060720
-EXDATE:20121012T170000Z,20121102T170000Z
+DTSTART;VALUE=DATE:20060720
+EXDATE;TZID=America/New_York:20121012T170000,20121102T170000
 GEO:46.01;8.57
 LAST-MODIFIED:19960817T133000
 ORGANIZER:mailto:joe@example.com?subject=Ruby
@@ -56,7 +56,7 @@ EOS
       organizer(URI::MailTo.build(['joe@example.com', 'subject=Ruby']))
 
       # Date
-      start  Date.parse("2006-07-20")
+      start Date.parse("2006-07-20"), {'VALUE' => 'DATE'}
 
       # DateTime
       timestamp DateTime.parse("2006-07-20T17:40:52+0200")
@@ -67,12 +67,12 @@ EOS
       uid "foobar"
 
       add_rrule "FREQ=WEEKLY;UNTIL=20130220T180000Z;BYDAY=FR"
-
-      add_exdate "20121012T170000Z"
-      add_exdate "20121102T170000Z"
+      exception_dates %w(20121012T170000 20121102T170000), {'TZID' => 'America/New_York'}
     end
 
-    assert_equal(RESULT.gsub("\n", "\r\n"), @cal.to_ical)
+    assert_equal(RESULT, @cal.to_ical)
+    # test round-trip
+    assert_equal(@cal.to_ical, Icalendar.parse(RESULT).to_ical)
   end
 
   def test_to_ical_folding

data/test/test_tzinfo.rb

@@ -4,6 +4,7 @@ require 'test/unit'
 require 'icalendar'
 require 'tzinfo'
 require 'icalendar/tzinfo'
+require 'timecop'
 
 class TestTZInfoExt < Test::Unit::TestCase
   def setup
@@ -31,7 +32,7 @@ class TestTZInfoExt < Test::Unit::TestCase
 BEGIN:VTIMEZONE
 TZID:America/Cayman
 BEGIN:STANDARD
-DTSTART:19120201T000712
+DTSTART:19120201T000711
 TZNAME:EST
 TZOFFSETFROM:-0652
 TZOFFSETTO:-0500
@@ -54,4 +55,29 @@ END:STANDARD
 END:VTIMEZONE
     EXPECTED
   end
+
+  def test_dst_transition
+    tz = TZInfo::Timezone.get "America/Los_Angeles"
+
+    # DST transition in America/Los_Angeles
+    Timecop.freeze('2013-11-03T01:30:00-08:00') do
+      assert_raises(TZInfo::AmbiguousTime) { tz.ical_timezone( tz.now ) }
+      assert_raises(TZInfo::AmbiguousTime) { tz.ical_timezone( tz.now, nil ) }
+      assert_raises(TZInfo::AmbiguousTime) do 
+        TZInfo::Timezone.default_dst = nil
+        tz.ical_timezone( tz.now )
+      end
+      
+      assert_nothing_raised { tz.ical_timezone( tz.now, true ) }
+      assert_nothing_raised { tz.ical_timezone( tz.now, false ) }
+      assert_nothing_raised do 
+        TZInfo::Timezone.default_dst = true
+        tz.ical_timezone( tz.now )
+      end
+      assert_nothing_raised do 
+        TZInfo::Timezone.default_dst = false
+        tz.ical_timezone( tz.now )
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icalendar
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Ryan Ahearn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-18 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -52,6 +52,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.3
 description: |2
       Implements the iCalendar specification (RFC-2445) in Ruby.  This allows
       for the generation and parsing of .ics files, which are used by a
@@ -63,6 +77,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - COPYING
 - GPL
 - Gemfile