CFPropertyList 2.2.7 → 2.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 231474cbce57560dae7b25644de40d1f37663673
-  data.tar.gz: 9f8dfba275d0463e41334bb31554f87e62779f71
+  metadata.gz: a2c18e8671e6aa61b76ef1b99fff2850b2746c4d
+  data.tar.gz: 153b07e4656885b5cd155af83555dad763a17e1a
 SHA512:
-  metadata.gz: a601bfff8427aa0deeddde5df7ae0661664a3b83aacbc526801363d505619c8d127f920f0ef739c88c5e83382ce9b106d7ebdb1be4b89ef2170f1c83f74055a6
-  data.tar.gz: fa625c48f0495140e0d271a525b3d5c6c6a58c722a5b33d0f8fcc22b120810da087eac406b229e78d78f1a84c813d7da398396bd35a7bc91aa6ce199d2e2893a
+  metadata.gz: 75f4be2ff85f13c0309b7c7fe390b721a5ee98d454aa45a010ba03288381a0f9c6e90539f7c34921685c5ef92e8803ab7469ce826059bfa777a98d001974d3fe
+  data.tar.gz: b7842bee8b9cb899b432880b16e675c78e4cb87ed64c473efb988c2dd4313266844b1f341f8b659e0baeaca9ad0bf7fa81fbc74f763ea53c8ecedafd149d59a3

data/lib/cfpropertylist/rbBinaryCFPropertyList.rb

@@ -295,11 +295,11 @@ module CFPropertyList
       # first: read keys
       if(length != 0) then
         buff = fd.read(length * @object_ref_size)
-        keys = unpack_with_size(@object_ref_size, buff) #buff.unpack(@object_ref_size == 1 ? "C*" : "n*")
+        keys = unpack_with_size(@object_ref_size, buff)
 
         # second: read object refs
         buff = fd.read(length * @object_ref_size)
-        objects = unpack_with_size(@object_ref_size, buff) #buff.unpack(@object_ref_size == 1 ? "C*" : "n*")
+        objects = unpack_with_size(@object_ref_size, buff)
 
         # read real keys and objects
         0.upto(length-1) do |i|
@@ -313,13 +313,14 @@ module CFPropertyList
     end
     protected :read_binary_dict
 
-    # Read an object type byte, decode it and delegate to the correct reader function
+    # Read an object type byte, decode it and delegate to the correct
+    # reader function
     def read_binary_object(fname,fd)
       # first: read the marker byte
       buff = fd.read(1)
 
       object_length = buff.unpack("C*")
-      object_length = object_length[0]  & 0xF
+      object_length = object_length[0] & 0xF
 
       buff = buff.unpack("H*")
       object_type = buff[0][0].chr
@@ -344,6 +345,8 @@ module CFPropertyList
         read_binary_string(fname,fd,object_length)
       when '6' # unicode string (utf16be)
         read_binary_unicode_string(fname,fd,object_length)
+      when '8'
+        CFUid.new(read_binary_int(fname, fd, object_length).value)
       when 'a' # array
         read_binary_array(fname,fd,object_length)
       when 'd' # dictionary
@@ -511,6 +514,32 @@ module CFPropertyList
       @written_object_count - 1
     end
 
+    def uid_to_binary(value)
+      nbytes = 0
+      nbytes = 1  if value > 0xFF # 1 byte integer
+      nbytes += 1 if value > 0xFFFF # 4 byte integer
+      nbytes += 1 if value > 0xFFFFFFFF # 8 byte integer
+      nbytes = 3  if value < 0 # 8 byte integer, since signed
+
+      @object_table[@written_object_count] = Binary.type_bytes(0b1000, nbytes) <<
+        if nbytes < 3
+          [value].pack(
+            if nbytes == 0    then "C"
+            elsif nbytes == 1 then "n"
+            else "N"
+            end
+          )
+        else
+          # 64 bit signed integer; we need the higher and the lower 32 bit of the value
+          high_word = value >> 32
+          low_word = value & 0xFFFFFFFF
+          [high_word,low_word].pack("NN")
+        end
+
+      @written_object_count += 1
+      @written_object_count - 1
+    end
+
     # Convert date value (apple format) to binary and adds it to the object table
     def date_to_binary(val)
       val = val.getutc.to_f - CFDate::DATE_DIFF_APPLE_UNIX # CFDate is a real, number of seconds since 01/01/2001 00:00:00 GMT

data/lib/cfpropertylist/rbCFPropertyList.rb

@@ -129,6 +129,7 @@ module CFPropertyList
   def guess(object, options = {})
     case object
     when Fixnum, Integer       then CFInteger.new(object)
+    when UidFixnum             then CFUid.new(object)
     when Float                 then CFReal.new(object)
     when TrueClass, FalseClass then CFBoolean.new(object)
 
@@ -183,7 +184,7 @@ module CFPropertyList
   def native_types(object,keys_as_symbols=false)
     return if object.nil?
 
-    if(object.is_a?(CFDate) || object.is_a?(CFString) || object.is_a?(CFInteger) || object.is_a?(CFReal) || object.is_a?(CFBoolean)) then
+    if(object.is_a?(CFDate) || object.is_a?(CFString) || object.is_a?(CFInteger) || object.is_a?(CFReal) || object.is_a?(CFBoolean)) || object.is_a?(CFUid) then
       return object.value
     elsif(object.is_a?(CFData)) then
       return CFPropertyList::Blob.new(object.decoded_value)

data/lib/cfpropertylist/rbCFTypes.rb

@@ -17,6 +17,13 @@ module CFPropertyList
   class Blob < String
   end
 
+  ##
+  # UidFixnum is intended to distinguish between a Ruby Fixnum
+  # instance that should be converted to a CFInteger/CFReal type and a
+  # Ruby Fixnum instance that should be converted to a CFUid type.
+  class UidFixnum < Fixnum
+  end
+
   # This class defines the base class for all CFType classes
   #
   class CFType
@@ -243,6 +250,17 @@ module CFPropertyList
       bplist.dict_to_binary(self)
     end
   end
+
+  class CFUid < CFType
+    def to_xml(parser)
+      CFDictionary.new({'CF$UID' => CFInteger.new(@value)}).to_xml(parser)
+    end
+
+    # convert to binary
+    def to_binary(bplist)
+      bplist.uid_to_binary(@value)
+    end
+  end
 end
 
 # eof

data/lib/cfpropertylist/rbLibXMLParser.rb

@@ -104,7 +104,11 @@ module CFPropertyList
           end
         end
 
-        ret = CFDictionary.new(hsh)
+        if hsh['CF$UID'] and hsh.keys.length == 1
+          ret = CFUid.new(hsh['CF$UID'].value)
+        else
+          ret = CFDictionary.new(hsh)
+        end
 
       when 'array'
         ary = Array.new

data/lib/cfpropertylist/rbNokogiriParser.rb

@@ -107,7 +107,11 @@ module CFPropertyList
           end
         end
 
-        ret = CFDictionary.new(hsh)
+        if hsh['CF$UID'] and hsh.keys.length == 1
+          ret = CFUid.new(hsh['CF$UID'].value)
+        else
+          ret = CFDictionary.new(hsh)
+        end
 
       when 'array'
         ary = Array.new

data/lib/cfpropertylist/rbREXMLParser.rb

@@ -53,7 +53,6 @@ module CFPropertyList
     end
 
     def new_node(name)
-      #LibXML::XML::Node.new(name)
       REXML::Element.new(name)
     end
 
@@ -105,7 +104,11 @@ module CFPropertyList
           end
         end
 
-        ret = CFDictionary.new(hsh)
+        if hsh['CF$UID'] and hsh.keys.length == 1
+          ret = CFUid.new(hsh['CF$UID'].value)
+        else
+          ret = CFDictionary.new(hsh)
+        end
 
       when 'array'
         ary = Array.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: CFPropertyList
 version: !ruby/object:Gem::Version
-  version: 2.2.7
+  version: 2.2.8
 platform: ruby
 authors:
 - Christian Kruse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake