roxo 0.0.1 → 0.0.2

data/lib/roxo.rb

@@ -7,71 +7,62 @@ require 'libxml'
 # z.bar.baz #=> "asdf"
 
 # Ruby Objects as XML Objects
-module ROXO
-  # Can take a String of XML data, or anything that responds to
-  # either +read+ or +to_s+.
-  def self.new(duck)
-    method = duck.respond_to?(:read) ? :read : :to_s
-    Element.new(::LibXML::XML::Parser.string(duck.send(method)).parse.root)
+class ROXO
+  instance_methods.each do |meth|
+    eval "undef #{meth}" unless [:__send__, :__id__, :object_id, :class].include?(meth.to_sym)
   end
 
-  private ##################################################################
-
-  class Element
-    instance_methods.each do |meth|
-      eval "undef #{meth}" unless [:__send__, :__id__, :object_id, :class].include?(meth.to_sym)
-    end
-
-    include Comparable
+  include Comparable
+  
+  # Accessors and other one-liners
+  attr_reader :raw, :name, :value, :children
+  def __attributes; @attributes;            end
+  def   attributes; @attributes.keys;       end
+  def    terminal?; @children.size.zero?;   end # A node is terminal if we can't descend any further
+  def      has?(o); !! send(o);             end # Boolean. Does this exist?
+  def        [](o); @attributes[o.to_s];    end # Only lookup attributes
+  def         to_s; @value;                 end 
+  
+  def initialize(xml)
+    unless xml.class == LibXML::XML::Parser
+      method = xml.respond_to?(:read) ? :read : :to_s
+      xml = ::LibXML::XML::Parser.string(xml.send(method))
+    end 
     
-    # Accessors and other one-liners
-    attr_reader :raw, :name, :value
-    def __attributes; @attributes;            end
-    def   __children; @children;              end
-    def   attributes; @attributes.keys;       end
-    def     children; @children_by_name.keys; end
-    def    terminal?; @children.size.zero?;   end # A node is terminal if we can't descend any further
-    def      has?(o); !! send(o);             end # Boolean. Does this exist?
-    def        [](o); @attributes[o.to_s];    end # Only lookup attributes
-    def         to_s; @value;                 end 
+    @raw, @name, @attributes = xml, xml.name, xml.attributes.to_h
     
-    def initialize(xml)
-      @raw, @name, @attributes = xml, xml.name, xml.attributes.to_h
-      
-      @children         = xml.children.select(&:element?)
-      @children_by_name = @children.group_by{|c|c.name.to_sym}
-      
-      text_value  = xml.children.select(&:text?).map(&:to_s).reject(&:empty?).join
-      cdata_value = xml.children.select(&:cdata?).map{|c|c.to_s.chomp(']]>').sub('<![CDATA[', '')}.join
-      @value = text_value.empty? ? cdata_value : text_value
-    end
-
-    def inspect
-      terminal? ? value.inspect : "#<ROXO::Element(#{name}):0x#{object_id.to_s(16)}>"
-    end 
+    @children = xml.children.select(&:element?).group_by{|c|c.name.to_sym}
+    
+    text_value  = xml.children.select(&:text?).map(&:to_s).reject(&:empty?).join
+    cdata_value = xml.children.select(&:cdata?).map{|c|c.to_s.chomp(']]>').sub('<![CDATA[', '')}.join
+    @value = text_value.empty? ? cdata_value : text_value
+  end
 
-    def <=>(other)
-      return z unless (z = self.class             <=> other.class            ).zero?
-      return z unless (z = self.__attributes.sort <=> other.__attributes.sort).zero?
-      return z unless (z = self.value             <=> other.value            ).zero?
-      return z unless (z = self.name              <=> other.name             ).zero?
+  def inspect
+    terminal? ? value.inspect : "#<ROXO(#{name}):0x#{object_id.to_s(16)}>"
+  end 
 
-      our_nodes   =  self.__children.map{|n|self.class.new(n)}
-      their_nodes = other.__children.map{|n|self.class.new(n)}
+  def <=>(other)
+    return z unless (z = self.class             <=> other.class            ).zero?
+    return z unless (z = self.__attributes.sort <=> other.__attributes.sort).zero?
+    return z unless (z = self.value             <=> other.value            ).zero?
+    return z unless (z = self.name              <=> other.name             ).zero?
 
-      our_nodes.sort <=> their_nodes.sort
-    end
+    our_nodes   =  self.children.values.flatten.map{|n|self.class.new(n)}
+    their_nodes = other.children.values.flatten.map{|n|self.class.new(n)}
 
-    def method_missing(sym, *args)
-      if @children_by_name[sym]
-        return self.class.new(@children_by_name[sym].first)
-      elsif @attributes[sym.to_s]
-        return @attributes[sym.to_s]
-      elsif @children_by_name[sing = sym.to_s.singularize.to_sym]
-        return @children_by_name[sing].map{|e|self.class.new(e)}
-      end 
-    end
+    our_nodes.sort <=> their_nodes.sort
+  end
 
+  def method_missing(sym, *args)
+    if @children_by_name[sym]
+      return self.class.new(@children_by_name[sym].first)
+    elsif @attributes[sym.to_s]
+      return @attributes[sym.to_s]
+    elsif @children_by_name[sing = sym.to_s.singularize.to_sym]
+      return @children_by_name[sing].map{|e|self.class.new(e)}
+    end 
   end
-  
+
 end
+

data/roxo.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name    = 'roxo'
-  gem.version = "0.0.1"
+  gem.version = "0.0.2"
 
   gem.author, gem.email = 'Burke Libbey', "burke@burkelibbey.org"
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Burke Libbey