icalendar 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 840281a09af33da66b8c292c3eedda0aafd3ce60
-  data.tar.gz: 2f5c282164f680485f8f6cc16dfacc0874e542bb
+  metadata.gz: d4db102bf429a3d77d75304d090f6d70dc7583cc
+  data.tar.gz: b2026750077bf1f1e710ba8c00f44aec5929f4e7
 SHA512:
-  metadata.gz: bf6e5b790341c0f4cf523d08b19b67590d631ab4740246ae2f56fcb486e3261f302d59d6e8ed4eb689fa80b1290c11605e62bfc64f1197c6a8a0013d8ae3390d
-  data.tar.gz: b52091e873332de047e71bcfbc6b2c75b2f54a01b8c40dc98964c8f850f0ef9b4ae25d4f62368a5018ea5341aac991e351e62c2b9b2ee7f9b6f159717c8c594c
+  metadata.gz: b4f15e10169c03011e3112d6a7cd1b8119a95e3aed2c36b11f493377f3d803cfeb55f28d444f1eafec90e93666d191097e863c6bb6dd9e30334e2813d8089527
+  data.tar.gz: 16a837818c5bc0de6a95b989caf165407ed4a6f33c8bf26301197a33e4c59bf0c6cb1ee31d0b3ad5783c05431513332d96f7b7cf15b4716ea8a4559f1a177287

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.5.3 2014-04-20
+ * Restore printing of parameters on multiline properties
+ * Prevent crash on parsing calendar with NAME properties - Philip Müller
+ * Enforce lack of ruby 1.8.7 support
+
 === 1.5.2 2014-02-22
  * Output timezone components first
  * Fix undefined local variable or method 'e' - Jason Stirk

data/icalendar.gemspec

@@ -22,9 +22,10 @@ Gem::Specification.new do |s|
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename f }
   s.require_paths = ['lib']
 
+  s.required_ruby_version = '>= 1.9.3'
+
   s.add_development_dependency 'rake', '~> 10.0'
   s.add_development_dependency 'bundler', '~> 1.3'
   s.add_development_dependency 'tzinfo', '~> 0.3'
   s.add_development_dependency 'timecop', '~> 0.6.3'
 end
-

data/lib/icalendar/base.rb

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

data/lib/icalendar/component.rb

@@ -124,15 +124,19 @@ module Icalendar
       properties.sort.map do |key, val|
         property = fix_conflict_with_built_in(key)
         prelude = property.gsub(/_/, '-').upcase
-        params = print_parameters(val)
 
-        value = ":#{val.to_ical}"
-        multiline = multiline_property?(property)
-        if multiline || (!multiline && !excludes.include?(property))
-          value = escape_chars(value)
+        if multiline_property? property
+          val.map do |part|
+            params = print_parameters part
+            value = escape_chars ":#{part.to_ical}"
+            chunk_lines "#{prelude}#{params}#{value}"
+          end.join
+        else
+          params = print_parameters val
+          value = ":#{val.to_ical}"
+          value = escape_chars(value) unless excludes.include? property
+          chunk_lines "#{prelude}#{params}#{value}"
         end
-
-        chunk_lines(prelude + params + value)
       end.join
     end
 

data/lib/icalendar/component/event.rb

@@ -21,6 +21,8 @@ module Icalendar
     # Access classification (PUBLIC, PRIVATE, CONFIDENTIAL...)
     ical_property :ip_class, :klass
 
+    ical_property :ip_name
+
     # Date & time of creation
     ical_property :created
 
@@ -77,7 +79,7 @@ module Icalendar
     ## Multi-instance properties
 
     # Associates a URI or binary blob with this item
-    ical_multi_property :attach, :attachment, :attachments
+    ical_multiline_property :attach, :attachment, :attachments
 
     # Defines an attendee for this calendar item
     ical_multiline_property :attendee, :attendee, :attendees

data/lib/icalendar/component/journal.rb

@@ -35,7 +35,7 @@ module Icalendar
     ical_property :recurid, :recurrence_id
 
     # Multi-properties
-    ical_multi_property :attach, :attachment, :attachments
+    ical_multiline_property :attach, :attachment, :attachments
     ical_multiline_property :attendee, :attendee, :attendees
     ical_multi_property :categories, :category, :categories
     ical_multi_property :comment, :comment, :comments
@@ -58,4 +58,3 @@ module Icalendar
 
   end
 end
-

data/lib/icalendar/component/todo.rb

@@ -33,13 +33,13 @@ module Icalendar
     ical_property :summary
     ical_property :uid, :user_id
     ical_property :url
-    
+
     # Single but mutually exclusive TODO: not testing anything yet
     ical_property :due
     ical_property :duration
 
     # Multi-properties
-    ical_multi_property :attach, :attachment, :attachments
+    ical_multiline_property :attach, :attachment, :attachments
     ical_multiline_property :attendee, :attendee, :attendees
     ical_multi_property :categories, :category, :categories
     ical_multi_property :comment, :comment, :comments
@@ -51,7 +51,7 @@ module Icalendar
     ical_multi_property :resources, :resource, :resources
     ical_multi_property :rdate, :recurrence_date, :recurrence_dates
     ical_multi_property :rrule, :recurrence_rule, :recurrence_rules
-    
+
     def initialize()
       super("VTODO")
 

data/lib/icalendar/parser.rb

@@ -182,7 +182,7 @@ module Icalendar
           name = name.downcase
 
           # TODO: check to see if there are any more conflicts.
-          if name == 'class' or name == 'method'
+          if name == 'class' or name == 'method' or name == 'name'
             name = "ip_" + name
           end
 

data/test/fixtures/nonstandard.ics

@@ -20,5 +20,6 @@ GEO:37.386013;-122.0829322
 DTSTART;TZID=US-Mountain:20050120T170000
 DTEND:20050120T184500
 DTSTAMP:20050118T211523Z
+NAME:SomeName
 END:VEVENT
 END:VCALENDAR

data/test/fixtures/single_event.ics

@@ -19,5 +19,6 @@ GEO:37.386013;-122.0829322
 DTSTART;TZID=US-Mountain:20050120T170000
 DTEND:20050120T184500
 DTSTAMP:20050118T211523Z
+NAME:SomeName
 END:VEVENT
 END:VCALENDAR

data/test/test_parameter.rb

@@ -38,6 +38,24 @@ class TestParameter < Test::Unit::TestCase
     end
   end
 
+  def test_attachment_parameters
+    params = {
+      'ENCODING' => ['BASE64'],
+      'FMTYPE' => ['text/directory'],
+      'VALUE' => ['BINARY'],
+      'X-APPLE-FILENAME' => ['1234.vcf']
+    }
+    @event.add_attachment 'binarystring', params
+
+    assert_equal params, @event.attachments[0].ical_params
+    @cal.add_event @event
+    cal_str = @cal.to_ical
+
+    cals = Icalendar::Parser.new(cal_str).parse
+    event = cals.first.events.first
+    assert_equal params, event.attachments[0].ical_params
+  end
+
   def test_unquoted_property_parameters
     params = {'ALTREP' => ['"http://my.language.net"'],
               'LANGUAGE' => ['SPANISH:CATILLAN'],

data/test/test_parser.rb

@@ -74,6 +74,7 @@ class TestIcalendarParser < Test::Unit::TestCase
     
     event = cal.events.first
     assert_equal("bsuidfortestabc123", event.uid)
+    assert_equal("SomeName", event.ip_name)
     
     summary = "This is a really long summary to test the method of unfolding lines, so I'm just going to make it a whole bunch of lines."
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icalendar
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Ryan Ahearn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2014-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -142,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='