gravitext-xmlprod 1.4.1-java → 1.5.b.0-java

data/History.rdoc

@@ -1,3 +1,15 @@
+=== 1.5.b.0 (2012-1-29)
+* New Element ruby extensions and XMLHelper for IO optimization (with
+  perf tests)
+* Add Element.detachAllChildren for convenience/efficiency
+* Add selectable attribute QuoteMark.DOUBLE (default) or SINGLE mode
+  Encoder and Producer.
+* Add Tag.WILDCARD_NS for wildcard matching of namespaces
+* Add Attribute.equals and hashCode for completeness, matching
+* Add shortcut DEFAULT Namespace constructor
+* Add java_import(s) for jruby
+* Upgrade to tarpit ~> 2.0, bundler Gemfile, gemspec (dev)
+
 === 1.4.1 (2011-10-1)
 * Convert ruby tests to minitest
 * Fix ruby 1.9 compatibility (in test): o.to_a -> Array( o )

data/Manifest.txt

@@ -7,7 +7,9 @@ pom.xml
 bin/gravitext-xmlprod-perftest
 lib/gravitext-xmlprod/version.rb
 lib/gravitext-xmlprod.rb
+lib/gravitext-xmlprod/extensions.rb
+test/setup.rb
 test/test_dom.rb
 test/test_tree.rb
 test/xml/huffingtonpost.full.atom.xml
-lib/gravitext-xmlprod/gravitext-xmlprod-1.4.1.jar
+lib/gravitext-xmlprod/gravitext-xmlprod-1.5.b.0.jar

data/NOTICE.txt

@@ -1,2 +1,2 @@
 gravitext-xmlprod
-Copyright (c) 2008-2011 David Kellum
+Copyright (c) 2008-2012 David Kellum

data/README.rdoc

@@ -16,7 +16,7 @@ extensible XML tree representation in Java.
 
 == License
 
-Copyright (c) 2008-2011 David Kellum
+Copyright (c) 2008-2012 David Kellum
 
 Licensed under the Apache License, Version 2.0 (the "License"); you
 may not use this file except in compliance with the License.  You

data/Rakefile

@@ -1,41 +1,7 @@
 # -*- ruby -*-
 
-$LOAD_PATH << './lib'
-require 'gravitext-xmlprod/version'
-
 require 'rubygems'
-gem     'rjack-tarpit', '~> 1.4'
+require 'bundler/setup'
 require 'rjack-tarpit'
 
-t = RJack::TarPit.new( 'gravitext-xmlprod',
-                       Gravitext::XMLProd::VERSION,
-                       :no_assembly, :java_platform )
-
-t.specify do |h|
-  h.developer( "David Kellum", "dek-oss@gravitext.com" )
-  h.extra_deps     << [ 'gravitext-util', '~> 1.5.0'   ]
-
-  h.testlib = :minitest
-  h.extra_dev_deps += [ [ 'rjack-jdom',     '~> 1.1.0.0' ],
-                        [ 'minitest',       '~> 2.3'     ] ]
-
-  h.rubyforge_name = "gravitext"
-end
-
-file 'Manifest.txt' => [ 'lib/gravitext-xmlprod/version.rb' ]
-
-task :check_pom_version do
-  t.test_line_match( 'pom.xml', /<version>/, /#{t.version}/ )
-end
-task :check_history_version do
-  t.test_line_match( 'History.rdoc', /^==/, / #{t.version} / )
-end
-task :check_history_date do
-  t.test_line_match( 'History.rdoc', /^==/, /\([0-9\-]+\)$/ )
-end
-
-task :gem  => [ :check_pom_version, :check_history_version                      ]
-task :tag  => [ :check_pom_version, :check_history_version, :check_history_date ]
-task :push => [                                             :check_history_date ]
-
-t.define_tasks
+RJack::TarPit.new( 'gravitext-xmlprod' ).define_tasks

data/bin/gravitext-xmlprod-perftest

@@ -2,7 +2,7 @@
 # -*- ruby -*-
 
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -22,6 +22,7 @@ $LOAD_PATH.unshift File.join( File.dirname(__FILE__), "..", "lib" )
 require 'rubygems'
 
 require 'gravitext-xmlprod'
+require 'gravitext-xmlprod/extensions'
 require 'gravitext-util/perftest'
 require 'optparse'
 
@@ -29,11 +30,14 @@ require 'java'
 
 class TestCollection
   include Gravitext
+  include Gravitext::XMLProd
   include Gravitext::Concurrent
 
   import 'com.gravitext.xml.producer.perftests.PerfTestFactory'
   import 'com.gravitext.xml.producer.perftests.StringBufferEncodePerfTest'
   import 'com.gravitext.xml.tree.TreePerfTest'
+  import 'com.gravitext.xml.tree.StAXUtils'
+  import 'com.gravitext.xml.tree.TreeUtils'
 
   def run
     options = {}
@@ -89,6 +93,31 @@ class TestCollection
       TreePerfTest::Impl.values.map do |s|
         TreePerfTest.new( xml, s, ( name == 'tree_write' ) )
       end
+
+    when 'ruby_parse'
+      xfile = File.join( File.dirname(__FILE__), '..',
+                         'test/xml/huffingtonpost.full.atom.xml' )
+      xml = IO.read( xfile )
+      [ BlockTestFactory.new( "parse_tree-ext" ) do
+          parse_tree( xml ).children.length
+        end,
+        BlockTestFactory.new( "stax_parse" ) do
+          StAXUtils::staxParse( StAXUtils::staxInput( xml ) ).children.length
+        end ]
+
+    when 'ruby'
+      xfile = File.join( File.dirname(__FILE__), '..',
+                         'test/xml/huffingtonpost.full.atom.xml' )
+
+      root = parse_tree( IO.read( xfile ) )
+
+      [ BlockTestFactory.new( "write_element-ext" ) do
+          root.to_xml.length
+        end,
+        BlockTestFactory.new( "produce_string" ) do
+          TreeUtils.produce_string( root, Indentor::COMPRESSED ).length
+        end ]
+
     else
       raise "No test named #{name}."
     end

data/lib/gravitext-xmlprod.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -19,10 +19,20 @@ require 'java'
 
 require 'gravitext-util'
 
-module Gravitext
+module Gravitext::XMLProd
 
-  module XMLProd
-    require File.join( LIB_DIR, "gravitext-xmlprod-#{ VERSION }.jar" )
-  end
+  require File.join( LIB_DIR, "gravitext-xmlprod-#{ VERSION }.jar" )
+
+  java_import 'com.gravitext.xml.producer.CharacterEncoder'
+  java_import 'com.gravitext.xml.producer.Indentor'
+  java_import 'com.gravitext.xml.producer.Attribute'
+  java_import 'com.gravitext.xml.producer.Namespace'
+  java_import 'com.gravitext.xml.producer.Tag'
+
+  QuoteMark = CharacterEncoder::QuoteMark
+
+  java_import 'com.gravitext.xml.tree.Characters'
+  java_import 'com.gravitext.xml.tree.Element'
+  java_import 'com.gravitext.xml.tree.Node'
 
 end

data/lib/gravitext-xmlprod/extensions.rb

@@ -0,0 +1,83 @@
+#--
+# Copyright (c) 2012 David Kellum
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you
+# may not use this file except in compliance with the License.  You
+# may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.  See the License for the specific language governing
+# permissions and limitations under the License.
+#++
+
+require 'gravitext-xmlprod'
+
+# Magic loader hook -> XMLService
+require 'com/gravitext/xml/jruby/XML'
+
+module Gravitext::XMLProd
+
+  import 'com.gravitext.xml.jruby.ReturnElement'
+
+  def parse_tree( input )
+    rval = ReturnElement.new
+    XMLHelper.stax_parse_string( input, rval )
+    rval.value
+  end
+
+  module_function :parse_tree
+
+  class Element
+
+    # Shorthand for attribute accessed either by name (default
+    # Namespace) or Attribute object.
+    def []( name )
+      attribute( name )
+    end
+
+    def characters
+      XMLHelper.element_characters( self )
+    end
+
+    # Return Array of child elements matching tag and/or further
+    # constrained where yielding to block returns true.
+    def select( tag = nil )
+      tag = Tag.new( tag, Tag.WILDCARD_NS ) unless tag.nil? || tag.is_a?( Tag )
+      if block_given?
+        children.select do |c|
+          c.element? && ( tag.nil? || c.tag == tag ) && yield( c )
+        end
+      else
+        children.select do |c|
+          c.element? && ( c.tag == tag )
+        end
+      end
+    end
+
+    # Return first child element matching tag and/or where yielding to
+    # block returns true. Without a block is equivalent to
+    # first_element.
+    def find( tag = nil )
+      tag = Tag.new( tag, Tag.WILDCARD_NS ) unless tag.nil? || tag.is_a?( Tag )
+      if block_given?
+        children.find do |c|
+          c.element? && ( tag.nil? || c.tag == tag ) && yield( c )
+        end
+      else
+        first_element( tag )
+      end
+    end
+
+    # Serialize self to String of XML, using specified Indentor and
+    # QuoteMark to use for attributes.
+    def to_xml( indentor = Indentor::COMPRESSED, qmark = QuoteMark::DOUBLE )
+      XMLHelper.write_element( self, indentor, qmark )
+    end
+
+  end
+
+end

data/lib/gravitext-xmlprod/version.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -16,7 +16,7 @@
 
 module Gravitext
   module XMLProd
-    VERSION = '1.4.1'
+    VERSION = '1.5.b.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.4.1</version>
+  <version>1.5.b.0</version>
   <name>Gravitext XML Producer</name>
   <url>http://gravitext.com/oss/gravitext-xmlprod</url>
 
@@ -32,7 +32,7 @@
   <parent>
     <groupId>com.gravitext</groupId>
     <artifactId>gravitext-parent</artifactId>
-    <version>1.6</version>
+    <version>1.7</version>
     <relativePath>../gravitext-parent/pom.xml</relativePath>
   </parent>
 
@@ -49,7 +49,21 @@
     <dependency>
       <groupId>com.gravitext</groupId>
       <artifactId>gravitext-util</artifactId>
-      <version>[1.5.0,1.6.0)</version>
+      <version>[1.6.b,1.6.9999)</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jruby.extras</groupId>
+      <artifactId>bytelist</artifactId>
+      <version>1.0.10</version>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jruby</groupId>
+      <artifactId>jruby-core</artifactId>
+      <version>1.6.5.1</version>
+      <optional>true</optional>
     </dependency>
 
     <dependency>

data/test/setup.rb

@@ -0,0 +1,5 @@
+require 'rubygems'
+require 'bundler/setup'
+
+require 'minitest/unit'
+require 'minitest/autorun'

data/test/test_dom.rb

@@ -2,7 +2,7 @@
 #.hashdot.profile += jruby-shortlived
 
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -17,10 +17,7 @@
 # permissions and limitations under the License.
 #++
 
-require 'rubygems'
-require 'minitest/unit'
-
-$LOAD_PATH.unshift File.join( File.dirname(__FILE__), "..", "lib" )
+require File.join( File.dirname( __FILE__ ), "setup" )
 
 require 'gravitext-xmlprod'
 

data/test/test_tree.rb

@@ -2,7 +2,7 @@
 #.hashdot.profile += jruby-shortlived
 
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -17,19 +17,18 @@
 # permissions and limitations under the License.
 #++
 
-require 'rubygems'
-require 'minitest/unit'
-
-$LOAD_PATH.unshift File.join( File.dirname(__FILE__), "..", "lib" )
+require File.join( File.dirname( __FILE__ ), "setup" )
 
 require 'gravitext-xmlprod'
+require 'gravitext-xmlprod/extensions'
 
 class TestTree < MiniTest::Unit::TestCase
+  include Gravitext::XMLProd
+
   import 'com.gravitext.xml.tree.TreeUtils'
   import 'com.gravitext.xml.tree.SAXUtils'
   import 'com.gravitext.xml.tree.StAXUtils'
-  import 'com.gravitext.xml.producer.Indentor'
-  import 'com.gravitext.xml.producer.Tag'
+  import 'javax.xml.stream.XMLStreamException'
 
   TEST_XML = {}
 
@@ -42,9 +41,10 @@ class TestTree < MiniTest::Unit::TestCase
 XML
 
   TEST_XML[ :atts ] = <<XML
-<doc>
+<doc xmlns="foo">
  <a att1="a1value"/>
  <b att2="a2value"/>
+ <b att2="a2value.1"/>
 </doc>
 XML
 
@@ -97,9 +97,7 @@ XML
   end
 
   def assert_xml( xml, root )
-    assert_equal( xml.rstrip,
-                  TreeUtils::produceString( root, Indentor::COMPRESSED ),
-                  show_node( root ) )
+    assert_equal( xml.rstrip, root.to_xml, show_node( root ) )
   end
 
   def test_find
@@ -117,7 +115,7 @@ XML
  </o2>
 </doc>
 XML
-    root = StAXUtils::staxParse( StAXUtils::staxInput( xml ) )
+    root = parse_tree( xml )
     assert_equal( 'text', first( root, :o1, :i1 ).characters )
     assert_equal( 'next', first( root, :o1, :i2 ).characters )
 
@@ -128,6 +126,38 @@ XML
     assert_nil( first( root, :o3 ) )
   end
 
+  def test_find_namespace
+    root = SAXUtils::saxParse( SAXUtils::saxInput( TEST_XML[ :namespace_1 ] ) )
+    aelm = root.find( 'a' )
+    assert( aelm, "found using WILDCARD_NS" )
+    assert_equal( "bar", aelm.tag.namespace.nameIRI, "found the right s:a tag" )
+  end
+
+  def test_select_attribute
+    root = parse_tree( TEST_XML[ :atts ] )
+    # Note: Default NS (foo) is here irrelevent
+    avals = root.select( 'b' ) { |e| e['att2'] }
+    assert_equal( 2, avals.length, "element with att2 found" )
+
+    att = Attribute.new( 'att2' )
+    assert_equal( %w[ a2value a2value.1 ],
+                  avals.map { |e| e[ att ] },
+                  "Matching default NS attribute" )
+  end
+
+  def test_select_attribute_ns
+    root = parse_tree( TEST_XML[ :namespace_2 ] )
+    att = Attribute.new( 'att2', Namespace.new( 'bar' ) )
+    # Note: NS prefix is irrelevant
+    assert_equal( 1, root.select { |e| e[ att ] == 'a2value' }.length )
+  end
+
+  def test_invalid_xml_error
+    assert_raises( XMLStreamException ) do
+      parse_tree( "<doc><open></doc>" )
+    end
+  end
+
   def first( root, *tags )
     root.first_element( *( tags.map { |s| Tag.new( s.to_s ) } ) )
   end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: gravitext-xmlprod
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.4.1
+  prerelease: 4
+  version: 1.5.b.0
 platform: java
 authors: 
   - David Kellum
@@ -10,55 +10,53 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-01 00:00:00 Z
+date: 2012-01-30 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: gravitext-util
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
+    version_requirements: &id001 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 1.5.0
+            version: 1.6.b
+    requirement: *id001
+    prerelease: false
     type: :runtime
-    version_requirements: *id001
   - !ruby/object:Gem::Dependency 
     name: rjack-jdom
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
+    version_requirements: &id002 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: 1.1.0.0
+    requirement: *id002
+    prerelease: false
     type: :development
-    version_requirements: *id002
   - !ruby/object:Gem::Dependency 
     name: minitest
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
+    version_requirements: &id003 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: "2.3"
+    requirement: *id003
+    prerelease: false
     type: :development
-    version_requirements: *id003
   - !ruby/object:Gem::Dependency 
     name: rjack-tarpit
-    prerelease: false
-    requirement: &id004 !ruby/object:Gem::Requirement 
+    version_requirements: &id004 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 1.4.0
+            version: "2.0"
+    requirement: *id004
+    prerelease: false
     type: :development
-    version_requirements: *id004
-description: |-
-  XML utilities, includes a fast XML streaming producer and an
-  extensible XML tree representation in Java.
+description: 
 email: 
   - dek-oss@gravitext.com
 executables: 
@@ -66,8 +64,6 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-  - Manifest.txt
-  - NOTICE.txt
   - History.rdoc
   - README.rdoc
 files: 
@@ -80,11 +76,12 @@ files:
   - bin/gravitext-xmlprod-perftest
   - lib/gravitext-xmlprod/version.rb
   - lib/gravitext-xmlprod.rb
+  - lib/gravitext-xmlprod/extensions.rb
+  - test/setup.rb
   - test/test_dom.rb
   - test/test_tree.rb
   - test/xml/huffingtonpost.full.atom.xml
-  - lib/gravitext-xmlprod/gravitext-xmlprod-1.4.1.jar
-  - .gemtest
+  - lib/gravitext-xmlprod/gravitext-xmlprod-1.5.b.0.jar
 homepage: http://gravitext.rubyforge.org
 licenses: []
 
@@ -99,20 +96,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 2
+        segments: 
+          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.3.1
 requirements: []
 
-rubyforge_project: gravitext
-rubygems_version: 1.8.10
+rubyforge_project: 
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: XML utilities, includes a fast XML streaming producer and an extensible XML tree representation in Java.
-test_files: 
-  - test/test_dom.rb
-  - test/test_tree.rb
+test_files: []
+