tilia-vobject 4.0.0.pre.alpha2 → 4.0.0.pre.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93752908dd3fe5f2eb4e779f3b502f2a9188748a
-  data.tar.gz: 4920f43108b370cd96c113fe3afe9884c740835b
+  metadata.gz: 8900d4d2faaf438d17e6923a26592c4ee2f27774
+  data.tar.gz: b0be93b82f5ccc6c0e9f946e049779f9c7bb3e8a
 SHA512:
-  metadata.gz: 69c4ba324840c8ccee64989a1f77b67c3ebae5fea404bbc5eeb0ece7895b190ef95e5d758854af86d94d57a2fc7f50508e312b28156d62a3bd2d3567afac4ac2
-  data.tar.gz: a3f12529cf63684643432cc8a36f292c8e7b947ece7692e3173db95acb65a2149d40720ee7de01a0f6f75978eb8bc79adbf6a7a542362d03832bbbebba2ae5b7
+  metadata.gz: 2821bac8ff9cb8c5cc9deb317e1801818885d7535658c926bcda7150d8f45ad0aab2a16cb9ec834f4141bef7eb754e90cf3f24f3957b18b85d4a91c893613f95
+  data.tar.gz: befa8ae1001750277f5a3ae90d364d44e81865bc10f03afebff9d38a4758b3f06ffcda8559975e8666f025cf644ea4f0d9b6c7ab9722f94f558c0aa16cc06420

data/lib/tilia/v_object/component/v_alarm.rb

@@ -70,13 +70,15 @@ module Tilia
 
           if key?('DURATION')
             duration = DateTimeParser.parse_duration(self['DURATION'])
-            repeat = self['repeat']
-            repeat = 1 if repeat.blank?
+            repeat = self['REPEAT'].to_s.to_i
+            repeat = 1 if repeat == 0
 
             occurrence = effective_trigger
-            repeat.to_s.to_i.times do |_i|
-              return true if start <= occurrence && ending > occurrence
+            return true if start <= occurrence && ending > occurrence
+
+            repeat.times do |_i|
               occurrence += duration
+              return true if start <= occurrence && ending > occurrence
             end
             return false
           else

data/lib/tilia/v_object/component/v_card.rb

@@ -153,7 +153,7 @@ module Tilia
         # VCards with version 2.1, 3.0 and 4.0 are found.
         #
         # If the VCARD doesn't know its version, 2.1 is assumed.
-        DEFAULT_VERSION ||= VCARD21
+        DEFAULT_VERSION = VCARD21
 
         # Validates the node for correctness.
         #

data/lib/tilia/v_object/component.rb

@@ -460,7 +460,7 @@ module Tilia
       # Specifically, this will ensure all child elements are also cloned.
       #
       # @return void
-      def initialize_copy(_other)
+      def initialize_copy(_original)
         new_children = {}
         @children.each do |child_name, child_group|
           new_children[child_name] = []
@@ -582,6 +582,24 @@ module Tilia
         messages
       end
 
+      # Call this method on a document if you're done using it.
+      #
+      # It's intended to remove all circular references, so PHP can easily clean
+      # it up.
+      #
+      # @return void
+      def destroy
+        super
+
+        @children.each do |child_name, child_group|
+          child_group.each do |child|
+            child.destroy
+          end
+        end
+
+        @children = {}
+      end
+
       # TODO: document
       def to_s
         serialize

data/lib/tilia/v_object/document.rb

@@ -10,22 +10,22 @@ module Tilia
     # This class also provides a registry for document types.
     class Document < Component
       # Unknown document type.
-      UNKNOWN ||= 1
+      UNKNOWN = 1
 
       # vCalendar 1.0.
-      VCALENDAR10 ||= 2
+      VCALENDAR10 = 2
 
       # iCalendar 2.0.
-      ICALENDAR20 ||= 3
+      ICALENDAR20 = 3
 
       # vCard 2.1.
-      VCARD21 ||= 4
+      VCARD21 = 4
 
       # vCard 3.0.
-      VCARD30 ||= 5
+      VCARD30 = 5
 
       # vCard 4.0.
-      VCARD40 ||= 6
+      VCARD40 = 6
 
       # The default name for this component.
       #

data/lib/tilia/v_object/node.rb

@@ -9,21 +9,21 @@ module Tilia
       #
       # If REPAIR is set, the validator will attempt to repair any broken data
       # (if possible).
-      REPAIR ||= 1
+      REPAIR = 1
 
       # If this option is set, the validator will operate on the vcards on the
       # assumption that the vcards need to be valid for CardDAV.
       #
       # This means for example that the UID is required, whereas it is not for
       # regular vcards.
-      PROFILE_CARDDAV ||= 2
+      PROFILE_CARDDAV = 2
 
       # If this option is set, the validator will operate on iCalendar objects
       # on the assumption that the vcards need to be valid for CalDAV.
       #
       # This means for example that calendars can only contain objects with
       # identical component types and UIDs.
-      PROFILE_CALDAV ||= 4
+      PROFILE_CALDAV = 4
 
       # Reference to the parent object, if this is not the top object.
       #
@@ -57,6 +57,17 @@ module Tilia
       def xml_serialize(_writer)
       end
 
+      # Call this method on a document if you're done using it.
+      #
+      # It's intended to remove all circular references, so PHP can easily clean
+      # it up.
+      #
+      # @return void
+      def destroy
+        @parent = nil
+        @root = nil
+      end
+
       # Validates the node for correctness.
       #
       # The following options are supported:

data/lib/tilia/v_object/parser/parser.rb

@@ -10,11 +10,11 @@ module Tilia
         # In the case of the MimeDir parser, this means that the parser will
         # accept slashes and underscores in property names, and it will also
         # attempt to fix Microsoft vCard 2.1's broken line folding.
-        OPTION_FORGIVING ||= 1
+        OPTION_FORGIVING = 1
 
         # If this option is turned on, any lines we cannot parse will be ignored
         # by the reader.
-        OPTION_IGNORE_INVALID_LINES ||= 2
+        OPTION_IGNORE_INVALID_LINES = 2
 
         # Bitmask of parser options.
         #

data/lib/tilia/v_object/parser/xml.rb

@@ -7,8 +7,8 @@ module Tilia
       class Xml < Parser
         require 'tilia/v_object/parser/xml/element'
 
-        XCAL_NAMESPACE ||= 'urn:ietf:params:xml:ns:icalendar-2.0'
-        XCARD_NAMESPACE ||= 'urn:ietf:params:xml:ns:vcard-4.0'
+        XCAL_NAMESPACE = 'urn:ietf:params:xml:ns:icalendar-2.0'
+        XCARD_NAMESPACE = 'urn:ietf:params:xml:ns:vcard-4.0'
 
         # The input data.
         #

data/lib/tilia/v_object/property.rb

@@ -408,7 +408,7 @@ module Tilia
       # Specifically, this will ensure all child elements are also cloned.
       #
       # @return void
-      def initialize_copy(_other)
+      def initialize_copy(_original)
         new_params = {}
         @parameters.each do |key, child|
           new_params[key] = child.clone
@@ -519,6 +519,22 @@ module Tilia
         warnings
       end
 
+      # Call this method on a document if you're done using it.
+      #
+      # It's intended to remove all circular references, so PHP can easily clean
+      # it up.
+      #
+      # @return void
+      def destroy
+        super
+
+        @parameters.each do |_name, param|
+          param.destroy
+        end
+
+        @parameters = {}
+      end
+
       # TODO: document
       def ==(other)
         if other.is_a?(String)

data/lib/tilia/v_object/version.rb

@@ -3,7 +3,7 @@ module Tilia
     # This class contains the version number for the VObject package.
     class Version
       # Full version number.
-      VERSION = '4.0.0-alpha2'
+      VERSION = '4.0.0-alpha3'
     end
   end
 end

data/test/v_object/document_test.rb

@@ -62,9 +62,9 @@ module Tilia
         event.add(prop)
         assert_equal(event, prop.parent)
 
-        # TODO: destroy object?!
-        # vcal.destroy
-        # assert_nil(prop.parent)
+        vcal.destroy
+
+        assert_nil(prop.parent)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tilia-vobject
 version: !ruby/object:Gem::Version
-  version: 4.0.0.pre.alpha2
+  version: 4.0.0.pre.alpha3
 platform: ruby
 authors:
 - Jakob Sack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-24 00:00:00.000000000 Z
+date: 2016-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilia-xml