icalendar 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 370af2e2d4636f906480c2a2d9faa6f71d00c572
-  data.tar.gz: a9bf492ff26c0d75dbe138f2a08841910882105d
+  metadata.gz: bac1e484f0c1f2c316989f0fb092e799cdcbc768
+  data.tar.gz: 43df9e195316a6fa72ea53ef22b615c62dccf807
 SHA512:
-  metadata.gz: 4f73cd84ce78cb0c7bc9cb5c65a08de0c09d1cffe087ad5b9b17ef92e6ad32e0f470b23ecd53255d99198e7fd980a9eac28b317574adca005bada4294001201b
-  data.tar.gz: a3fae6aef26214cda39e5974cc9c38556a4626a2aff24af82a5310319a76dd79cc7f18a3cc46e093b37c809664f9ec99b694e237b06d2f3d1a88b216d58f4b93
+  metadata.gz: 8f3facfc15d82ac4d1364d82fd8f9dbca4d6101e725a93acd182a86a35571ec8180dd3fcf85b92fdce31b79a1cb7e7ef68aa07eca27bfc5bb81bcfb41b16bcc5
+  data.tar.gz: b9732aa49cfe06380fc0a401499bca6334c3dafdaad1a640f50d7e7d97d32be9f8651904064653436f892293896e0b5280651a77d48523e81e2b2eb926f809d2

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.4.1 2013-06-25
+ * Don't escape semicolon in GEO property - temirov
+ * Allow access to various parts of RRule class
+
 === 1.4.0 2013-05-21
  * Implement ACKNOWLEDGED property for VALARM - tsuzuki08
  * Output VERSION property as first line after BEGIN:VCALENDAR

data/lib/icalendar/base.rb

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

data/lib/icalendar/component.rb

@@ -136,22 +136,19 @@ module Icalendar
         end
 
         # Property name
-        unless multiline_property?(key)
-          prelude = "#{key.gsub(/_/, '-').upcase}" +
-
-          # Possible parameters
-          print_parameters(val)
+        if !multiline_property?(key)
+          prelude = "#{key.gsub(/_/, '-').upcase}#{print_parameters val}"
 
           # Property value
           value = ":#{val.to_ical}"
-          value = escape_chars(value) unless %w[rrule categories exdate].include?(key)
+          value = escape_chars(value) unless %w[geo 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"
+            value = escape_chars(value)
             add_sliced_text(s, prelude + params + value)
           end
         end
@@ -174,7 +171,7 @@ module Icalendar
     # Print the parameters for a specific property.
     def print_parameters(value)
       s = ""
-      return s unless value.respond_to?(:ical_params) and not value.ical_params.nil?
+      return s unless value.respond_to?(:ical_params) && !value.ical_params.nil?
 
       value.ical_params.each do |key, val|
         s << ";#{key}"
@@ -213,12 +210,12 @@ module Icalendar
     # Make it protected so we can monitor usage...
     protected
 
-    def Component.ical_component(*syms)
+    def self.ical_component(*syms)
       hash_accessor :@components, *syms
     end
 
     # Define a set of methods supporting a new property
-    def Component.ical_property(property, alias_name = nil, prop_name = nil)
+    def self.ical_property(property, alias_name = nil, prop_name = nil)
       property = "#{property}".strip.downcase
       alias_name = "#{alias_name}".strip.downcase unless alias_name.nil?
       # If a prop_name was given then we use that for the actual storage
@@ -231,7 +228,7 @@ module Icalendar
 
     # Define a set of methods defining a new property, which
     # supports multiple values for the same property name.
-    def Component.ical_multi_property(property, singular, plural)
+    def self.ical_multi_property(property, singular, plural)
       property = "#{property}".strip.downcase.gsub(/-/, '_')
       plural = "#{plural}".strip.downcase
 
@@ -248,7 +245,7 @@ module Icalendar
 
     # Define a set of methods defining a new property, which
     # supports multiple values in multiple lines with same property name
-    def Component.ical_multiline_property(property, singular, plural)
+    def self.ical_multiline_property(property, singular, plural)
       @@multiline_properties["#{property}"] = true
       ical_multi_property(property, singular, plural)
     end
@@ -256,7 +253,7 @@ module Icalendar
 
     private
 
-    def Component.generate_getter(property, alias_name)
+    def self.generate_getter(property, alias_name)
       unless instance_methods.include? property
         code = <<-code
             def #{property}(val = nil, params = nil)
@@ -284,7 +281,7 @@ module Icalendar
       end
     end
 
-    def Component.generate_setter(property, alias_name)
+    def self.generate_setter(property, alias_name)
       setter = property + '='
       unless instance_methods.include? setter
         code = <<-code
@@ -298,7 +295,7 @@ module Icalendar
       end
     end
 
-    def Component.generate_query(property, alias_name)
+    def self.generate_query(property, alias_name)
       query = "#{property}?"
       unless instance_methods.include? query
         code = <<-code
@@ -313,7 +310,7 @@ module Icalendar
       end
     end
 
-    def Component.generate_multi_getter(property, plural)
+    def self.generate_multi_getter(property, plural)
       # Getter for whole array
       unless instance_methods.include? plural
         code = <<-code
@@ -330,7 +327,7 @@ module Icalendar
       end
     end
 
-    def Component.generate_multi_setter(property, plural)
+    def self.generate_multi_setter(property, plural)
       # Setter for whole array
       unless instance_methods.include? plural+'+'
         code = <<-code
@@ -353,7 +350,7 @@ module Icalendar
       end
     end
 
-    def Component.generate_multi_query(property, plural)
+    def self.generate_multi_query(property, plural)
       # Query for any of these properties
       unless instance_methods.include? plural+'?'
         code = <<-code
@@ -366,7 +363,7 @@ module Icalendar
       end
     end
 
-    def Component.generate_multi_adder(property, singular)
+    def self.generate_multi_adder(property, singular)
       adder = "add_"+singular.to_s
       # Add another item to this properties array
       unless instance_methods.include? adder
@@ -397,7 +394,7 @@ module Icalendar
       end
     end
 
-    def Component.generate_multi_remover(property, singular)
+    def self.generate_multi_remover(property, singular)
       # Remove an item from this properties array
       unless instance_methods.include? "remove_#{singular}"
         code = <<-code

data/lib/icalendar/parser.rb

@@ -350,7 +350,7 @@ module Icalendar
     end
     
     def parse_recur(name, params, value)
-      ::Icalendar::RRule.new(name, params, value, self)
+      ::Icalendar::RRule.new(name, params, value)
     end
 
     # Durations

data/lib/icalendar/rrule.rb

@@ -33,15 +33,15 @@ module Icalendar
         "#{@position}#{@day}"
       end
     end
-    
-    def initialize(name, params, value, parser)
+
+    attr_accessor :frequency, :until, :count, :interval, :by_list, :wkst
+
+    def initialize(name, params, value)
       @value = value
       frequency_match = value.match(/FREQ=(SECONDLY|MINUTELY|HOURLY|DAILY|WEEKLY|MONTHLY|YEARLY)/)
-      raise Icalendar::InvalidPropertyValue.new("FREQ must be specified for RRULE values") unless frequency_match
       @frequency = frequency_match[1]
       @until = parse_date_val("UNTIL", value)
       @count = parse_int_val("COUNT", value)
-      raise Icalendar::InvalidPropertyValue.new("UNTIL and COUNT must not both be specified for RRULE values") if [@until, @count].compact.length > 1
       @interval = parse_int_val("INTERVAL", value)
       @by_list = {:bysecond => parse_int_list("BYSECOND", value)}
       @by_list[:byminute] = parse_int_list("BYMINUTE",value)
@@ -59,23 +59,25 @@ module Icalendar
     def orig_value
       @value
     end
-    
+
     def to_ical
-      result = ["FREQ=#{@frequency}"]
-      result << ";UNTIL=#{@until.to_ical}" if @until
-      result << ";COUNT=#{@count}" if @count
-      result << ";INTERVAL=#{@interval}" if @interval
-      @by_list.each do |key, value|
+      raise Icalendar::InvalidPropertyValue.new("FREQ must be specified for RRULE values") unless frequency
+      raise Icalendar::InvalidPropertyValue.new("UNTIL and COUNT must not both be specified for RRULE values") if [self.until, count].compact.length > 1
+      result = ["FREQ=#{frequency}"]
+      result << "UNTIL=#{self.until.to_ical}" if self.until
+      result << "COUNT=#{count}" if count
+      result << "INTERVAL=#{interval}" if interval
+      by_list.each do |key, value|
         if value
           if key == :byday
-            result << ";BYDAY=#{value.join ','}"
+            result << "BYDAY=#{value.join ','}"
           else
-            result << ";#{key.to_s.upcase}=#{value}"
+            result << "#{key.to_s.upcase}=#{value}"
           end
         end
       end
-      result << ";WKST=#{@wkst}" if @wkst
-      result.join
+      result << "WKST=#{wkst}" if wkst
+      result.join ';'
     end
     
     def parse_date_val(name, string)
@@ -122,11 +124,11 @@ module Icalendar
     # TODO: Incomplete
     def occurrences_of_event_starting(event, datetime)
       initial_start = event.dtstart
-      (0...@count).map {|day_offset| 
-              occurrence = event.clone
-              occurrence.dtstart = initial_start + day_offset
-              occurrence.clone
-              }
+      (0...count).map do |day_offset|
+        occurrence = event.clone
+        occurrence.dtstart = initial_start + day_offset
+        occurrence.clone
+      end
     end
   end
 

data/test/test_conversions.rb

@@ -19,7 +19,7 @@ DESCRIPTION:desc
 DTSTAMP:20060720T174052
 DTSTART:20060720
 EXDATE:20121012T170000Z,20121102T170000Z
-GEO:46.01\\;8.57
+GEO:46.01;8.57
 LAST-MODIFIED:19960817T133000
 ORGANIZER:mailto:joe@example.com?subject=Ruby
 RRULE:FREQ=WEEKLY;UNTIL=20130220T180000Z;BYDAY=FR

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icalendar
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Ryan Ahearn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyforge
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: newgem
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
 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