icalendar 2.0.0.beta.1 → 2.0.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb0a66f621c41416a3adc31d2b51de3f28b5f777
-  data.tar.gz: b5ec14a510654033efffa5c75cac5fb7cba3227e
+  metadata.gz: 8a5e107e53784e1a46b2eea851f53da90b4c7a5d
+  data.tar.gz: fc7ab4fdf29eee625e3b34f0c2989611973cb12a
 SHA512:
-  metadata.gz: 8a91a092682a21f37d46f70107ce223df05c6a3d906cf4cc8b87dfb5e4524429498979ec41dcac6319359b768a8e70f177ebcb5cf87ffd12b0eac757d874d607
-  data.tar.gz: 70a6edaf55706b6bc500145967c75c1eb0d98d5ea5262aae745c89a1084ce8d019b4baf7cd9d763345258296883a53b78a4c7f26a707b1c5375d5ed7a397a359
+  metadata.gz: 8370c7815a1b841a87559805efe26cfe42762bfd6447a44206856fa30b347c6aedab88f6ff1690e44d3512d76506b7d5ca3c2438f9cc0bd53c360a6f84c426bc
+  data.tar.gz: 38d884b87d744f5224221577d3b0e525810823900c064a1c4c42097235db0fc3a3a16c5cc58e13728846047231753e5a4804bb41a6695874a3261157717d4e6a

data/History.txt

@@ -1,3 +1,8 @@
+=== 2.0.0.beta.2 2014-04-11
+ * Add uid & acknowledged fields from valarm extensions
+ * Swallow NoMethodError on non-strict parsers
+ * Expose a parse_property method on Icalendar::Parser
+
 === 2.0.0.beta.1 2014-03-30
  * Rewrite for easier development going forward.
 

data/lib/icalendar/alarm.rb

@@ -16,6 +16,10 @@ module Icalendar
 
     optional_property :attach, Icalendar::Values::Uri
 
+    # not part of base spec - need better abstraction for extensions
+    optional_single_property :uid
+    optional_single_property :acknowledged, Icalendar::Values::DateTime
+
     def initialize
       super 'alarm'
     end
@@ -32,4 +36,4 @@ module Icalendar
       super
     end
   end
-end
+end

data/lib/icalendar/parser.rb

@@ -12,12 +12,13 @@ module Icalendar
       else
         raise ArgumentError, 'Icalendar::Parser.new must be called with a String or IO object'
       end
+      read_in_data
       @strict = strict
     end
 
     def parse
       source.rewind
-      @data = source.gets and @data.chomp!
+      read_in_data
       calendars = []
       while (fields = next_fields)
         if fields[:name] == 'begin' && fields[:value].downcase == 'vcalendar'
@@ -27,6 +28,41 @@ module Icalendar
       calendars
     end
 
+    def parse_property(component, fields = nil)
+      fields = next_fields if fields.nil?
+      klass = component.class.default_property_types[fields[:name]]
+      if !fields[:params]['value'].nil?
+        klass_name = fields[:params].delete('value').first
+        unless klass_name.upcase == klass.value_type
+          klass_name = klass_name.downcase.gsub(/(?:\A|-)(.)/) { |m| m[-1].upcase }
+          klass = Icalendar::Values.const_get klass_name if Icalendar::Values.const_defined?(klass_name)
+        end
+      end
+      if klass.value_type != 'RECUR' && fields[:value] =~ /(?<!\\)([,;])/
+        delimiter = $1
+        prop_value = Icalendar::Values::Array.new fields[:value].split(/(?<!\\)[;,]/),
+                                                  klass,
+                                                  fields[:params],
+                                                  delimiter: delimiter
+      else
+        prop_value = klass.new fields[:value], fields[:params]
+      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
+        else
+          component.send "#{prop_name}=", prop_value
+        end
+      rescue NoMethodError => nme
+        raise nme if strict?
+      end
+    end
+
+    def strict?
+      !!@strict
+    end
+
     private
 
     def parse_component(component)
@@ -44,38 +80,20 @@ module Icalendar
           end
         else
           # new property
-          klass = component.class.default_property_types[fields[:name]]
-          if !fields[:params]['value'].nil?
-            klass_name = fields[:params].delete('value').first
-            unless klass_name.upcase == klass.value_type
-              klass_name = klass_name.downcase.gsub(/(?:\A|-)(.)/) { |m| m[-1].upcase }
-              klass = Icalendar::Values.const_get klass_name if Icalendar::Values.const_defined?(klass_name)
-            end
-          end
-          if klass.value_type != 'RECUR' && fields[:value] =~ /(?<!\\)([,;])/
-            delimiter = $1
-            prop_value = Icalendar::Values::Array.new fields[:value].split(/(?<!\\)[;,]/),
-                                                      klass,
-                                                      fields[:params],
-                                                      delimiter: delimiter
-          else
-            prop_value = klass.new fields[:value], fields[:params]
-          end
-          prop_name = %w(class method).include?(fields[:name]) ? "ip_#{fields[:name]}" : fields[:name]
-          if component.class.multiple_properties.include? prop_name
-            component.send "append_#{prop_name}", prop_value
-          else
-            component.send "#{prop_name}=", prop_value
-          end
+          parse_property component, fields
         end
       end
       component
     end
 
+    def read_in_data
+      @data = source.gets and @data.chomp!
+    end
+
     def next_fields
       line = @data or return nil
       loop do
-        @data = source.gets and @data.chomp!
+        read_in_data
         if @data =~ /\A[ \t].+\z/
           line << @data[1, @data.size]
         elsif @data !~ /\A\s*\z/

data/lib/icalendar/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icalendar
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.1
+  version: 2.0.0.beta.2
 platform: ruby
 authors:
 - Ryan Ahearn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-30 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake