CFPropertyList 2.2.0 → 2.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0365c5873a771aa9b3f29a9c40ff915c23839a25
+  data.tar.gz: 4cc982239b806c7857b844deebbcca016deea87d
+SHA512:
+  metadata.gz: a4ec6d399c5823c687ac7800ec9b72d9b0e69f1eb9774cf9467f84d3d1555e903c53d6dc23312e0cfeed9349a5fb044406b2d0750ed3799bdb4ef40ce855dd7d
+  data.tar.gz: d1043959eac257f061eef8279cebdcfe1de2fe0f1ecacdab816805f95e8a105446b40089c477b66ff2f5f2994163569bc41292feb5e01c9a38f597178c8822ed

data/lib/rbBinaryCFPropertyList.rb

@@ -38,10 +38,13 @@ module CFPropertyList
       @count_objects = number_of_objects
 
       # decode offset table
-      formats = ["","C*","n*","(H6)*","N*"]
-      @offsets = coded_offset_table.unpack(formats[offset_size])
-      if(offset_size == 3)
-        0.upto(@offsets.size-1) { |i| @offsets[i] = @offsets[i].to_i(16) }
+      if(offset_size != 3)
+        formats = ["","C*","n*","","N*"]
+        @offsets = coded_offset_table.unpack(formats[offset_size])
+      else
+        @offsets = coded_offset_table.unpack("C*").each_slice(3).map {
+          |x,y,z| (x << 16) | (y << 8) | z
+        }
       end
 
       @object_ref_size = object_ref_size

data/lib/rbCFPropertyList.rb

@@ -222,10 +222,12 @@ module CFPropertyList
 
     # Path of PropertyList
     attr_accessor :filename
-    # Path of PropertyList
+    # the original format of the PropertyList
     attr_accessor :format
     # the root value in the plist file
     attr_accessor :value
+    # default value for XML generation; if true generate formatted XML
+    attr_accessor :formatted
 
     # initialize a new CFPropertyList, arguments are:
     #
@@ -238,11 +240,22 @@ module CFPropertyList
       @filename = opts[:file]
       @format = opts[:format] || FORMAT_AUTO
       @data = opts[:data]
+      @formatted = opts[:formatted]
 
       load(@filename) unless @filename.nil?
       load_str(@data) unless @data.nil?
     end
 
+    # returns a list of registered parsers
+    def self.parsers
+      @@parsers
+    end
+
+    # set a list of parsers
+    def self.parsers=(val)
+      @@parsers = val
+    end
+
     # Load an XML PropertyList
     # filename = nil:: The filename to read from; if nil, read from the file defined by instance variable +filename+
     def load_xml(filename=nil)
@@ -288,8 +301,10 @@ module CFPropertyList
         if filetype == "bplist" then
           raise CFFormatError.new("Wrong file version #{version}") unless version == "00"
           prsr = Binary.new
+          @format = List::FORMAT_BINARY
         else
           prsr = CFPropertyList.xml_parser_interface.new
+          @format = List::FORMAT_XML
         end
 
         @value = prsr.load({:data => str})
@@ -321,12 +336,16 @@ module CFPropertyList
         if filetype == "bplist" then
           raise CFFormatError.new("Wong file version #{version}") unless version == "00"
           prsr = Binary.new
+          @format = List::FORMAT_BINARY
         else
           prsr = CFPropertyList.xml_parser_interface.new
+          @format = List::FORMAT_XML
         end
 
         @value = prsr.load({:file => file})
       end
+
+      raise CFFormatError.new("Invalid format or parser error!") if @value.nil?
     end
 
     # Serialize CFPropertyList object to specified format and write it to file
@@ -345,7 +364,10 @@ module CFPropertyList
       end
 
       opts[:root] = @value
+      opts[:formatted] = @formatted unless opts.has_key?(:formatted)
+
       prsr = @@parsers[format-1].new
+
       content = prsr.to_str(opts)
 
       File.open(file, 'wb') {

data/lib/rbLibXMLParser.rb

@@ -10,14 +10,20 @@ module CFPropertyList
     # * :file - The filename of the file to load
     # * :data - The data to parse
     def load(opts)
+      doc = nil
+
       if(opts.has_key?(:file)) then
         doc = LibXML::XML::Document.file(opts[:file],:options => LibXML::XML::Parser::Options::NOBLANKS|LibXML::XML::Parser::Options::NOENT)
       else
         doc = LibXML::XML::Document.string(opts[:data],:options => LibXML::XML::Parser::Options::NOBLANKS|LibXML::XML::Parser::Options::NOENT)
       end
 
-      root = doc.root.first
-      return import_xml(root)
+      if doc
+        root = doc.root.first
+        return import_xml(root)
+      end
+    rescue LibXML::XML::Error => e
+      raise CFFormatError.new('invalid XML: ' + e.message)
     end
 
     # serialize CFPropertyList object to XML
@@ -105,6 +111,8 @@ module CFPropertyList
 
         if node.children? then
           node.children.each do |n|
+            next if n.text? # avoid a bug of libxml
+            next if n.comment?
             ary.push import_xml(n)
           end
         end

data/lib/rbNokogiriParser.rb

@@ -10,7 +10,6 @@ module CFPropertyList
     # * :file - The filename of the file to load
     # * :data - The data to parse
     def load(opts)
-
       doc = nil
       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) }
@@ -18,8 +17,12 @@ module CFPropertyList
         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)
+      if doc
+        root = doc.root.children.first
+        return import_xml(root)
+      end
+    rescue Nokogiri::XML::SyntaxError => e
+      raise CFFormatError.new('invalid XML: ' + e.message)
     end
 
     # serialize CFPropertyList object to XML
@@ -112,6 +115,8 @@ module CFPropertyList
 
         unless children.empty? then
           children.each do |n|
+            next if n.text? # avoid a bug of libxml
+            next if n.comment?
             ary.push import_xml(n)
           end
         end

data/lib/rbREXMLParser.rb

@@ -18,8 +18,12 @@ module CFPropertyList
         doc = REXML::Document.new(opts[:data])
       end
 
-      root = doc.root.elements[1]
-      return import_xml(root)
+      if doc
+        root = doc.root.elements[1]
+        return import_xml(root)
+      end
+    rescue REXML::ParseException => e
+      raise CFFormatError.new('invalid XML: ' + e.message)
     end
 
     # serialize CFPropertyList object to XML
@@ -108,6 +112,7 @@ module CFPropertyList
 
         if node.has_elements? then
           node.elements.each do |n|
+            next if n.name == '#text' # avoid a bug of libxml
             ary.push import_xml(n)
           end
         end

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: CFPropertyList
 version: !ruby/object:Gem::Version
-  version: 2.2.0
-  prerelease: 
+  version: 2.2.1
 platform: ruby
 authors:
 - Christian Kruse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-14 00:00:00.000000000 Z
+date: 2013-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.0
 description: This is a module to read, write and manipulate both binary and XML property
@@ -46,27 +43,26 @@ files:
 - README
 homepage: http://github.com/ckruse/CFPropertyList
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Read, write and manipulate both binary and XML property lists as defined
   by apple
 test_files: []