icalendar 2.0.0.beta.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a5e107e53784e1a46b2eea851f53da90b4c7a5d
-  data.tar.gz: fc7ab4fdf29eee625e3b34f0c2989611973cb12a
+  metadata.gz: 1bec860be74d825a4185f664e5faf729a7dab764
+  data.tar.gz: 5b4f8aa6e13794637bd35e1094df96426a8622c1
 SHA512:
-  metadata.gz: 8370c7815a1b841a87559805efe26cfe42762bfd6447a44206856fa30b347c6aedab88f6ff1690e44d3512d76506b7d5ca3c2438f9cc0bd53c360a6f84c426bc
-  data.tar.gz: 38d884b87d744f5224221577d3b0e525810823900c064a1c4c42097235db0fc3a3a16c5cc58e13728846047231753e5a4804bb41a6695874a3261157717d4e6a
+  metadata.gz: f2097431525222e84223153f4e1288363600c9635fa29ce951de03ddcb8f400b327d55561861f14032df344db8acc1157c44395cd5a42f1f95eef312555f7cb6
+  data.tar.gz: 7b26558a56b5a5e40ab08c4841288122810151de6f701deeb76da0785af4ae57cc0fc2a335354e587a7e2e433f9708640aa3db7108a722bbe48cd370a9d6f0e2

data/.gitignore

@@ -5,3 +5,4 @@ Gemfile.lock
 pkg/
 .bundle
 coverage/
+tags

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.0.0 2014-04-22
+ * Add Icalendar.logger class & logging in Parser
+ * Support tzinfo ~> 0.3 and ~> 1.1
+
 === 2.0.0.beta.2 2014-04-11
  * Add uid & acknowledged fields from valarm extensions
  * Swallow NoMethodError on non-strict parsers

data/README.md

@@ -64,20 +64,22 @@ EXAMPLES
 
     params = {"altrep" => "http://my.language.net", "language" => "SPANISH"}
 
-    cal.event do |e|
+    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
 
-    cal.event do |e|
+    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'}
 
 #### We can output the calendar as a string ####
 
@@ -184,7 +186,9 @@ TIMEZONES
     # END:VTIMEZONE
 
 iCalendar has some basic support for creating VTIMEZONE blocks from timezone information pulled from `tzinfo`.
-You must require `tzinfo` support manually to take advantage, and iCalendar only supports `tzinfo` with versions `~> 0.3`
+You must require `tzinfo` support manually to take advantage.
+
+iCalendar has been tested and works with `tzinfo` versions 0.3 and 1.1
 
 #### Example ####
 

data/icalendar.gemspec

@@ -22,9 +22,19 @@ variety of calendaring applications.
   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'
+
+  # test with both groups of tzinfo dependencies
+  # tzinfo 1.x
+  s.add_development_dependency 'tzinfo', '~> 1.1'
+  s.add_development_dependency 'tzinfo-data', '~> 1.2014'
+  # tzinfo 0.x
+  # s.add_development_dependency 'tzinfo', '~> 0.3'
+  # end tzinfo
+
   s.add_development_dependency 'activesupport', '~> 3.2'
   s.add_development_dependency 'timecop', '~> 0.7.0'
   s.add_development_dependency 'rspec', '~> 2.14'

data/lib/icalendar.rb

@@ -1,7 +1,17 @@
+require 'icalendar/logger'
+
 module Icalendar
 
   MAX_LINE_LENGTH = 75
 
+  def self.logger
+    @logger ||= Icalendar::Logger.new(STDERR)
+  end
+
+  def self.logger=(logger)
+    @logger = logger
+  end
+
   def self.parse(source, single = false)
     calendars = Parser.new(source).parse
     single ? calendars.first : calendars
@@ -20,4 +30,4 @@ require 'icalendar/journal'
 require 'icalendar/freebusy'
 require 'icalendar/timezone'
 require 'icalendar/calendar'
-require 'icalendar/parser'
+require 'icalendar/parser'

data/lib/icalendar/logger.rb

@@ -0,0 +1,16 @@
+require 'delegate'
+require 'logger'
+
+module Icalendar
+
+  class Logger < ::SimpleDelegator
+
+    def initialize(sink, level = ::Logger::WARN)
+      logger = ::Logger.new(sink)
+      logger.level = level
+      super logger
+    end
+
+  end
+
+end

data/lib/icalendar/parser.rb

@@ -10,7 +10,9 @@ module Icalendar
       elsif source.respond_to? :to_s
         @source = StringIO.new source.to_s, 'r'
       else
-        raise ArgumentError, 'Icalendar::Parser.new must be called with a String or IO object'
+        msg = 'Icalendar::Parser.new must be called with a String or IO object'
+        Icalendar.fatal msg
+        fail ArgumentError, msg
       end
       read_in_data
       @strict = strict
@@ -49,13 +51,19 @@ module Icalendar
       end
       prop_name = %w(class method).include?(fields[:name]) ? "ip_#{fields[:name]}" : fields[:name]
       begin
-        if component.class.multiple_properties.include? prop_name
-          component.send "append_#{prop_name}", prop_value
+        method_name = if component.class.multiple_properties.include? prop_name
+          "append_#{prop_name}"
         else
-          component.send "#{prop_name}=", prop_value
+          "#{prop_name}="
         end
+        component.send method_name, prop_value
       rescue NoMethodError => nme
-        raise nme if strict?
+        if strict?
+          Icalendar.logger.error "No method \"#{method_name}\" for component #{component}"
+          raise nme
+        else
+          Icalendar.logger.warn "No method \"#{method_name}\" for component #{component}. Skipping."
+        end
       end
     end
 
@@ -71,6 +79,7 @@ module Icalendar
           break
         elsif fields[:name] == 'begin'
           klass_name = fields[:value].gsub(/\AV/, '').downcase.capitalize
+          Icalendar.logger.debug "Adding component #{klass_name}"
           if Icalendar.const_defined? klass_name
             component.add_component parse_component(Icalendar.const_get(klass_name).new)
           elsif Icalendar::Timezone.const_defined? klass_name
@@ -79,7 +88,6 @@ module Icalendar
             component.add_component parse_component(Component.new klass_name.downcase, fields[:value])
           end
         else
-          # new property
           parse_property component, fields
         end
       end
@@ -112,7 +120,7 @@ module Icalendar
     LINE = "(?<name>#{NAME})(?<params>(?:;#{PARAM})*):(?<value>#{VALUE})"
 
     def parse_fields(input)
-      parts = %r{#{LINE}}.match(input) or raise "Invalid iCalendar input line: #{input}"
+      parts = %r{#{LINE}}.match(input) or fail "Invalid iCalendar input line: #{input}"
       params = {}
       parts[:params].scan %r{#{PARAM}} do |match|
         param_name = match[0].downcase
@@ -121,6 +129,7 @@ module Icalendar
           params[param_name] << param_value.gsub(/\A"|"\z/, '') if param_value.size > 0
         end
       end
+      Icalendar.logger.debug "Found fields: #{parts.inspect} with params: #{params.inspect}"
       {
         name: parts[:name].downcase.gsub('-', '_'),
         params: params,

data/lib/icalendar/tzinfo.rb

@@ -21,7 +21,7 @@
 #   # the mixins now generate all the timezone info for the date in question
 #   timezone = tz.ical_timezone(estart)
 #   cal.add(timezone)
-#  
+#
 #   cal.event do
 #       dtstart       estart
 #       dtend        eend
@@ -40,26 +40,14 @@
 
 
 require 'tzinfo'
+begin
+  require 'tzinfo/data'
+rescue LoadError
+  Icalendar.logger.info "Could not load tzinfo/data, hopefully tzinfo is accurate (ignore for tzinfo 0.x)"
+end
 
-module TZInfo
-  class Timezone
-    def ical_timezone(date, dst = Timezone.default_dst)
-      period = period_for_local(date, dst)
-      timezone = Icalendar::Timezone.new
-      timezone.tzid = identifier
-      if period.start_transition.nil?
-        timezone.add_component period.single
-      elsif period.end_transition.nil?
-        timezone.add_component period.dst? ? period.daylight : period.standard
-      else
-        timezone.add_component period.daylight
-        timezone.add_component period.standard
-      end
-      timezone
-    end
-  end
-
-  class TimezoneTransitionInfo
+module Icalendar
+  module TimezoneTransition
     def offset_from
       previous_offset.ical_offset
     end
@@ -68,7 +56,7 @@ module TZInfo
       offset.ical_offset
     end
 
-    def rrule 
+    def rrule
       start = local_start.to_datetime
       # this is somewhat of a hack, but seems to work ok
       [sprintf(
@@ -84,12 +72,52 @@ module TZInfo
     end
   end
 
-  class TimezoneOffsetInfo
+  module TimezoneOffset
     def ical_offset
       o = utc_total_offset
       sprintf '%+-2.2d%2.2d', (o / 3600).to_i, ((o / 60) % 60).to_i
     end
   end
+end
+
+
+module TZInfo
+  class Timezone
+    def ical_timezone(date, dst = Timezone.default_dst)
+      period = period_for_local(date, dst)
+      timezone = Icalendar::Timezone.new
+      timezone.tzid = identifier
+      if period.start_transition.nil?
+        timezone.add_component period.single
+      elsif period.end_transition.nil?
+        timezone.add_component period.dst? ? period.daylight : period.standard
+      else
+        timezone.add_component period.daylight
+        timezone.add_component period.standard
+      end
+      timezone
+    end
+  end
+
+  if defined? TimezoneTransitionInfo
+    class TimezoneTransitionInfo
+      include Icalendar::TimezoneTransition
+    end
+  else
+    class TimezoneTransition
+      include Icalendar::TimezoneTransition
+    end
+  end
+
+  if defined? TimezoneOffsetInfo
+    class TimezoneOffsetInfo
+      include Icalendar::TimezoneOffset
+    end
+  else
+    class TimezoneOffset
+      include Icalendar::TimezoneOffset
+    end
+  end
 
   class TimezonePeriod
     def daylight

data/lib/icalendar/version.rb

@@ -1,5 +1,5 @@
 module Icalendar
 
-  VERSION = '2.0.0.beta.2'
+  VERSION = '2.0.0'
 
 end

data/spec/fixtures/nonstandard.ics

@@ -0,0 +1,25 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:bsprodidfortestabc123
+BEGIN:VEVENT
+UID:bsuidfortestabc123
+ORGANIZER:mailto:joebob@random.net
+ATTACH:http://bush.sucks.org/impeach/him.rhtml
+ATTACH:http://corporations-dominate.existence.net/why.rhtml
+SUMMARY:This is a really long summary
+  to test the method of unfolding lines\,
+  so I'm just going to ma
+ ke it
+  a whol
+ e
+  bunch of lines.
+CLASS:PRIVATE
+PRIORITY:2
+CUSTOMFIELD:Not properly noted as custom with X- prefix.
+GEO:37.386013;-122.0829322
+DTSTART;TZID=US-Mountain:20050120T170000
+DTEND:20050120T184500
+DTSTAMP:20050118T211523Z
+NAME:SomeName
+END:VEVENT
+END:VCALENDAR

data/spec/roundtrip_spec.rb

@@ -37,4 +37,21 @@ describe Icalendar do
       expect(subject.dtend.to_ical(subject.class.default_property_types['dtend'])).to match /^;VALUE=DATE:20061215$/
     end
   end
+
+  describe 'non-standard values' do
+    before(:all) { Icalendar.logger = Icalendar::Logger.new File::NULL }
+    after(:all) { Icalendar.logger = nil }
+    let(:source) { File.read File.join(File.dirname(__FILE__), 'fixtures', 'nonstandard.ics') }
+    subject { Icalendar::Parser.new(source, strict) }
+
+    context 'strict parser' do
+      let(:strict) { true }
+      specify { expect { subject.parse }.to raise_error }
+    end
+
+    context 'lenient parser' do
+      let(:strict) { false }
+      specify { expect { subject.parse}.to_not raise_error }
+    end
+  end
 end

data/spec/tzinfo_spec.rb

@@ -82,4 +82,4 @@ END:VTIMEZONE
     end
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icalendar
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Ryan Ahearn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,14 +44,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: tzinfo-data
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2014'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2014'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +150,7 @@ files:
 - lib/icalendar/has_components.rb
 - lib/icalendar/has_properties.rb
 - lib/icalendar/journal.rb
+- lib/icalendar/logger.rb
 - lib/icalendar/parser.rb
 - lib/icalendar/timezone.rb
 - lib/icalendar/todo.rb
@@ -162,6 +177,7 @@ files:
 - spec/calendar_spec.rb
 - spec/event_spec.rb
 - spec/fixtures/nondefault_values.ics
+- spec/fixtures/nonstandard.ics
 - spec/fixtures/single_event.ics
 - spec/fixtures/timezone.ics
 - spec/freebusy_spec.rb
@@ -192,12 +208,12 @@ 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:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14
@@ -209,6 +225,7 @@ test_files:
 - spec/calendar_spec.rb
 - spec/event_spec.rb
 - spec/fixtures/nondefault_values.ics
+- spec/fixtures/nonstandard.ics
 - spec/fixtures/single_event.ics
 - spec/fixtures/timezone.ics
 - spec/freebusy_spec.rb