CFPropertyList 2.0.11 → 2.0.12

data/lib/rbBinaryCFPropertyList.rb

@@ -141,7 +141,15 @@ module CFPropertyList
         val = val[0]
       when 3
         hiword,loword = buff.unpack("NN")
-        val = hiword << 32 | loword
+        if (hiword & 0x80000000) != 0
+          # 8 byte integers are always signed, and are negative when bit 63 is
+          # set. Decoding into either a Fixnum or Bignum is tricky, however,
+          # because the size of a Fixnum varies among systems, and Ruby
+          # doesn't consider the number to be negative, and won't sign extend.
+          val = -(2**63 - ((hiword & 0x7fffffff) << 32 | loword))
+        else
+          val = hiword << 32 | loword
+        end
       end
 
       return CFInteger.new(val);
@@ -226,8 +234,15 @@ module CFPropertyList
     def Binary.charset_strlen(str,charset="UTF-8")
       return str.length if str.respond_to?("encode")
 
-      str = Iconv.conv("UTF-8",charset,str) if charset != "UTF-8"
-      return str.scan(/./mu).size
+      utf8_str = Iconv.conv("UTF-8",charset,str)
+      size = utf8_str.scan(/./mu).size
+
+      # UTF-16 code units in the range D800-DBFF are the beginning of
+      # a surrogate pair, and count as one additional character for
+      # length calculation.
+      str.split('').each_slice(2) { |pair| size += 1 if ("\xd8".."\xdb").include?(pair[0]) } if charset =~ /^UTF-16/
+
+      return size
     end
 
     # Read a unicode string value, coded as UTF-16BE
@@ -374,11 +389,16 @@ module CFPropertyList
 
     # calculate how many bytes are needed to save +count+
     def Binary.bytes_needed(count)
-      nbytes = 0
-
-      while count >= 1 do
-        nbytes += 1
-        count /= 256
+      if count < 2**8
+        nbytes = 1
+      elsif count < 2**16
+        nbytes = 2
+      elsif count < 2**32
+        nbytes = 4
+      elsif count < 2**64
+        nbytes = 8
+      else
+        raise CFFormatError.new("Data size too large: #{count}")
       end
 
       return nbytes
@@ -388,12 +408,20 @@ module CFPropertyList
     def Binary.int_bytes(int)
       intbytes = ""
 
-      if(int > 0xFFFF) then
-        intbytes = "\x12"+[int].pack("N") # 4 byte integer
-      elsif(int > 0xFF) then
-        intbytes = "\x11"+[int].pack("n") # 2 byte integer
+      if(int >= 0) then
+        if (int <= 0xFF) then
+          intbytes = "\x10"+[int].pack("c") # 1 byte integer
+        elsif(int <= 0xFFFF) then
+          intbytes = "\x11"+[int].pack("n") # 2 byte integer
+        elsif(int <= 0xFFFFFFFF) then
+          intbytes = "\x12"+[int].pack("N") # 4 byte integer
+        elsif(int <= 0x7FFFFFFFFFFFFFFF)
+          intbytes = "\x13"+[int >> 32, int & 0xFFFFFFFF].pack("NN") # 8 byte integer
+        else
+          raise CFFormatError.new("Integer too large: #{int}")
+        end
       else
-        intbytes = "\x10"+[int].pack("C") # 8 byte integer
+        intbytes = "\x13"+[int >> 32, int & 0xFFFFFFFF].pack("NN") # 8 byte integer
       end
 
       return intbytes;
@@ -519,8 +547,8 @@ module CFPropertyList
         end
 
         if(utf16) then
-          bdata = Binary.type_bytes("6",Binary.charset_strlen(val,"UTF-8")) # 6 is 0110, unicode string (utf16be)
           val = Binary.charset_convert(val,"UTF-8","UTF-16BE")
+          bdata = Binary.type_bytes("6",Binary.charset_strlen(val,"UTF-16BE")) # 6 is 0110, unicode string (utf16be)
 
           val.force_encoding("ASCII-8BIT") if val.respond_to?("encode")
           @object_table[saved_object_count] = bdata + val

data/lib/rbCFPropertyList.rb

@@ -109,7 +109,7 @@ module CFPropertyList
       return CFBoolean.new(object)
     elsif(object.is_a?(String)) then
       return object.blob? ? CFData.new(object, CFData::DATA_RAW) : CFString.new(object)
-    elsif(object.is_a?(IO)) then
+    elsif(object.respond_to?(:read)) 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)

data/lib/rbCFTypes.rb

@@ -166,7 +166,7 @@ module CFPropertyList
 
     # get base64 encoded value
     def encoded_value
-      @value ||= Base64.encode64(@raw_value)
+      @value ||= "\n#{Base64.encode64(@raw_value).gsub("\n", '').scan(/.{1,76}/).join("\n")}\n"
     end
 
     # get base64 decoded value

data/lib/rbXMLCFPropertyList.rb

@@ -37,7 +37,7 @@ module CFPropertyList
         |line|
         str1 << line
         unless(first) then
-          str1 << "<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n" if line =~ /^\s*<\?xml/
+          str1 << "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n" if line =~ /^\s*<\?xml/
         end
 
         first = true

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: CFPropertyList
 version: !ruby/object:Gem::Version 
-  hash: 25
   prerelease: false
   segments: 
   - 2
   - 0
-  - 11
-  version: 2.0.11
+  - 12
+  version: 2.0.12
 platform: ruby
 authors: 
 - Christian Kruse
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-26 00:00:00 +02:00
+date: 2010-09-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
         - 1
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         - 7
@@ -80,7 +77,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -89,7 +85,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"