CFPropertyList 2.0.10 → 2.0.11

data/lib/rbBinaryCFPropertyList.rb

@@ -90,19 +90,19 @@ module CFPropertyList
       offsets = []
 
       0.upto(@object_table.size-1) do |i|
-        binary_str += @object_table[i]
+        binary_str << @object_table[i]
         offsets[i] = object_offset
         object_offset += @object_table[i].bytesize
       end
 
       offsets.each do |offset|
-        binary_str += Binary.pack_it_with_size(offset_size,offset)
+        binary_str << "#{Binary.pack_it_with_size(offset_size,offset)}"
       end
 
-      binary_str += [offset_size, @object_ref_size].pack("x6CC")
-      binary_str += [@count_objects].pack("x4N")
-      binary_str += [0].pack("x4N")
-      binary_str += [table_offset].pack("x4N")
+      binary_str << [offset_size, @object_ref_size].pack("x6CC")
+      binary_str << [@count_objects].pack("x4N")
+      binary_str << [0].pack("x4N")
+      binary_str << [table_offset].pack("x4N")
 
       return binary_str
     end
@@ -472,7 +472,7 @@ module CFPropertyList
       elsif(value.is_a?(CFData)) then
         val = value.decoded_value
         @int_size += Binary.bytes_size_int(val.length)
-        @misc_size += val.length
+        @misc_size += val.length + 1
         @count_objects += 1
         return
       end
@@ -630,7 +630,7 @@ module CFPropertyList
       bdata = Binary.type_bytes("a", val.value.size) # a is 1010, type indicator for arrays
 
       val.value.each do |v|
-        bdata += Binary.pack_it_with_size(@object_ref_size,  v.to_binary(self));
+        bdata << Binary.pack_it_with_size(@object_ref_size,  v.to_binary(self));
       end
 
       @object_table[saved_object_count] = bdata
@@ -647,11 +647,11 @@ module CFPropertyList
       val.value.each_key do |k|
         str = CFString.new(k)
         key = str.to_binary(self)
-        bdata += Binary.pack_it_with_size(@object_ref_size,key)
+        bdata << Binary.pack_it_with_size(@object_ref_size,key)
       end
 
       val.value.each_value do |v|
-        bdata += Binary.pack_it_with_size(@object_ref_size,v.to_binary(self))
+        bdata << Binary.pack_it_with_size(@object_ref_size,v.to_binary(self))
       end
 
       @object_table[saved_object_count] = bdata

data/lib/rbCFPropertyList.rb

@@ -3,6 +3,7 @@
 require 'libxml'
 require 'kconv'
 require 'date'
+require 'time'
 
 #
 # CFPropertyList implementation
@@ -57,15 +58,20 @@ module CFPropertyList
   end
 end
 
-dirname = File.dirname(__FILE__)
-require dirname + '/rbCFPlistError.rb'
-require dirname + '/rbCFTypes.rb'
-require dirname + '/rbXMLCFPropertyList.rb'
-require dirname + '/rbBinaryCFPropertyList.rb'
+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
 
-require 'iconv' unless "".respond_to?("encode")
+  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
 
-class String
   unless("".respond_to?(:bytesize)) then
     def bytesize
       self.length
@@ -73,6 +79,13 @@ class String
   end
 end
 
+dirname = File.dirname(__FILE__)
+require dirname + '/rbCFPlistError.rb'
+require dirname + '/rbCFTypes.rb'
+require dirname + '/rbXMLCFPropertyList.rb'
+require dirname + '/rbBinaryCFPropertyList.rb'
+
+require 'iconv' unless "".respond_to?("encode")
 
 module CFPropertyList
   # Create CFType hierarchy by guessing the correct CFType, e.g.
@@ -95,11 +108,11 @@ module CFPropertyList
     elsif(object.is_a?(TrueClass) || object.is_a?(FalseClass)) then
       return CFBoolean.new(object)
     elsif(object.is_a?(String)) then
-      return CFString.new(object)
+      return object.blob? ? CFData.new(object, CFData::DATA_RAW) : CFString.new(object)
+    elsif(object.is_a?(IO)) then
+      return CFData.new(object.read(), CFData::DATA_RAW)
     elsif(object.is_a?(Time) || object.is_a?(DateTime) || object.is_a?(Date)) then
       return CFDate.new(object)
-    elsif(object.is_a?(IO)) then
-      return CFData.new(object.read, CFData::DATA_RAW)
     elsif(object.is_a?(Array)) then
       ary = Array.new
       object.each do

data/lib/rbCFTypes.rb

@@ -157,20 +157,28 @@ module CFPropertyList
     # set value to defined state, either base64 encoded or raw
     def initialize(value=nil,format=DATA_BASE64)
       if(format == DATA_RAW) then
-        @value = Base64.encode64(value)
+        @raw_value = value
+        @raw_value.blob = true
       else
         @value = value
       end
     end
 
+    # get base64 encoded value
+    def encoded_value
+      @value ||= Base64.encode64(@raw_value)
+    end
+
     # get base64 decoded value
     def decoded_value
-      return Base64.decode64(@value)
+      @raw_value ||= String.new(Base64.decode64(@value))
+      @raw_value.blob = true
+      @raw_value
     end
 
     # convert to XML
     def to_xml
-      return LibXML::XML::Node.new('data') << LibXML::XML::Node.new_text(@value)
+      return LibXML::XML::Node.new('data') << LibXML::XML::Node.new_text(encoded_value())
     end
 
     # convert to binary

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: CFPropertyList
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 2
   - 0
-  - 10
-  version: 2.0.10
+  - 11
+  version: 2.0.11
 platform: ruby
 authors: 
 - Christian Kruse
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-14 00:00:00 +02:00
+date: 2010-08-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency