icalendar 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aee422660be821b5fa0060bd0344282e673db97f
-  data.tar.gz: 95df849c43f1868e9cf7a9f644fffc9384afce97
+  metadata.gz: 370af2e2d4636f906480c2a2d9faa6f71d00c572
+  data.tar.gz: a9bf492ff26c0d75dbe138f2a08841910882105d
 SHA512:
-  metadata.gz: a3108d6a9d6474c9210e083653fbfd1fc9e9979f8c5093ea1bab7f03c6263c687c261c5cab8d8fecd5ff6b80d539d877f33c7b15ac782e9b75cb4c5e9c255f1b
-  data.tar.gz: 9f6d142d8f346c422ed99d56b2f386419647f1a502f7c77787a0c730dcf4287a0fe9463abc174957808ba89413549b3082a17672f22da3e4d00adc2ff169bde0
+  metadata.gz: 4f73cd84ce78cb0c7bc9cb5c65a08de0c09d1cffe087ad5b9b17ef92e6ad32e0f470b23ecd53255d99198e7fd980a9eac28b317574adca005bada4294001201b
+  data.tar.gz: a3fae6aef26214cda39e5974cc9c38556a4626a2aff24af82a5310319a76dd79cc7f18a3cc46e093b37c809664f9ec99b694e237b06d2f3d1a88b216d58f4b93

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.4.0 2013-05-21
+ * Implement ACKNOWLEDGED property for VALARM - tsuzuki08
+ * Output VERSION property as first line after BEGIN:VCALENDAR
+ * Check for unbounded timezone transitions in tzinfo
+
 === 1.3.0 2013-03-31
  * Lenient parsing mode ignores unknown properties - David Grandinetti
  * VTIMEZONE positive offsets properly have "+" prepended (Fixed issue

data/lib/icalendar/base.rb

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

data/lib/icalendar/calendar.rb

@@ -25,6 +25,20 @@ module Icalendar
       self.version = "2.0" # Version of the specification
     end
 
+    def print_component
+      "BEGIN:#{@name.upcase}\r\n" +
+      "VERSION:#{version}\r\n" +
+
+      # Then the properties
+      print_properties(@properties.select { |k,v| k != 'version' }) +
+
+      # sub components
+      yield +
+
+      # End of this component
+      "END:#{@name.upcase}\r\n"
+    end
+
     def event(&block)
       e = Event.new
       # Note: I'm not sure this is the best way to pass this down, but it works

data/lib/icalendar/component.rb

@@ -125,10 +125,10 @@ module Icalendar
       "END:#{@name.upcase}\r\n"
     end
 
-    def print_properties
+    def print_properties(properties = @properties)
       s = ""
 
-      @properties.sort.each do |key,val|
+      properties.sort.each do |key,val|
         # Take out underscore for property names that conflicted
         # with built-in words.
         if key =~ /ip_.*/

data/lib/icalendar/component/alarm.rb

@@ -29,6 +29,7 @@ module Icalendar
     ical_property :last_modified
     ical_property :timestamp
     ical_property :sequence
+    ical_property :acknowledged
 
     # Multi properties
     ical_multiline_property :attendee, :attendee, :attendees

data/lib/icalendar/parser.rb

@@ -291,6 +291,7 @@ module Icalendar
       @parsers["CREATED"] = m
       @parsers["DTSTAMP"] = m
       @parsers["LAST-MODIFIED"] = m
+      @parsers["ACKNOWLEDGED"] = m
 
       # URI's
       m = self.method(:parse_uri)

data/lib/icalendar/tzinfo.rb

@@ -47,75 +47,94 @@ module TZInfo
       period = period_for_local(date)
       timezone = Icalendar::Timezone.new
       timezone.timezone_id = identifier
-      timezone.add(period.daylight)
-      timezone.add(period.standard)
-      return timezone
+      if period.start_transition.nil?
+        timezone.add period.single
+      elsif period.end_transition.nil?
+        timezone.add period.dst? ? period.daylight : period.standard
+      else
+        timezone.add period.daylight
+        timezone.add period.standard
+      end
+      timezone
     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)
+      previous_offset.ical_offset
     end
 
     def offset_to
-      a = offset.utc_total_offset
-      sprintf("%+-2.2d%2.2d", (a / 3600).to_i, ((a / 60) % 60).to_i)
+      offset.ical_offset
     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",
+        'FREQ=YEARLY;BYMONTH=%d;BYDAY=%d%s',
         start.month, 
         ((start.day - 1)/ 7).to_i + 1,
-        start.strftime("%a").upcase[0,2]
+        start.strftime('%a').upcase[0,2]
       )]
     end
 
     def dtstart
-      local_start.to_datetime.strftime("%Y%m%dT%H%M%S")
+      local_start.to_datetime.strftime '%Y%m%dT%H%M%S'
     end
+  end
 
+  class TimezoneOffsetInfo
+    def ical_offset
+      o = utc_total_offset
+      sprintf '%+-2.2d%2.2d', (o / 3600).to_i, ((o / 60) % 60).to_i
+    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
+      Icalendar::Daylight.new.tap do |day|
+        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 unless end_transition.nil?
+        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
       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
+      Icalendar::Standard.new.tap do |std|
+        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 unless end_transition.nil?
+        end
+      end
+    end
+
+    def single
+      Icalendar::Standard.new.tap do |std|
         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
+        std.timezone_offset_from = offset.ical_offset
+        std.timezone_offset_to = offset.ical_offset
+        std.dtstart = DateTime.new(1970).strftime '%Y%m%dT%H%M%S'
       end
-      return std
     end
   end
 end

data/test/fixtures/folding.ics

@@ -1,7 +1,7 @@
 BEGIN:VCALENDAR
+VERSION:2.0
 CALSCALE:GREGORIAN
 PRODID:iCalendar-Ruby
-VERSION:2.0
 X-WR-CALNAME:Test Long Description
 BEGIN:VEVENT
 DESCRIPTION:FULL DETAILS:\nhttp://test.com/events/570\n\nCary Brothers walk

data/test/test_conversions.rb

@@ -10,9 +10,9 @@ class TestConversions < Test::Unit::TestCase
 
   RESULT = <<EOS
 BEGIN:VCALENDAR
+VERSION:2.0
 CALSCALE:GREGORIAN
 PRODID:iCalendar-Ruby
-VERSION:2.0
 BEGIN:VEVENT
 CATEGORIES:foo,bar,baz
 DESCRIPTION:desc

data/test/test_tzinfo.rb

@@ -7,8 +7,8 @@ require 'icalendar/tzinfo'
 
 class TestTZInfoExt < Test::Unit::TestCase
   def setup
-    tz = TZInfo::Timezone.get("Europe/Copenhagen")
-    @timezone = tz.ical_timezone(DateTime.new(1970))
+    tz = TZInfo::Timezone.get 'Europe/Copenhagen'
+    @timezone = tz.ical_timezone DateTime.new(1970)
   end
 
   def test_daylight_offset
@@ -24,4 +24,34 @@ class TestTZInfoExt < Test::Unit::TestCase
     assert_equal "+0200", tz_offset_from
     assert_equal "+0100", tz_offset_to
   end
+
+  def test_no_end_transition
+    tz = TZInfo::Timezone.get('America/Cayman').ical_timezone DateTime.now
+    assert_equal <<-EXPECTED.gsub("\n", "\r\n"), tz.to_ical
+BEGIN:VTIMEZONE
+TZID:America/Cayman
+BEGIN:STANDARD
+DTSTART:19120201T000712
+TZNAME:EST
+TZOFFSETFROM:-0652
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+    EXPECTED
+  end
+
+  def test_no_transition
+    tz = TZInfo::Timezone.get('UTC').ical_timezone DateTime.now
+    assert_equal <<-EXPECTED.gsub("\n", "\r\n"), tz.to_ical
+BEGIN:VTIMEZONE
+TZID:UTC
+BEGIN:STANDARD
+DTSTART:19700101T000000
+TZNAME:UTC
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+    EXPECTED
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icalendar
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Ryan Ahearn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyforge