CFPropertyList 2.0.13.1 → 2.0.14

data/lib/rbBinaryCFPropertyList.rb

@@ -222,16 +222,24 @@ module CFPropertyList
 
     # Count characters considering character set
     def Binary.charset_strlen(str,charset="UTF-8")
-      return str.length if str.respond_to?("encode")
-
-      utf8_str = Iconv.conv("UTF-8",charset,str)
-      size = utf8_str.scan(/./mu).size
-
+      if str.respond_to?(:encode)
+        size = str.length
+      else
+        utf8_str = Iconv.conv("UTF-8",charset,str)
+        size = utf8_str.scan(/./mu).size
+      end
+      
       # 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/
-
+      if charset =~ /^UTF-16/
+        if str.respond_to?(:encode)
+          str.bytes.to_a.each_slice(2) { |pair| size += 1 if (0xd8..0xdb).include?(pair[0]) }
+        else
+          str.split('').each_slice(2) { |pair| size += 1 if ("\xd8".."\xdb").include?(pair[0]) }
+        end
+      end
+      
       return size
     end
 
@@ -434,7 +442,11 @@ module CFPropertyList
     end
 
     def Binary.ascii_string?(str)
-      return str.scan(/[\x80-\xFF]/m).size == 0
+      if str.respond_to?(:ascii_only?)
+        return str.ascii_only?
+      else
+        return str.scan(/[\x80-\xFF]/mn).size == 0
+      end
     end
     
     # Uniques and transforms a string value to binary format and adds it to the object table
@@ -572,10 +584,9 @@ module CFPropertyList
       saved_object_count = @written_object_count
       @written_object_count += 1
 
-      keys_and_values = val.value.collect do |k, v|
-        [ CFString.new(k).to_binary(self), v.to_binary(self) ]
-      end.flatten      
-
+      keys_and_values = val.value.keys.collect { |k| CFString.new(k).to_binary(self) }
+      keys_and_values += val.value.keys.collect { |k| val.value[k].to_binary(self) }
+      
       bdata = Binary.type_bytes(0b1101,val.value.size) +
         Binary.pack_int_array_with_size(@object_ref_size, keys_and_values)
 

data/lib/rbXMLCFPropertyList.rb

@@ -43,6 +43,7 @@ module CFPropertyList
         first = true
       end
 
+      str1.force_encoding('UTF-8') if str1.respond_to?(:force_encoding)
       return str1
     end
 
@@ -50,8 +51,14 @@ module CFPropertyList
 
     # get the value of a DOM node
     def get_value(n)
-      return n.first.content if n.children?
-      return n.content
+      content = if n.children?
+        n.first.content
+      else
+        n.content
+      end
+      
+      content.force_encoding('UTF-8') if content.respond_to?(:force_encoding)
+      content
     end
 
     # import the XML values

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: CFPropertyList
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 2
-  - 0
-  - 13
-  - 1
-  version: 2.0.13.1
+  version: 2.0.14
 platform: ruby
 authors: 
 - Christian Kruse
@@ -15,39 +9,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-17 00:00:00 +02:00
+date: 2010-09-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: libxml-ruby
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 0
         version: 1.1.0
-  type: :runtime
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rake
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 7
-        - 0
         version: 0.7.0
-  type: :runtime
-  version_requirements: *id002
+    version: 
 description: This is a module to read, write and manipulate both binary and XML property lists as defined by apple.
 email: cjk@wwwtech.de
 executables: []
@@ -74,25 +58,21 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: cfpropertylist
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Read, write and manipulate both binary and XML property lists as defined by apple