tilia-vobject 4.0.0.pre.alpha5 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bb045bffc5a4f09ec5b42bf531c93af195bb13c
-  data.tar.gz: aee0bcf064936a2edf655b1233b07d6e17ee9363
+  metadata.gz: 36119ae1bd7d80d9fd72fe489b3db6981bdf3300
+  data.tar.gz: 4e29de64dffe0710536f3c4eebce613eb14ea6d4
 SHA512:
-  metadata.gz: fde2b577247818ebaa90fa4432b12ce6186af67f3b37c29322857ad416e0a770d870001aab010b3b9b223b8aa386fa36ffcf46956f3d34d93a241e559e967a97
-  data.tar.gz: b09d50a778617b84cbc219f95b9d9a993cbcff17deedba818b15c15653336723494a1cd08f5565be4134c0bfd27e330834c9ac5a93743a2d608ec92c6574db31
+  metadata.gz: d6897e4c4a95dc66fcbdfdbb12e34a4ab2f50c43ca3c0e06950c98e5c63caf00cdc36b1a7b6d230e1883f148f08d9179c3b824b28fbe0129a77f81c804809786
+  data.tar.gz: bf9e4f694742556c0bc718d439c992021aedf134e417d0d5523cc48369166e3a26131ac27fd6faeeaa245dc01b7cf02dcbba6c7eca131eef497e97250f2f384f

data/CHANGELOG.sabre.md

@@ -1,7 +1,57 @@
 ChangeLog
 =========
 
-4.0.0-alpha2 (2015-09-04)
+4.0.2 (2016-01-11)
+------------------
+
+* #288: Only decode `CHARSET` if we're reading vCard 2.1. If it appears
+  in any other document, we must ignore it.
+
+
+4.0.1 (2016-01-04)
+------------------
+
+* #284: When generating `CANCEL` iTip messages, we now include `DTEND`.
+  (@kewisch)
+
+
+4.0.0 (2015-12-11)
+------------------
+
+* #274: When creating new vCards, the default vCard version is now 4.0.
+* #275: `VEVENT`, `VTODO` and `VCARD` now automatically get a `UID` and
+  `DTSTAMP` property if this was not already specified.
+* `ParseException` now extends `\Exception`.
+* `Sabre\VObject\Reader::read` now has a `$charset` argument.
+* #272: `Sabre\VObject\Recur\EventIterator::$maxInstances` is now
+  `Sabre\VObject\Settings::$maxRecurrences` and is also honored by the
+  FreeBusyGenerator.
+* #278: `expand()` did not work correctly on events with sub-components.
+
+
+4.0.0-beta1 (2015-12-02)
+------------------------
+
+* #258: Support for expanding events that use `RDATE`. (@jabdoa2)
+* #258: Correctly support TZID for events that use `RDATE`. (@jabdoa2)
+* #240: `Component\VCalendar::expand()` now returns a new expanded `VCalendar`
+  object, instead of editing the existing `VCalendar` in-place. This is a BC
+  break.
+* #265: Using the new `InvalidDataException` in place of
+  `InvalidArgumentException` and `LogicException` in all places where we fail
+  because there was something wrong with input data.
+* #227: Always add `VALUE=URI` to `PHOTO` properties.
+* #235: Always add `VALUE=URI` to `URL` properties.
+* It's now possible to override which class is used instead of
+  `Component\VCalendar` or `Component\VCard` during parsing.
+* #263: Lots of small cleanups. (@jakobsack)
+* #220: Automatically stop recurring after 3500 recurrences.
+* #41: Allow user to set different encoding than UTF-8 when decoding vCards.
+* #41: Support the `ENCODING` parameter from vCard 2.1.
+  Both ISO-8859-1 and Windows-1252 are currently supported.
+* #185: Fix encoding/decoding of `TIME` values in jCal/jCard.
+
+ 4.0.0-alpha2 (2015-09-04)
 -------------------------
 
 * Updated windows timezone file to support new mexican timezone.
@@ -50,7 +100,14 @@ ChangeLog
   and `IntegerValue` to allow PHP 7 compatibility.
 
 
-3.4.7 (2015-09-04)
+3.4.8 (2016-01-04)
+------------------
+
+* #284: When generating `CANCEL` iTip messages, we now include `DTEND`.
+  (@kewisch).
+
+
+3.4.7 (2015-09-05)
 ------------------
 
 * #253: Handle `isInTimeRange` for recurring events that have 0 valid

data/Gemfile

@@ -1,13 +1,6 @@
 source 'https://rubygems.org'
 
-# Internal dependencies
-gem 'tilia-xml', '~> 1.1'
-
-# External dependencies
-gem 'activesupport', '~> 4.2'
-gem 'mail', '~> 2.6'
-gem 'tzinfo', '~> 1.2'
-gem 'rchardet', '~>1.6'
+gemspec
 
 # Testing
 gem 'rake'

data/Gemfile.lock

@@ -1,7 +1,17 @@
+PATH
+  remote: .
+  specs:
+    tilia-vobject (4.0.2)
+      activesupport (>= 4.0)
+      mail (~> 2.6)
+      rchardet (~> 1.6)
+      tilia-xml (~> 1.3)
+      tzinfo (~> 1.2)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.5)
+    activesupport (4.2.5.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -38,12 +48,12 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     thread_safe (0.3.5)
-    tilia-uri (1.0.1)
-      activesupport (~> 4.2)
-    tilia-xml (1.2.0)
-      activesupport (~> 4.2)
-      libxml-ruby (~> 2.8)
-      tilia-uri (~> 1.0)
+    tilia-uri (1.0.1.1)
+      activesupport (>= 4.0)
+    tilia-xml (1.3.0)
+      activesupport (>= 4.0)
+      libxml-ruby (>= 2.8)
+      tilia-uri (~> 1.0, >= 1.0.1.1)
     tins (1.6.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -53,15 +63,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 4.2)
-  mail (~> 2.6)
   minitest (~> 5.8)
   rake
-  rchardet (~> 1.6)
   rubocop (~> 0.34)
   simplecov (~> 0.10)
-  tilia-xml (~> 1.1)
-  tzinfo (~> 1.2)
+  tilia-vobject!
   yard (~> 0.8)
 
 BUNDLED WITH

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2015 Jakob Sack (tilia@jakobsack.de)
+Copyright (C) 2015-2016 Jakob Sack (tilia@jakobsack.de)
 
 All rights reserved.
 

data/LICENSE.sabre

@@ -1,4 +1,4 @@
-Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/)
+Copyright (C) 2011-2016 fruux GmbH (https://fruux.com/)
 
 All rights reserved.
 

data/lib/tilia/v_object.rb

@@ -24,6 +24,7 @@ module Tilia
     require 'tilia/v_object/uuid_util'
     require 'tilia/v_object/component'
     require 'tilia/v_object/document'
+    require 'tilia/v_object/invalid_data_exception'
     require 'tilia/v_object/parse_exception'
     require 'tilia/v_object/eof_exception'
     require 'tilia/v_object/reader'

data/lib/tilia/v_object/birthday_calendar_generator.rb

@@ -4,7 +4,7 @@ module Tilia
     class BirthdayCalendarGenerator
       # Input objects.
       #
-      # @var array
+      # @return [array]
       # RUBY: attr_accessor :objects
 
       # Default year.
@@ -13,7 +13,7 @@ module Tilia
 
       # Output format for the SUMMARY.
       #
-      # @var string
+      # @return [String]
       # RUBY: attr_accessor :format
 
       # Creates the generator.
@@ -21,7 +21,7 @@ module Tilia
       # Check the setTimeRange and setObjects methods for details about the
       # arguments.
       #
-      # @param mixed objects
+      # @param objects
       def initialize(objects = nil)
         @objects = []
         @format = '%1s\'s Birthday'
@@ -34,9 +34,9 @@ module Tilia
       # You must either supply a vCard as a string or as a Component/VCard object.
       # It's also possible to supply an array of strings or objects.
       #
-      # @param mixed objects
+      # @param objects
       #
-      # @return void
+      # @return [void]
       def objects=(objects)
         objects = [objects] unless objects.is_a?(Array)
 
@@ -59,14 +59,14 @@ module Tilia
 
       # Sets the output format for the SUMMARY
       #
-      # @param string format
+      # @param [String] format
       #
-      # @return void
+      # @return [void]
       attr_writer :format
 
       # Parses the input data and returns a VCALENDAR.
       #
-      # @return Component/VCalendar
+      # @return [Component/VCalendar]
       def result
         calendar = Component::VCalendar.new
 
@@ -92,7 +92,7 @@ module Tilia
           # Skip if we can't parse the BDAY value.
           begin
             date_parts = DateTimeParser.parse_v_card_date_time(object['BDAY'].value)
-          rescue ArgumentError
+          rescue InvalidDataException
             next
           end
 
@@ -100,7 +100,7 @@ module Tilia
           unknown_year = false
 
           unless date_parts['year']
-            object['BDAY'] = "#{self.class::DEFAULT_YEAR}-#{date_parts['month']}-#{date_parts['date']}"
+            object['BDAY'] = "#{DEFAULT_YEAR}-#{date_parts['month']}-#{date_parts['date']}"
             unknown_year = true
           end
 
@@ -123,7 +123,7 @@ module Tilia
               'BDAY',
               'X-SABRE-VCARD-UID' => object['UID'].value,
               'X-SABRE-VCARD-FN'  => object['FN'].value,
-              'X-SABRE-OMIT-YEAR' => self.class::DEFAULT_YEAR
+              'X-SABRE-OMIT-YEAR' => DEFAULT_YEAR
             )
           else
             event.add(

data/lib/tilia/v_object/cli.rb

@@ -5,62 +5,62 @@ module Tilia
     class Cli
       # No output.
       #
-      # @var bool
+      # @return [Boolean]
       # RUBY: attr_accessor :quiet
 
       # Help display.
       #
-      # @var bool
+      # @return [Boolean]
       # RUBY: attr_accessor :show_help
 
       # Wether to spit out 'mimedir' or 'json' format.
       #
-      # @var string
+      # @return [String]
       # RUBY: attr_accessor :format
 
       # JSON pretty print.
       #
-      # @var bool
+      # @return [Boolean]
       # RUBY: attr_accessor :pretty
 
       # Source file.
       #
-      # @var string
+      # @return [String]
       # RUBY: attr_accessor :input_path
 
       # Destination file.
       #
-      # @var string
+      # @return [String]
       # RUBY: attr_accessor :output_path
 
       # output stream.
       #
-      # @var resource
+      # @return [resource]
       # RUBY: attr_accessor :stdout
 
       # stdin.
       #
-      # @var resource
+      # @return [resource]
       # RUBY: attr_accessor :stdin
 
       # stderr.
       #
-      # @var resource
+      # @return [resource]
       # RUBY: attr_accessor :stderr
 
       # Input format (one of json or mimedir).
       #
-      # @var string
+      # @return [String]
       # RUBY: attr_accessor :input_format
 
       # Makes the parser less strict.
       #
-      # @var bool
+      # @return [Boolean]
       # RUBY: attr_accessor :forgiving
 
       # Main function.
       #
-      # @return int
+      # @return [Fixnum]
       def main(argv)
         # @codeCoverageIgnoreStart
         # We cannot easily test this, so we'll skip it. Pretty basic anyway.
@@ -156,9 +156,10 @@ module Tilia
             return_code = send(command, input)
             real_code = return_code unless return_code == 0
           end
-        rescue EofException => e
+        rescue EofException
           # end of file
-        rescue Exception => e
+          return real_code
+        rescue StandardError => e
           log("Error: #{e}", 'red')
           return 2
         end
@@ -170,7 +171,7 @@ module Tilia
 
       # Shows the help message.
       #
-      # @return void
+      # @return [void]
       def show_help
         log('Usage:', 'yellow')
         log('  vobject [options] command [arguments]')
@@ -210,9 +211,9 @@ HELP
 
       # Validates a VObject file.
       #
-      # @param Component v_obj
+      # @param [Component] v_obj
       #
-      # @return int
+      # @return [Fixnum]
       def validate(v_obj)
         return_code = 0
 
@@ -248,9 +249,9 @@ HELP
 
       # Repairs a VObject file.
       #
-      # @param Component v_obj
+      # @param [Component] v_obj
       #
-      # @return int
+      # @return [Fixnum]
       def repair(v_obj)
         return_code = 0
 
@@ -288,9 +289,9 @@ HELP
 
       # Converts a vObject file to a new format.
       #
-      # @param Component v_obj
+      # @param [Component] v_obj
       #
-      # @return int
+      # @return [Fixnum]
       def convert(v_obj)
         json = false
         convert_version = nil
@@ -336,9 +337,9 @@ HELP
 
       # Colorizes a file.
       #
-      # @param Component v_obj
+      # @param [Component] v_obj
       #
-      # @return int
+      # @return [Fixnum]
       def color(v_obj)
         @stdout.write(serialize_component(v_obj))
         0 # otherwise bytes written will be returned
@@ -346,9 +347,9 @@ HELP
 
       # Returns an ansi color string for a color name.
       #
-      # @param string color
+      # @param [String] color
       #
-      # @return string
+      # @return [String]
       def colorize(color, str, reset_to = 'default')
         colors = {
           'cyan'    => '1;36',
@@ -364,10 +365,10 @@ HELP
 
       # Writes out a string in specific color.
       #
-      # @param string color
-      # @param string str
+      # @param [String] color
+      # @param [String] str
       #
-      # @return void
+      # @return [void]
       def c_write(color, str)
         @stdout.write(colorize(color, str))
       end
@@ -386,10 +387,10 @@ HELP
         # space to accomodate elements. The key is added to the score to
         # preserve the original relative order of elements.
         #
-        # @param int key
-        # @param array array
+        # @param [Fixnum] key
+        # @param [array] array
         #
-        # @return int
+        # @return [Fixnum]
         sort_score = lambda do |key, array|
           key = array.index(key)
           if array[key].is_a?(Component)
@@ -439,9 +440,9 @@ HELP
 
       # Colorizes a property.
       #
-      # @param Property property
+      # @param [Property] property
       #
-      # @return void
+      # @return [void]
       def serialize_property(property)
         if property.group
           c_write('default', property.group)
@@ -500,9 +501,9 @@ HELP
 
       # Parses the list of arguments.
       #
-      # @param array argv
+      # @param [array] argv
       #
-      # @return void
+      # @return [void]
       def parse_arguments(argv)
         positional = []
         options = {}
@@ -543,7 +544,7 @@ HELP
 
       # Reads the input file.
       #
-      # @return Component
+      # @return [Component]
       def read_input
         unless @parser
           @stdin = File.open(@input_path, 'r') if @input_path != '-'
@@ -560,9 +561,9 @@ HELP
 
       # Sends a message to STDERR.
       #
-      # @param string msg
+      # @param [String] msg
       #
-      # @return void
+      # @return [void]
       def log(msg, color = 'default')
         return if @quiet