icalendar 1.1.5 → 1.1.6

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.1.6 2011-03-10
+* Fix todo handling (thanks to Frank Schwarz)
+* clean up a number of warnings during test runs
+
 === 1.1.5 2010-06-21
 * Fix for windows line endings (thanks to Rowan Collins)
 

data/Rakefile

@@ -19,6 +19,11 @@ $hoe = Hoe.spec 'icalendar' do
   self.readme_file = "README.rdoc"
 end
 
+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 }
 

data/lib/icalendar/base.rb

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

data/lib/icalendar/calendar.rb

@@ -29,11 +29,11 @@ module Icalendar
       e = Event.new
       # Note: I'm not sure this is the best way to pass this down, but it works
       e.tzid = self.timezones[0].tzid if self.timezones.length > 0
-     
+
       self.add_component e
 
       if block
-        e.instance_eval &block
+        e.instance_eval(&block)
         if e.tzid
           e.dtstart.ical_params = { "TZID" => e.tzid }
           e.dtend.ical_params = { "TZID" => e.tzid }
@@ -42,7 +42,7 @@ module Icalendar
 
       e
     end
-    
+
     def find_event(uid)
       self.events.find {|e| e.uid == uid}
     end
@@ -51,7 +51,7 @@ module Icalendar
       e = Todo.new
       self.add_component e
 
-      e.instance_eval &block if block
+      e.instance_eval(&block) if block
 
       e
     end
@@ -59,12 +59,12 @@ module Icalendar
     def find_todo(uid)
       self.todos.find {|t| t.uid == uid}
     end
-    
+
     def journal(&block)
       e = Journal.new
       self.add_component e
 
-      e.instance_eval &block if block
+      e.instance_eval(&block) if block
 
       e
     end
@@ -77,7 +77,7 @@ module Icalendar
       e = Freebusy.new
       self.add_component e
 
-      e.instance_eval &block if block
+      e.instance_eval(&block) if block
 
       e
     end
@@ -90,11 +90,11 @@ module Icalendar
       e = Timezone.new
       self.add_component e
 
-      e.instance_eval &block if block
+      e.instance_eval(&block) if block
 
       e
     end
-    
+
     # The "PUBLISH" method in a "VEVENT" calendar component is an
     # unsolicited posting of an iCalendar object. Any CU may add published
     # components to their calendar. The "Organizer" MUST be present in a

data/lib/icalendar/component.rb

@@ -144,7 +144,7 @@ module Icalendar
 
            # Property value
            value = ":#{val.to_ical}"
-           value = escape_chars(value) unless key == "rrule"
+           value = escape_chars(value) unless ["rrule", "categories"].include?(key)
            add_sliced_text(s, prelude + value)
          else
            prelude = "#{key.gsub(/_/, '-').upcase}"

data/lib/icalendar/component/event.rb

@@ -19,7 +19,7 @@ module Icalendar
     ## Single instance properties
 
     # Access classification (PUBLIC, PRIVATE, CONFIDENTIAL...)
-    ical_property :ip_class, :klass 
+    ical_property :ip_class, :klass
 
     # Date & time of creation
     ical_property :created
@@ -29,13 +29,13 @@ module Icalendar
 
     # Specifies the timezone for the event
     attr_accessor :tzid
-    
+
     # Specifies date-time when calendar component begins
     ical_property :dtstart, :start
 
     # Latitude & longitude for specified activity
     ical_property :geo, :geo_location
- 
+
     # Date & time this item was last modified
     ical_property :last_modified
 
@@ -67,7 +67,7 @@ module Icalendar
     ical_property :recurrence_id, :recurid
 
     ## Single but mutually exclusive properties (Not testing though)
-    
+
     # Specifies a date and time that this item ends
     ical_property :dtend, :end
 
@@ -81,7 +81,7 @@ module Icalendar
 
     # Defines an attendee for this calendar item
     ical_multiline_property :attendee, :attendee, :attendees
-    
+
     # Defines the categories for a calendar component (school, work...)
     ical_multi_property :categories, :category, :categories
 
@@ -102,7 +102,7 @@ module Icalendar
     # recurring calendar item.
     ical_multi_property :rdate, :recurrence_date, :recurrence_dates
     ical_multi_property :rrule, :recurrence_rule, :recurrence_rules
-    
+
     def initialize()
       super("VEVENT")
 
@@ -116,11 +116,11 @@ module Icalendar
       a = Alarm.new
       self.add a
 
-      a.instance_eval &block if block
+      a.instance_eval(&block) if block
 
       a
     end
-    
+
     def occurrences_starting(time)
       recurrence_rules.first.occurrences_of_event_starting(self, time)
     end

data/lib/icalendar/component/timezone.rb

@@ -28,7 +28,7 @@ module Icalendar
     ical_property :tzoffsetfrom, :timezone_offset_from
     ical_property :tzid, :timezone_id
     ical_property :tzname, :timezone_name
-    
+
     ical_property :created
     ical_property :last_modified
     ical_property :timestamp
@@ -57,18 +57,18 @@ module Icalendar
       s
       end
     end
-    
+
 
     def initialize(name = "VTIMEZONE")
       super(name)
     end
-    
+
     # Allow block syntax for declaration of standard and daylight components of timezone
     def standard(&block)
       e = Standard.new
       self.add_component e
 
-      e.instance_eval &block if block
+      e.instance_eval(&block) if block
 
       e
     end
@@ -77,14 +77,14 @@ module Icalendar
       e = Daylight.new
       self.add_component e
 
-      e.instance_eval &block if block
+      e.instance_eval(&block) if block
 
       e
     end
   end
 
   # A Standard component is a sub-component of the Timezone component which
-  # is used to describe the standard time offset. 
+  # is used to describe the standard time offset.
   class Standard < Timezone
 
     def initialize()

data/lib/icalendar/component/todo.rb

@@ -25,10 +25,10 @@ module Icalendar
     ical_property :last_modified
     ical_property :location
     ical_property :organizer
-    ical_property :percent
+    ical_property :percent_complete, :percent
     ical_property :priority
     ical_property :recurid, :recurrence_id
-    ical_property :seq, :sequence
+    ical_property :sequence, :seq
     ical_property :status
     ical_property :summary
     ical_property :uid, :user_id

data/lib/meta.rb

@@ -1,6 +1,6 @@
 # A set of methods to help create meta-programming gizmos.
 class Object
-  # The metaclass is the singleton behind every object.  
+  # The metaclass is the singleton behind every object.
   def metaclass
     class << self
       self
@@ -8,8 +8,8 @@ class Object
   end
 
   # Evaluates the block in the context of the metaclass
-  def meta_eval &blk
-    metaclass.instance_eval &blk
+  def meta_eval(&blk)
+    metaclass.instance_eval(&blk)
   end
 
   # Acts like an include except it adds the module's methods

data/test/component/test_todo.rb

@@ -1,13 +1,31 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+require File.dirname(__FILE__) + '/../test_helper.rb'
+
+require 'date'
 
 class TestTodo < Test::Unit::TestCase
+    include Icalendar
+
+    def test_todo_fields
+
+        cal = Calendar.new
+
+        t = cal.todo do
+            summary      "Plan next vacations"
+            description  "Let's have a break"
+            percent      50
+            seq          1
+            add_category "TRAVEL"
+            add_category "SPORTS"
+        end
 
-  def setup
-    @cal = Icalendar::Calendar.new
-    @todo = Icalendar::Todo.new
-  end
+        calString = cal.to_ical
 
-  def test_new
-    assert(@todo)
-  end
+        assert_match(/PERCENT-COMPLETE:50/, calString)
+        assert_match(/DESCRIPTION:Let's have a break/, calString)
+        assert_match(/CATEGORIES:TRAVEL,SPORTS/, calString)
+        assert_match(/SEQUENCE:1/, calString)
+
+    end
 end
+
+

data/test/test_component.rb

@@ -5,7 +5,6 @@ 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

data/test/test_conversions.rb

@@ -14,7 +14,7 @@ CALSCALE:GREGORIAN
 PRODID:iCalendar-Ruby
 VERSION:2.0
 BEGIN:VEVENT
-CATEGORIES:foo\\,bar\\,baz
+CATEGORIES:foo,bar,baz
 DESCRIPTION:desc
 DTSTAMP:20060720T174052
 DTSTART:20060720
@@ -33,7 +33,7 @@ EOS
   end
 
   def test_to_ical_conversions
-    @cal.event do 
+    @cal.event do
       # String
       description "desc"
 
@@ -42,17 +42,17 @@ EOS
 
       # Float by way of Geo class
       geo(Geo.new(46.01, 8.57))
-      
+
       # Array
       categories ["foo", "bar"]
       add_category "baz"
 
-      # Last Modified 
+      # Last Modified
       last_modified DateTime.parse("1996-08-17T13:30:00")
 
       # URI
       organizer(URI::MailTo.build(['joe@example.com', 'subject=Ruby']))
-      
+
       # Date
       start  Date.parse("2006-07-20")
 
@@ -64,13 +64,13 @@ EOS
 
       uid "foobar"
     end
-       
+
     assert_equal(RESULT.gsub("\n", "\r\n"), @cal.to_ical)
   end
 
   def test_to_ical_folding
     @cal.x_wr_calname = 'Test Long Description'
-    
+
     @cal.event do
       url      'http://test.com/events/644'
       dtend     DateTime.parse('20061215T180000')
@@ -80,18 +80,18 @@ EOS
       uid      'foobar'
       summary  'DigiWorld 2006'
 
-      description "FULL DETAILS:\nhttp://test.com/events/570\n\n" + 
-        "Cary Brothers walks the same musical ground as Pete Yorn, Nick Drake, " + 
-        "Jeff Buckley and others; crafting emotional melodies, with strong vocals " + 
-        "and thoughtful lyrics. Brett Dennen has "that thing." " + 
-        "Inspired fans describe it: "lush shimmering vocals, an intricately " + 
-        "groovin' guitar style, a lyrical beauty rare in a young songwriter," + 
-        "" and "this soulful blend of everything that feels good." " + 
+      description "FULL DETAILS:\nhttp://test.com/events/570\n\n" +
+        "Cary Brothers walks the same musical ground as Pete Yorn, Nick Drake, " +
+        "Jeff Buckley and others; crafting emotional melodies, with strong vocals " +
+        "and thoughtful lyrics. Brett Dennen has "that thing." " +
+        "Inspired fans describe it: "lush shimmering vocals, an intricately " +
+        "groovin' guitar style, a lyrical beauty rare in a young songwriter," +
+        "" and "this soulful blend of everything that feels good." " +
         "Rising up around him is music; transcending genres, genders and generations."
     end
-    
+
     folded = File.read(File.join(File.dirname(__FILE__), 'fixtures/folding.ics')).gsub("\n", "\r\n")
     assert_equal(folded, @cal.to_ical)
   end
-  
+
 end

data/test/test_helper.rb

@@ -1,3 +1,7 @@
 require 'stringio'
 require 'test/unit'
+if ENV['UNDER_HUDSON']
+  require 'rubygems'
+  require 'ci/reporter/rake/test_unit_loader'
+end
 require File.dirname(__FILE__) + '/../lib/icalendar'

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: icalendar
 version: !ruby/object:Gem::Version 
-  version: 1.1.5
+  hash: 31
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 6
+  version: 1.1.6
 platform: ruby
 authors: 
 - Sean Dague
@@ -9,39 +15,57 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-21 00:00:00 -04:00
+date: 2011-03-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubyforge
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 0
+        - 3
         version: 2.0.3
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: gemcutter
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 3
+        - 0
         version: 0.3.0
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 5
+        - 0
         version: 2.5.0
-    version: 
+  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
@@ -155,21 +179,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: icalendar
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: This is a Ruby library for dealing with iCalendar files