tilia-vobject 4.0.0.pre.alpha4 → 4.0.0.pre.alpha5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9a25648ed541c29492f805734327e8cc4438aef
-  data.tar.gz: a7554324ae3d755529b9b7bd09fa52f22833c57b
+  metadata.gz: 4bb045bffc5a4f09ec5b42bf531c93af195bb13c
+  data.tar.gz: aee0bcf064936a2edf655b1233b07d6e17ee9363
 SHA512:
-  metadata.gz: ff95ab96237bfbdf5f59bf14af3a27e1080eee2afef19846909e72ac9629296f61dc45a41b8cf5ad5a8b114db53316c9961d0411ad9c1eee1d8f10671e60f87a
-  data.tar.gz: 3eea394b3de90edcfe065d86b9ec8638716c81634680ea522aeef2d1677addd9fe5d0be2e3966b218e709c95403bd7dd4df9e081fef6200040cdd600b71f0307
+  metadata.gz: fde2b577247818ebaa90fa4432b12ce6186af67f3b37c29322857ad416e0a770d870001aab010b3b9b223b8aa386fa36ffcf46956f3d34d93a241e559e967a97
+  data.tar.gz: b09d50a778617b84cbc219f95b9d9a993cbcff17deedba818b15c15653336723494a1cd08f5565be4134c0bfd27e330834c9ac5a93743a2d608ec92c6574db31

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

@@ -138,8 +138,8 @@ module Tilia
         #
         # @return void
         def input=(input)
-          input = input.readlines.join('') if input.respond_to?(:readlines)
-          input = JSON.parse(input) if input.is_a?(String)
+          input = input.read unless input.is_a?(String)
+          input = JSON.parse(input)
 
           @input = input
         end

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

@@ -56,7 +56,7 @@ module Tilia
             stream.write(input)
             stream.rewind
             @input = stream
-          elsif input.respond_to?(:readlines)
+          elsif input.respond_to?(:read)
             @input = input
           else
             fail ArgumentError, 'This parser can only read from strings or streams.'

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

@@ -292,7 +292,7 @@ module Tilia
         #
         # @return void
         def input=(input)
-          input = input.readlines.join('') if input.respond_to?(:readlines)
+          input = input.read unless input.is_a?(String)
 
           if input.is_a?(String)
             reader = Tilia::Xml::Reader.new

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-alpha4'
+      VERSION = '4.0.0-alpha5'
     end
   end
 end

data/test/v_object/cli_test.rb

@@ -91,7 +91,7 @@ ICS
         version = Tilia::VObject::Version::VERSION
         assert_equal(
           '["vcard",[["version",{},"text","4.0"],["prodid",{},"text","-//Tilia//Tilia VObject ' + version + '//EN"],["fn",{},"text","Cowboy Henk"]]]',
-          @cli.stdout.readlines.join('')
+          @cli.stdout.read
         )
       end
 
@@ -121,7 +121,7 @@ ICS
       "version",
 JCARD
 
-        assert_equal(expected, @cli.stdout.readlines.join('')[0..39])
+        assert_equal(expected, @cli.stdout.read[0..39])
       end
 
       def test_convert_j_cal_fail
@@ -191,7 +191,7 @@ FN:Cowboy Henk
 END:VCARD
 VCF
 
-        assert_equal(expected, @cli.stdout.readlines.join('').gsub("\r\n", "\n"))
+        assert_equal(expected, @cli.stdout.read.gsub("\r\n", "\n"))
       end
 
       def test_convert_default_formats
@@ -239,7 +239,7 @@ FN:Cowboy Henk
 END:VCARD
 VCF
 
-        assert_equal(expected, @cli.stdout.readlines.join('').gsub("\r\n", "\n"))
+        assert_equal(expected, @cli.stdout.read.gsub("\r\n", "\n"))
       end
 
       def test_v_card4030
@@ -270,7 +270,7 @@ FN:Cowboy Henk
 END:VCARD
 VCF
 
-        assert_equal(expected, @cli.stdout.readlines.join('').gsub("\r\n", "\n"))
+        assert_equal(expected, @cli.stdout.read.gsub("\r\n", "\n"))
       end
 
       def test_v_card4021
@@ -357,7 +357,7 @@ VCF
         assert_equal(2, @cli.main(['repair', '-']))
 
         @cli.stdout.rewind
-        assert(@cli.stdout.readlines.join('') =~ /BEGIN:VCARD\r\nVERSION:2.1\r\nUID:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\r\nEND:VCARD\r\n$/)
+        assert(@cli.stdout.read =~ /BEGIN:VCARD\r\nVERSION:2.1\r\nUID:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\r\nEND:VCARD\r\n$/)
       end
 
       def test_repair_nothing
@@ -382,7 +382,7 @@ VCF
         result = @cli.main(['repair', '-'])
 
         @cli.stderr.rewind
-        error = @cli.stderr.readlines.join('')
+        error = @cli.stderr.read
 
         assert_equal(0, result, "This should have been error free. stderr output:\n#{error}")
       end
@@ -419,7 +419,7 @@ VCF
         result = @cli.main(['color', '-'])
 
         @cli.stderr.rewind
-        error = @cli.stderr.readlines.join('')
+        error = @cli.stderr.read
 
         assert_equal(0, result, "This should have been error free. stderr output:\n#{error}")
       end
@@ -451,7 +451,7 @@ VCF
         result = @cli.main(['color', '-'])
 
         @cli.stderr.rewind
-        error = @cli.stderr.readlines.join('')
+        error = @cli.stderr.read
 
         assert_equal(0, result, "This should have been error free. stderr output:\n#{error}")
       end

data/test/v_object/test_case.rb

@@ -13,7 +13,7 @@ module Tilia
       # CALSCALE will automatically get removed if it's set to GREGORIAN.
       def assert_v_obj_equals(expected, actual, message = '')
         get_obj = lambda do |input|
-          input = input.readlines.join("\n") if input.respond_to?(:readlines)
+          input = input.read if input.respond_to?(:read)
 
           input = Tilia::VObject::Reader.read(input) if input.is_a?(String)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tilia-vobject
 version: !ruby/object:Gem::Version
-  version: 4.0.0.pre.alpha4
+  version: 4.0.0.pre.alpha5
 platform: ruby
 authors:
 - Jakob Sack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilia-xml