icalendar2 0.1.0 → 0.1.1

data/CHANGELOG.md

@@ -1,2 +1,5 @@
-0.1.0
+0.1.1 2012-12-13
+* Pass tests under Ruby 1.8.7 [#2]
+
+0.1.0 2012-12-12
 * Initial commit

data/README.md

@@ -1,5 +1,7 @@
 # icalendar2 - generate, consume and validate iCalendar feeds
 
+[![Build Status](https://travis-ci.org/ericcf/icalendar2.png?branch=master)](https://travis-ci.org/ericcf/icalendar2)
+
 ## Warning
 
 This is NOT production ready yet. It has not been extensively tested, and you

data/lib/icalendar2/calendar.rb

@@ -8,10 +8,10 @@ module Icalendar2
         Event::VALUE => []
       }
       @properties = {
-        :calscale => Property::Nil.new,
-        :method =>   Property::Nil.new,
-        :prodid =>   Property::Nil.new,
-        :version =>  Property::Nil.new
+        "calscale" => Property::Nil.new,
+        "method" =>   Property::Nil.new,
+        "prodid" =>   Property::Nil.new,
+        "version" =>  Property::Nil.new
       }
     end
 
@@ -32,7 +32,7 @@ module Icalendar2
     end
 
     def set_property(property_name, value, parameters = {})
-      property = property_name.downcase.to_sym
+      property = property_name.to_s.downcase
       if value.nil?
         @properties[property].value.to_s
       elsif (factory = CalendarProperty.get_factory(property_name))
@@ -64,7 +64,9 @@ module Icalendar2
       str = "#{Tokens::COMPONENT_BEGIN}:#{VALUE}#{Tokens::CRLF}"
       str << body_to_ical
       str << "#{Tokens::COMPONENT_END}:#{VALUE}#{Tokens::CRLF}"
-      str.encode("UTF-8")
+      str = str.encode("UTF-8") if str.respond_to?(:encode)
+      
+      str
     end
 
     def add_component(component)
@@ -78,7 +80,8 @@ module Icalendar2
     private
 
     def body_to_ical
-      str = @properties.values.map(&:to_ical).join
+      sorted_properties = @properties.zip.map(&:first).sort
+      str = sorted_properties.map { |p| p[1] && p[1].to_ical }.join
       str << events.map(&:to_ical).join
     end
   end

data/lib/icalendar2/calendar_property.rb

@@ -3,7 +3,8 @@ module Icalendar2
     def self.get_factory(calendar_property_name)
       # "VERSION" => CalendarProperty::Version, etc.
       begin
-        const_get(calendar_property_name.capitalize, false)
+        property_class_name = calendar_property_name.to_s.capitalize
+        const_get(property_class_name) if const_defined?(property_class_name)
       rescue NameError
         nil
       end

data/lib/icalendar2/component/alarm.rb

@@ -0,0 +1,9 @@
+module Icalendar2
+  # See http://tools.ietf.org/html/rfc5545#section-3.6.6
+  class Alarm < Component::Base
+    VALUE = "VALARM"
+
+    requires :exactly_one => [:action, :trigger]
+    accepts :exactly_one => [:description, :duration, :repeat, :attach]
+  end
+end

data/lib/icalendar2/component/base.rb

@@ -31,7 +31,7 @@ module Icalendar2
       def valid?
         present_property_names = @properties.keys
         @properties.values.flatten.all?(&:valid?) &&
-          self.class.required_property_names.all? { |p| present_property_names.include?(p) }
+          self.class.required_property_names.all? { |p| present_property_names.include?(p.to_s) }
       end
 
       def set_property(property_name, value, parameters = {})
@@ -61,9 +61,9 @@ module Icalendar2
         define_method(property_sym) do |*args|
           value, parameters = *args
           if value.nil?
-            @properties[property_sym]
+            @properties[property_sym.to_s]
           else
-            @properties[property_sym] = Property.get_factory(property_sym).new(value, parameters)
+            @properties[property_sym.to_s] = Property.get_factory(property_sym).new(value, parameters)
           end
         end
         alias_method "#{property_sym}=", property_sym
@@ -72,18 +72,19 @@ module Icalendar2
       def self.define_multiple_accessor(property_sym)
         property_factory = Property.get_factory(property_sym)
         define_method(property_factory::PLURAL) do
-          @properties[property_sym]
+          @properties[property_sym.to_s]
         end
         define_method(property_sym) do |*args|
           value, parameters = *args
-          @properties[property_sym] ||= []
-          @properties[property_sym] << property_factory.new(value, parameters)
+          @properties[property_sym.to_s] ||= []
+          @properties[property_sym.to_s] << property_factory.new(value, parameters)
         end
         alias_method "#{property_sym}=", property_sym
       end
 
       def properties_to_ical
-        @properties.values.flatten.map(&:to_ical).join
+        sorted_properties = @properties.zip.map(&:first).sort
+        sorted_properties.map { |p| p[1] && p[1].to_ical }.join
       end
     end
   end

data/lib/icalendar2/component/freebusy.rb

@@ -0,0 +1,16 @@
+module Icalendar2
+  # See http://tools.ietf.org/html/rfc5545#section-3.6.4
+  class Freebusy < Component::Base
+    VALUE = "VFREEBUSY"
+
+    requires :exactly_one => [:dtstamp, :uid]
+    accepts :exactly_one => [:contact, :dtstart, :dtend, :organizer, :url],
+      :one_or_more => [:attendee, :comment, :freebusy, :rstatus]
+
+    def initialize
+      super
+      self.uid = new_uid
+      self.dtstamp = new_timestamp
+    end
+  end
+end

data/lib/icalendar2/component/journal.rb

@@ -0,0 +1,18 @@
+module Icalendar2
+  # See http://tools.ietf.org/html/rfc5545#section-3.6.3
+  class Journal < Component::Base
+    VALUE = "VJOURNAL"
+
+    requires :exactly_one => [:dtstamp, :uid]
+    accepts :exactly_one => [:klass, :created, :dtstart, :last_mod, :organizer,
+      :recurid, :seq, :status, :summary, :url],
+      :one_or_more => [:rrule, :attach, :attendee, :categories, :comment,
+      :contact, :description, :exdate, :related_to, :rdate, :rstatus]
+
+    def initialize
+      super
+      self.uid = new_uid
+      self.dtstamp = new_timestamp
+    end
+  end
+end

data/lib/icalendar2/component/timezone.rb

@@ -0,0 +1,9 @@
+module Icalendar2
+  # See http://tools.ietf.org/html/rfc5545#section-3.6.5
+  class Timezone < Component::Base
+    VALUE = "VTIMEZONE"
+
+    requires :exactly_one => [:tzid]
+    accepts :exactly_one => [:last_mod, :tzurl]
+  end
+end

data/lib/icalendar2/component/todo.rb

@@ -0,0 +1,19 @@
+module Icalendar2
+  # See http://tools.ietf.org/html/rfc5545#section-3.6.2
+  class Todo < Component::Base
+    VALUE = "VTODO"
+
+    requires :exactly_one => [:dtstamp, :uid]
+    accepts :exactly_one => [:klass, :completed, :created, :description,
+      :dtstart, :geo, :last_mod, :location, :organizer, :percent, :priority,
+      :recurid, :seq, :status, :summary, :url, :due, :duration],
+      :one_or_more => [:rrule, :attach, :attendee, :categories, :comment,
+      :contact, :exdate, :rstatus, :related_to, :resources, :rdate]
+
+    def initialize
+      super
+      self.uid = new_uid
+      self.dtstamp = new_timestamp
+    end
+  end
+end

data/lib/icalendar2/component.rb

@@ -2,7 +2,8 @@ module Icalendar2
   module Component
     def self.get_factory(component_name)
       # "VFOO" => "Foo", etc.
-      Icalendar2.const_get(component_name.gsub(/^V/, "").capitalize, false)
+      component_class_name = component_name.gsub(/^V/, "").capitalize
+      Icalendar2.const_get(component_class_name) if Icalendar2.const_defined?(component_class_name)
     end
   end
 end

data/lib/icalendar2/property/base.rb

@@ -2,7 +2,6 @@ module Icalendar2
   module Property
     class Base
       MAX_LINE_LENGTH = 75
-      LIST_SEPARATOR = /(?<!\\),/
 
       attr_reader :value, :parameters
 
@@ -26,7 +25,7 @@ module Icalendar2
 
       def initialize(value, parameters = {})
         @value = if list?
-          value_list = value.respond_to?(:map) ? value : value.split(LIST_SEPARATOR)
+          value_list = value.respond_to?(:gsub) ? split_list(value) : value
           value_list.map { |v| value_object(v) }
         else
           value_object(value)
@@ -55,9 +54,11 @@ module Icalendar2
 
       private
 
+      LIST_SEPARATOR = /([^\\]),/
+
       def validate
         @valid = if @value.is_a? Array
-          @value.all?(&:valid?)
+          @value.compact.all?(&:valid?)
         else
           @value.valid?
         end
@@ -75,6 +76,11 @@ module Icalendar2
       def fold(str)
         str.scan(/.{1,#{MAX_LINE_LENGTH}}/).join("#{Tokens::CRLF} ")
       end
+
+      def split_list(str)
+        # Ruby 1.8.7 doesn't support negative lookbehind, so using this hack...
+        str.gsub(LIST_SEPARATOR, "\\1x,").split(/x,/)
+      end
     end
   end
 end

data/lib/icalendar2/property.rb

@@ -3,7 +3,7 @@ module Icalendar2
     def self.get_factory(property_sym)
       # :foo => "Foo", :bar_baz => "BarBaz", etc.
       property_name = property_sym.to_s.split(/_/).map(&:capitalize).join('')
-      const_get(property_name, false)
+      const_get(property_name) if const_defined?(property_name)
     end
   end
 end

data/lib/icalendar2/tokens.rb

@@ -13,7 +13,7 @@ module Icalendar2
     QSAFE_CHAR =         /[^"#{CONTROL_CHARS}]/
     SAFE_CHAR =          /[^"#{CONTROL_CHARS};:,]/
     VALUE_CHAR =         /[^#{CONTROL_CHARS}]/
-    NON_US_ASCII_CHARS = "\x80-\xFF".force_encoding("UTF-8")
+    NON_US_ASCII_CHARS = "\x80-\xFF"
     QUOTED_STRING =      /#{DQUOTE}(?:#{SAFE_CHAR})*#{DQUOTE}/
     PARAM_VALUE =        "(?:#{SAFE_CHAR})*|#{QUOTED_STRING}"
     IANA_TOKEN =         "[-a-zA-Z0-9]+"

data/lib/icalendar2/value/text_value.rb

@@ -4,14 +4,11 @@ module Icalendar2
   class TextValue < Value
 
     def initialize(value)
-      replacements = {
-        '\\' =>     '\\\\',
-        ';' =>      '\;',
-        ',' =>      '\,',
-        "\r\n" =>   "\n",
-        "\r" =>     "\n"
-      }
-      super(value.respond_to?(:gsub) ? value.gsub(/\\|;|,|\r\n|\r/, replacements) : value)
+      if value.respond_to?(:gsub)
+        super(value.gsub(/\\/, "\\\\\\").gsub(';', '\;').gsub(',', '\,').gsub("\r\n", "\n").gsub("\r", "\n"))
+      else
+        super(value)
+      end
     end
   end
 end

data/lib/icalendar2/value.rb

@@ -13,7 +13,8 @@ module Icalendar2
     def self.get_factory(value_sym)
       # :foo => "Foo", :bar_baz => "BarBaz", etc.
       value_name = value_sym.to_s.split(/_/).map(&:capitalize).join('')
-      Icalendar2.const_get("#{value_name}Value", false)
+      value_class_name = "#{value_name}Value"
+      Icalendar2.const_get(value_class_name) if Icalendar2.const_defined?(value_class_name)
     end
 
     def initialize(value)

data/lib/icalendar2/version.rb

@@ -1,3 +1,3 @@
 module Icalendar2
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/icalendar2.rb

@@ -8,6 +8,11 @@ module Icalendar2
 
   autoload :Component, "icalendar2/component"
   autoload :Event, "icalendar2/component/event"
+  autoload :Todo, "icalendar2/component/todo"
+  autoload :Journal, "icalendar2/component/journal"
+  autoload :Freebusy, "icalendar2/component/freebusy"
+  autoload :Timezone, "icalendar2/component/timezone"
+  autoload :Alarm, "icalendar2/component/alarm"
   module Component
     autoload :Base, "icalendar2/component/base"
   end

metadata

@@ -1,50 +1,60 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: icalendar2
-version: !ruby/object:Gem::Version
-  version: 0.1.0
+version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
-authors:
+authors: 
 - Eric Carty-Fickes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-12 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-12-13 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2'
-description: Borrows fromt the API used by the icalendar Ruby gem. Outputs iCalendar
-  (RFC 5545) formatted text.
-email:
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        version: "2"
+  type: :development
+  version_requirements: *id001
+description: Borrows fromt the API used by the icalendar Ruby gem. Outputs iCalendar (RFC 5545) formatted text.
+email: 
 - ericcf@northwestern.edu
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - CHANGELOG.md
 - README.md
-files:
+files: 
 - lib/icalendar2/calendar.rb
 - lib/icalendar2/calendar_property/calscale.rb
 - lib/icalendar2/calendar_property/method.rb
 - lib/icalendar2/calendar_property/prodid.rb
 - lib/icalendar2/calendar_property/version.rb
 - lib/icalendar2/calendar_property.rb
+- lib/icalendar2/component/alarm.rb
 - lib/icalendar2/component/base.rb
 - lib/icalendar2/component/event.rb
+- lib/icalendar2/component/freebusy.rb
+- lib/icalendar2/component/journal.rb
+- lib/icalendar2/component/timezone.rb
+- lib/icalendar2/component/todo.rb
 - lib/icalendar2/component.rb
 - lib/icalendar2/parameter/altrep.rb
 - lib/icalendar2/parameter/base.rb
@@ -106,26 +116,36 @@ files:
 - README.md
 homepage: https://github.com/ericcf/icalendar2
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: iCalendar (RFC 5545) Ruby library
 test_files: []
+