icalendar 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 851d909893eaa853f0196567cf367c7062e725f8
-  data.tar.gz: d218b26b7f7b9b8f004308fab26290538c542e0b
+  metadata.gz: 617189d256108d77d8cbf965621d324794e5ceb6
+  data.tar.gz: 10041e3a5a825c812dc849d6ddc2997b5fcc5776
 SHA512:
-  metadata.gz: 7e47ce5836cf569bc8a8dfa79d642093302587ae6cff544162ad9f26197c20df73d3062e1bb74a52e21c9a765a0fa8ce7469f9c3342520528bbd660647249616
-  data.tar.gz: fd89f85a3cb86ebb50dbfff5db479bfcf7232c7f7ef061ae2d60fcb5d8cb48bb876aff4604b3ec50e2bcecfa25b2d86a0374de5c9d473d09ba616a52377f2421
+  metadata.gz: ae3cf91f03aec36792d2f8a90b82265a71b66971bb535c6e41018bb6c611680e49d2535a0d165535011fffc85101447d545873d1f389960a4adb95e528891b59
+  data.tar.gz: 59bb0240f2ff661a885792bacc976b273c2b10d234bc3cb32ca5c1f26031418d4f4ac58f6971dc1a2c6957c9074408674c557b98686dee83bdc6e24123efa1d5

data/History.txt

@@ -1,4 +1,9 @@
-=== 2.4.0 2015-07-04
+=== 2.4.1 2016-09-03
+ * Fix parsing multiple calendars or components in same file - Patrick Schnetger
+ * Fix multi-byte folding bug - Niels Laukens
+ * Fix typos across the code - Martin Edenhofer & yuuji.yaginuma
+
+=== 2.4.0 2016-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

data/README.md

@@ -97,7 +97,7 @@ Sometimes we don't care if an event's start or end are `Date` or `DateTime` obje
 ```ruby
 event = cal.event do |e|
   e.dtstart = Icalendar::Values::DateOrDateTime.new('20140924').call
-  e.dtend   = Icalendar::Values::DateOrDateTime.new('20140924').call
+  e.dtend   = Icalendar::Values::DateOrDateTime.new('20140925').call
   e.summary = 'This is an all-day event, because DateOrDateTime will return Dates'
 end
 ```

data/lib/icalendar.rb

@@ -13,7 +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."
+    warn "**** DEPRECATION WARNING ****\nIcalendar.parse will be removed. Please switch to Icalendar::Calendar.parse."
     calendars = Parser.new(source).parse
     single ? calendars.first : calendars
   end

data/lib/icalendar/component.rb

@@ -12,7 +12,7 @@ module Icalendar
 
     def self.parse(source)
       parser = Parser.new(source)
-      parser.component = self.new
+      parser.component_class = self
       parser.parse
     end
 
@@ -56,9 +56,37 @@ module Icalendar
       prop_name.gsub(/\Aip_/, '').gsub('_', '-').upcase
     end
 
-    def ical_fold(content_line)
-      split = content_line.split ''
-      [].tap { |a| a << split.shift(Icalendar::MAX_LINE_LENGTH).join until split.empty? }.join "\r\n "
+    def ical_fold(long_line, indent = "\x20")
+      # rfc2445 says:
+      # Lines of text SHOULD NOT be longer than 75 octets, excluding the line
+      # break. Long content lines SHOULD be split into a multiple line
+      # representations using a line "folding" technique. That is, a long
+      # line can be split between any two characters by inserting a CRLF
+      # immediately followed by a single linear white space character (i.e.,
+      # SPACE, US-ASCII decimal 32 or HTAB, US-ASCII decimal 9). Any sequence
+      # of CRLF followed immediately by a single linear white space character
+      # is ignored (i.e., removed) when processing the content type.
+      #
+      # Note the useage of "octets" and "characters": a line should not be longer
+      # than 75 octets, but you need to split between characters, not bytes.
+      # This is challanging with Unicode composing accents, for example.
+
+      chars = long_line.scan(/\P{M}\p{M}*/u) # split in graphenes
+      folded = ['']
+      bytes = 0
+      while chars.count > 0
+        c = chars.shift
+        cb = c.bytes.count
+        if bytes + cb > Icalendar::MAX_LINE_LENGTH
+          # Split here
+          folded.push "#{indent}"
+          bytes = indent.bytes.count
+        end
+        folded[-1] += c
+        bytes += cb
+      end
+
+      folded.join("\r\n")
     end
 
     def ical_components

data/lib/icalendar/parser.rb

@@ -1,7 +1,7 @@
 module Icalendar
 
   class Parser
-    attr_writer :component
+    attr_writer :component_class
     attr_reader :source, :strict
 
     def initialize(source, strict = false)
@@ -23,6 +23,7 @@ module Icalendar
       read_in_data
       components = []
       while (fields = next_fields)
+        component = component_class.new
         if fields[:name] == 'begin' && fields[:value].downcase == component.ical_name.downcase
           components << parse_component(component)
         end
@@ -93,8 +94,8 @@ module Icalendar
 
     private
 
-    def component
-      @component ||= Icalendar::Calendar.new
+    def component_class
+      @component_class ||= Icalendar::Calendar
     end
 
     def parse_component(component)

data/lib/icalendar/version.rb

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

data/spec/fixtures/single_event.ics

@@ -12,7 +12,8 @@ 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.
+ \, so I'm just going to make it a whole bunch of lines. With a twist: a "
+ ö" takes up multiple bytes\, and should be wrapped to the next line.
 ATTACH:http://bush.sucks.org/impeach/him.rhtml
 ATTACH:http://corporations-dominate.existence.net/why.rhtml
 RDATE;TZID=US-Mountain:20050121T170000,20050122T170000

data/spec/fixtures/two_events.ics

@@ -0,0 +1,28 @@
+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
+BEGIN:VEVENT
+DTSTAMP:20110118T211523Z
+UID:uid-1234-uid-4321
+DTSTART;TZID=US-Mountain:20110120T170000
+DTEND;TZID=US-Mountain:20110120T184500
+CLASS:PRIVATE
+GEO:37.386013;-122.0829322
+ORGANIZER:mailto:jmera@jmera.human
+PRIORITY:2
+SUMMARY:This is a very short summary.
+RDATE;TZID=US-Mountain:20110121T170000,20110122T170000
+END:VEVENT

data/spec/parser_spec.rb

@@ -35,7 +35,7 @@ describe Icalendar::Parser do
     context 'event.ics' do
       let(:fn) { 'event.ics' }
 
-      before { subject.component = Icalendar::Event.new }
+      before { subject.component_class = Icalendar::Event }
 
       it 'returns an array of events' do
         expect(subject.parse).to be_instance_of Array
@@ -43,6 +43,18 @@ describe Icalendar::Parser do
         expect(subject.parse[0]).to be_instance_of Icalendar::Event
       end
     end
+    context 'events.ics' do
+      let(:fn) { 'two_events.ics' }
+
+      before { subject.component_class = Icalendar::Event }
+
+      it 'returns an array of events' do
+        events = subject.parse
+        expect(events.count).to be 2
+        expect(events.first.uid).to eq("bsuidfortestabc123")
+        expect(events.last.uid).to eq("uid-1234-uid-4321")
+      end
+    end
   end
 
   describe '#parse with bad line' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icalendar
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Ryan Ahearn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2016-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -204,6 +204,7 @@ files:
 - spec/fixtures/timezone.ics
 - spec/fixtures/two_date_time_events.ics
 - spec/fixtures/two_day_events.ics
+- spec/fixtures/two_events.ics
 - spec/fixtures/two_time_events.ics
 - spec/freebusy_spec.rb
 - spec/journal_spec.rb
@@ -245,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: A ruby implementation of the iCalendar specification (RFC-5545).
@@ -264,6 +265,7 @@ test_files:
 - spec/fixtures/timezone.ics
 - spec/fixtures/two_date_time_events.ics
 - spec/fixtures/two_day_events.ics
+- spec/fixtures/two_events.ics
 - spec/fixtures/two_time_events.ics
 - spec/freebusy_spec.rb
 - spec/journal_spec.rb