icalendar 0.95 → 0.96

data/lib/icalendar/parser.rb

@@ -164,18 +164,25 @@ module Icalendar
           break
         elsif name == "BEGIN" # New component
           case(fields[:value])
-          when "VEVENT"
-            component.events << parse_component(Event.new)
-          when "VTODO"
-            component.todos << parse_component(Todo.new)
-          when "VJOURNAL"
-            component.journals << parse_component(Journal.new)
-          when "VFREEBUSY"
-            component.freebusys << parse_component(Freebusy.new)
-          when "VTIMEZONE"
-            component.timezones << parse_component(Timezone.new)
-          when "VALARM"
-            component.alarms << parse_component(Alarm.new)
+          when "VEVENT" # Event
+            component.add_component parse_component(Event.new)
+          when "VTODO" # Todo entry
+            component.add_component parse_component(Todo.new)
+          when "VALARM" # Alarm sub-component for event and todo
+            component.add_component parse_component(Alarm.new)
+          when "VJOURNAL" # Journal entry
+            component.add_component parse_component(Journal.new)
+          when "VFREEBUSY" # Free/Busy section
+            component.add_component parse_component(Freebusy.new)
+          when "VTIMEZONE" # Timezone specification
+            component.add_component parse_component(Timezone.new)
+          when "STANDARD" # Standard time sub-component for timezone
+            component.add_component parse_component(Standard.new)
+          when "DAYLIGHT" # Daylight time sub-component for timezone
+            component.add_component parse_component(Daylight.new)
+          else # Uknown component type, skip to matching end
+            until ((line = next_line) == "END:#{fields[:value]}"); end
+            next
           end
         else # If its not a component then it should be a property
           
@@ -191,11 +198,11 @@ module Icalendar
             val = fields[:value]
           end
 
-          if component.multi_property?(name.upcase) && component.properties
+          if component.multi_property?(name.upcase)
             val = [val]
 
             if fields[:params].empty?
-              params = [nil]
+              params = []
             else
               params = fields[:params]
             end
@@ -231,21 +238,17 @@ module Icalendar
       paramslist = $2
       value = $3
       
+      # Parse the parameters
       params = {}
-      
-      # Collect the params, if any.
       if paramslist.size > 1
-        
-        # v3.0 and v2.1 params
         paramslist.scan( %r{#{PARAM}}i ) do
           
-          # param names are case-insensitive, and multi-valued
+          # parameter names are case-insensitive, and multi-valued
           pname = $1
           pvals = $3
           
-          # v2.1 pvals have no '=' sign, figure out what kind of param it
-          # is (either its a known encoding, or we treat it as a 'type'
-          # param).
+          # If their isn't an '=' sign then we need to do some custom
+          # business.  Defaults to 'type'
           if $2 == ""
             pvals = $1
             case $1
@@ -260,9 +263,13 @@ module Icalendar
             end
           end
           
+          # Make entries into the params dictionary where the name
+          # is the key and the value is an array of values.
           unless params.key? pname
             params[pname] = []
           end
+
+          # Save all the values into the array.
           pvals.scan( %r{(#{PVALUE})} ) do
             if $1.size > 0
               params[pname] << $1

data/test/calendar_test.rb

@@ -6,41 +6,41 @@ require 'icalendar'
 require 'date'
 
 class TestCalendar < Test::Unit::TestCase
-  # Generate a calendar using the raw api, and then spit it out
-  # as a string.  Parse the string and make sure everything matches up.
-  def test_raw_generation    
-    # Create a fresh calendar
-    cal = Icalendar::Calendar.new
-    
-    cal.calscale = "GREGORIAN"
-    cal.version = "3.2"
-    cal.prodid = "test-prodid"
-    
-    # Now generate the string and then parse it so we can verify 
-    # that everything was set, generated and parsed correctly.
-    calString = cal.to_ical
-
-    cals = Icalendar::Parser.new(calString).parse
-    
-    cal2 = cals.first
-    assert_equal("GREGORIAN", cal2.calscale)
-    assert_equal("3.2", cal2.version)
-    assert_equal("test-prodid", cal2.prodid)
-  end
-
-  def test_block_creation
-    cal = Icalendar::Calendar.new
-    cal.event do
-      dtend "19970903T190000Z"
-      summary "This is my summary"
-    end
-    
-    event = cal.event
-    event.dtend = "19970903T190000Z"
-    event.summary = "This is my summary"
-
-    ev = cal.events.each do |ev|
-      assert_equal("19970903T190000Z", ev.dtend)
-    end
-  end
+   # Generate a calendar using the raw api, and then spit it out
+   # as a string.  Parse the string and make sure everything matches up.
+   def test_raw_generation    
+      # Create a fresh calendar
+      cal = Icalendar::Calendar.new
+
+      cal.calscale = "GREGORIAN"
+      cal.version = "3.2"
+      cal.prodid = "test-prodid"
+
+      # Now generate the string and then parse it so we can verify 
+      # that everything was set, generated and parsed correctly.
+      calString = cal.to_ical
+
+      cals = Icalendar::Parser.new(calString).parse
+
+      cal2 = cals.first
+      assert_equal("GREGORIAN", cal2.calscale)
+      assert_equal("3.2", cal2.version)
+      assert_equal("test-prodid", cal2.prodid)
+   end
+
+   def test_block_creation
+      cal = Icalendar::Calendar.new
+      cal.event do
+         dtend "19970903T190000Z"
+         summary "This is my summary"
+      end
+
+      event = cal.event
+      event.dtend = "19970903T190000Z"
+      event.summary = "This is my summary"
+
+      ev = cal.events.each do |ev|
+         assert_equal("19970903T190000Z", ev.dtend)
+      end
+   end
 end

data/test/component/event_test.rb

@@ -32,7 +32,7 @@ class TestVevent < Test::Unit::TestCase
   def test_single_properties
     @event.klass = "PRIVATE"
     
-    @cal.add(@event)
+    @cal.add_component(@event)
     
     cals = Icalendar::Parser.new(@cal.to_ical).parse
     cal2 = cals.first

data/test/component_test.rb

@@ -6,69 +6,69 @@ require 'icalendar'
 
 class TestComponent < Test::Unit::TestCase
 
-  # Create a calendar with an event for each test.
-  def setup
-    @cal = Icalendar::Calendar.new
-    @event = Icalendar::Event.new
-  end
+   # Create a calendar with an event for each test.
+   def setup
+      @cal = Icalendar::Calendar.new
+      @event = Icalendar::Event.new
+   end
 
-  def test_ical_property
-    # No alias but it does have a prop_name
-    assert_equal(@event.klass?, false)
-    @event.klass = "PRIVATE"
-    assert_equal(@event.klass?, true)
-    assert_equal(@event.klass, "PRIVATE")
-    
-    # Check that both dtstart and its alias start work correctly
-    date = DateTime.new(2005, 02, 05, 23, 24, 25)
-    @event.dtend = date
-    assert_equal(@event.dtend.year, date.year)
+   def test_ical_property
+      # No alias but it does have a prop_name
+      assert_equal(@event.klass?, false)
+      @event.klass = "PRIVATE"
+      assert_equal(@event.klass?, true)
+      assert_equal(@event.klass, "PRIVATE")
 
-    date2 =  DateTime.new(2005, 02, 05, 23, 24, 26)
-    @event.end = date2
-    assert_equal(@event.end.year, date2.year)
-  end
+      # Check that both dtstart and its alias start work correctly
+      date = DateTime.new(2005, 02, 05, 23, 24, 25)
+      @event.dtend = date
+      assert_equal(@event.dtend.year, date.year)
 
-  def test_ical_multi_property
-    # Query
-    assert_equal(@event.comments?, false)
-    @event.comments = []
-    assert_equal(@event.comments?, true)
-    
-    # Should return an empty array, rather than nil
-    assert_equal(@event.comments.size, 0)
+      date2 =  DateTime.new(2005, 02, 05, 23, 24, 26)
+      @event.end = date2
+      assert_equal(@event.end.year, date2.year)
+   end
 
-    # Add and remove
-    @event.add_comment "c1"
-    @event.add_comment "c2"
-    assert_equal(@event.comments.size, 2)
-    assert_equal(@event.comments, ["c1", "c2"])
-    @event.remove_comment "c1"
-    assert_equal(@event.comments, ["c2"])
+   def test_ical_multi_property
+      # Query
+      assert_equal(@event.comments?, false)
+      @event.comments = []
+      assert_equal(@event.comments?, true)
 
-    # Set & get whole array
-    foo = ["as", "df"]
-    @event.comments = foo
-    assert_equal(@event.comments, foo)
+      # Should return an empty array, rather than nil
+      assert_equal(@event.comments.size, 0)
 
-    foo = ["asdf", "qwer"]    
-    @event.comments(foo)
-    assert_equal(@event.comments, foo)
+      # Add and remove
+      @event.add_comment "c1"
+      @event.add_comment "c2"
+      assert_equal(@event.comments.size, 2)
+      assert_equal(@event.comments, ["c1", "c2"])
+      @event.remove_comment "c1"
+      assert_equal(@event.comments, ["c2"])
 
-    # Error cases
-    assert_raise(ArgumentError) { @event.comments("asdf") }
-  end
+      # Set & get whole array
+      foo = ["as", "df"]
+      @event.comments = foo
+      assert_equal(@event.comments, foo)
 
-  def test_bad_args
-    # Single property
-    assert_raise(NotImplementedError) do
-      @event.klass = {}
-    end
-    
-    # Multi property
-    assert_raise(NotImplementedError) do
-      @event.comments = [{}]
-    end
-  end
+      foo = ["asdf", "qwer"]    
+      @event.comments(foo)
+      assert_equal(@event.comments, foo)
+
+      # Error cases
+      assert_raise(ArgumentError) { @event.comments("asdf") }
+   end
+
+   def test_bad_args
+      # Single property
+      assert_raise(NotImplementedError) do
+         @event.klass = {}
+      end
+
+      # Multi property
+      assert_raise(NotImplementedError) do
+         @event.comments = [{}]
+      end
+   end
 
 end

data/test/interactive.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/ruby
+
+# NOTE: you must have installed ruby-breakpoint in order to use this script.
+# Grab it using gem with "gem install ruby-breakpoint --remote" or download
+# from the website (http://ruby-breakpoint.rubyforge.org/) then run setup.rb
+
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+
+require 'breakpoint'
+
+require 'icalendar'
+
+cal = Icalendar::Parser.new(File.new("life.ics")).parse
+
+breakpoint

data/test/life.ics

@@ -0,0 +1,45 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+X-WR-CALNAME:Life
+PRODID:-//Apple Computer\, Inc//iCal 2.0//EN
+X-WR-RELCALID:69FB0467-7E07-4DE7-901D-B70242B3DB25
+X-WR-TIMEZONE:America/Chicago
+CALSCALE:GREGORIAN
+METHOD:PUBLISH
+BEGIN:VTIMEZONE
+TZID:America/Chicago
+LAST-MODIFIED:20050825T194346Z
+BEGIN:DAYLIGHT
+DTSTART:20050403T080000
+TZOFFSETTO:-0500
+TZOFFSETFROM:+0000
+TZNAME:CDT
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20051030T020000
+TZOFFSETTO:-0600
+TZOFFSETFROM:-0500
+TZNAME:CST
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:bsuidfortestabc123
+ORGANIZER:mailto:joebob@random.net
+ATTACH:http://bush.sucks.org/impeach/him.rhtml
+ATTACH:http://corporations-dominate.existence.net/why.rhtml
+SUMMARY:This is a really long summary
+  to test the method of unfolding lines
+  so I'm just going to ma
+ ke it
+  a whol
+ e
+  bunch of lines.
+CLASS:PRIVATE
+PRIORITY:2
+GEO:37.386013;-122.0829322
+DTSTART;TZID=US-Mountain:20050120T170000
+DTEND:20050120T184500
+DTSTAMP:20050118T211523Z
+END:VEVENT
+END:VCALENDAR
+

data/test/parameter_test.rb

@@ -0,0 +1,20 @@
+# Test out property parameter functionality
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+
+require 'date'
+require 'test/unit'
+require 'icalendar'
+
+class TestComponent < Test::Unit::TestCase
+
+   # Create a calendar with an event for each test.
+   def setup
+      @cal = Icalendar::Calendar.new
+      @event = Icalendar::Event.new
+   end
+
+   def test_property_parameters
+      @event.summary = "This is a test summary.", 
+        {"ALTREP" => "http://my.language.net", "LANGUAGE" => "SPANISH"}  
+   end
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.1
+rubygems_version: 0.8.11
 specification_version: 1
 name: icalendar
 version: !ruby/object:Gem::Version 
-  version: "0.95"
-date: 2005-06-12
+  version: "0.96"
+date: 2005-10-10 00:00:00 +02:00
 summary: A ruby implementation of the iCalendar specification (RFC-2445).
 require_paths: 
   - lib
-author: Jeff Rose
 email: rosejn@gmail.com
 homepage: http://icalendar.rubyforge.org/
 rubyforge_project: 
@@ -27,95 +26,49 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
         version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
+authors: 
+  - Jeff Rose
 files: 
-  - test/calendar_test.rb
-  - test/single_event.ics
-  - test/simplecal.ics
   - test/component
+  - test/component_test.rb
+  - test/single_event.ics
   - test/property_helpers.rb
+  - test/simplecal.ics
+  - test/life.ics
+  - test/calendar_test.rb
   - test/parser_test.rb
-  - test/component_test.rb
+  - test/parameter_test.rb
+  - test/interactive.rb
   - test/component/event_test.rb
   - lib/icalendar
   - lib/icalendar.rb
-  - lib/icalendar/parser.rb
-  - lib/icalendar/calendar.rb
-  - lib/icalendar/parameter.rb
-  - lib/icalendar/helpers.rb
   - lib/icalendar/component
-  - "lib/icalendar/#helpers.rb#"
+  - lib/icalendar/conversions.rb
+  - lib/icalendar/parameter.rb
   - lib/icalendar/component.rb
+  - lib/icalendar/helpers.rb
+  - lib/icalendar/calendar.rb
   - lib/icalendar/base.rb
-  - lib/icalendar/conversions.rb
+  - lib/icalendar/parser.rb
+  - lib/icalendar/foo.rb
   - lib/icalendar/component/freebusy.rb
+  - lib/icalendar/component/event.rb
   - lib/icalendar/component/journal.rb
   - lib/icalendar/component/todo.rb
-  - lib/icalendar/component/event.rb
-  - lib/icalendar/component/alarm.rb
   - lib/icalendar/component/timezone.rb
-  - docs/api
+  - lib/icalendar/component/alarm.rb
   - docs/rfcs
   - docs/examples
-  - docs/api/files
-  - docs/api/index.html
-  - docs/api/rdoc-style.css
-  - docs/api/fr_method_index.html
-  - docs/api/fr_class_index.html
-  - docs/api/fr_file_index.html
-  - docs/api/created.rid
-  - docs/api/classes
-  - docs/api/files/lib
-  - docs/api/files/GPL.html
-  - docs/api/files/README.html
-  - docs/api/files/COPYING.html
-  - docs/api/files/lib/icalendar
-  - docs/api/files/lib/icalendar_rb.html
-  - docs/api/files/lib/icalendar/component
-  - docs/api/files/lib/icalendar/parser_rb.html
-  - docs/api/files/lib/icalendar/component_rb.html
-  - docs/api/files/lib/icalendar/parameter_rb.html
-  - docs/api/files/lib/icalendar/calendar_rb.html
-  - docs/api/files/lib/icalendar/helpers_rb.html
-  - docs/api/files/lib/icalendar/base_rb.html
-  - docs/api/files/lib/icalendar/conversions_rb.html
-  - docs/api/files/lib/icalendar/component/journal_rb.html
-  - docs/api/files/lib/icalendar/component/event_rb.html
-  - docs/api/files/lib/icalendar/component/todo_rb.html
-  - docs/api/files/lib/icalendar/component/timezone_rb.html
-  - docs/api/files/lib/icalendar/component/alarm_rb.html
-  - docs/api/files/lib/icalendar/component/freebusy_rb.html
-  - docs/api/classes/String.html
-  - docs/api/classes/DateTime.html
-  - docs/api/classes/Icalendar
-  - docs/api/classes/Float.html
-  - docs/api/classes/Fixnum.html
-  - docs/api/classes/Array.html
-  - docs/api/classes/Time.html
-  - docs/api/classes/Date.html
-  - docs/api/classes/Icalendar/Parser.html
-  - docs/api/classes/Icalendar/InvalidPropertyValue.html
-  - docs/api/classes/Icalendar/Alarm.html
-  - docs/api/classes/Icalendar/Todo.html
-  - docs/api/classes/Icalendar/Journal.html
-  - docs/api/classes/Icalendar/Component.html
-  - docs/api/classes/Icalendar/Parameter.html
-  - docs/api/classes/Icalendar/Timezone.html
-  - docs/api/classes/Icalendar/Calendar.html
-  - docs/api/classes/Icalendar/Base.html
-  - docs/api/classes/Icalendar/Freebusy.html
-  - docs/api/classes/Icalendar/Event.html
-  - docs/api/classes/Icalendar/DateProp.html
-  - docs/api/classes/Icalendar/DateProp
-  - docs/api/classes/Icalendar/InvalidComponentClass.html
-  - docs/api/classes/Icalendar/DateProp/ClassMethods.html
   - docs/rfcs/rfc2425.pdf
   - docs/rfcs/rfc2426.pdf
   - docs/rfcs/rfc2445.pdf
   - docs/rfcs/rfc2446.pdf
   - docs/rfcs/rfc2447.pdf
   - docs/rfcs/rfc3283.txt
-  - docs/examples/create_cal.rb
   - docs/examples/single_event.ics
+  - docs/examples/create_cal.rb
   - docs/examples/parse_cal.rb
   - Rakefile
   - README