CFPropertyList 2.0.17 → 2.1

data/lib/rbBinaryCFPropertyList.rb

@@ -435,6 +435,8 @@ module CFPropertyList
 
     # Uniques and transforms a string value to binary format and adds it to the object table
     def string_to_binary(val)
+      val = val.to_s
+
       @unique_table[val] ||= begin
         if !Binary.ascii_string?(val)
           utf8_strlen = Binary.charset_strlen(val, "UTF-8")
@@ -554,33 +556,6 @@ module CFPropertyList
       @object_table[saved_object_count] = bdata
       return saved_object_count
     end
-
-=begin It is difficult to reap benefits from an Enumerator
-    # like an array, but we don't know length ahead of time
-    def enum_to_binary(val)
-      saved_object_count = @written_object_count
-      @written_object_count += 1
-
-      size = 0
-      # This destroys our low-memory stream.
-      # However, testing shows that it is faster
-      #   Probably because packing this single Array (in pack_int_array_with_size)
-      #   is faster than packing each individual array member separately
-      #   i.e. to be faster it needs an Enumerator#pack
-      binary = val.value.map do |v|
-        size += 1;
-        v.to_binary(self)
-      end
-      @object_refs += size
-
-      bdata = Binary.type_bytes(0b1010, size) <<
-        Binary.pack_int_array_with_size(object_ref_size(@object_refs), binary)
-
-      @object_table[saved_object_count] = bdata
-      saved_object_count
-    end
-=end
-
   end
 end
 

data/lib/rbCFPropertyList.rb

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
-require 'libxml'
 require 'kconv'
 require 'date'
 require 'time'
@@ -56,6 +55,17 @@ module CFPropertyList
       return true
     end
   end
+
+  class XMLParserInterface < ParserInterface
+    def new_node(name)
+    end
+
+    def new_text(val)
+    end
+
+    def append_node(parent, child)
+    end
+  end
 end
 
 class String
@@ -82,11 +92,35 @@ 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")
 
+begin
+  Enumerable::Enumerator.new([])
+rescue NameError => e
+  module Enumerable
+    class Enumerator
+    end
+  end
+end
+
+begin
+  require dirname + '/rbLibXMLParser.rb'
+  try_nokogiri = false
+rescue LoadError => e
+  try_nokogiri = true
+end
+
+if try_nokogiri then
+  begin
+    require dirname + '/rbNokogiriParser.rb'
+  rescue LoadError => e
+    require dirname + '/rbREXMLParser.rb'
+  end
+end
+
+
 module CFPropertyList
   # Create CFType hierarchy by guessing the correct CFType, e.g.
   #
@@ -99,7 +133,7 @@ module CFPropertyList
   # +convert_unknown_to_string+::   Convert unknown objects to string calling to_str()
   # +converter_method+::    Convert unknown objects to known objects calling +method_name+
   #
-  #  cftypes = CFPropertyList.guess(x,:convert_unknown_to_string => true,:converter_method => :to_hash)
+  #  cftypes = CFPropertyList.guess(x,:convert_unknown_to_string => true,:converter_method => :to_hash, :converter_with_opts => true)
   def guess(object, options = {})
     case object
     when Fixnum, Integer       then CFInteger.new(object)
@@ -111,7 +145,7 @@ module CFPropertyList
 
     when Time, DateTime, Date  then CFDate.new(object)
 
-    when Array, Enumerator
+    when Array, Enumerator, Enumerable::Enumerator
       ary = Array.new
       object.each do |o|
         ary.push CFPropertyList.guess(o, options)
@@ -125,18 +159,6 @@ module CFPropertyList
         hsh[k] = CFPropertyList.guess(v, options)
       end
       CFDictionary.new(hsh)
-
-=begin
-    when Enumerator
-      CFEnumerator.new(
-        Enumerator.new do |yielder|
-          object.each do |o|
-            yielder << CFPropertyList.guess(o, options)
-          end
-        end
-      )
-=end
-
     else
       case
       when Object.const_defined?('BigDecimal') && object.is_a?(BigDecimal)
@@ -144,7 +166,11 @@ module CFPropertyList
       when object.respond_to?(:read)
         CFData.new(object.read(), CFData::DATA_RAW)
       when options[:converter_method] && object.respond_to?(options[:converter_method])
-        CFPropertyList.guess(object.send(options[:converter_method]),options)
+        if options[:converter_with_opts]
+          CFPropertyList.guess(object.send(options[:converter_method],options),options)
+        else
+          CFPropertyList.guess(object.send(options[:converter_method]),options)
+        end
       when options[:convert_unknown_to_string]
         CFString.new(object.to_s)
       else

data/lib/rbCFTypes.rb

@@ -20,7 +20,8 @@ module CFPropertyList
       @value = value
     end
 
-    def to_xml; end
+    def to_xml(parser)
+    end
 
     def to_binary(bplist) end
   end
@@ -29,9 +30,9 @@ module CFPropertyList
   # It will convert the value to UTF-16BE if necessary (i.e. if non-ascii char contained)
   class CFString < CFType
     # convert to XML
-    def to_xml
-      n = LibXML::XML::Node.new('string')
-      n << LibXML::XML::Node.new_text(@value) unless @value.nil?
+    def to_xml(parser)
+      n = parser.new_node('string')
+      n = parser.append_node(n, parser.new_text(@value)) unless @value.nil?
       n
     end
 
@@ -44,8 +45,10 @@ module CFPropertyList
   # This class holds integer/fixnum values
   class CFInteger < CFType
     # convert to XML
-    def to_xml
-      return LibXML::XML::Node.new('integer') << LibXML::XML::Node.new_text(@value.to_s)
+    def to_xml(parser)
+      n = parser.new_node('integer')
+      n = parser.append_node(n, parser.new_text(@value.to_s))
+      n
     end
 
     # convert to binary
@@ -57,8 +60,10 @@ module CFPropertyList
   # This class holds float values
   class CFReal < CFType
     # convert to XML
-    def to_xml
-      return LibXML::XML::Node.new('real') << LibXML::XML::Node.new_text(@value.to_s)
+    def to_xml(parser)
+      n = parser.new_node('real')
+      n = parser.append_node(n, parser.new_text(@value.to_s))
+      n
     end
 
     # convert to binary
@@ -122,8 +127,10 @@ module CFPropertyList
     end
 
     # convert to XML
-    def to_xml
-      LibXML::XML::Node.new('date') << LibXML::XML::Node.new_text(CFDate::date_string(@value))
+    def to_xml(parser)
+      n = parser.new_node('date')
+      n = parser.append_node(n, parser.new_text(CFDate::date_string(@value)))
+      n
     end
 
     # convert to binary
@@ -135,8 +142,8 @@ module CFPropertyList
   # This class contains a boolean value
   class CFBoolean < CFType
     # convert to XML
-    def to_xml
-      LibXML::XML::Node.new(@value ? 'true' : 'false')
+    def to_xml(parser)
+      parser.new_node(@value ? 'true' : 'false')
     end
 
     # convert to binary
@@ -175,8 +182,10 @@ module CFPropertyList
     end
 
     # convert to XML
-    def to_xml
-      LibXML::XML::Node.new('data') << LibXML::XML::Node.new_text(encoded_value())
+    def to_xml(parser)
+      n = parser.new_node('data')
+      n = parser.append_node(n, parser.new_text(encoded_value()))
+      n
     end
 
     # convert to binary
@@ -193,10 +202,10 @@ module CFPropertyList
     end
 
     # convert to XML
-    def to_xml
-      n = LibXML::XML::Node.new('array')
+    def to_xml(parser)
+      n = parser.new_node('array')
       @value.each do |v|
-        n << v.to_xml
+        n = parser.append_node(n, v.to_xml(parser))
       end
       n
     end
@@ -207,14 +216,6 @@ module CFPropertyList
     end
   end
 
-=begin
-  class CFEnumerator < CFArray
-    def to_binary(bplist)
-      bplist.enum_to_binary(self)
-    end
-  end
-=end
-
   # this class contains a hash of values
   class CFDictionary < CFType
     # Create new CFDictonary type.
@@ -223,12 +224,12 @@ module CFPropertyList
     end
 
     # convert to XML
-    def to_xml
-      n = LibXML::XML::Node.new('dict')
-      @value.each_pair do |key,value|
-        k = LibXML::XML::Node.new('key') << LibXML::XML::Node.new_text(key)
-        n << k
-        n << value.to_xml
+    def to_xml(parser)
+      n = parser.new_node('dict')
+      @value.each_pair do |key, value|
+        k = parser.append_node(parser.new_node('key'), parser.new_text(key.to_s))
+        n = parser.append_node(n, k)
+        n = parser.append_node(n, value.to_xml(parser))
       end
       n
     end

data/lib/{rbXMLCFPropertyList.rb → rbLibXMLParser.rb}

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
 
+require 'libxml'
+
 module CFPropertyList
   # XML parser
-  class XML < ParserInterface
+  class XML < XMLParserInterface
     # read a XML file
     # opts::
     # * :file - The filename of the file to load
@@ -27,7 +29,7 @@ module CFPropertyList
       doc.encoding = LibXML::XML::Encoding::UTF_8
 
       doc.root['version'] = '1.0'
-      doc.root << opts[:root].to_xml()
+      doc.root << opts[:root].to_xml(self)
 
       # ugly hack, but there's no other possibility I know
       str = doc.to_s(:indent => opts[:formatted])
@@ -46,6 +48,18 @@ module CFPropertyList
       return str1
     end
 
+    def new_node(name)
+      LibXML::XML::Node.new(name)
+    end
+
+    def new_text(val)
+      LibXML::XML::Node.new_text(val)
+    end
+
+    def append_node(parent, child)
+      parent << child
+    end
+
     protected
 
     # get the value of a DOM node
@@ -72,6 +86,7 @@ module CFPropertyList
         if node.children? then
           node.children.each do |n|
             next if n.text? # avoid a bug of libxml
+            next if n.comment?
 
             if n.name == "key" then
               key = get_value(n)

data/lib/rbNokogiriParser.rb

@@ -0,0 +1,140 @@
+# -*- coding: utf-8 -*-
+
+require 'nokogiri'
+
+module CFPropertyList
+  # XML parser
+  class XML < ParserInterface
+    # read a XML file
+    # opts::
+    # * :file - The filename of the file to load
+    # * :data - The data to parse
+    def load(opts)
+      if(opts.has_key?(:file)) then
+        File.open(opts[:file], "rb") { |fd| doc = Nokogiri::XML::Document.parse(fd, nil, nil, Nokogiri::XML::ParseOptions::NOBLANKS|Nokogiri::XML::ParseOptions::NOENT) }
+      else
+        doc = Nokogiri::XML::Document.parse(opts[:data], nil, nil, Nokogiri::XML::ParseOptions::NOBLANKS|Nokogiri::XML::ParseOptions::NOENT)
+      end
+
+      root = doc.root.children.first
+      return import_xml(root)
+    end
+
+    # serialize CFPropertyList object to XML
+    # opts = {}:: Specify options: :formatted - Use indention and line breaks
+    def to_str(opts={})
+      doc = Nokogiri::XML::Document.new
+      @doc = doc
+
+      doc.root = doc.create_element 'plist', :version => '1.0'
+      doc.encoding = 'UTF-8'
+
+      doc.root << opts[:root].to_xml(self)
+
+      # ugly hack, but there's no other possibility I know
+      s_opts = Nokogiri::XML::Node::SaveOptions::AS_XML
+      s_opts |= Nokogiri::XML::Node::SaveOptions::FORMAT if opts[:formatted]
+
+      str = doc.serialize(:save_with => s_opts)
+      str1 = String.new
+      first = false
+      str.each_line do |line|
+        str1 << line
+        unless(first) then
+          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
+      end
+
+      str1.force_encoding('UTF-8') if str1.respond_to?(:force_encoding)
+      return str1
+    end
+
+    def new_node(name)
+      @doc.create_element name
+    end
+
+    def new_text(val)
+      @doc.create_text_node val
+    end
+
+    def append_node(parent, child)
+      parent << child
+    end
+
+    protected
+
+    # get the value of a DOM node
+    def get_value(n)
+      content = if n.children.empty?
+        n.content
+      else
+        n.children.first.content
+      end
+
+      content.force_encoding('UTF-8') if content.respond_to?(:force_encoding)
+      content
+    end
+
+    # import the XML values
+    def import_xml(node)
+      ret = nil
+
+      case node.name
+      when 'dict'
+        hsh = Hash.new
+        key = nil
+        children = node.children
+
+        unless children.empty? then
+          children.each do |n|
+            next if n.text? # avoid a bug of libxml
+            next if n.comment?
+
+            if n.name == "key" then
+              key = get_value(n)
+            else
+              raise CFFormatError.new("Format error!") if key.nil?
+              hsh[key] = import_xml(n)
+              key = nil
+            end
+          end
+        end
+
+        ret = CFDictionary.new(hsh)
+
+      when 'array'
+        ary = Array.new
+        children = node.children
+
+        unless children.empty? then
+          children.each do |n|
+            ary.push import_xml(n)
+          end
+        end
+
+        ret = CFArray.new(ary)
+
+      when 'true'
+        ret = CFBoolean.new(true)
+      when 'false'
+        ret = CFBoolean.new(false)
+      when 'real'
+        ret = CFReal.new(get_value(node).to_f)
+      when 'integer'
+        ret = CFInteger.new(get_value(node).to_i)
+      when 'string'
+        ret = CFString.new(get_value(node))
+      when 'data'
+        ret = CFData.new(get_value(node))
+      when 'date'
+        ret = CFDate.new(CFDate.parse_date(get_value(node)))
+      end
+
+      return ret
+    end
+  end
+end
+
+# eof

data/lib/rbREXMLParser.rb

@@ -0,0 +1,136 @@
+# -*- coding: utf-8 -*-
+
+require 'rexml/document'
+
+module CFPropertyList
+  # XML parser
+  class XML < ParserInterface
+    # read a XML file
+    # opts::
+    # * :file - The filename of the file to load
+    # * :data - The data to parse
+    def load(opts)
+      if(opts.has_key?(:file)) then
+        File.open(opts[:file], "rb") { |fd| doc = REXML::Document.new(fd) }
+      else
+        doc = REXML::Document.new(opts[:data])
+      end
+
+      root = doc.root.elements[1]
+      return import_xml(root)
+    end
+
+    # serialize CFPropertyList object to XML
+    # opts = {}:: Specify options: :formatted - Use indention and line breaks
+    def to_str(opts={})
+      doc = REXML::Document.new
+      @doc = doc
+
+      doc.context[:attribute_quote] = :quote
+
+      doc.add_element 'plist', {'version' => '1.0'}
+      doc.root << opts[:root].to_xml(self)
+
+      formatter = if opts[:formatted] then
+        f = REXML::Formatters::Pretty.new(2)
+        f.compact = true
+        f
+      else
+        REXML::Formatters::Default.new
+      end
+
+      str = formatter.write(doc.root, "")
+      str1 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n" + str + "\n"
+      str1.force_encoding('UTF-8') if str1.respond_to?(:force_encoding)
+
+      return str1
+    end
+
+    def new_node(name)
+      #LibXML::XML::Node.new(name)
+      REXML::Element.new(name)
+    end
+
+    def new_text(val)
+      val
+    end
+
+    def append_node(parent, child)
+      if child.is_a?(String) then
+        parent.add_text child
+      else
+        parent.elements << child
+      end
+      parent
+    end
+
+    protected
+
+    # get the value of a DOM node
+    def get_value(n)
+      content = n.text
+
+      content.force_encoding('UTF-8') if content.respond_to?(:force_encoding)
+      content
+    end
+
+    # import the XML values
+    def import_xml(node)
+      ret = nil
+
+      case node.name
+      when 'dict'
+        hsh = Hash.new
+        key = nil
+
+        if node.has_elements? then
+          node.elements.each do |n|
+            #print n.name + "\n"
+            next if n.name == '#text' # avoid a bug of libxml
+            next if n.name == '#comment'
+
+            if n.name == "key" then
+              key = get_value(n)
+            else
+              raise CFFormatError.new("Format error!") if key.nil?
+              hsh[key] = import_xml(n)
+              key = nil
+            end
+          end
+        end
+
+        ret = CFDictionary.new(hsh)
+
+      when 'array'
+        ary = Array.new
+
+        if node.has_elements? then
+          node.elements.each do |n|
+            ary.push import_xml(n)
+          end
+        end
+
+        ret = CFArray.new(ary)
+
+      when 'true'
+        ret = CFBoolean.new(true)
+      when 'false'
+        ret = CFBoolean.new(false)
+      when 'real'
+        ret = CFReal.new(get_value(node).to_f)
+      when 'integer'
+        ret = CFInteger.new(get_value(node).to_i)
+      when 'string'
+        ret = CFString.new(get_value(node))
+      when 'data'
+        ret = CFData.new(get_value(node))
+      when 'date'
+        ret = CFDate.new(CFDate.parse_date(get_value(node)))
+      end
+
+      return ret
+    end
+  end
+end
+
+# eof

metadata

@@ -1,99 +1,67 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: CFPropertyList
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 2
-  - 0
-  - 17
-  version: 2.0.17
+version: !ruby/object:Gem::Version
+  version: '2.1'
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Christian Kruse
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-02 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
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 0
-        version: 1.1.0
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+date: 2012-04-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &7342600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 7
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.7.0
-  type: :runtime
-  version_requirements: *id002
-description: This is a module to read, write and manipulate both binary and XML property lists as defined by apple.
+  type: :development
+  prerelease: false
+  version_requirements: *7342600
+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: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
-files: 
-- lib/cfpropertylist.rb
-- lib/rbCFTypes.rb
-- lib/rbXMLCFPropertyList.rb
+files:
 - lib/rbBinaryCFPropertyList.rb
+- lib/rbREXMLParser.rb
 - lib/rbCFPlistError.rb
+- lib/rbLibXMLParser.rb
+- lib/rbCFTypes.rb
+- lib/rbNokogiriParser.rb
 - lib/rbCFPropertyList.rb
+- lib/cfpropertylist.rb
 - README
-has_rdoc: true
 homepage: http://github.com/ckruse/CFPropertyList
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: cfpropertylist
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: Read, write and manipulate both binary and XML property lists as defined by apple
+summary: Read, write and manipulate both binary and XML property lists as defined
+  by apple
 test_files: []
-