icalendar 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b22d9bc37f8f10ba08d5b8aa155dfb1b97a9876c800c547271f43ce15f09b89d
-  data.tar.gz: 91260efab7eafc852e509258fa0163cd1ac2c41352b9482fcae85a45547fa325
+  metadata.gz: fbeadc87a1316894e02896fd63e7f7644a1ab5bf3a542b0d5a02c59aabf2d603
+  data.tar.gz: 3aaf09d7984fed57644d091fa76285084d9fbf3568e6078939e7887d6f44f50a
 SHA512:
-  metadata.gz: a6466ed9d1ae91fd9007b42a8d9001879e601ea5f03c338fceb5dcda03b3b32e27ca115cb3a359560b9c04c8944891a174d3bade9596f84d2ca12808dad3046d
-  data.tar.gz: a587f1166316ad6a87602d3026144c3d3e9ca09a6d3ef2a40a0664aa77cd497817894df6d53503f6cdcfd95a99fcc2e66c6a8688af19870de2a199cf9b47511d
+  metadata.gz: e6134ff7d12c820d7ee10a316108c1d7a9db274cccd366b93a49fa491931038edd78eb37789a24962cc6370c83fd34d67508dd24b574e8d1fa235e815c1fa22d
+  data.tar.gz: 0bad8ab7548493a133686dab3a6d36a58aeecddb8642da83cef5a2184d0d08e97dc59307fc6fdd9574935319044ccb5ffa50f9c936aa60e5637a2430e78eb446

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.7.1 2021-03-14
+ * Recover from bad line-wrapping code that splits in the middle of Unicode code points
+ * Add a verbose option to the Parser to quiet some of the chattier log entries
+
 === 2.7.0 2020-09-12
  * Handle custom component names, with and without X- prefix
  * Fix Component lookup to avoid namespace collisions

data/README.md

@@ -220,7 +220,8 @@ end
 iCalendar has some basic support for creating VTIMEZONE blocks from timezone information pulled from `tzinfo`.
 You must require `tzinfo` support manually to take advantage.
 
-iCalendar has been tested and works with `tzinfo` versions 0.3 and 1.x
+iCalendar has been tested and works with `tzinfo` versions 0.3, 1.x, and 2.x. The `tzinfo-data` gem may also
+be required depending on your version of `tzinfo` and potentially your operating system.
 
 #### Example ####
 

data/lib/icalendar.rb

@@ -33,3 +33,4 @@ require 'icalendar/freebusy'
 require 'icalendar/timezone'
 require 'icalendar/calendar'
 require 'icalendar/parser'
+require 'icalendar/version'

data/lib/icalendar/component.rb

@@ -11,9 +11,10 @@ module Icalendar
     attr_accessor :parent
 
     def self.parse(source)
-      parser = Parser.new(source)
-      parser.component_class = self
-      parser.parse
+      _parse source
+    rescue ArgumentError
+      source.rewind if source.respond_to?(:rewind)
+      _parse Parser.clean_bad_wrapping(source)
     end
 
     def initialize(name, ical_name = nil)
@@ -101,6 +102,14 @@ module Icalendar
       end
       collection.empty? ? nil : collection.join.chomp("\r\n")
     end
+
+    class << self
+      private def _parse(source)
+        parser = Parser.new(source)
+        parser.component_class = self
+        parser.parse
+      end
+    end
   end
 
 end

data/lib/icalendar/parser.rb

@@ -4,9 +4,24 @@ module Icalendar
 
   class Parser
     attr_writer :component_class
-    attr_reader :source, :strict, :timezone_store
+    attr_reader :source, :strict, :timezone_store, :verbose
 
-    def initialize(source, strict = false)
+    def self.clean_bad_wrapping(source)
+      content = if source.respond_to? :read
+        source.read
+      elsif source.respond_to? :to_s
+        source.to_s
+      else
+        msg = 'Icalendar::Parser.clean_bad_wrapping must be called with a String or IO object'
+        Icalendar.fatal msg
+        fail ArgumentError, msg
+      end
+      encoding = content.encoding
+      content.force_encoding(Encoding::ASCII_8BIT)
+      content.gsub(/\r?\n[ \t]/, "").force_encoding(encoding)
+    end
+
+    def initialize(source, strict = false, verbose = false)
       if source.respond_to? :gets
         @source = source
       elsif source.respond_to? :to_s
@@ -18,6 +33,7 @@ module Icalendar
       end
       read_in_data
       @strict = strict
+      @verbose = verbose
       @timezone_store = TimezoneStore.new
     end
 
@@ -49,7 +65,7 @@ module Icalendar
           Icalendar.logger.error "No method \"#{method_name}\" for component #{component}"
           raise nme
         else
-          Icalendar.logger.warn "No method \"#{method_name}\" for component #{component}. Appending to custom."
+          Icalendar.logger.warn "No method \"#{method_name}\" for component #{component}. Appending to custom." if verbose?
           component.append_custom_property prop_name, prop_value
         end
       end
@@ -93,6 +109,10 @@ module Icalendar
       !!@strict
     end
 
+    def verbose?
+      @verbose
+    end
+
     private
 
     def component_class

data/lib/icalendar/version.rb

@@ -1,5 +1,5 @@
 module Icalendar
 
-  VERSION = '2.7.0'
+  VERSION = '2.7.1'
 
 end

data/spec/calendar_spec.rb

@@ -170,4 +170,13 @@ END:VCALENDAR
       expect(subject.ip_method).to eq 'PUBLISH'
     end
   end
+
+  describe '.parse' do
+    let(:source) { File.read File.join(File.dirname(__FILE__), 'fixtures', 'bad_wrapping.ics') }
+
+    it 'correctly parses a bad file' do
+      actual = described_class.parse(source)
+      expect(actual[0]).to be_a(described_class)
+    end
+  end
 end

data/spec/fixtures/bad_wrapping.ics

@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:manual
+CALSCALE:GREGORIAN
+BEGIN:VEVENT
+DTSTAMP:20200902T223352Z
+UID:6e7d7fe5-6735-4cdd-bfe4-761dfcecd7a7
+DTSTART;VALUE=DATE:20200902
+DTEND;VALUE=DATE:20200903
+DESCRIPTION:Event description that puts a UTF-8 multi-octet sequence right�
+ �here.
+SUMMARY:UTF-8 multi-octet sequence test
+END:VEVENT
+END:VCALENDAR

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icalendar
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - Ryan Ahearn
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-12 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_cube
@@ -210,6 +210,7 @@ files:
 - spec/calendar_spec.rb
 - spec/downcased_hash_spec.rb
 - spec/event_spec.rb
+- spec/fixtures/bad_wrapping.ics
 - spec/fixtures/custom_component.ics
 - spec/fixtures/event.ics
 - spec/fixtures/nondefault_values.ics
@@ -262,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.11
 signing_key:
 specification_version: 4
 summary: A ruby implementation of the iCalendar specification (RFC-5545).
@@ -271,6 +272,7 @@ test_files:
 - spec/calendar_spec.rb
 - spec/downcased_hash_spec.rb
 - spec/event_spec.rb
+- spec/fixtures/bad_wrapping.ics
 - spec/fixtures/custom_component.ics
 - spec/fixtures/event.ics
 - spec/fixtures/nondefault_values.ics