nokogiri-plist 0.2.0 → 0.3.0

data/README.rdoc

@@ -34,15 +34,23 @@ There is already a plist gem (http://github.com/bleything/plist) that has simila
 
   >  require 'nokogiri-plist'
   
+  Parse the plist XML
+
   >  plist = Nokogiri::PList(open('test.plist'))
   => { "Beers" => ["Black Butte", "Steel Reserve", "Bass Pale Ale"], "Beers Drank" => 4123, "Beer Drinker" => "Casey"}
   
+  Read a dict property thats value is an array
+
   >  plist["Beers"]
   => ["Black Butte", "Steel Reserve", "Bass Pale Ale"]
   
+  Read another value
+
   >  plist["Beer Drinker"]
   => "Casey"
   
+  Turn it into a string containing XML
+
   > puts plist.to_plist_xml
     <dict>
       <key>Beers</key>
@@ -55,9 +63,13 @@ There is already a plist gem (http://github.com/bleything/plist) that has simila
       <key>Beer Drinker</key><string>Casey</string>
     </dict>
     
+  Convert a string into a plist XML string
+
   > "beer".to_plist_xml
   => "<string>beer</string>" 
   
+  Convert an array to a plist XML string
+
   > puts (1..3).to_a.to_plist_xml
   <array>
     <integer>1</integer>
@@ -65,16 +77,15 @@ There is already a plist gem (http://github.com/bleything/plist) that has simila
     <integer>3</integer>
   </array>
 
+
 == REQUIREMENTS:
 
-* ruby 1.9 (I'll eventually make sure it works in 1.8, but I'm using 1.9 at the moment)
+* Ruby (tested with 1.9.1 and 1.8.7)
 * nokogiri
 * shoulda and mocha (only if you want to run the tests)
 
 
 == INSTALL:
 
-I haven't published this gem yet, but once I write tests and more documentation the following will work:
-
-* gem install nokogiri-plist
+* [sudo] gem install nokogiri-plist
 

data/lib/nokogiri/plist/generator.rb

@@ -9,6 +9,7 @@ module Nokogiri
       end
       
       def self.to_s(value, current_indent = 0)
+        # Todo: make these procs and allow custom procs (for data for example)
         case value
           when Array
             tag("array", nil, current_indent) do

data/lib/nokogiri/plist/parser.rb

@@ -4,53 +4,59 @@ module Nokogiri
       
     class Parser
       
-      def parse(xml)
-        @converters = {
-          'integer' => Proc.new { |node| node.content.to_i },
-          'real'    => Proc.new { |node| node.content.to_f },
-          'string'  => Proc.new { |node| node.content.to_s },
-          'date'    => Proc.new { |node| DateTime.parse(node.content) },
-          'true'    => Proc.new { |node| true },
-          'false'   => Proc.new { |node| false },
-          'dict'    => Proc.new { |node| parse_dict node },
-          'array'   => Proc.new { |node| parse_array node },
-          'data'    => Proc.new { |node| node.content }
-        }
-        plist = xml.xpath('/plist').first
-        parse_value_node next_valid_sibling(plist.children.first)
-      end
-      
-      def parse_value_node(value_node)
-        @converters[value_node.name].call(value_node)
-      end
-      
-      def valid_type?(type)
-        not @converters[type].nil?
-      end
-      
-      def valid_node?(node)
-        valid_type?(node.name) or node.name == "key"
-      end
-      
-      def parse_dict(node)
-        node.xpath('./key').inject({}) do |return_value, key_node|
-          return_value[key_node.content] = parse_value_node(next_valid_sibling key_node)
-          return_value
+      class << self
+        
+        def parse(xml, options={})
+          @converters = {
+            'integer' => Proc.new { |node| node.content.to_i },
+            'real'    => Proc.new { |node| node.content.to_f },
+            'string'  => Proc.new { |node| node.content.to_s },
+            'date'    => Proc.new { |node| DateTime.parse(node.content) },
+            'true'    => Proc.new { |node| true },
+            'false'   => Proc.new { |node| false },
+            'dict'    => Proc.new { |node| parse_dict node },
+            'array'   => Proc.new { |node| parse_array node },
+            'data'    => Proc.new { |node| node.content.to_s }
+          }.merge(options[:converters] || {})
+          @dict_class = options[:dict_class] || Hash
+          plist = xml.root
+          plist = plist.children.first if plist.name == "plist"
+          parse_value_node next_valid_sibling plist
         end
-      end
-      
-      def parse_array(node)
-        node.children.inject([]) do |return_value, node|
-          return_value << parse_value_node(node) if valid_node? node
-          return_value
+        
+        def parse_value_node(value_node)
+          @converters[value_node.name].call(value_node)
         end
-      end
-      
-      def next_valid_sibling(node)
-        until node.nil? or valid_type? node.name
-          node = node.next_sibling
+        
+        def valid_type?(type)
+          not @converters[type].nil?
+        end
+        
+        def valid_node?(node)
+          valid_type?(node.name) or node.name == "key"
+        end
+        
+        def parse_dict(node)
+          node.xpath('./key').inject(@dict_class.new) do |return_value, key_node|
+            return_value[key_node.content] = parse_value_node(next_valid_sibling key_node)
+            return_value
+          end
+        end
+        
+        def parse_array(node)
+          node.children.inject([]) do |return_value, node|
+            return_value << parse_value_node(node) if valid_node? node
+            return_value
+          end
+        end
+        
+        def next_valid_sibling(node)
+          until node.nil? or valid_type? node.name
+            node = node.next_sibling
+          end
+          node
         end
-        node
+        
       end
       
     end

data/lib/nokogiri/plist/parser.rb~

@@ -0,0 +1,66 @@
+module Nokogiri
+
+  module PList
+      
+    class Parser
+      
+      class << self
+        
+        def parse(xml, options={})
+          @converters = {
+            'integer' => Proc.new { |node| node.content.to_i },
+            'real'    => Proc.new { |node| node.content.to_f },
+            'string'  => Proc.new { |node| node.content.to_s },
+            'date'    => Proc.new { |node| DateTime.parse(node.content) },
+            'true'    => Proc.new { |node| true },
+            'false'   => Proc.new { |node| false },
+            'dict'    => Proc.new { |node| parse_dict node },
+            'array'   => Proc.new { |node| parse_array node },
+            'data'    => Proc.new { |node| node.content.to_s }
+          }.merge(options[:converters] || {})
+          @dict_class = options[:dict_class] || Hash
+          plist = xml.root
+          plist = plist.children.first if plist.name == "plist"
+          parse_value_node next_valid_sibling plist
+        end
+        
+        def parse_value_node(value_node)
+          @converters[value_node.name].call(value_node)
+        end
+        
+        def valid_type?(type)
+          not @converters[type].nil?
+        end
+        
+        def valid_node?(node)
+          valid_type?(node.name) or node.name == "key"
+        end
+        
+        def parse_dict(node)
+          node.xpath('./key').inject(@dict_class.new) do |return_value, key_node|
+            return_value[key_node.content] = parse_value_node(next_valid_sibling key_node)
+            return_value
+          end
+        end
+        
+        def parse_array(node)
+          node.children.inject([]) do |return_value, node|
+            return_value << parse_value_node(node) if valid_node? node
+            return_value
+          end
+        end
+        
+        def next_valid_sibling(node)
+          until node.nil? or valid_type? node.name
+            node = node.next_sibling
+          end
+          node
+        end
+        
+      end
+      
+    end
+    
+  end
+  
+end

data/lib/nokogiri/plist.rb

@@ -3,7 +3,7 @@ module Nokogiri
   class << self
     
     def PList(xml)
-      Nokogiri::PList::Parser.new.parse(Nokogiri::XML(xml))
+      Nokogiri::PList::Parser.parse(Nokogiri::XML(xml))
     end 
     
   end

data/lib/nokogiri/plist.rb~

@@ -0,0 +1,11 @@
+module Nokogiri  
+  
+  class << self
+    
+    def PList(xml)
+      Nokogiri::PList::Parser.parsea(Nokogiri::XML(xml))
+    end 
+    
+  end
+  
+end

data/lib/nokogiri/xml/node.rb

@@ -5,7 +5,7 @@ module Nokogiri
     class Node
       
       def to_plist
-        Nokogiri::PList::Parser.new.parse(self)
+        Nokogiri::PList::Parser.parse(self)
       end
       
     end

data/lib/nokogiri/xml/node.rb~

@@ -0,0 +1,15 @@
+module Nokogiri  
+  
+  module XML
+    
+    class Node
+      
+      def to_plist
+        Nokogiri::PList::Parser.new.parse(self)
+      end
+      
+    end
+
+  end
+  
+end

data/lib/nokogiri-plist.rb

@@ -1,5 +1,9 @@
-
-require 'nokogiri'
+begin
+  require 'nokogiri'  
+rescue LoadError
+  require 'rubygems'
+  retry
+end
 require 'date'
 
 # TODO: Do this a not so stupid way

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: nokogiri-plist
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Casey Howard
@@ -15,23 +14,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-27 00:00:00 -07:00
+date: 2010-05-30 00:00:00 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
+dependencies: []
+
 description: Allows Nokogiri objects to be converted to PLists
 email: 
 - caseyhoward@caseyhoward.com
@@ -45,7 +31,10 @@ files:
 - lib/nokogiri-plist.rb
 - lib/string.rb
 - lib/nokogiri/plist/parser.rb
+- lib/nokogiri/plist/parser.rb~
 - lib/nokogiri/plist/generator.rb
+- lib/nokogiri/plist.rb~
+- lib/nokogiri/xml/node.rb~
 - lib/nokogiri/xml/node.rb
 - lib/nokogiri/plist.rb
 - LICENSE
@@ -60,20 +49,16 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
       segments: 
       - 1
       - 3
@@ -81,8 +66,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 
-rubyforge_project: nokogiri-plist
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: PList parsing capabilities built using Nokogiri