roxo 0.0.2 → 0.0.3

data/lib/roxo.rb

@@ -1,11 +1,6 @@
-require 'rubygems'
 require 'active_support/inflector'
 require 'libxml' 
 
-# z = ROXO.new("<foo a='zxcv'><bar><baz>asdf</baz></bar></foo>")
-# z.a #=> "zxcv"
-# z.bar.baz #=> "asdf"
-
 # Ruby Objects as XML Objects
 class ROXO
   instance_methods.each do |meth|
@@ -14,9 +9,8 @@ class ROXO
 
   include Comparable
   
-  # Accessors and other one-liners
   attr_reader :raw, :name, :value, :children
-  def __attributes; @attributes;            end
+  def __attributes; @attributes.sort;       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?
@@ -24,34 +18,26 @@ class ROXO
   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 
-    
+    xml = ::LibXML::XML::Parser.string(xml).parse.root unless xml.kind_of?(LibXML::XML::Node)
+
     @raw, @name, @attributes = xml, xml.name, xml.attributes.to_h
-    
     @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 inspect
-    terminal? ? value.inspect : "#<ROXO(#{name}):0x#{object_id.to_s(16)}>"
+    terminal? ? value.inspect : "#<ROXO:0x#{object_id.to_s(16)} @name=\"#{@name}\", ...>"
   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?
-
-    our_nodes   =  self.children.values.flatten.map{|n|self.class.new(n)}
-    their_nodes = other.children.values.flatten.map{|n|self.class.new(n)}
-
-    our_nodes.sort <=> their_nodes.sort
+    [:class, :__attributes, :value, :name].each do |key|
+      return z unless (z = self.send(key) <=> other.send(key)).zero?
+    end 
+    nodes = lambda{|obj|obj.children.values.flatten.map{|n|self.class.new(n)}}
+    nodes[self] <=> nodes[other]
   end
 
   def method_missing(sym, *args)
@@ -65,4 +51,3 @@ class ROXO
   end
 
 end
-

data/roxo.gemspec

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

metadata

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