gravitext-xmlprod 1.5.1-java → 1.6.0-java

data/History.rdoc

@@ -1,3 +1,6 @@
+=== 1.6.0 (2012-6-23)
+* Add Element.find_r, select_r recursive variants
+
 === 1.5.1 (2012-4-5)
 * Upgrade to gravitext-util ~> 1.6.1
 * StAXConsumer: fully non-private, non-final

data/Manifest.txt

@@ -12,4 +12,4 @@ test/setup.rb
 test/test_dom.rb
 test/test_tree.rb
 test/xml/huffingtonpost.full.atom.xml
-lib/gravitext-xmlprod/gravitext-xmlprod-1.5.1.jar
+lib/gravitext-xmlprod/gravitext-xmlprod-1.6.0.jar

data/lib/gravitext-xmlprod/extensions.rb

@@ -54,6 +54,14 @@ module Gravitext::XMLProd
       end
     end
 
+    # Return Array of descendant elements matching tag and/or where
+    # yielding to block returns true.  Elements failing the tag/block
+    # test will be recursed into, in search of more matches.
+    def select_r( tag = nil, &block )
+      tag = Tag.new( tag, Tag.WILDCARD_NS ) unless tag.nil? || tag.is_a?( Tag )
+      _select_r( [], tag, block || TRUTH )
+    end
+
     # Return first child element matching tag and/or where yielding to
     # block returns true. Without a block is equivalent to
     # first_element.
@@ -68,6 +76,15 @@ module Gravitext::XMLProd
       end
     end
 
+    # Return first descendant element matching the specified tag
+    # and/or where yielding to block returns true.  Elements failing
+    # the tag/block test will be recursed into, in search of the first
+    # match.
+    def find_r( tag = nil, &block )
+      tag = Tag.new( tag, Tag.WILDCARD_NS ) unless tag.nil? || tag.is_a?( Tag )
+      _find_r( tag, block || TRUTH )
+    end
+
     # Serialize self to String of XML, with options.
     def to_xml( opts = {} )
       XMLHelper.write_element( self,
@@ -75,6 +92,33 @@ module Gravitext::XMLProd
                                opts[ :qmark ]      || QuoteMark::DOUBLE,
                                opts[ :implied_ns ] || [] )
     end
+
+    def _find_r( tag, pred )
+      children.each do |c|
+        if c.element?
+          found = c if ( tag.nil? || c.tag == tag ) && pred.call( c )
+          found ||= c._find_r( tag, pred )
+          return found if found
+        end
+      end
+      nil
+    end
+
+    def _select_r( matches, tag, pred )
+      children.each do |c|
+        if c.element?
+          if ( tag.nil? || c.tag == tag ) && pred.call( c )
+            matches << c
+          else
+            c._select_r( matches, tag, pred )
+          end
+        end
+      end
+      matches
+    end
+
+    TRUTH = lambda { |e| true }
+
   end
 
 end

data/lib/gravitext-xmlprod/version.rb

@@ -16,7 +16,7 @@
 
 module Gravitext
   module XMLProd
-    VERSION = '1.5.1'
+    VERSION = '1.6.0'
 
     LIB_DIR = File.dirname(__FILE__) # :nodoc:
   end

data/pom.xml

@@ -4,7 +4,7 @@
   <groupId>com.gravitext</groupId>
   <artifactId>gravitext-xmlprod</artifactId>
   <packaging>jar</packaging>
-  <version>1.5.1</version>
+  <version>1.6.0</version>
   <name>Gravitext XML Producer</name>
   <url>http://gravitext.com/oss/gravitext-xmlprod</url>
 

data/test/test_tree.rb

@@ -160,6 +160,33 @@ XML
     assert_equal( 1, root.select { |e| e[ att ] == 'a2value' }.length )
   end
 
+  def test_recurse
+    xml = <<XML
+<doc>
+ <o1 a='1'>
+  <i1>text</i1>
+  <i2>next</i2>
+ </o1>
+ <o1 a='2'/>
+ <o1>
+  <o2>
+   <i1 a='3'>other</i1>
+   <i3/>
+  </o2>
+ </o1>
+</doc>
+XML
+    root = parse_tree( xml )
+
+    assert_equal( 'text', root.find_r( 'i1' ).characters )
+    assert_equal( 'next', root.find_r( 'i2' ).characters )
+    assert_equal( 'other',
+                  root.find_r( 'i1' ) { |e| e['a'] == '3' }.characters )
+
+    assert_equal( %w[ 1 2 3 ],
+                  root.select_r { |e| e['a'] }.map { |e| e['a'] } )
+  end
+
   def test_invalid_xml_error
     assert_raises( XMLStreamException ) do
       parse_tree( "<doc><open></doc>" )

metadata

@@ -2,7 +2,7 @@
 name: gravitext-xmlprod
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.5.1
+  version: 1.6.0
 platform: java
 authors: 
   - David Kellum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-06 00:00:00 Z
+date: 2012-06-23 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: gravitext-util
@@ -81,7 +81,7 @@ files:
   - test/test_dom.rb
   - test/test_tree.rb
   - test/xml/huffingtonpost.full.atom.xml
-  - lib/gravitext-xmlprod/gravitext-xmlprod-1.5.1.jar
+  - lib/gravitext-xmlprod/gravitext-xmlprod-1.6.0.jar
 homepage: http://gravitext.rubyforge.org
 licenses: []