icalendar 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ed623b569af5c7f68aa5917f19acedb5a11f7e8
-  data.tar.gz: 3293337f990892e2c07cc9c8d23f5bf4b86e5a37
+  metadata.gz: 851d909893eaa853f0196567cf367c7062e725f8
+  data.tar.gz: d218b26b7f7b9b8f004308fab26290538c542e0b
 SHA512:
-  metadata.gz: 4a95ab23132eeffa95b42b1c2da033aa46b92775caf43928458ffd048685f66095855235b1b951f1bb18a1a33b7fb817cc1e4fc3f1b4917a277a3f18306dc592
-  data.tar.gz: 8d77c499752d3f589b9dca961d61df24f9b67a89f4764c462e71bcedd313a0f8d3b1aace26849bbe183a415235e4c6b159b8ea4b194b37cf9b202a73f001c568
+  metadata.gz: 7e47ce5836cf569bc8a8dfa79d642093302587ae6cff544162ad9f26197c20df73d3062e1bb74a52e21c9a765a0fa8ce7469f9c3342520528bbd660647249616
+  data.tar.gz: fd89f85a3cb86ebb50dbfff5db479bfcf7232c7f7ef061ae2d60fcb5d8cb48bb876aff4604b3ec50e2bcecfa25b2d86a0374de5c9d473d09ba616a52377f2421

data/.travis.yml

@@ -1,9 +1,12 @@
+sudo: false
+before_install:
+  - gem install bundler
 language: ruby
 rvm:
+  - 2.3.1
+  - 2.2
   - 2.1
   - 2.0
-  - 1.9.3
-  - 1.9.2
   - jruby-19mode
   - rbx-2
   - ruby-head

data/History.txt

@@ -1,3 +1,8 @@
+=== 2.4.0 2015-07-04
+ * Enable parsing individual ICalendar components - Patrick Schnetger
+ * many bug fixes. Thanks to Quan Sun, Garry Shutler, Ryan Bigg, Patrick Schnetger and others
+ * README/documentation updates. Thanks to JonMidhir and Hendrik Sollich
+
 === 2.3.0 2015-04-26
  * fix value parameter for properties with multiple values
  * fix error when assigning Icalendar::Values::Array to a component

data/README.md

@@ -38,51 +38,79 @@ EXAMPLES
 
 ### Creating calendars and events ###
 
-    require 'icalendar'
-
-    # Create a calendar with an event (standard method)
-    cal = Icalendar::Calendar.new
-    cal.event do |e|
-      e.dtstart     = Icalendar::Values::Date.new('20050428')
-      e.dtend       = Icalendar::Values::Date.new('20050429')
-      e.summary     = "Meeting with the man."
-      e.description = "Have a long lunch meeting and decide nothing..."
-      e.ip_class    = "PRIVATE"
-    end
-
-    cal.publish
+```ruby
+require 'icalendar'
+
+# Create a calendar with an event (standard method)
+cal = Icalendar::Calendar.new
+cal.event do |e|
+  e.dtstart     = Icalendar::Values::Date.new('20050428')
+  e.dtend       = Icalendar::Values::Date.new('20050429')
+  e.summary     = "Meeting with the man."
+  e.description = "Have a long lunch meeting and decide nothing..."
+  e.ip_class    = "PRIVATE"
+end
+
+cal.publish
+```
 
 #### Or you can make events like this ####
 
-    event = Icalendar::Event.new
-    event.dtstart = DateTime.civil(2006, 6, 23, 8, 30)
-    event.summary = "A great event!"
-    cal.add_event(event)
+```ruby
+event = Icalendar::Event.new
+event.dtstart = DateTime.civil(2006, 6, 23, 8, 30)
+event.summary = "A great event!"
+cal.add_event(event)
 
-    event2 = cal.event  # This automatically adds the event to the calendar
-    event2.dtstart = DateTime.civil(2006, 6, 24, 8, 30)
-    event2.summary = "Another great event!"
+event2 = cal.event  # This automatically adds the event to the calendar
+event2.dtstart = DateTime.civil(2006, 6, 24, 8, 30)
+event2.summary = "Another great event!"
+```
 
 #### Support for property parameters ####
 
-    params = {"altrep" => "http://my.language.net", "language" => "SPANISH"}
+```ruby
+params = {"altrep" => "http://my.language.net", "language" => "SPANISH"}
+
+event = cal.event do |e|
+  e.dtstart = Icalendar::Values::Date.new('20050428')
+  e.dtend   = Icalendar::Values::Date.new('20050429')
+  e.summary = Icalendar::Values::Text.new "This is a summary with params.", params
+end
+event.summary.ical_params #=> {'altrep' => 'http://my.language.net', 'language' => 'SPANISH'}
+
+# or
+
+event = cal.event do |e|
+  e.dtstart = Icalendar::Values::Date.new('20050428')
+  e.dtend   = Icalendar::Values::Date.new('20050429')
+  e.summary = "This is a summary with params."
+  e.summary.ical_params = params
+end
+event.summary.ical_params #=> {'altrep' => 'http://my.language.net', 'language' => 'SPANISH'}
+```
+
+#### Support for Dates or DateTimes
 
-    event = cal.event do |e|
-      e.dtstart = Icalendar::Values::Date.new('20050428')
-      e.dtend   = Icalendar::Values::Date.new('20050429')
-      e.summary = Icalendar::Values::Text.new "This is a summary with params.", params
-    end
-    event.summary.ical_params #=> {'altrep' => 'http://my.language.net', 'language' => 'SPANISH'}
+Sometimes we don't care if an event's start or end are `Date` or `DateTime` objects. For this, we can use `DateOrDateTime.new(value).call`
 
-    # or
+```ruby
+event = cal.event do |e|
+  e.dtstart = Icalendar::Values::DateOrDateTime.new('20140924').call
+  e.dtend   = Icalendar::Values::DateOrDateTime.new('20140924').call
+  e.summary = 'This is an all-day event, because DateOrDateTime will return Dates'
+end
+```
 
-    event = cal.event do |e|
-      e.dtstart = Icalendar::Values::Date.new('20050428')
-      e.dtend   = Icalendar::Values::Date.new('20050429')
-      e.summary = "This is a summary with params."
-      e.summary.ical_params = params
-    end
-    event.summary.ical_params #=> {'altrep' => 'http://my.language.net', 'language' => 'SPANISH'}
+#### Support for URLs
+
+For clients that can parse and display a URL associated with an event, it's possible to assign one.
+
+```ruby
+event = cal.event do |e|
+  e.url = 'https://example.com'
+end
+```
 
 #### We can output the calendar as a string ####
 
@@ -94,30 +122,32 @@ ALARMS
 
 ### Within an event ###
 
-    cal.event do |e|
-      # ...other event properties
-      e.alarm do |a|
-        a.action          = "EMAIL"
-        a.description     = "This is an event reminder" # email body (required)
-        a.summary         = "Alarm notification"        # email subject (required)
-        a.attendee        = %w(mailto:me@my-domain.com mailto:me-too@my-domain.com) # one or more email recipients (required)
-        a.append_attendee "mailto:me-three@my-domain.com"
-        a.trigger         = "-PT15M" # 15 minutes before
-        a.append_attach   Icalendar::Values::Uri.new "ftp://host.com/novo-procs/felizano.exe", "fmttype" => "application/binary" # email attachments (optional)
-      end
-
-      e.alarm do |a|
-        a.action  = "DISPLAY" # This line isn't necessary, it's the default
-        a.summary = "Alarm notification"
-        a.trigger = "-P1DT0H0M0S" # 1 day before
-      end
-
-      e.alarm do |a|
-        a.action        = "AUDIO"
-        a.trigger       = "-PT15M"
-        a.append_attach "Basso"
-      end
-    end
+```ruby
+cal.event do |e|
+  # ...other event properties
+  e.alarm do |a|
+    a.action          = "EMAIL"
+    a.description     = "This is an event reminder" # email body (required)
+    a.summary         = "Alarm notification"        # email subject (required)
+    a.attendee        = %w(mailto:me@my-domain.com mailto:me-too@my-domain.com) # one or more email recipients (required)
+    a.append_attendee "mailto:me-three@my-domain.com"
+    a.trigger         = "-PT15M" # 15 minutes before
+    a.append_attach   Icalendar::Values::Uri.new "ftp://host.com/novo-procs/felizano.exe", "fmttype" => "application/binary" # email attachments (optional)
+  end
+
+  e.alarm do |a|
+    a.action  = "DISPLAY" # This line isn't necessary, it's the default
+    a.summary = "Alarm notification"
+    a.trigger = "-P1DT0H0M0S" # 1 day before
+  end
+
+  e.alarm do |a|
+    a.action        = "AUDIO"
+    a.trigger       = "-PT15M"
+    a.append_attach "Basso"
+  end
+end
+```
 
 #### Output ####
 
@@ -147,38 +177,42 @@ ALARMS
 
 Calling the `event.alarm` method will create an alarm if one doesn't exist. To check if an event has an alarm use the `has_alarm?` method.
 
-    event.has_alarm?
-    # => false
-    
-    event.alarm
-    # => #<Icalendar::Alarm ... >
-    
-    event.has_alarm?
-    #=> true
+```ruby
+event.has_alarm?
+# => false
+
+event.alarm
+# => #<Icalendar::Alarm ... >
+
+event.has_alarm?
+#=> true
+```
 
 TIMEZONES
 ---
 
-    cal = Icalendar::Calendar.new
-    cal.timezone do |t|
-      t.tzid = "America/Chicago"
-
-      t.daylight do |d|
-        d.tzoffsetfrom = "-0600"
-        d.tzoffsetto   = "-0500"
-        d.tzname       = "CDT"
-        d.dtstart      = "19700308T020000"
-        d.rrule        = "FREQ=YEARLY;BYMONTH=3;BYDAY=2SU"
-      end
-
-      t.standard do |s|
-        s.tzoffsetfrom = "-0500"
-        s.tzoffsetto   = "-0600"
-        s.tzname       = "CST"
-        s.dtstart      = "19701101T020000"
-        s.rrule        = "FREQ=YEARLY;BYMONTH=11;BYDAY=1SU"
-      end
-    end
+```ruby
+cal = Icalendar::Calendar.new
+cal.timezone do |t|
+  t.tzid = "America/Chicago"
+
+  t.daylight do |d|
+    d.tzoffsetfrom = "-0600"
+    d.tzoffsetto   = "-0500"
+    d.tzname       = "CDT"
+    d.dtstart      = "19700308T020000"
+    d.rrule        = "FREQ=YEARLY;BYMONTH=3;BYDAY=2SU"
+  end
+
+  t.standard do |s|
+    s.tzoffsetfrom = "-0500"
+    s.tzoffsetto   = "-0600"
+    s.tzname       = "CST"
+    s.dtstart      = "19701101T020000"
+    s.rrule        = "FREQ=YEARLY;BYMONTH=11;BYDAY=1SU"
+  end
+end
+```
 
 #### Output ####
 
@@ -207,53 +241,76 @@ iCalendar has been tested and works with `tzinfo` versions 0.3 and 1.1
 
 #### Example ####
 
-    require 'icalendar/tzinfo'
+```ruby
+require 'icalendar/tzinfo'
 
-    cal = Icalendar::Calendar.new
+cal = Icalendar::Calendar.new
 
-    event_start = DateTime.new 2008, 12, 29, 8, 0, 0
-    event_end = DateTime.new 2008, 12, 29, 11, 0, 0
+event_start = DateTime.new 2008, 12, 29, 8, 0, 0
+event_end = DateTime.new 2008, 12, 29, 11, 0, 0
 
-    tzid = "America/Chicago"
-    tz = TZInfo::Timezone.get tzid
-    timezone = tz.ical_timezone event_start
-    cal.add_timezone timezone
+tzid = "America/Chicago"
+tz = TZInfo::Timezone.get tzid
+timezone = tz.ical_timezone event_start
+cal.add_timezone timezone
 
-    cal.event do |e|
-      e.dtstart = Icalendar::Values::DateTime.new event_start, 'tzid' => tzid
-      e.dtend   = Icalendar::Values::DateTime.new event_end, 'tzid' => tzid
-      e.summary = "Meeting with the man."
-      e.description = "Have a long lunch meeting and decide nothing..."
-      e.organizer = "mailto:jsmith@example.com"
-      e.organizer = Icalendar::Values::CalAddress.new("mailto:jsmith@example.com", cn: 'John Smith')
-    end
+cal.event do |e|
+  e.dtstart = Icalendar::Values::DateTime.new event_start, 'tzid' => tzid
+  e.dtend   = Icalendar::Values::DateTime.new event_end, 'tzid' => tzid
+  e.summary = "Meeting with the man."
+  e.description = "Have a long lunch meeting and decide nothing..."
+  e.organizer = "mailto:jsmith@example.com"
+  e.organizer = Icalendar::Values::CalAddress.new("mailto:jsmith@example.com", cn: 'John Smith')
+end
+```
 
 
 Parsing iCalendars
 ---
 
-    # Open a file or pass a string to the parser
-    cal_file = File.open("single_event.ics")
+```ruby
+# Open a file or pass a string to the parser
+cal_file = File.open("single_event.ics")
 
-    # Parser returns an array of calendars because a single file
-    # can have multiple calendars.
-    cals = Icalendar.parse(cal_file)
-    cal = cals.first
+# Parser returns an array of calendars because a single file
+# can have multiple calendars.
+cals = Icalendar::Calendar.parse(cal_file)
+cal = cals.first
 
-    # Now you can access the cal object in just the same way I created it
-    event = cal.events.first
+# Now you can access the cal object in just the same way I created it
+event = cal.events.first
 
-    puts "start date-time: #{event.dtstart}"
-    puts "start date-time timezone: #{event.dtstart.ical_params['tzid']}"
-    puts "summary: #{event.summary}"
+puts "start date-time: #{event.dtstart}"
+puts "start date-time timezone: #{event.dtstart.ical_params['tzid']}"
+puts "summary: #{event.summary}"
+```
 
 You can also create a `Parser` instance directly, this can be used to enable
 strict parsing:
 
-    # Sometimes you want to strongly verify only rfc-approved properties are
-    # used
-    strict_parser = Icalendar::Parser.new(cal_file, true)
-    cal = strict_parser.parse
+```ruby
+# Sometimes you want to strongly verify only rfc-approved properties are
+# used
+strict_parser = Icalendar::Parser.new(cal_file, true)
+cal = strict_parser.parse
+```
+
+Parsing Components (e.g. Events)
+---
+
+```ruby
+# Open a file or pass a string to the parser
+event_file = File.open("event.ics")
+
+# Parser returns an array of events because a single file
+# can have multiple events.
+events = Icalendar::Event.parse(event_file)
+event = events.first
+
+puts "start date-time: #{event.dtstart}"
+puts "start date-time timezone: #{event.dtstart.ical_params['tzid']}"
+puts "summary: #{event.summary}"
+```
 
 Finders
 ---
@@ -262,15 +319,17 @@ Often times in web apps and other interactive applications you'll need to
 lookup items in a calendar to make changes or get details.  Now you can find
 everything by the unique id automatically associated with all components.
 
-    cal = Calendar.new
-    10.times { cal.event } # Create 10 events with only default data.
-    some_event = cal.events[5] # Grab it from the array of events
+```ruby
+cal = Calendar.new
+10.times { cal.event } # Create 10 events with only default data.
+some_event = cal.events[5] # Grab it from the array of events
 
-    # Use the uid as the key in your app
-    key = some_event.uid
+# Use the uid as the key in your app
+key = some_event.uid
 
-    # so later you can find it.
-    same_event = cal.find_event(key)
+# so later you can find it.
+same_event = cal.find_event(key)
+```
 
 Examples
 ---
@@ -311,3 +370,20 @@ Support & Contributions
 
 Please submit pull requests from a rebased topic branch and
 include tests for all bugs and features.
+
+Contributor Code of Conduct
+---
+
+As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+
+This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.1.0, available at [http://contributor-covenant.org/version/1/1/0/](http://contributor-covenant.org/version/1/1/0/)

data/icalendar.gemspec

@@ -47,6 +47,6 @@ ActiveSupport is required for TimeWithZone support, but not required for general
   s.add_development_dependency 'i18n', '< 0.7.0'
 
   s.add_development_dependency 'timecop', '~> 0.7.0'
-  s.add_development_dependency 'rspec', '~> 2.14'
+  s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'simplecov', '~> 0.8'
 end

data/lib/icalendar.rb

@@ -13,6 +13,7 @@ module Icalendar
   end
 
   def self.parse(source, single = false)
+    warn "**** DEPRECATION WARNING ****\nIcalender.parse will be removed. Please switch to Icalendar::Calendar.parse."
     calendars = Parser.new(source).parse
     single ? calendars.first : calendars
   end

data/lib/icalendar/calendar.rb

@@ -22,6 +22,7 @@ module Icalendar
     def publish
       self.ip_method = 'PUBLISH'
     end
+
   end
 
 end

data/lib/icalendar/component.rb

@@ -10,6 +10,12 @@ module Icalendar
     attr_reader :ical_name
     attr_accessor :parent
 
+    def self.parse(source)
+      parser = Parser.new(source)
+      parser.component = self.new
+      parser.parse
+    end
+
     def initialize(name, ical_name = nil)
       @name = name
       @ical_name = ical_name || "V#{name.upcase}"

data/lib/icalendar/has_properties.rb

@@ -141,7 +141,12 @@ module Icalendar
         property_var = "@#{prop}"
 
         define_method "#{prop}=" do |value|
-          instance_variable_set property_var, Array(map_property_value(value, klass, true)).compact
+          mapped = map_property_value value, klass, true
+          if mapped.is_a? Icalendar::Values::Array
+            instance_variable_set property_var, mapped.to_a.compact
+          else
+            instance_variable_set property_var, [mapped].compact
+          end
         end
 
         define_method prop do

data/lib/icalendar/parser.rb

@@ -1,7 +1,7 @@
 module Icalendar
 
   class Parser
-
+    attr_writer :component
     attr_reader :source, :strict
 
     def initialize(source, strict = false)
@@ -21,21 +21,22 @@ module Icalendar
     def parse
       source.rewind
       read_in_data
-      calendars = []
+      components = []
       while (fields = next_fields)
-        if fields[:name] == 'begin' && fields[:value].downcase == 'vcalendar'
-          calendars << parse_component(Calendar.new)
+        if fields[:name] == 'begin' && fields[:value].downcase == component.ical_name.downcase
+          components << parse_component(component)
         end
       end
-      calendars
+      components
     end
 
     def parse_property(component, fields = nil)
       fields = next_fields if fields.nil?
-      prop_value = wrap_property_value component, fields
       prop_name = %w(class method).include?(fields[:name]) ? "ip_#{fields[:name]}" : fields[:name]
+      multi_property = component.class.multiple_properties.include? prop_name
+      prop_value = wrap_property_value component, fields, multi_property
       begin
-        method_name = if component.class.multiple_properties.include? prop_name
+        method_name = if multi_property
           "append_#{prop_name}"
         else
           "#{prop_name}="
@@ -52,10 +53,10 @@ module Icalendar
       end
     end
 
-    def wrap_property_value(component, fields)
+    def wrap_property_value(component, fields, multi_property)
       klass = get_wrapper_class component, fields
-      if klass.value_type != 'RECUR' && fields[:value] =~ /(?<!\\)([,;])/
-        delimiter = $1
+      if wrap_in_array? klass, fields[:value], multi_property
+        delimiter = fields[:value].match(/(?<!\\)([,;])/)[1]
         Icalendar::Values::Array.new fields[:value].split(/(?<!\\)[;,]/),
                                      klass,
                                      fields[:params],
@@ -69,6 +70,11 @@ module Icalendar
       retry
     end
 
+    def wrap_in_array?(klass, value, multi_property)
+      klass.value_type != 'RECUR' &&
+        ((multi_property && value =~ /(?<!\\)[,;]/) || value =~ /(?<!\\);/)
+    end
+
     def get_wrapper_class(component, fields)
       klass = component.class.default_property_types[fields[:name]]
       if !fields[:params]['value'].nil?
@@ -87,6 +93,10 @@ module Icalendar
 
     private
 
+    def component
+      @component ||= Icalendar::Calendar.new
+    end
+
     def parse_component(component)
       while (fields = next_fields)
         if fields[:name] == 'end'

data/lib/icalendar/value.rb

@@ -55,7 +55,7 @@ module Icalendar
     end
 
     def escape_param_value(value)
-      v = value.gsub '"', "'"
+      v = value.to_s.gsub('"', "'")
       v =~ /[;:,]/ ? %("#{v}") : v
     end
 
@@ -63,8 +63,9 @@ module Icalendar
 
 end
 
-# helper; not actual iCalendar value type
+# helpers; not actual iCalendar value type
 require_relative 'values/array'
+require_relative 'values/date_or_date_time'
 
 # iCalendar value types
 require_relative 'values/binary'

data/lib/icalendar/values/array.rb

@@ -11,6 +11,10 @@ module Icalendar
                    value.map do |v|
                      if v.is_a? Icalendar::Values::Array
                        Icalendar::Values::Array.new v.value, klass, v.ical_params, delimiter: v.value_delimiter
+                     elsif v.is_a? ::Array
+                       Icalendar::Values::Array.new v, klass, params, delimiter: value_delimiter
+                     elsif v.is_a? Icalendar::Value
+                       v
                      else
                        klass.new v, params
                      end

data/lib/icalendar/values/date.rb

@@ -8,7 +8,13 @@ module Icalendar
 
       def initialize(value, params = {})
         if value.is_a? String
-          super ::Date.strptime(value, FORMAT), params
+          begin
+            parsed_date = ::Date.strptime(value, FORMAT)
+          rescue ArgumentError => e
+            raise FormatError.new("Failed to parse \"#{value}\" - #{e.message}")
+          end
+
+          super parsed_date, params
         elsif value.respond_to? :to_date
           super value.to_date, params
         else
@@ -28,6 +34,8 @@ module Icalendar
         end
       end
 
+      class FormatError < ArgumentError
+      end
     end
 
   end

data/lib/icalendar/values/date_or_date_time.rb

@@ -0,0 +1,29 @@
+module Icalendar
+  module Values
+
+    # DateOrDateTime can be used to set an attribute to either a Date or a DateTime value.
+    # It should not be used wihtout also invoking the `call` method.
+    class DateOrDateTime
+
+      attr_reader :value, :params, :parsed
+      def initialize(value, params = {})
+        @value = value
+        @params = params
+      end
+
+      def call
+        @parsed ||= begin
+                      Icalendar::Values::DateTime.new value, params
+                    rescue Icalendar::Values::DateTime::FormatError
+                      Icalendar::Values::Date.new value, params
+                    end
+      end
+
+      def to_ical
+        fail NoMethodError, 'You cannot use DateOrDateTime directly. Invoke `call` before `to_ical`'
+      end
+
+    end
+
+  end
+end

data/lib/icalendar/version.rb

@@ -1,5 +1,5 @@
 module Icalendar
 
-  VERSION = '2.3.0'
+  VERSION = '2.4.0'
 
 end

data/spec/calendar_spec.rb

@@ -71,7 +71,7 @@ describe Icalendar::Calendar do
 
     describe '#add_event' do
       it 'delegates to non add_ version' do
-        subject.should_receive(:event).with ical_component
+        expect(subject).to receive(:event).with(ical_component)
         subject.add_event ical_component
       end
     end

data/spec/event_spec.rb

@@ -96,6 +96,18 @@ describe Icalendar::Event do
     end
   end
 
+  describe '.parse' do
+    let(:source) { File.read File.join(File.dirname(__FILE__), 'fixtures', fn) }
+    let(:fn) { 'event.ics' }
+
+    it 'should return an events array' do
+      events = Icalendar::Event.parse(source)
+      expect(events).to be_instance_of Array
+      expect(events.count).to be 1
+      expect(events.first).to be_instance_of Icalendar::Event
+    end
+  end
+
   describe '#find_alarm' do
     it 'should not respond_to find_alarm' do
       expect(subject.respond_to?(:find_alarm)).to be false

data/spec/fixtures/event.ics

@@ -0,0 +1,17 @@
+BEGIN:VEVENT
+DTSTAMP:20050118T211523Z
+UID:bsuidfortestabc123
+DTSTART;TZID=US-Mountain:20050120T170000
+DTEND;TZID=US-Mountain:20050120T184500
+CLASS:PRIVATE
+GEO:37.386013;-122.0829322
+ORGANIZER:mailto:joebob@random.net
+PRIORITY:2
+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.
+ATTACH:http://bush.sucks.org/impeach/him.rhtml
+ATTACH:http://corporations-dominate.existence.net/why.rhtml
+RDATE;TZID=US-Mountain:20050121T170000,20050122T170000
+X-TEST-COMPONENT;QTEST="Hello, World":Shouldn't double double quotes
+END:VEVENT
+

data/spec/parser_spec.rb

@@ -32,6 +32,17 @@ describe Icalendar::Parser do
         expect(ics).to match 'EXDATE;VALUE=DATE:20120323,20130323'
       end
     end
+    context 'event.ics' do
+      let(:fn) { 'event.ics' }
+
+      before { subject.component = Icalendar::Event.new }
+
+      it 'returns an array of events' do
+        expect(subject.parse).to be_instance_of Array
+        expect(subject.parse.count).to be 1
+        expect(subject.parse[0]).to be_instance_of Icalendar::Event
+      end
+    end
   end
 
   describe '#parse with bad line' do

data/spec/roundtrip_spec.rb

@@ -6,12 +6,13 @@ describe Icalendar do
     let(:source) { File.read File.join(File.dirname(__FILE__), 'fixtures', 'single_event.ics') }
 
     it 'will generate the same file as is parsed' do
-      expect(Icalendar.parse(source, true).to_ical).to eq source
+      ical = Icalendar::Calendar.parse(source).first.to_ical
+      expect(ical).to eq source
     end
 
     it 'array properties can be assigned to a new event' do
       event = Icalendar::Event.new
-      parsed = Icalendar.parse source, true
+      parsed = Icalendar::Calendar.parse(source).first
       event.rdate = parsed.events.first.rdate
       expect(event.rdate.first).to be_kind_of Icalendar::Values::Array
       expect(event.rdate.first.ical_params).to eq 'tzid' => ['US-Mountain']
@@ -21,13 +22,14 @@ describe Icalendar do
   describe 'timezone round trip' do
     let(:source) { File.read File.join(File.dirname(__FILE__), 'fixtures', 'timezone.ics') }
     it 'will generate the same file as it parsed' do
-      expect(Icalendar.parse(source, true).to_ical).to eq source
+      ical = Icalendar::Calendar.parse(source).first.to_ical
+      expect(ical).to eq source
     end
   end
 
   describe 'non-default values' do
     let(:source) { File.read File.join(File.dirname(__FILE__), 'fixtures', 'nondefault_values.ics') }
-    subject { Icalendar.parse(source, true).events.first }
+    subject { Icalendar::Calendar.parse(source).first.events.first }
 
     it 'will set dtstart to Date' do
       expect(subject.dtstart.value).to eq ::Date.new(2006, 12, 15)
@@ -48,7 +50,7 @@ describe Icalendar do
 
   describe 'sorting daily events' do
     let(:source) { File.read File.join(File.dirname(__FILE__), 'fixtures', 'two_day_events.ics') }
-    subject { Icalendar.parse(source, true).events }
+    subject { Icalendar::Calendar.parse(source).first.events }
 
     it 'sorts day events' do
       events = subject.sort_by(&:dtstart)
@@ -60,7 +62,7 @@ describe Icalendar do
 
   describe 'sorting time events' do
     let(:source) { File.read File.join(File.dirname(__FILE__), 'fixtures', 'two_time_events.ics') }
-    subject { Icalendar.parse(source, true).events }
+    subject { Icalendar::Calendar.parse(source).first.events }
 
     it 'sorts time events by start time' do
       events = subject.sort_by(&:dtstart)
@@ -82,7 +84,7 @@ describe Icalendar do
 
   describe 'sorting date / time events' do
     let(:source) { File.read File.join(File.dirname(__FILE__), 'fixtures', 'two_date_time_events.ics') }
-    subject { Icalendar.parse(source, true).events }
+    subject { Icalendar::Calendar.parse(source).first.events }
 
     it 'sorts time events' do
       events = subject.sort_by(&:dtstart)
@@ -102,7 +104,7 @@ describe Icalendar do
 
     context 'strict parser' do
       let(:strict) { true }
-      specify { expect { subject.parse }.to raise_error }
+      specify { expect { subject.parse }.to raise_error(NoMethodError) }
     end
 
     context 'lenient parser' do

data/spec/spec_helper.rb

@@ -13,7 +13,6 @@ require 'timecop'
 require 'icalendar'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

data/spec/timezone_spec.rb

@@ -7,25 +7,25 @@ describe Icalendar::Timezone do
 
     context 'with both standard and daylight components' do
       before(:each) do
-        subject.daylight { |d| d.should_receive(:valid?).and_return true }
-        subject.standard { |s| s.should_receive(:valid?).and_return true }
+        subject.daylight { |d| allow(d).to receive(:valid?).and_return true }
+        subject.standard { |s| allow(s).to receive(:valid?).and_return true }
       end
 
       it { should be_valid }
     end
 
     context 'with only standard' do
-      before(:each) { subject.standard { |s| s.stub(:valid?).and_return true } }
-      it { should be_valid }
+      before(:each) { subject.standard { |s| allow(s).to receive(:valid?).and_return true } }
+      it { expect(subject).to be_valid }
     end
 
     context 'with only daylight' do
-      before(:each) { subject.daylight { |d| d.stub(:valid?).and_return true } }
-      it { should be_valid }
+      before(:each) { subject.daylight { |d| allow(d).to receive(:valid?).and_return true } }
+      it { expect(subject).to be_valid }
     end
 
     context 'with neither standard or daylight' do
       it { should_not be_valid }
     end
   end
-end
+end

data/spec/tzinfo_spec.rb

@@ -26,18 +26,18 @@ describe 'TZInfo::Timezone' do
   end
 
   describe 'no end transition' do
-    let(:tz) { TZInfo::Timezone.get 'America/Cayman' }
+    let(:tz) { TZInfo::Timezone.get 'Asia/Shanghai' }
     let(:date) { DateTime.now }
 
     it 'only creates a standard component' do
       expect(subject.to_ical).to eq <<-EXPECTED.gsub "\n", "\r\n"
 BEGIN:VTIMEZONE
-TZID:America/Cayman
+TZID:Asia/Shanghai
 BEGIN:STANDARD
-DTSTART:19120201T000711
-TZOFFSETFROM:-0652
-TZOFFSETTO:-0500
-TZNAME:EST
+DTSTART:19910914T230000
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+TZNAME:CST
 END:STANDARD
 END:VTIMEZONE
       EXPECTED

data/spec/values/date_or_date_time_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe Icalendar::Values::DateOrDateTime do
+
+  subject { described_class.new value, params }
+  let(:params) { {} }
+
+  describe '#call' do
+    context 'DateTime value' do
+      let(:value) { '20140209T194355Z' }
+
+      it 'returns a DateTime object' do
+        expect(subject.call).to be_a_kind_of(Icalendar::Values::DateTime)
+      end
+
+      it 'has the proper value' do
+        expect(subject.call.value).to eq DateTime.new(2014, 2, 9, 19, 43, 55)
+      end
+    end
+
+    context 'Date value' do
+      let(:value) { '20140209' }
+
+      it 'returns a Date object' do
+        expect(subject.call).to be_a_kind_of(Icalendar::Values::Date)
+      end
+
+      it 'has the proper value' do
+        expect(subject.call.value).to eq Date.new(2014, 2, 9)
+      end
+    end
+
+    context 'unparseable date' do
+      let(:value) { '99999999' }
+
+      it 'raises an error including the unparseable time' do
+        expect { subject.call }.to raise_error(ArgumentError, %r{Failed to parse \"#{value}\"})
+      end
+    end
+  end
+end

data/spec/values/text_spec.rb

@@ -68,5 +68,11 @@ describe Icalendar::Values::Text do
         expect(subject.params_ical).to eq %(;PARAM="Hello, 'World'",GoodbyeMoon)
       end
     end
+    context 'nil value' do
+      let(:param_value) { nil }
+      it 'trats nil as blank' do
+        expect(subject.params_ical).to eq %(;PARAM=)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icalendar
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Ryan Ahearn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-26 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -177,6 +177,7 @@ files:
 - lib/icalendar/values/boolean.rb
 - lib/icalendar/values/cal_address.rb
 - lib/icalendar/values/date.rb
+- lib/icalendar/values/date_or_date_time.rb
 - lib/icalendar/values/date_time.rb
 - lib/icalendar/values/duration.rb
 - lib/icalendar/values/float.rb
@@ -193,6 +194,7 @@ files:
 - spec/calendar_spec.rb
 - spec/downcased_hash_spec.rb
 - spec/event_spec.rb
+- spec/fixtures/event.ics
 - spec/fixtures/nondefault_values.ics
 - spec/fixtures/nonstandard.ics
 - spec/fixtures/recurrence.ics
@@ -211,6 +213,7 @@ files:
 - spec/timezone_spec.rb
 - spec/todo_spec.rb
 - spec/tzinfo_spec.rb
+- spec/values/date_or_date_time_spec.rb
 - spec/values/date_time_spec.rb
 - spec/values/duration_spec.rb
 - spec/values/period_spec.rb
@@ -242,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A ruby implementation of the iCalendar specification (RFC-5545).
@@ -251,6 +254,7 @@ test_files:
 - spec/calendar_spec.rb
 - spec/downcased_hash_spec.rb
 - spec/event_spec.rb
+- spec/fixtures/event.ics
 - spec/fixtures/nondefault_values.ics
 - spec/fixtures/nonstandard.ics
 - spec/fixtures/recurrence.ics
@@ -269,6 +273,7 @@ test_files:
 - spec/timezone_spec.rb
 - spec/todo_spec.rb
 - spec/tzinfo_spec.rb
+- spec/values/date_or_date_time_spec.rb
 - spec/values/date_time_spec.rb
 - spec/values/duration_spec.rb
 - spec/values/period_spec.rb