tilia-vobject 4.0.0.pre.alpha5 → 4.0.2

data/test/v_object/splitter/i_calendar_test.rb

@@ -30,7 +30,10 @@ EOT
         objects = Tilia::VObject::Splitter::ICalendar.new(temp_file)
 
         to_return = ''
-        while object = objects.next
+        loop do
+          object = objects.next
+          break unless object
+
           to_return += object.serialize
         end
         assert_equal([], Tilia::VObject::Reader.read(to_return).validate)
@@ -64,7 +67,10 @@ EOT
         objects = Tilia::VObject::Splitter::ICalendar.new(temp_file)
 
         to_return = ''
-        while object = objects.next
+        loop do
+          object = objects.next
+          break unless object
+
           to_return += object.serialize
         end
 
@@ -75,7 +81,9 @@ EOT
         data = <<EOT
 EOT
         temp_file = create_stream(data)
-        assert_raises(Tilia::VObject::ParseException) { objects = Tilia::VObject::Splitter::ICalendar.new(temp_file) }
+        assert_raises(Tilia::VObject::ParseException) do
+          Tilia::VObject::Splitter::ICalendar.new(temp_file)
+        end
       end
 
       def test_i_calendar_import_multiple_valid_events
@@ -108,7 +116,10 @@ EOT
 
         to_return = ''
         i = 0
-        while object = objects.next
+        loop do
+          object = objects.next
+          break unless object
+
           # event[i] already includes \n
           expected = <<EOT
 BEGIN:VCALENDAR
@@ -144,7 +155,10 @@ EOT
         objects = Tilia::VObject::Splitter::ICalendar.new(temp_file)
 
         to_return = ''
-        while object = objects.next
+        loop do
+          object = objects.next
+          break unless object
+
           to_return += object.serialize
         end
 
@@ -237,7 +251,10 @@ EOT
 
         to_return = ''
         i = 0
-        while object = objects.next
+        loop do
+          object = objects.next
+          break unless object
+
           # newlines are part of the variables
           expected = <<EOT
 BEGIN:VCALENDAR
@@ -287,7 +304,10 @@ EOT
         objects = Tilia::VObject::Splitter::ICalendar.new(temp_file)
 
         to_return = ''
-        while object = objects.next
+        loop do
+          object = objects.next
+          break unless object
+
           to_return += object.serialize
         end
 

data/test/v_object/splitter/v_card_test.rb

@@ -55,7 +55,8 @@ EOT
         splitter = Tilia::VObject::Splitter::VCard.new(temp_file)
 
         assert_raises(Tilia::VObject::ParseException) do
-          while object = splitter.next
+          loop do
+            break unless splitter.next
           end
         end
       end
@@ -97,7 +98,7 @@ EOT
         temp_file = create_stream(data)
 
         objects = Tilia::VObject::Splitter::VCard.new(temp_file)
-        object = objects.next
+        objects.next
 
         assert_nil(objects.next)
       end
@@ -111,7 +112,8 @@ EOT
 
         objects = Tilia::VObject::Splitter::VCard.new(temp_file)
         assert_raises(Tilia::VObject::ParseException) do
-          while object = objects.next
+          loop do
+            break unless objects.next
           end
         end
       end

data/test/v_object/test_case.rb

@@ -11,6 +11,8 @@ module Tilia
       # just get in the way.
       #
       # CALSCALE will automatically get removed if it's set to GREGORIAN.
+      #
+      # Any property that has the value **ANY** will be treated as a wildcard.
       def assert_v_obj_equals(expected, actual, message = '')
         get_obj = lambda do |input|
           input = input.read if input.respond_to?(:read)
@@ -28,12 +30,20 @@ module Tilia
           input
         end
 
-        expected = get_obj.call(expected)
-        actual = get_obj.call(actual)
+        expected = get_obj.call(expected).serialize
+        actual = get_obj.call(actual).serialize
+
+        # Finding wildcards in expected.
+        expected.scan(/^([A-Z]+):\*\*ANY\*\*\r$/) do |match|
+          actual = actual.gsub(
+            /^#{Regexp.quote(match[0])}:(.*)\r$/,
+            "#{match[0]}:**ANY**\r"
+          )
+        end
 
         assert_equal(
-          expected.serialize,
-          actual.serialize,
+          expected,
+          actual,
           message
         )
       end

data/tilia-vobject.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
   s.email       = 'tilia@jakobsack.de'
   s.files       = `git ls-files`.split("\n")
   s.homepage    = 'https://github.com/tilia/tilia-vobject'
-  s.add_runtime_dependency 'tilia-xml', '~> 1.1'
-  s.add_runtime_dependency 'activesupport', '~> 4.2'
+  s.add_runtime_dependency 'tilia-xml', '~> 1.3'
+  s.add_runtime_dependency 'activesupport', '>= 4.0'
   s.add_runtime_dependency 'mail', '~> 2.6'
   s.add_runtime_dependency 'tzinfo', '~> 1.2'
   s.add_runtime_dependency 'rchardet', '~>1.6'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tilia-vobject
 version: !ruby/object:Gem::Version
-  version: 4.0.0.pre.alpha5
+  version: 4.0.2
 platform: ruby
 authors:
 - Jakob Sack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilia-xml
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +127,7 @@ files:
 - lib/tilia/v_object/i_tip/i_tip_exception.rb
 - lib/tilia/v_object/i_tip/message.rb
 - lib/tilia/v_object/i_tip/same_organizer_for_all_components_exception.rb
+- lib/tilia/v_object/invalid_data_exception.rb
 - lib/tilia/v_object/node.rb
 - lib/tilia/v_object/parameter.rb
 - lib/tilia/v_object/parse_exception.rb
@@ -164,6 +165,7 @@ files:
 - lib/tilia/v_object/reader.rb
 - lib/tilia/v_object/recur.rb
 - lib/tilia/v_object/recur/event_iterator.rb
+- lib/tilia/v_object/recur/max_instances_exceeded_exception.rb
 - lib/tilia/v_object/recur/no_instances_exception.rb
 - lib/tilia/v_object/recur/r_date_iterator.rb
 - lib/tilia/v_object/recur/r_rule_iterator.rb
@@ -224,7 +226,7 @@ files:
 - test/v_object/i_tip/message_test.rb
 - test/v_object/issue153.vcf
 - test/v_object/issue153_test.rb
-- test/v_object/issue26_test.rb
+- test/v_object/issue259_test.rb
 - test/v_object/issue36_work_around_test.rb
 - test/v_object/issue40_test.rb
 - test/v_object/issue64.vcf
@@ -249,6 +251,7 @@ files:
 - test/v_object/property/i_calendar/duration_test.rb
 - test/v_object/property/i_calendar/recur_test.rb
 - test/v_object/property/text_test.rb
+- test/v_object/property/uri_test.rb
 - test/v_object/property/v_card/date_and_or_time_test.rb
 - test/v_object/property/v_card/language_tag_test.rb
 - test/v_object/property_test.rb
@@ -257,11 +260,14 @@ files:
 - test/v_object/recur/event_iterator/by_set_pos_hang_test.rb
 - test/v_object/recur/event_iterator/expand_floating_times_test.rb
 - test/v_object/recur/event_iterator/fifth_tuesday_problem_test.rb
+- test/v_object/recur/event_iterator/handle_r_date_expand_test.rb
 - test/v_object/recur/event_iterator/incorrect_expand_test.rb
 - test/v_object/recur/event_iterator/infinite_loop_problem_test.rb
+- test/v_object/recur/event_iterator/issue26_test.rb
 - test/v_object/recur/event_iterator/issue48_test.rb
 - test/v_object/recur/event_iterator/issue50_test.rb
 - test/v_object/recur/event_iterator/main_test.rb
+- test/v_object/recur/event_iterator/max_instances_test.rb
 - test/v_object/recur/event_iterator/missing_overridden_test.rb
 - test/v_object/recur/event_iterator/no_instances_test.rb
 - test/v_object/recur/event_iterator/override_first_event_test.rb
@@ -295,9 +301,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.5