icalendar 1.2.0 → 1.2.1

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.2.1 2012-11-12
+ * Adds uid property to alarms to support iCloud - Jeroen Jacobs
+ * Fix up testing docs - Eric Carty-Fickes
+ * Fix parsing property params that have : in them - Sean Dague
+ * Clean up warnings in test suite - Sean Dague
+
 === 1.2.0 2012-08-30
 * Fix calendar handling for dates < 1000 - Ryan Ahearn
 * Updated license to GPL/BSD/Ruby at users option

data/README.rdoc

@@ -259,6 +259,21 @@ It's all about rubygems:
 
 $ sudo gem install icalendar
 
+== Testing
+
+You cannot use the most recent version of rake (10.x +), so you must install an
+older version, such as 0.9.2.2:
+
+  gem install rake -v=0.9.2.2
+
+The gem `hoe` is required as well:
+
+  gem install hoe
+
+To run the tests:
+
+  rake _0.9.2.2_ test
+
 == License
 
 This library is released under the same license as Ruby itself.

data/Rakefile

@@ -6,7 +6,6 @@ require './lib/icalendar'
 
 Hoe.plugin :newgem
 Hoe.plugin :website
-# Hoe.plugin :cucumberfeatures
 
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
@@ -14,7 +13,6 @@ $hoe = Hoe.spec 'icalendar' do
   self.developer 'Sean Dague', 'sean@dague.net'
   self.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
   self.rubyforge_name       = self.name # TODO this is default value
-  # self.extra_deps         = [['activesupport','>= 2.0.2']]
   self.extra_rdoc_files = ["README.rdoc"]
   self.readme_file = "README.rdoc"
 end
@@ -23,10 +21,3 @@ if ENV['UNDER_HUDSON']
   require 'ci/reporter/rake/test_unit'
   task :test => ["ci:setup:testunit"]
 end
-
-require 'newgem/tasks'
-Dir['tasks/**/*.rake'].each { |t| load t }
-
-# TODO - want other tests/tasks run by default? Add them to the list
-# remove_task :default
-# task :default => [:spec, :features]

data/lib/icalendar/base.rb

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

data/lib/icalendar/component.rb

@@ -137,24 +137,24 @@ module Icalendar
         
         # Property name
         unless multiline_property?(key)
-           prelude = "#{key.gsub(/_/, '-').upcase}" +
-
-           # Possible parameters
-           print_parameters(val)
-
-           # Property value
-           value = ":#{val.to_ical}"
-           value = escape_chars(value) unless ["rrule", "categories"].include?(key)
-           add_sliced_text(s, prelude + value)
-         else
-           prelude = "#{key.gsub(/_/, '-').upcase}"
-            val.each do |v|
-               params = print_parameters(v)
-               value = ":#{v.to_ical}"
-               value = escape_chars(value) unless key == "rrule"
-               add_sliced_text(s, prelude + params + value)
-            end
-         end
+          prelude = "#{key.gsub(/_/, '-').upcase}" +
+
+          # Possible parameters
+          print_parameters(val)
+
+          # Property value
+          value = ":#{val.to_ical}"
+          value = escape_chars(value) unless %w[rrule categories exdate].include?(key)
+          add_sliced_text(s, prelude + value)
+        else
+          prelude = "#{key.gsub(/_/, '-').upcase}"
+          val.each do |v|
+            params = print_parameters(v)
+            value = ":#{v.to_ical}"
+            value = escape_chars(value) unless key == "rrule"
+            add_sliced_text(s, prelude + params + value)
+          end
+        end
       end
       s
     end
@@ -171,12 +171,12 @@ module Icalendar
       add_to.gsub!(/ *$/, '')
     end
 
-    # Print the parameters for a specific property
-    def print_parameters(val)
+    # Print the parameters for a specific property.
+    def print_parameters(value)
       s = ""
-      return s unless val.respond_to?(:ical_params) and not val.ical_params.nil?
+      return s unless value.respond_to?(:ical_params) and not value.ical_params.nil?
 
-      val.ical_params.each do |key,val|
+      value.ical_params.each do |key, val|
         s << ";#{key}"
         val = [ val ] unless val.is_a?(Array)
 

data/lib/icalendar/component/alarm.rb

@@ -17,6 +17,7 @@ module Icalendar
     ical_property :description
     ical_property :trigger
     ical_property :summary
+    ical_property :uid
     
     # Single but must appear together
     ical_property :duration

data/lib/icalendar/parser.rb

@@ -154,7 +154,6 @@ module Icalendar
 
           # Lookup the property name to see if we have a string to
           # object parser for this property type.
-          orig_value = value
           if @parsers.has_key?(name)
             value = @parsers[name].call(name, params, value)
           end
@@ -196,7 +195,7 @@ module Icalendar
     QSTR    = '"[^"]*"'
 
     # Contentline
-    LINE = "(#{NAME})(.*(?:#{QSTR})|(?:[^:]*))\:(.*)"
+    LINE = "(#{NAME})((?:(?:[^:]*?)(?:#{QSTR})(?:[^:]*?))+|(?:[^:]*))\:(.*)"
    
     # *<Any character except CTLs, DQUOTE, ";", ":", ",">
     PTEXT   = '[^";:,]*'

data/test/component/test_event.rb

@@ -11,18 +11,6 @@ unless defined? 1.days
   end
 end
 
-# Define a test event
-testEvent = <<EOS
-BEGIN:VEVENT
-UID:19970901T130000Z-123401@host.com
-DTSTAMP:19970901T1300Z
-DTSTART:19970903T163000Z
-DTEND:19970903T190000Z
-SUMMARY:Annual Employee Review
-CLASS:PRIVATE
-CATEGORIES:BUSINESS,HUMAN RESOURCES
-END:VEVENT
-EOS
 
 class TestEvent < Test::Unit::TestCase
 

data/test/component/test_todo.rb

@@ -9,7 +9,7 @@ class TestTodo < Test::Unit::TestCase
 
     cal = Calendar.new
 
-    t = cal.todo do
+    cal.todo do
       summary      "Plan next vacations"
       description  "Let's have a break"
       percent      50

data/test/test_calendar.rb

@@ -37,7 +37,7 @@ class TestCalendar < Test::Unit::TestCase
       event.dtend "19970903T190000Z", {:TZID => "Europe/Copenhagen"}
       event.summary "This is my summary"
 
-      ev = cal.events.each do |ev|
+      cal.events.each do |ev|
          assert_equal("19970903T190000Z", ev.dtend)
          assert_equal("This is my summary", ev.summary)
       end

data/test/test_conversions.rb

@@ -18,9 +18,11 @@ CATEGORIES:foo,bar,baz
 DESCRIPTION:desc
 DTSTAMP:20060720T174052
 DTSTART:20060720
+EXDATE:20121012T170000Z,20121102T170000Z
 GEO:46.01\\;8.57
 LAST-MODIFIED:19960817T133000
 ORGANIZER:mailto:joe@example.com?subject=Ruby
+RRULE:FREQ=WEEKLY;UNTIL=20130220T180000Z;BYDAY=FR
 SEQUENCE:2
 UID:foobar
 X-TIME-OF-DAY:101736
@@ -63,6 +65,11 @@ EOS
       x_time_of_day Time.at(123456).utc
 
       uid "foobar"
+
+      add_rrule "FREQ=WEEKLY;UNTIL=20130220T180000Z;BYDAY=FR"
+
+      add_exdate "20121012T170000Z"
+      add_exdate "20121102T170000Z"
     end
 
     assert_equal(RESULT.gsub("\n", "\r\n"), @cal.to_ical)

data/test/test_parameter.rb

@@ -6,28 +6,35 @@ require 'date'
 require 'test/unit'
 require 'icalendar'
 
-class TestComponent < Test::Unit::TestCase
+class TestParameter < Test::Unit::TestCase
 
    # Create a calendar with an event for each test.
-   def setup
-      @cal = Icalendar::Calendar.new
-      @event = Icalendar::Event.new
-   end
+  def setup
+    @cal = Icalendar::Calendar.new
+    @event = Icalendar::Event.new
+  end
+  
+  def test_property_parameters
+    tests = [
+             {"ALTREP" =>['"http://my.language.net"'], 
+               "LANGUAGE" => ["SPANISH"]},
+             {"ALTREP" =>['"http://my.language.net"'], 
+               "LANGUAGE" => ['"SPANISH:CATILLAN"']},
+             {"ALTREP" =>["foo"], 
+               "LANGUAGE" => ["SPANISH"]}
+             ]
 
-   def test_property_parameters
-     params = {"ALTREP" =>['"http://my.language.net"'], "LANGUAGE" => ["SPANISH"]}
-     # params = {"ALTREP" =>["foo"], "LANGUAGE" => ["SPANISH"]}
+    tests.each do |params| 
       @event.summary("This is a test summary.", params)
-
+      
       assert_equal params, @event.summary.ical_params
-
+      
       @cal.add_event @event
       cal_str = @cal.to_ical
-#       puts cal_str
-
+      
       cals = Icalendar::Parser.new(cal_str).parse
-#       pp cals
       event = cals.first.events.first
       assert_equal params, event.summary.ical_params
-   end
+    end
+  end
 end

metadata

@@ -1,109 +1,79 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: icalendar
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 1.2.1
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 0
-  version: 1.2.0
 platform: ruby
-authors: 
+authors:
 - Sean Dague
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-31 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rdoc
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: newgem
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        - 3
-        version: 1.5.3
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+- !ruby/object:Gem::Dependency
   name: hoe
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.3'
   type: :development
-  version_requirements: *id003
-description: |-
-  This is a Ruby library for dealing with iCalendar files.  Rather than
-  explaining myself, here is the introduction from RFC-2445, which
-  defines the format:
-  
-  The use of calendaring and scheduling has grown considerably in the
-  last decade. Enterprise and inter-enterprise business has become
-  dependent on rapid scheduling of events and actions using this
-  information technology. However, the longer term growth of calendaring
-  and scheduling, is currently limited by the lack of Internet standards
-  for the message content types that are central to these knowledgeware
-  applications. This memo is intended to progress the level of
-  interoperability possible between dissimilar calendaring and
-  scheduling applications. This memo defines a MIME content type for
-  exchanging electronic calendaring and scheduling information. The
-  Internet Calendaring and Scheduling Core Object Specification, or
-  iCalendar, allows for the capture and exchange of information normally
-  stored within a calendaring and scheduling application; such as a
-  Personal Information Manager (PIM) or a Group Scheduling product. 
-  
-  The iCalendar format is suitable as an exchange format between
-  applications or systems. The format is defined in terms of a MIME
-  content type. This will enable the object to be exchanged using
-  several transports, including but not limited to SMTP, HTTP, a file
-  system, desktop interactive protocols such as the use of a memory-
-  based clipboard or drag/drop interactions, point-to-point asynchronous
-  communication, wired-network transport, or some form of unwired
-  transport such as infrared might also be used.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.3'
+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
+  and actions using this\ninformation technology. However, the longer term growth
+  of calendaring\nand scheduling, is currently limited by the lack of Internet standards\nfor
+  the message content types that are central to these knowledgeware\napplications.
+  This memo is intended to progress the level of\ninteroperability possible between
+  dissimilar calendaring and\nscheduling applications. This memo defines a MIME content
+  type for\nexchanging electronic calendaring and scheduling information. The\nInternet
+  Calendaring and Scheduling Core Object Specification, or\niCalendar, allows for
+  the capture and exchange of information normally\nstored within a calendaring and
+  scheduling application; such as a\nPersonal Information Manager (PIM) or a Group
+  Scheduling product. \n\nThe iCalendar format is suitable as an exchange format between\napplications
+  or systems. The format is defined in terms of a MIME\ncontent type. This will enable
+  the object to be exchanged using\nseveral transports, including but not limited
+  to SMTP, HTTP, a file\nsystem, desktop interactive protocols such as the use of
+  a memory-\nbased clipboard or drag/drop interactions, point-to-point asynchronous\ncommunication,
+  wired-network transport, or some form of unwired\ntransport such as infrared might
+  also be used."
+email:
 - sean@dague.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - PostInstall.txt
 - README.rdoc
 - website/index.txt
-files: 
+files:
 - COPYING
 - GPL
 - History.txt
@@ -168,45 +138,37 @@ files:
 - .gemtest
 homepage: http://github.com/sdague/icalendar
 licenses: []
-
 post_install_message: PostInstall.txt
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: icalendar
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: This is a Ruby library for dealing with iCalendar files
-test_files: 
+test_files:
+- test/test_calendar.rb
+- test/test_conversions.rb
 - test/test_component.rb
-- test/component/test_timezone.rb
+- test/test_helper.rb
 - test/component/test_todo.rb
+- test/component/test_timezone.rb
 - test/component/test_event.rb
-- test/test_calendar.rb
-- test/test_helper.rb
-- test/test_conversions.rb
-- test/test_parser.rb
 - test/test_parameter.rb
+- test/test_parser.rb