CFPropertyList 2.1.2 → 2.2.0

data/lib/rbBinaryCFPropertyList.rb

@@ -214,7 +214,7 @@ module CFPropertyList
 
     # Convert the given string from one charset to another
     def Binary.charset_convert(str,from,to="UTF-8")
-      return str.clone.force_encoding(from).encode(to) if str.respond_to?("encode")
+      return str.dup.force_encoding(from).encode(to) if str.respond_to?("encode")
       Iconv.conv(to,from,str)
     end
 

data/lib/rbCFPropertyList.rb

@@ -73,19 +73,6 @@ module CFPropertyList
 end
 
 class String
-  unless("".respond_to?(:blob) && "".respond_to?(:blob=)) then
-    # The blob status of this string (to set to true if a binary string)
-    attr_accessor :blob
-  end
-
-  unless("".respond_to?(:blob?)) then
-    # Returns whether or not +str+ is a blob.
-    # @return [true,false] If true, this string contains binary data. If false, its a regular string
-    def blob?
-      blob
-    end
-  end
-
   unless("".respond_to?(:bytesize)) then
     def bytesize
       self.length
@@ -148,8 +135,11 @@ module CFPropertyList
     when Float                 then CFReal.new(object)
     when TrueClass, FalseClass then CFBoolean.new(object)
 
+    when Blob
+      CFData.new(object, CFData::DATA_RAW)
+
     when String
-      object.blob? ? CFData.new(object, CFData::DATA_RAW) : CFString.new(object)
+      CFString.new(object)
 
     when Time, DateTime, Date  then CFDate.new(object)
 
@@ -296,7 +286,7 @@ module CFPropertyList
 
         prsr = nil
         if filetype == "bplist" then
-          raise CFFormatError.new("Wong file version #{version}") unless version == "00"
+          raise CFFormatError.new("Wrong file version #{version}") unless version == "00"
           prsr = Binary.new
         else
           prsr = CFPropertyList.xml_parser_interface.new
@@ -323,6 +313,7 @@ module CFPropertyList
 
       when List::FORMAT_AUTO then # what we now do is ugly, but neccessary to recognize the file format
         magic_number = IO.read(file,8)
+        raise IOError.new("File #{file} is empty.") unless magic_number
         filetype = magic_number[0..5]
         version = magic_number[6..7]
 

data/lib/rbCFTypes.rb

@@ -10,6 +10,13 @@
 require 'base64'
 
 module CFPropertyList
+  ##
+  # Blob is intended to distinguish between a Ruby String instance that should
+  # be converted to a CFString type and a Ruby String instance that should be
+  # converted to a CFData type
+  class Blob < String
+  end
+
   # This class defines the base class for all CFType classes
   #
   class CFType
@@ -163,7 +170,6 @@ module CFPropertyList
     def initialize(value=nil,format=DATA_BASE64)
       if(format == DATA_RAW)
         @raw_value = value
-        @raw_value.blob = true
       else
         @value = value
       end
@@ -176,9 +182,7 @@ module CFPropertyList
 
     # get base64 decoded value
     def decoded_value
-      @raw_value ||= String.new(Base64.decode64(@value))
-      @raw_value.blob = true
-      @raw_value
+      @raw_value ||= Blob.new(Base64.decode64(@value))
     end
 
     # convert to XML

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: CFPropertyList
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2012-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -36,8 +36,6 @@ extra_rdoc_files:
 - README
 files:
 - lib/cfpropertylist.rb
-- lib/lala.plist
-- lib/my_test.rb
 - lib/rbBinaryCFPropertyList.rb
 - lib/rbCFPlistError.rb
 - lib/rbCFPropertyList.rb

data/lib/my_test.rb

@@ -1,11 +0,0 @@
-$:.push('.')
-require 'rbCFPropertyList'
-ahash = {"SALTED-SHA512"=> "\214\351\005 \250\224\204\2510M\231\004\312YH\336yk\v\372\313\v\236\372u\255g\177\343\234$wh\221\001\220@/\343:\227\270\203\214g\320\361%'\315J/\t\317\354\275\017\000\241\225\302\322G\026& \205\344"}
-ahash["SALTED-SHA512"].blob = true
-bpl = CFPropertyList::List.new
-bpl.value = CFPropertyList.guess(ahash)
-results = bpl.to_str
-
-fd = File.open("lala.plist", "wb")
-fd.write results
-fd.close