CFPropertyList 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0365c5873a771aa9b3f29a9c40ff915c23839a25
-  data.tar.gz: 4cc982239b806c7857b844deebbcca016deea87d
+  metadata.gz: 2583d99467cd5b72787e594784a01cc38235fb35
+  data.tar.gz: a99215eb410bc4c0bf30954f80799da7714eb689
 SHA512:
-  metadata.gz: a4ec6d399c5823c687ac7800ec9b72d9b0e69f1eb9774cf9467f84d3d1555e903c53d6dc23312e0cfeed9349a5fb044406b2d0750ed3799bdb4ef40ce855dd7d
-  data.tar.gz: d1043959eac257f061eef8279cebdcfe1de2fe0f1ecacdab816805f95e8a105446b40089c477b66ff2f5f2994163569bc41292feb5e01c9a38f597178c8822ed
+  metadata.gz: 078d45dd78c76dd52767adc09b8ec74dcb77fe58aece7749604340b7421d372775bd109b9cb878ffb996171852f83a720a5e2d83e559941d07780a5e567cd872
+  data.tar.gz: 260de5c1c07b134b1e164992f10292d109dcb33551d02aca1f91ebecf596b1fb76397e9220881736f6f3718d55ef90e61e5e60408f678cc156b38567eba38fe3

data/lib/rbBinaryCFPropertyList.rb

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 
+require 'stringio'
+
 module CFPropertyList
   # Binary PList parser class
   class Binary

data/lib/rbCFPropertyList.rb

@@ -162,7 +162,12 @@ module CFPropertyList
       when Object.const_defined?('BigDecimal') && object.is_a?(BigDecimal)
         CFReal.new(object)
       when object.respond_to?(:read)
-        CFData.new(object.read(), CFData::DATA_RAW)
+        raw_data = object.read
+        # treat the data as a bytestring (ASCII-8BIT) if Ruby supports it.  Do this by forcing
+        # the encoding, on the assumption that the bytes were read correctly, and just tagged with
+        # an inappropriate encoding, rather than transcoding.
+        raw_data.force_encoding(Encoding::ASCII_8BIT) if raw_data.respond_to?(:force_encoding)
+        CFData.new(raw_data, CFData::DATA_RAW)
       when options[:converter_method] && object.respond_to?(options[:converter_method])
         if options[:converter_with_opts]
           CFPropertyList.guess(object.send(options[:converter_method],options),options)
@@ -380,8 +385,13 @@ module CFPropertyList
     # format = List::FORMAT_BINARY:: The format to save the plist
     # opts={}:: Pass parser options
     def to_str(format=List::FORMAT_BINARY,opts={})
+      raise CFFormatError.new("Format #{format} not supported, use List::FORMAT_BINARY or List::FORMAT_XML") if format != FORMAT_BINARY && format != FORMAT_XML
+
       prsr = @@parsers[format-1].new
+
       opts[:root] = @value
+      opts[:formatted] = @formatted unless opts.has_key?(:formatted)
+
       return prsr.to_str(opts)
     end
   end
@@ -395,7 +405,7 @@ class Array
 
     plist = CFPropertyList::List.new
     plist.value = CFPropertyList.guess(self, options)
-    plist.to_str(options[:plist_format])
+    plist.to_str(options[:plist_format], options)
   end
 end
 
@@ -406,7 +416,7 @@ class Enumerator
 
     plist = CFPropertyList::List.new
     plist.value = CFPropertyList.guess(self, options)
-    plist.to_str(options[:plist_format])
+    plist.to_str(options[:plist_format], options)
   end
 end
 
@@ -417,7 +427,7 @@ class Hash
 
     plist = CFPropertyList::List.new
     plist.value = CFPropertyList.guess(self, options)
-    plist.to_str(options[:plist_format])
+    plist.to_str(options[:plist_format], options)
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: CFPropertyList
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Christian Kruse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake