Empact-roxml 2.1 → 2.2

data/lib/roxml/xml/libxml.rb

@@ -1,7 +1,7 @@
 require 'libxml'
 
 module ROXML
-  module XML # ::nodoc::
+  module XML # :nodoc:all
     Document = LibXML::XML::Document
     Node = LibXML::XML::Node
     Parser = LibXML::XML::Parser
@@ -19,7 +19,7 @@ module ROXML
     private
       def namespaced(xpath)
         xpath.between('/') do |component|
-          if component =~ /\w+/ && !component.include?(':')
+          if component =~ /\w+/ && !component.include?(':') && !component.starts_with?('@')
             in_default_namespace(component)
           else
             component

data/lib/roxml/xml/rexml.rb

@@ -1,5 +1,5 @@
 module ROXML
-  module XML # ::nodoc::
+  module XML # :nodoc:all
     Document = REXML::Document
     Node = REXML::Element
 
@@ -16,7 +16,10 @@ module ROXML
       end
 
       alias_attribute :content, :text
-      alias :search :get_elements
+
+      def search(xpath)
+        REXML::XPath.match(self, xpath)
+      end
 
       def child_add(element)
         if element.is_a?(REXML::CData)

data/roxml.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "roxml"
   s.summary = "Ruby Object to XML mapping library"
-  s.version = "2.1"
+  s.version = "2.2"
   s.homepage = "http://roxml.rubyforge.org"
   s.platform = Gem::Platform::RUBY
   s.authors = ["Ben Woosley", "Zak Mandhro", "Anders Engstrom", "Russ Olsen"]
@@ -13,9 +13,13 @@ Gem::Specification.new do |s|
     'Rakefile',
     'roxml.gemspec',
     'lib/roxml.rb',
-    'lib/roxml/array.rb',
+    'lib/roxml/extensions/array.rb',
+    'lib/roxml/extensions/array/conversions.rb',
+    'lib/roxml/extensions/string.rb',
+    'lib/roxml/extensions/string/conversions.rb',
+    'lib/roxml/extensions/string/iterators.rb',
+    'lib/roxml/extensions/deprecation.rb',
     'lib/roxml/options.rb',
-    'lib/roxml/string.rb',
     'lib/roxml/xml.rb',
     'lib/roxml/xml/libxml.rb',
     'lib/roxml/xml/rexml.rb',
@@ -30,11 +34,18 @@ Gem::Specification.new do |s|
     'test/fixtures/book_with_default_namespace.xml',
     'test/fixtures/book_with_depth.xml',
     'test/fixtures/book_with_publisher.xml',
+    'test/fixtures/book_with_wrapped_attr.xml',
     'test/fixtures/dictionary_of_attrs.xml',
+    'test/fixtures/dictionary_of_attr_name_clashes.xml',
+    'test/fixtures/dictionary_of_guarded_names.xml',
     'test/fixtures/dictionary_of_mixeds.xml',
+    'test/fixtures/dictionary_of_names.xml',
+    'test/fixtures/dictionary_of_name_clashes.xml',
     'test/fixtures/dictionary_of_texts.xml',
     'test/fixtures/library_uppercase.xml',
     'test/fixtures/library.xml',
+    'test/fixtures/node_with_attr_name_conflicts.xml',
+    'test/fixtures/node_with_name_conflicts.xml',
     'test/fixtures/nameless_ageless_youth.xml',
     'test/fixtures/person_with_guarded_mothers.xml',
     'test/fixtures/person_with_mothers.xml',
@@ -54,6 +65,8 @@ Gem::Specification.new do |s|
     'test/unit/xml_object_test.rb',
     'test/unit/xml_text_test.rb']
   s.requirements << 'none'
+  s.add_dependency 'extensions', '>= 0.6.0'
+  s.add_development_dependency('Empact-rails-plugin-package-task', '>= 0.1') if s.respond_to?(:add_development_dependency)
   s.require_path = 'lib'
   s.test_files = [
     'test/unit/options_test.rb',

data/test/fixtures/book_with_wrapped_attr.xml

@@ -0,0 +1,3 @@
+<book>
+  <ids ISBN="0974514055" />
+</book>

data/test/fixtures/dictionary_of_attr_name_clashes.xml

@@ -0,0 +1,8 @@
+<dictionary>
+  <definition name="quaquaversally">
+    <content>adjective: (of a geological formation) sloping downward from the center in all directions.</content>
+  </definition>
+  <definition name="tergiversate">
+    <content>To use evasions or ambiguities; equivocate.</content>
+  </definition>
+</dictionary>

data/test/fixtures/dictionary_of_guarded_names.xml

@@ -0,0 +1,6 @@
+<dictionary>
+  <definitions>
+    <quaquaversally>adjective: (of a geological formation) sloping downward from the center in all directions.</quaquaversally>
+    <tergiversate>To use evasions or ambiguities; equivocate.</tergiversate>
+  </definitions>
+</dictionary>

data/test/fixtures/dictionary_of_name_clashes.xml

@@ -0,0 +1,10 @@
+<dictionary>
+  <definition>
+    <name>quaquaversally</name>
+    <content>adjective: (of a geological formation) sloping downward from the center in all directions.</content>
+  </definition>
+  <definition>
+    <name>tergiversate</name>
+    <content>To use evasions or ambiguities; equivocate.</content>
+  </definition>
+</dictionary>

data/test/fixtures/dictionary_of_names.xml

@@ -0,0 +1,4 @@
+<dictionary>
+  <quaquaversally>adjective: (of a geological formation) sloping downward from the center in all directions.</quaquaversally>
+  <tergiversate>To use evasions or ambiguities; equivocate.</tergiversate>
+</dictionary>

data/test/fixtures/node_with_attr_name_conflicts.xml

@@ -0,0 +1 @@
+<node content="Just junk... really" name="Cartwheel" />

data/test/fixtures/node_with_name_conflicts.xml

@@ -0,0 +1,4 @@
+<node>
+  <content>Just junk... really</content>
+  <name>Cartwheel</name>
+</node>

data/test/mocks/mocks.rb

@@ -1,5 +1,39 @@
 require "lib/roxml"
 
+class Muffins
+  include ROXML
+
+  xml_reader(:count, :from => 'bakers_dozens') {|val| val.to_i * 13 }
+end
+
+class MuffinsWithStackedBlocks
+  include ROXML
+
+  xml_reader(:count, :from => 'bakers_dozens', :as => Integer) {|val| val * 13 }
+end
+
+class Numerology
+  include ROXML
+
+  xml_reader :predictions, {:attrs => ['number', 'meaning']} do |k, v|
+    [Integer(k), v]
+  end
+end
+
+class Contributor
+  include ROXML
+
+  xml_reader :role, :attr
+  xml_reader :name
+end
+
+class WriteableContributor
+  include ROXML
+
+  xml_accessor :role, :attr
+  xml_accessor :name
+end
+
 class Book
   include ROXML
 
@@ -7,9 +41,17 @@ class Book
   xml_reader :title
   xml_reader :description, :as => :cdata
   xml_reader :author
-  xml_accessor :pages, :text => 'pagecount' do |val|
-    Integer(val)
-  end
+  xml_accessor :pages, :text => 'pagecount', :as => Integer
+end
+
+class BookWithRequired
+  include ROXML
+
+  xml_accessor :isbn, :attr => 'ISBN', :required => true
+  xml_reader :title, :required => true
+  xml_reader :contributors, [Contributor], :in => 'contributor_array', :required => true
+  xml_reader :contributor_hash, {:attrs => ['role', 'name']},
+                                :from => 'contributor', :in => 'contributor_hash', :required => true
 end
 
 class BookWithAttrFrom
@@ -18,6 +60,13 @@ class BookWithAttrFrom
   xml_accessor :isbn, :attr, :from => 'ISBN'
 end
 
+class BookWithWrappedAttr
+  include ROXML
+
+  xml_name :book
+  xml_accessor :isbn, :attr => 'ISBN', :in => 'ids'
+end
+
 class Measurement
   include ROXML
 
@@ -80,13 +129,6 @@ class BookWithAuthorTextAttribute
   xml_reader :author, Author
 end
 
-class Contributor
-  include ROXML
-
-  xml_reader :role, :attr
-  xml_reader :name
-end
-
 class BookWithContributions
   include ROXML
 
@@ -107,6 +149,16 @@ class BookWithContributors
   xml_reader :contributors, Contributor, :as => :array
 end
 
+class WriteableBookWithContributors
+  include ROXML
+
+  xml_name :book
+  xml_accessor :isbn, :attr
+  xml_accessor :title
+  xml_accessor :description
+  xml_accessor :contributors, Contributor, :as => :array
+end
+
 class NamelessBook
   include ROXML
 
@@ -209,4 +261,4 @@ class PersonWithMotherOrMissing
   xml_reader :age, :attr, :else => 21
   xml_reader :name, :else => 'Anonymous'
   xml_reader :mother, PersonWithMotherOrMissing, :else => Person.new
-end
+end

data/test/unit/options_test.rb

@@ -23,6 +23,19 @@ class TestOptions < Test::Unit::TestCase
     assert ROXML::Opts.new(:author, :content).content?
   end
 
+  def test_required
+    assert !ROXML::Opts.new(:author, :content).required?
+    assert ROXML::Opts.new(:author, :content, :required => true).required?
+    assert !ROXML::Opts.new(:author, :content, :required => false).required?
+  end
+
+  def test_required_conflicts_with_else
+    assert_raise ArgumentError do
+      ROXML::Opts.new(:author, :content, :required => true, :else => 'Johnny')
+    end
+    ROXML::Opts.new(:author, :content, :required => false, :else => 'Johnny')
+  end
+
   def test_hash_of_attrs
     opts = ROXML::Opts.new(:attributes, {:attrs => [:name, :value]})
     assert opts.hash?
@@ -45,7 +58,7 @@ class TestOptions < Test::Unit::TestCase
                                          :value => :content})
     assert opts.hash?
     assert !opts.array?
-    assert opts.hash.value.content
+    assert opts.hash.value.content?
     assert_equal [ROXML::XMLAttributeRef, ROXML::XMLTextRef], opts.hash.types
     assert_equal ['name', ''], opts.hash.names
   end
@@ -59,4 +72,31 @@ class TestOptions < Test::Unit::TestCase
     assert_equal [ROXML::XMLAttributeRef, ROXML::XMLAttributeRef], opts.hash.types
     assert_equal ['dt', 'dd'], opts.hash.names
   end
+
+  def test_no_block_shorthand_means_no_block
+    assert ROXML::Opts.new(:count).blocks.empty?
+    assert ROXML::Opts.new(:count, :as => :intager).blocks.empty?
+    assert ROXML::Opts.new(:count, :as => :foat).blocks.empty?
+  end
+
+  def test_block_integer_shorthand
+    assert_equal 3, ROXML::Opts.new(:count, :as => :integer).blocks.only['3']
+    assert_equal 3, ROXML::Opts.new(:count, :as => Integer).blocks.only['3']
+  end
+
+  def test_block_float_shorthand
+    assert_equal 3.1, ROXML::Opts.new(:count, :as => :float).blocks.only['3.1']
+    assert_equal 3.1, ROXML::Opts.new(:count, :as => Float).blocks.only['3.1']
+  end
+
+  def test_multiple_shorthands_raises
+    assert_raises ArgumentError do
+      ROXML::Opts.new(:count, :as => [Float, Integer])
+    end
+  end
+
+  def test_stacked_blocks
+    assert_equal 2, ROXML::Opts.new(:count, :as => Integer) {|val| val.to_i }.blocks.size
+    assert_equal 2, ROXML::Opts.new(:count, :as => Float) {|val| val.object_id }.blocks.size
+  end
 end

data/test/unit/roxml_test.rb

@@ -5,7 +5,7 @@ class TestROXML < Test::Unit::TestCase
   def test_malformed
     ROXML::XML::Parser.register_error_handler {|err| }
     assert_raise ROXML::XML::Parser::ParseError do
-      book = Book.parse(fixture(:book_malformed))
+      book = Book.from_xml(fixture(:book_malformed))
     end
   end
 

data/test/unit/string_test.rb

@@ -1,4 +1,4 @@
-require 'lib/roxml/string'
+require 'lib/roxml/extensions/string'
 
 class TestROXML < Test::Unit::TestCase
   def test_to_latin_is_accessible

data/test/unit/to_xml_test.rb

@@ -6,7 +6,7 @@ def to_xml_test(*names)
     xml_name ||= name
 
     define_method "test_#{name}" do
-      dict = name.to_s.camelize.constantize.parse(fixture(xml_name))
+      dict = name.to_s.camelize.constantize.from_xml(fixture(xml_name))
       xml = xml_fixture(xml_name)
       remove_children(xml)
       assert_equal xml, dict.to_xml
@@ -49,11 +49,13 @@ class TestOtherToXml < Test::Unit::TestCase
 
   to_xml_test :person_with_mother => :person_with_mothers,
               :person_with_guarded_mother => :person_with_guarded_mothers
+
+  to_xml_test :book_with_wrapped_attr
 end
 
 class TestToXmlWithDefaults < Test::Unit::TestCase
   def test_content_and_attr_defaults_are_represented_in_output
-    dict = Person.parse(fixture(:nameless_ageless_youth))
+    dict = Person.from_xml(fixture(:nameless_ageless_youth))
 
     xml = '<person age="21">Unknown</person>'
     assert_equal ROXML::XML::Parser.parse(xml).root, dict.to_xml
@@ -62,7 +64,7 @@ end
 
 class TestToXmlWithBlocks < Test::Unit::TestCase
   def test_pagecount_serialized_properly_after_modification
-    b = Book.parse(fixture(:book_valid))
+    b = Book.from_xml(fixture(:book_valid))
     xml = xml_fixture(:book_valid)
     assert_equal '357', xml.search('pagecount').first.content
     assert_equal 357, b.pages

data/test/unit/xml_attribute_test.rb

@@ -3,32 +3,37 @@ require File.join(File.dirname(__FILE__), '..', 'test_helper')
 class TestXMLAttribute < Test::Unit::TestCase
   def test_attr_from
     # :attr => *
-    book = Book.parse(fixture(:book_text_with_attribute))
+    book = Book.from_xml(fixture(:book_text_with_attribute))
     assert_equal '0201710897', book.isbn
 
     # :attr, :from => *
-    book = BookWithAttrFrom.parse(fixture(:book_text_with_attribute))
+    book = BookWithAttrFrom.from_xml(fixture(:book_text_with_attribute))
     assert_equal '0201710897', book.isbn
   end
 
   def test_mutable_attr
-    book = Book.parse(fixture(:book_text_with_attribute))
+    book = Book.from_xml(fixture(:book_text_with_attribute))
     assert book.respond_to?(:'isbn=')
   end
 
   def test_default_initialization
-    person = PersonWithMotherOrMissing.parse(fixture(:nameless_ageless_youth))
+    person = PersonWithMotherOrMissing.from_xml(fixture(:nameless_ageless_youth))
     assert_equal 21, person.age
   end
 
   def test_recursive_with_default_initialization
-    p = PersonWithMotherOrMissing.parse(fixture(:person_with_mothers))
+    p = PersonWithMotherOrMissing.from_xml(fixture(:person_with_mothers))
     assert_equal 21, p.mother.mother.mother.age
   end
 
   def test_no_name_clashes
-    n = NodeWithAttrNameConflicts.parse(fixture(:node_with_attr_name_conflicts))
+    n = NodeWithAttrNameConflicts.from_xml(fixture(:node_with_attr_name_conflicts))
     assert_equal "Just junk... really", n.content
     assert_equal "Cartwheel", n.name
   end
+
+  def test_wrapped_attr_accessible
+    b = BookWithWrappedAttr.from_xml(fixture(:book_with_wrapped_attr))
+    assert_equal "0974514055", b.isbn
+  end
 end

data/test/unit/xml_construct_test.rb

@@ -2,18 +2,18 @@ require File.join(File.dirname(__FILE__), '..', 'test_helper')
 
 class TestXMLAttribute < Test::Unit::TestCase
   def test_initialize_is_run
-    m = Measurement.parse('<measurement units="hundredths-meters">1130</measurement>')
+    m = Measurement.from_xml('<measurement units="hundredths-meters">1130</measurement>')
     assert_equal 11.3, m.value
     assert_equal 'meters', m.units
   end
 
   def test_initialize_is_run_for_nested_type
-    b = BookWithDepth.parse(fixture(:book_with_depth))
+    b = BookWithDepth.from_xml(fixture(:book_with_depth))
     assert_equal Measurement.new(11.3, 'meters'), b.depth
   end
 
   def test_initialize_is_run_for_nested_type_with_inheritance
-    b = InheritedBookWithDepth.parse(fixture(:book_with_depth))
+    b = InheritedBookWithDepth.from_xml(fixture(:book_with_depth))
     assert_equal Measurement.new(11.3, 'meters'), b.depth
   end
 end

data/test/unit/xml_hash_test.rb

@@ -7,47 +7,43 @@ class TestXMLHash < Test::Unit::TestCase
   end
 
   def test_attrs_hash
-    dict = DictionaryOfAttrs.parse(fixture(:dictionary_of_attrs))
+    dict = DictionaryOfAttrs.from_xml(fixture(:dictionary_of_attrs))
     assert_equal Hash, dict.definitions.class
     assert_equal @contents, dict.definitions
   end
 
   def test_text_hash
-    assert_equal 'definition', DictionaryOfTexts.tag_refs.only.name
-    assert_equal 'word', DictionaryOfTexts.tag_refs.only.hash.key.name
-    assert_equal 'meaning', DictionaryOfTexts.tag_refs.only.hash.value.name
-
-    dict = DictionaryOfTexts.parse(fixture(:dictionary_of_texts))
+    dict = DictionaryOfTexts.from_xml(fixture(:dictionary_of_texts))
     assert_equal Hash, dict.definitions.class
     assert_equal @contents, dict.definitions
   end
 
   def test_mixed_content_hash
-    dict = DictionaryOfMixeds.parse(fixture(:dictionary_of_mixeds))
+    dict = DictionaryOfMixeds.from_xml(fixture(:dictionary_of_mixeds))
     assert_equal Hash, dict.definitions.class
     assert_equal @contents, dict.definitions
   end
 
   def test_name_hash
-    dict = DictionaryOfNames.parse(fixture(:dictionary_of_names))
+    dict = DictionaryOfNames.from_xml(fixture(:dictionary_of_names))
     assert_equal Hash, dict.definitions.class
     assert_equal @contents, dict.definitions
   end
 
   def test_guarded_name_hash
-    dict = DictionaryOfGuardedNames.parse(fixture(:dictionary_of_guarded_names))
+    dict = DictionaryOfGuardedNames.from_xml(fixture(:dictionary_of_guarded_names))
     assert_equal Hash, dict.definitions.class
     assert_equal @contents, dict.definitions
   end
 
   def test_text_name_clashes
-    dict = DictionaryOfNameClashes.parse(fixture(:dictionary_of_name_clashes))
+    dict = DictionaryOfNameClashes.from_xml(fixture(:dictionary_of_name_clashes))
     assert_equal Hash, dict.definitions.class
     assert_equal @contents, dict.definitions
   end
 
   def test_attr_name_clashes
-    dict = DictionaryOfAttrNameClashes.parse(fixture(:dictionary_of_attr_name_clashes))
+    dict = DictionaryOfAttrNameClashes.from_xml(fixture(:dictionary_of_attr_name_clashes))
     assert_equal Hash, dict.definitions.class
     assert_equal @contents, dict.definitions
   end