icalendar 1.2.4 → 1.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: aee422660be821b5fa0060bd0344282e673db97f
+  data.tar.gz: 95df849c43f1868e9cf7a9f644fffc9384afce97
+SHA512:
+  metadata.gz: a3108d6a9d6474c9210e083653fbfd1fc9e9979f8c5093ea1bab7f03c6263c687c261c5cab8d8fecd5ff6b80d539d877f33c7b15ac782e9b75cb4c5e9c255f1b
+  data.tar.gz: 9f6d142d8f346c422ed99d56b2f386419647f1a502f7c77787a0c730dcf4287a0fe9463abc174957808ba89413549b3082a17672f22da3e4d00adc2ff169bde0

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.3.0 2013-03-31
+ * Lenient parsing mode ignores unknown properties - David Grandinetti
+ * VTIMEZONE positive offsets properly have "+" prepended (Fixed issue
+#18) - Benjamin Jorgensen (sorry for misspelling your last name)
+
 === 1.2.4 2013-03-26
  * Proxy component values now frozen in Ruby 2.0 (Fixed issue #17)
  * Clean up gemspec for cleaner installing via bundler/git

data/README.rdoc

@@ -215,13 +215,18 @@ Add `$KCODE = 'u'` to make icalender work correctly with Utf8 texts
   # can have multiple calendars.
   cals = Icalendar.parse(cal_file)
   cal = cals.first
-
+  
   # Now you can access the cal object in just the same way I created it
   event = cal.events.first
 
   puts "start date-time: " + event.dtstart
   puts "summary: " + event.summary
 
+  # Some calendars contain non-standard parameters (e.g. Apple iCloud
+  # calendars). You can pass in a `strict` value when creating a new parser.
+  unstrict_parser = Icalendar::Parser.new(cal_file, false)
+  cal = unstrict_parser.parse()
+
 == Finders:
 
 Often times in web apps and other interactive applications you'll need to

data/icalendar.gemspec

@@ -16,5 +16,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'newgem', '~> 1.5'
   s.add_development_dependency 'rubyforge', '~> 2.0'
   s.add_development_dependency 'rdoc', '~> 4.0'
+  s.add_development_dependency 'tzinfo', '~> 0.3'
 end
 

data/lib/icalendar/base.rb

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

data/lib/icalendar/parser.rb

@@ -39,9 +39,17 @@ module Icalendar
     # time-numzome = sign time-hour [":"] time-minute
     TIME = '(\d\d):?(\d\d):?(\d\d)(\.\d+)?(Z|[-+]\d\d:?\d\d)?'
 
-    def initialize(src)
+    # Defines if this is a strict parser.
+    attr_accessor :strict
+
+    def initialize(src, strict = true)
       # Setup the parser method hash table
-      setup_parsers()
+      setup_parsers
+
+      # The default behavior is to raise an error when the parser
+      # finds an unknown property. Set this to false to discard
+      # unknown properties instead of raising an error.
+      @strict = strict
 
       if src.respond_to?(:gets)
         @file = src
@@ -99,7 +107,7 @@ module Icalendar
 
         # Just iterate through until we find the beginning of a calendar object
         if fields[:name] == "BEGIN" and fields[:value] == "VCALENDAR"
-          cal = parse_component
+          cal = parse_component Calendar.new
           @@logger.debug "Added parsed calendar..."
           calendars << cal
         end
@@ -173,13 +181,13 @@ module Icalendar
             if component.respond_to?(adder)
               component.send(adder, value, params)
             else
-              raise(UnknownPropertyMethod, "Unknown property type: #{adder}")
+              raise(UnknownPropertyMethod, "Unknown property type: #{adder}") if strict
             end
           else
             if component.respond_to?(name)
               component.send(name, value, params)
             else
-              raise(UnknownPropertyMethod, "Unknown property type: #{name}")
+              raise(UnknownPropertyMethod, "Unknown property type: #{name}") if strict
             end
           end
         end  

data/lib/icalendar/tzinfo.rb

@@ -42,80 +42,80 @@
 # require "tzinfo"
 
 module TZInfo
-    class Timezone
-        def ical_timezone(date)
-            period = period_for_local(date)
-            timezone = Icalendar::Timezone.new
-            timezone.timezone_id = identifier
-            timezone.add(period.daylight)
-            timezone.add(period.standard)
-            return timezone
-        end
+  class Timezone
+    def ical_timezone(date)
+      period = period_for_local(date)
+      timezone = Icalendar::Timezone.new
+      timezone.timezone_id = identifier
+      timezone.add(period.daylight)
+      timezone.add(period.standard)
+      return timezone
     end
-    
-    class TimezoneTransitionInfo
-        def offset_from
-            a = previous_offset.utc_total_offset
-            sprintf("%2.2d%2.2d", (a / 3600).to_i, ((a / 60) % 60).to_i)
-        end
-        
-        def offset_to
-            a = offset.utc_total_offset
-            sprintf("%2.2d%2.2d", (a / 3600).to_i, ((a / 60) % 60).to_i)
-        end
-        
-        def rrule 
-            start = local_start.to_datetime
-            # this is somewhat of a hack, but seems to work ok
-            [sprintf(
-                    "FREQ=YEARLY;BYMONTH=%d;BYDAY=%d%s",
-                    start.month, 
-                    ((start.day - 1)/ 7).to_i + 1,
-                    start.strftime("%a").upcase[0,2]
-                    )]
-        end
-        
-        def dtstart
-            local_start.to_datetime.strftime("%Y%m%dT%H%M%S")
-        end
+  end
 
+  class TimezoneTransitionInfo
+    def offset_from
+      a = previous_offset.utc_total_offset
+      sprintf("%+-2.2d%2.2d", (a / 3600).to_i, ((a / 60) % 60).to_i)
     end
-    
-    class TimezonePeriod
-        def daylight
-            day = Icalendar::Daylight.new
-            if dst?
-                day.timezone_name = abbreviation.to_s
-                day.timezone_offset_from = start_transition.offset_from
-                day.timezone_offset_to = start_transition.offset_to
-                day.dtstart = start_transition.dtstart
-                day.recurrence_rules = start_transition.rrule
-            else
-                day.timezone_name = abbreviation.to_s.sub("ST","DT")
-                day.timezone_offset_from = end_transition.offset_from
-                day.timezone_offset_to = end_transition.offset_to
-                day.dtstart = end_transition.dtstart
-                day.recurrence_rules = end_transition.rrule
-            end
-            return day
-        end
-        
-        def standard
-            std = Icalendar::Standard.new
-            if dst?
-                std.timezone_name = abbreviation.to_s.sub("DT","ST")
-                std.timezone_offset_from = end_transition.offset_from
-                std.timezone_offset_to = end_transition.offset_to
-                std.dtstart = end_transition.dtstart
-                std.recurrence_rules = end_transition.rrule
-            else
-                std.timezone_name = abbreviation.to_s
-                std.timezone_offset_from = start_transition.offset_from
-                std.timezone_offset_to = start_transition.offset_to
-                std.dtstart = start_transition.dtstart
-                std.recurrence_rules = start_transition.rrule
-            end
-            return std
-        end
+
+    def offset_to
+      a = offset.utc_total_offset
+      sprintf("%+-2.2d%2.2d", (a / 3600).to_i, ((a / 60) % 60).to_i)
+    end
+
+    def rrule 
+      start = local_start.to_datetime
+      # this is somewhat of a hack, but seems to work ok
+      [sprintf(
+        "FREQ=YEARLY;BYMONTH=%d;BYDAY=%d%s",
+        start.month, 
+        ((start.day - 1)/ 7).to_i + 1,
+        start.strftime("%a").upcase[0,2]
+      )]
+    end
+
+    def dtstart
+      local_start.to_datetime.strftime("%Y%m%dT%H%M%S")
+    end
+
+  end
+
+  class TimezonePeriod
+    def daylight
+      day = Icalendar::Daylight.new
+      if dst?
+        day.timezone_name = abbreviation.to_s
+        day.timezone_offset_from = start_transition.offset_from
+        day.timezone_offset_to = start_transition.offset_to
+        day.dtstart = start_transition.dtstart
+        day.recurrence_rules = start_transition.rrule
+      else
+        day.timezone_name = abbreviation.to_s.sub("ST","DT")
+        day.timezone_offset_from = end_transition.offset_from
+        day.timezone_offset_to = end_transition.offset_to
+        day.dtstart = end_transition.dtstart
+        day.recurrence_rules = end_transition.rrule
+      end
+      return day
+    end
+
+    def standard
+      std = Icalendar::Standard.new
+      if dst?
+        std.timezone_name = abbreviation.to_s.sub("DT","ST")
+        std.timezone_offset_from = end_transition.offset_from
+        std.timezone_offset_to = end_transition.offset_to
+        std.dtstart = end_transition.dtstart
+        std.recurrence_rules = end_transition.rrule
+      else
+        std.timezone_name = abbreviation.to_s
+        std.timezone_offset_from = start_transition.offset_from
+        std.timezone_offset_to = start_transition.offset_to
+        std.dtstart = start_transition.dtstart
+        std.recurrence_rules = start_transition.rrule
+      end
+      return std
     end
+  end
 end

data/test/test_parser.rb

@@ -7,6 +7,7 @@ require 'icalendar'
 class TestIcalendarParser < Test::Unit::TestCase
 
   TEST_CAL = File.join(File.dirname(__FILE__), 'fixtures', 'single_event.ics')
+  NONSTANDARD = File.join(File.dirname(__FILE__), 'fixtures', 'nonstandard.ics')
 
   # First make sure that we can run the parser and get back objects.
   def test_new
@@ -43,6 +44,20 @@ class TestIcalendarParser < Test::Unit::TestCase
     do_asserts(cals)
   end
 
+  def test_strict_parser
+    File.open(NONSTANDARD) do |cal_file|
+      assert_raise(Icalendar::UnknownPropertyMethod) do
+        Icalendar::Parser.new(cal_file).parse
+      end
+    end
+  end
+
+  def test_lenient_parser
+    File.open(NONSTANDARD) do |cal_file|
+      do_asserts Icalendar::Parser.new(cal_file, false).parse
+    end
+  end
+
   # Just a helper method so we don't have to repeat the same tests.
   def do_asserts(cals)
     # Should just get one calendar back.

data/test/test_tzinfo.rb

@@ -0,0 +1,27 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+
+require 'test/unit'
+require 'icalendar'
+require 'tzinfo'
+require 'icalendar/tzinfo'
+
+class TestTZInfoExt < Test::Unit::TestCase
+  def setup
+    tz = TZInfo::Timezone.get("Europe/Copenhagen")
+    @timezone = tz.ical_timezone(DateTime.new(1970))
+  end
+
+  def test_daylight_offset
+    tz_offset_from = @timezone.instance_variable_get("@components")[:daylights][0].properties["tzoffsetfrom"]
+    tz_offset_to = @timezone.instance_variable_get("@components")[:daylights][0].properties["tzoffsetto"]
+    assert_equal "+0100", tz_offset_from
+    assert_equal "+0200", tz_offset_to
+  end
+
+  def test_standard_offset
+    tz_offset_from = @timezone.instance_variable_get("@components")[:standards][0].properties["tzoffsetfrom"]
+    tz_offset_to = @timezone.instance_variable_get("@components")[:standards][0].properties["tzoffsetto"]
+    assert_equal "+0200", tz_offset_from
+    assert_equal "+0100", tz_offset_to
+  end
+end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: icalendar
 version: !ruby/object:Gem::Version
-  version: 1.2.4
-  prerelease: 
+  version: 1.3.0
 platform: ruby
 authors:
 - Ryan Ahearn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyforge
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,23 +41,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: newgem
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,12 +62,11 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.5'
-description: ! "This is a Ruby library for dealing with iCalendar files.  Rather than\nexplaining
+description: "This is a Ruby library for dealing with iCalendar files.  Rather than\nexplaining
   myself, here is the introduction from RFC-2445, which\ndefines the format:\n\nThe
   use of calendaring and scheduling has grown considerably in the\nlast decade. Enterprise
   and inter-enterprise business has become\ndependent on rapid scheduling of events
@@ -162,9 +153,11 @@ files:
 - website/javascripts/rounded_corners_lite.inc.js
 - website/stylesheets/screen.css
 - website/template.html.erb
+- test/test_tzinfo.rb
 - .gemtest
 homepage: http://github.com/icalendar/icalendar
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -172,22 +165,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: icalendar
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This is a Ruby library for dealing with iCalendar files
 test_files:
 - test/component/test_event.rb
@@ -199,3 +190,4 @@ test_files:
 - test/test_helper.rb
 - test/test_parameter.rb
 - test/test_parser.rb
+- test/test_tzinfo.rb