roxo 0.1.6 → 0.1.7

data/lib/roxo.rb

@@ -8,12 +8,15 @@ class ROXO
   include Comparable
   
   attr_reader :raw, :name, :value, :children
-  def __attributes; @attributes.sort;       end
   def   attributes; @attributes.keys;       end
   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 __attributes
+    @attributes.sort.reject{|a|a.to_s =~ /^xmlns/}
+  end 
+
   def initialize(xml)
     xml = ::LibXML::XML::Parser.string(xml).parse.root unless xml.kind_of?(LibXML::XML::Node)
 
@@ -31,13 +34,20 @@ class ROXO
   end # A node is terminal if we can't descend any further
 
   def <=>(other)
-    [:class, :__attributes, :value, :name].each do |key|
-      return z unless (z = self.send(key) <=> other.send(key)).zero?
-    end 
+    return z unless (z = self.class <=> other.class).zero?
+    return z unless (z = self.__attributes <=> other.__attributes).zero?
+    return z unless (z = self.value <=> other.value).zero?
+    return z unless (z = self.name <=> other.name).zero?
+
     nodes = lambda{|obj|obj.children.values.flatten.map{|n|self.class.new(n)}}
     nodes[self] <=> nodes[other]
   end
 
+  def ==(o)
+    self.<=>(o) == 0
+  end 
+
+  
   def method_missing(sym, *args)
     if terminal? # Proxy all method calls to the wrapped object.
       return @value.send(sym, *args)

data/roxo.gemspec

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Burke Libbey
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-21 00:00:00 -05:00
+date: 2010-04-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency