traverse 0.0.1 → 0.0.2

data/.gitignore

@@ -3,3 +3,5 @@
 Gemfile.lock
 pkg/*
 .rvmrc
+*.swp
+.DS_Store

data/lib/traverse/version.rb

@@ -1,3 +1,3 @@
 module Traverse
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/traverse.rb

@@ -1,39 +1,52 @@
 require "traverse/version"
 require 'nokogiri'
 require 'open-uri'
+require 'active_support/inflector'
 
 module Traverse
   class Document
     def initialize document
-      if document.is_a? String
-        begin
-          @document = Nokogiri::XML(document)
-        rescue
-          return nil
-        end
-      else
-        @document = document
-      end
+      setup_underlying_document document
 
       if text_node?
         define_singleton_method "text" do
           @document.children.first.content
         end
-      else
-        @document.children.reject do |child|
-          child.is_a? Nokogiri::XML::Text
-        end.group_by(&:name).each do |name, children|
-          if children.count == 1
-            define_singleton_method "#{name}" do 
-              Document.new children.first
+      end
+
+      singular_children.group_by(&:name).each do |name, children|
+        if children.count == 1
+          child = children.first
+          if text_only_node? child
+            define_singleton_method name do
+              child.content.strip
             end
           else
-            define_singleton_method "#{name}s" do
-              children.map { |child| Document.new child }
+            define_singleton_method name do 
+              Document.new child
+            end
+          end
+        else
+          define_singleton_method name.pluralize do
+            children.map do |child|
+              if text_only_node? child
+                child.content.strip
+              else
+                Document.new child
+              end
             end
           end
         end
       end
+
+      plural_children.each do |pluralized_child|
+        define_singleton_method pluralized_child.name do
+          pluralized_child.children.reject do |baby|
+            baby.class == Nokogiri::XML::Text
+          end.map { |child| Document.new child }
+        end
+      end
+
     end
 
     def [] attr
@@ -45,12 +58,74 @@ module Traverse
         self[m] or super
       end
 
+      def attributes
+        if @document.is_a? Nokogiri::XML::Document
+          []
+        else
+          @document.attributes
+        end
+      end
+
       def text_node?
         num_children = @document.children.count
         return false unless num_children == 1
 
         @document.children.first.is_a? Nokogiri::XML::Text
       end
+
+      def text_only_node? node
+        node.children.all? do |child|
+          child.is_a? Nokogiri::XML::Text
+        end and node.attributes.empty?
+      end
+
+      def real_children
+        @document.children.reject do |child|
+          child.is_a? Nokogiri::XML::Text
+        end
+      end
+
+      def singular_children
+        real_children.select do |child|
+          child.children.any? do |baby|
+            if baby.class == Nokogiri::XML::Text
+              false # ignore text children
+            else
+              baby.name != child.name.singularize
+            end
+          end or child.children.all? do |baby|
+            baby.class == Nokogiri::XML::Text
+          end
+        end
+      end
+
+      def plural_children
+        real_children.select do |child|
+          child.children.all? do |baby|
+            if baby.class == Nokogiri::XML::Text
+              true
+            else
+              baby.name == child.name.singularize
+            end
+          end and child.children.count > 1
+        end
+      end
+
+      def setup_underlying_document document
+        if document.is_a? String
+          begin
+            @document = Nokogiri::XML(document)
+          rescue
+            return nil
+          end
+        else
+          @document = document
+        end
+      end
+
+      def to_s
+        "<Traversable... >"
+      end
   end
 
   module Proxy

data/spec/spec.rb

@@ -8,14 +8,14 @@ require 'minitest/pride'
 xml = %{
   <book title="Vineland" author="Thomas Pynchon">
     <author name="Thomas Pynchon">
-      <book title="V" />
-      <book title="The Crying of Lot 49" />
-      <book title="Gravity's Rainbow" />
-      <book title="Slow Learner" />
-      <book title="Vineland" />
-      <book title="Mason &amp; Dixon" />
-      <book title="Against the Day" />
-      <book title="Inherent Vice" />
+      <book> V </book>
+      <book> The Crying of Lot 49 </book>
+      <book> Gravity's Rainbow" </book>
+      <book> Slow Learner" </book>
+      <book> Vineland </book>
+      <book> Mason &amp; Dixon </book>
+      <book> Against the Day </book>
+      <book> Inherent Vice </book>
     </author>
     <epigraph author="Johnny Copeland">
       Every dog has his day,
@@ -45,6 +45,9 @@ xml = %{
       America has been doing to itself, to its children, all these many
       years.
     </review>
+    <pagecount>
+      385
+    </pagecount>
     <text text="seriously, who writes XML like this">
       I mean, rilly.
     </text>
@@ -85,7 +88,19 @@ describe Traverse::Document do
     @doc.book.text.text.must_match(/rilly/)
   end
 
+  it "knows when a node has only text and no attributes" do
+    @doc.book.pagecount.must_equal "385"
+  end
+
   it "knows to collect children with the same name" do
     @doc.book.author.books.count.must_equal 8
+    assert @doc.book.author.books.all? do |book|
+      book.is_a? String
+    end
+  end
+
+  it "knows to collect children of a pluralized parent" do
+    @doc.book.quotations.count.must_equal 2
+    @doc.book.quotations.last.text.must_match(/more like an idiot savant/)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traverse
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-02 00:00:00.000000000 -04:00
+date: 2011-08-03 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2164471840 !ruby/object:Gem::Requirement
+  requirement: &2157314300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,7 +22,7 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *2164471840
+  version_requirements: *2157314300
 description: Easily traverse an XML document.
 email:
 - alan.m.odonnell@gmail.com