nokogiri-plist 0.3.1 → 0.4.0

data/lib/nokogiri-plist.rb

@@ -1,14 +1,20 @@
+load_path = File.expand_path(File.dirname(__FILE__))
+$LOAD_PATH.unshift(load_path) unless $LOAD_PATH.include?(load_path)
+
 begin
-  require 'nokogiri'  
+  require 'nokogiri'
 rescue LoadError
   require 'rubygems'
   retry
 end
 require 'date'
 
-# TODO: Do this a not so stupid way
-require File.join(File.dirname(__FILE__), 'string')
-require File.join(File.dirname(__FILE__), 'nokogiri', 'plist', 'generator')
-require File.join(File.dirname(__FILE__), 'nokogiri', 'plist', 'parser')
-require File.join(File.dirname(__FILE__), 'nokogiri', 'plist')
-require File.join(File.dirname(__FILE__), 'nokogiri', 'xml', 'node')
+require 'nokogiri-plist/generator'
+require 'nokogiri-plist/parser'
+require 'nokogiri-plist/node'
+require 'nokogiri-plist/plist'
+
+require 'core_ext/string'
+
+# Nokogiri::XML::Node.extend NokogiriPList::Node
+Nokogiri::XML::Node.send :include, NokogiriPList::Node

data/lib/nokogiri-plist/generator.rb

@@ -0,0 +1,79 @@
+module NokogiriPList
+    
+  class Generator
+      
+    def self.indent_size
+      2
+    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
+            value.inject("") do |result, item|
+              result + item.to_plist_xml_unchomped(current_indent + 1)
+            end
+          end
+        when Hash
+          tag("dict", nil, current_indent) do
+            value.inject("") do |result, (dict_key, dict_value)|
+              result + tag("key", dict_key, current_indent + 1).chomp +
+              dict_value.to_plist_xml_unchomped
+            end
+          end
+        when TrueClass
+          tag("true", nil, current_indent)
+        when FalseClass
+          tag("false", nil, current_indent)
+        when Time
+          tag("date", value.utc.strftime('%Y-%m-%dT%H:%M:%SZ'), current_indent)
+        when Date # also catches DateTime
+          tag("date", value.strftime('%Y-%m-%dT%H:%M:%SZ'), current_indent)
+        when String, Symbol
+          tag("string", value, current_indent)
+        when Fixnum, Bignum, Integer
+          tag("integer", value, current_indent)
+        when Float
+          tag("real", value, current_indent)
+        end
+      end
+      
+    def self.indent(number)
+      " " * (number * indent_size)
+    end
+    
+    def self.array_or_hash?(item)
+      item.is_a?(Hash) or item.is_a?(Array)
+    end
+    
+    def self.tag(name, content=nil, current_indent=0, &block)
+      if content or block_given?
+        new_line = (["array", "dict"].include? name) ? "\n" : ""
+        closing_tag_indent = (new_line != "\n") ? 0 : current_indent
+        indent(current_indent) + "<#{name}>" + new_line +
+        (block_given? ? yield : content).to_s +
+        indent(closing_tag_indent) + "</#{name}>\n"
+      else
+        indent(current_indent) + "<#{name}/>\n"
+      end
+    end
+  end
+  
+end
+
+[String, Symbol, Integer, Float, Date, Time, Hash, Array, TrueClass, FalseClass].each do |klass|
+  
+  klass.class_eval do
+
+    def to_plist_xml(current_indent = 0)
+      self.to_plist_xml_unchomped(current_indent).chomp
+    end
+    
+    def to_plist_xml_unchomped(current_indent = 0)
+      NokogiriPList::Generator.to_s(self, current_indent)
+    end
+    
+  end
+
+end

data/lib/nokogiri-plist/node.rb

@@ -0,0 +1,11 @@
+module NokogiriPList
+
+  module Node
+    
+    def to_plist
+      NokogiriPList::Parser.parse(self)
+    end
+    
+  end
+  
+end

data/lib/nokogiri-plist/parser.rb

@@ -0,0 +1,62 @@
+module NokogiriPList
+      
+  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

data/lib/nokogiri-plist/plist.rb

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

data/lib/nokogiri-plist/version.rb

@@ -0,0 +1,3 @@
+module NokogiriPList
+  VERSION = "0.4.0" unless defined? NokogiriPList::VERSION
+end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: nokogiri-plist
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
+  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors: 
 - Casey Howard
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-08 00:00:00 -07:00
+date: 2011-05-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,26 +21,31 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: mocha
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: Allows Nokogiri objects to be converted to PLists
 email: 
 - caseyhoward@caseyhoward.com
@@ -57,11 +57,12 @@ extra_rdoc_files: []
 
 files: 
 - lib/nokogiri-plist.rb
-- lib/string.rb
-- lib/nokogiri/plist/parser.rb
-- lib/nokogiri/plist/generator.rb
-- lib/nokogiri/xml/node.rb
-- lib/nokogiri/plist.rb
+- lib/nokogiri-plist/version.rb
+- lib/nokogiri-plist/node.rb
+- lib/nokogiri-plist/plist.rb
+- lib/nokogiri-plist/parser.rb
+- lib/nokogiri-plist/generator.rb
+- lib/core_ext/string.rb
 - LICENSE
 - README.rdoc
 has_rdoc: true
@@ -78,25 +79,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   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
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: PList parsing capabilities built using Nokogiri

data/lib/nokogiri/plist.rb

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

data/lib/nokogiri/plist/generator.rb

@@ -1,83 +0,0 @@
-module Nokogiri
-
-  module PList
-    
-    class Generator
-      
-      def self.indent_size
-        2
-      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
-              value.inject("") do |result, item|             
-                result + item.to_plist_xml_unchomped(current_indent + 1)
-              end
-            end
-          when Hash
-            tag("dict", nil, current_indent) do
-              value.inject("") do |result, (dict_key, dict_value)|
-                result + tag("key", dict_key, current_indent + 1).chomp +
-                dict_value.to_plist_xml_unchomped
-              end
-            end
-          when TrueClass
-            tag("true", nil, current_indent)
-          when FalseClass
-            tag("false", nil, current_indent)
-          when Time
-            tag("date", value.utc.strftime('%Y-%m-%dT%H:%M:%SZ'), current_indent)
-          when Date # also catches DateTime
-            tag("date", value.strftime('%Y-%m-%dT%H:%M:%SZ'), current_indent)
-          when String, Symbol
-            tag("string", value, current_indent)
-          when Fixnum, Bignum, Integer
-            tag("integer", value, current_indent)
-          when Float
-            tag("real", value, current_indent)
-        end
-      end
-      
-      def self.indent(number)
-        " " * (number * indent_size) 
-      end
-      
-      def self.array_or_hash?(item)
-        item.is_a?(Hash) or item.is_a?(Array)
-      end
-      
-      def self.tag(name, content=nil, current_indent=0, &block)
-        if content or block_given?
-          new_line = (["array", "dict"].include? name) ? "\n" : ""
-          closing_tag_indent = (new_line != "\n") ? 0 : current_indent
-          indent(current_indent) + "<#{name}>" + new_line +
-          (block_given? ? yield : content).to_s +
-          indent(closing_tag_indent) + "</#{name}>\n"
-        else
-          indent(current_indent) + "<#{name}/>\n" 
-        end
-      end
-    end
-    
-  end
-  
-end
-
-[String, Symbol, Integer, Float, Date, Time, Hash, Array, TrueClass, FalseClass].each do |klass|
-  
-  klass.class_eval do
-
-    def to_plist_xml(current_indent = 0)
-      self.to_plist_xml_unchomped(current_indent).chomp
-    end
-    
-    def to_plist_xml_unchomped(current_indent = 0)
-      Nokogiri::PList::Generator.to_s(self, current_indent)
-    end
-    
-  end
-
-end

data/lib/nokogiri/plist/parser.rb

@@ -1,66 +0,0 @@
-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/xml/node.rb

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