roxml 2.5.3 → 3.1.0

data/spec/xml/namespaces_spec.rb

@@ -0,0 +1,32 @@
+require 'spec/spec_helper.rb'
+
+describe ROXML, "#xml_namespaces" do
+  class Tires
+     include ROXML
+
+     xml_namespaces \
+       :bobsbike => 'http://bobsbikes.example.com',
+       :alicesauto => 'http://alicesautosupply.example.com/'
+
+     xml_reader :bike_tires, :as => [], :from => '@name', :in => 'bobsbike:tire'
+     xml_reader :car_tires, :as => [], :from => '@name', :in => 'alicesauto:tire'
+   end
+
+  before do
+     @xml = %{<?xml version="1.0"?>
+       <inventory xmlns="http://alicesautosupply.example.com/" xmlns:bike="http://bobsbikes.example.com">
+        <tire name="super slick racing tire" />
+        <tire name="all weather tire" />
+        <bike:tire name="skinny street" />
+       </inventory>
+     }
+  end
+  
+  it "should remap default namespaces" do
+    Tires.from_xml(@xml).car_tires.should =~ ['super slick racing tire', 'all weather tire']
+  end
+
+  it "should remap prefix namespaces" do
+    Tires.from_xml(@xml).bike_tires.should == ['skinny street']
+  end
+end

data/spec/xml/parser_spec.rb

@@ -1,47 +1,26 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require 'spec/spec_helper.rb'
 
 describe ROXML::XML::Parser do
   before do
     # quiet the error handler
-    ROXML::XML::Error.reset_handler
+    ROXML::XML::Error.reset_handler if ROXML::XML::Error.respond_to?(:reset_handler)
   end
   
   it "should raise on malformed xml" do
-    proc { Book.from_xml(fixture(:book_malformed)) }.should raise_error(ROXML::XML::Error)
+    unless ROXML::XML_PARSER == 'nokogiri' # nokogiri is less strict and auto-closes for some reason
+      proc { Book.from_xml(fixture(:book_malformed)) }.should raise_error(ROXML::XML::Error)
+    end
   end
 
   it "should escape invalid characters on output to text node" do
-    node = ROXML::XML::Node.new("entities")
+    node = ROXML::XML::Node.create("entities")
     node.content = " < > ' \" & "
-    if ROXML::XML_PARSER == 'libxml'
-      node.to_s.should == "<entities> &lt; &gt; ' \" &amp; </entities>"
-    else
-      node.to_s.should == "<entities> &lt; &gt; &apos; &quot; &amp; </entities>"
-    end
+    node.to_s.should == "<entities> &lt; &gt; ' \" &amp; </entities>"
   end
 
   it "should esape invalid characters for attribute name" do
-    node = ROXML::XML::Node.new("attr_holder")
+    node = ROXML::XML::Node.create("attr_holder")
     node.attributes["entities"] = "\"'<>&"
-    if ROXML::XML_PARSER == 'libxml'
-      node.to_s.should == %{<attr_holder entities="&quot;'&lt;&gt;&amp;"/>}
-    else
-      node.to_s.should == %{<attr_holder entities='&quot;&apos;&lt;&gt;&amp;'/>}
-    end
+    node.to_s.should == %{<attr_holder entities="&quot;'&lt;&gt;&amp;"/>}
   end
 end
-
-describe ROXML::XML::Document do
-  describe "#save" do
-    context "with rexml parser" do
-      it "should defer to existing XMLDecl" do
-        if ROXML::XML_PARSER == 'rexml'
-          @doc = ROXML::XML::Document.new
-          @doc << REXML::XMLDecl.new('1.1')
-          @doc.save('spec/xml/decl_test.xml')
-          ROXML::XML::Parser.parse(File.read('spec/xml/decl_test.xml')).to_s.should == ROXML::XML::Parser.parse(%{<?xml version="1.1"?>}).to_s
-        end
-      end
-    end
-  end
-end

data/tasks/rdoc.rake

@@ -0,0 +1,13 @@
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  if File.exist?('VERSION')
+    version = File.read('VERSION')
+  else
+    version = ""
+  end
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "roxml-new #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/tasks/rspec.rake

@@ -1,21 +1,25 @@
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems'
-  require 'spec'
+require 'spec/rake/spectask'
+desc "Run specs"
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec' << 'examples'
+  spec.spec_opts = ['--options', "spec/spec.opts"]
+  spec.spec_files = FileList['spec/**/*_spec.rb']
 end
-begin
-  require 'spec/rake/spectask'
-rescue LoadError
-  puts <<-EOS
-To use rspec for testing you must install rspec gem:
-    gem install rspec
-EOS
-  exit(0)
+
+namespace :spec do
+  [:libxml, :nokogiri].each do |parser|
+    desc "Spec ROXML under the #{parser} parser"
+    Spec::Rake::SpecTask.new(parser) do |spec|
+      spec.libs << 'lib' << 'spec' << 'examples'
+      spec.spec_opts = ['--options=spec/spec.opts']
+      spec.spec_files = ["spec/support/#{parser}.rb"] + FileList['spec/**/*_spec.rb']
+    end
+  end
 end
 
-desc "Run the specs under spec/models"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/**/*_spec.rb']
+desc "Run specs with rcov"
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 end

data/tasks/test.rake

@@ -1,42 +1,35 @@
-# We need to override hoe's test task in order to support separate REXML & LibXML testing
-require  File.join(File.dirname(__FILE__), '../vendor/override_rake_task/lib/override_rake_task')
-
-Rake::TestTask.new(:bugs) do |t|
-  t.libs << 'test'
-  t.test_files = FileList['test/bugs/*_bugs.rb']
-  t.verbose = true
+require 'rake/testtask'
+Rake::TestTask.new(:bugs) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/bugs/*_bugs.rb'
+  test.verbose = true
 end
 
-remove_task :test
 desc "Test ROXML using the default parser selection behavior"
 task :test do
-  module ROXML
-    SILENCE_XML_NAME_WARNING = true
-  end
-  require 'lib/roxml'
   require 'rake/runtest'
-  Rake.run_tests $hoe.test_globs
+  Rake.run_tests 'test/unit/*_test.rb'
 end
 
 namespace :test do
-  desc "Test ROXML under the LibXML parser"
-  task :libxml do
+  desc "Test ROXML under the Nokogiri parser"
+  task :nokogiri do
     module ROXML
-      XML_PARSER = 'libxml'
+      XML_PARSER = 'nokogiri'
     end
     Rake::Task["test"].invoke
   end
 
-  desc "Test ROXML under the REXML parser"
-  task :rexml do
+   desc "Test ROXML under the LibXML parser"
+  task :libxml do
     module ROXML
-      XML_PARSER = 'rexml'
+      XML_PARSER = 'libxml'
     end
     Rake::Task["test"].invoke
   end
 
   desc "Runs tests under RCOV"
   task :rcov do
-    system "rcov -T --no-html -x '^/'  #{FileList[$hoe.test_globs]}"
+    system "rcov -T --no-html -x '^/'  #{FileList['test/unit/*_test.rb']}"
   end
 end

data/test/mocks/dictionaries.rb

@@ -4,14 +4,15 @@ class DictionaryOfAttrs
   include ROXML
 
   xml_name :dictionary
-  xml_reader :definitions, {:attrs => [:dt, :dd]}, :in => :definitions
+  xml_reader :definitions, :as => {:key => '@dt',
+                                   :value => '@dd'}, :in => :definitions
 end
 
 class DictionaryOfTexts
   include ROXML
 
   xml_name :dictionary
-  xml_reader :definitions, {:key => :word,
+  xml_reader :definitions, :as => {:key => :word,
                             :value => :meaning}
 end
 
@@ -19,7 +20,7 @@ class DictionaryOfMixeds
   include ROXML
 
   xml_name :dictionary
-  xml_reader :definitions, {:key => {:attr => :word},
+  xml_reader :definitions, :as => {:key => '@word',
                             :value => :content}
 end
 
@@ -27,7 +28,7 @@ class DictionaryOfNames
   include ROXML
 
   xml_name :dictionary
-  xml_reader :definitions, {:key => :name,
+  xml_reader :definitions, :as => {:key => :name,
                             :value => :content}
 end
 
@@ -35,7 +36,7 @@ class DictionaryOfGuardedNames
   include ROXML
 
   xml_name :dictionary
-  xml_reader :definitions, {:key => :name,
+  xml_reader :definitions, :as => {:key => :name,
                             :value => :content}, :in => :definitions
 end
 
@@ -43,7 +44,7 @@ class DictionaryOfNameClashes
   include ROXML
 
   xml_name :dictionary
-  xml_reader :definitions, {:key => 'name',
+  xml_reader :definitions, :as => {:key => 'name',
                             :value => 'content'}, :from => :definition
 end
 
@@ -51,6 +52,6 @@ class DictionaryOfAttrNameClashes
   include ROXML
 
   xml_name :dictionary
-  xml_reader :definitions, {:key => {:attr => :name},
+  xml_reader :definitions, :as => {:key => '@name',
                             :value => 'content'}, :from => :definition
 end

data/test/mocks/mocks.rb

@@ -15,7 +15,7 @@ end
 class Numerology
   include ROXML
 
-  xml_reader :predictions, {:attrs => ['number', 'meaning']} do |k, v|
+  xml_reader :predictions, :as => {:key => '@number', :value => '@meaning'} do |k, v|
     [Integer(k), v]
   end
 end
@@ -41,7 +41,7 @@ class Book
   xml_reader :title
   xml_reader :description, :cdata => true
   xml_reader :author
-  xml_accessor :pages, :text => 'pagecount', :as => Integer
+  xml_accessor :pages, :from => 'pagecount', :as => Integer
 end
 
 class BookWithRequired
@@ -49,8 +49,8 @@ class BookWithRequired
 
   xml_accessor :isbn, :from => '@ISBN', :required => true
   xml_reader :title, :required => true
-  xml_reader :contributors, [Contributor], :in => 'contributor_array', :required => true
-  xml_reader :contributor_hash, {:attrs => ['role', 'name']},
+  xml_reader :contributors, :as => [Contributor], :in => 'contributor_array', :required => true
+  xml_reader :contributor_hash, :as => {:key => '@role', :value => '@name'},
                                 :from => 'contributor', :in => 'contributor_hash', :required => true
 end
 
@@ -107,7 +107,7 @@ class BookWithDepth
   xml_reader :title
   xml_reader :description, :cdata => true
   xml_reader :author
-  xml_reader :depth, Measurement
+  xml_reader :depth, :as => Measurement
 end
 
 class Author
@@ -124,7 +124,7 @@ class BookWithAuthors
   xml_reader :isbn, :from => '@ISBN'
   xml_reader :title
   xml_reader :description, :cdata => true
-  xml_reader :authors, []
+  xml_reader :authors, :as => []
 end
 
 class BookWithAuthorTextAttribute
@@ -134,7 +134,7 @@ class BookWithAuthorTextAttribute
   xml_reader :isbn, :from => '@ISBN'
   xml_reader :title
   xml_reader :description, :cdata => true
-  xml_reader :author, Author
+  xml_reader :author, :as => Author
 end
 
 class BookWithContributions
@@ -144,7 +144,7 @@ class BookWithContributions
   xml_reader :isbn, :from => :attr
   xml_reader :title
   xml_reader :description
-  xml_reader :contributions, [Contributor], :from => 'contributor', :in => "contributions"
+  xml_reader :contributions, :as => [Contributor], :from => 'contributor', :in => "contributions"
 end
 
 class BookWithContributors
@@ -154,7 +154,7 @@ class BookWithContributors
   xml_reader :isbn, :from => :attr
   xml_reader :title
   xml_reader :description
-  xml_reader :contributors, [Contributor]
+  xml_reader :contributors, :as => [Contributor]
 end
 
 class WriteableBookWithContributors
@@ -164,7 +164,7 @@ class WriteableBookWithContributors
   xml_accessor :isbn, :from => :attr
   xml_accessor :title
   xml_accessor :description
-  xml_accessor :contributors, [Contributor]
+  xml_accessor :contributors, :as => [Contributor]
 end
 
 class NamelessBook
@@ -173,7 +173,7 @@ class NamelessBook
   xml_reader :isbn, :from => :attr
   xml_reader :title
   xml_reader :description
-  xml_reader :contributors, [Contributor]
+  xml_reader :contributors, :as => [Contributor]
 end
 
 class Publisher
@@ -189,7 +189,7 @@ class BookWithPublisher
   xml_reader :isbn, :from => :attr
   xml_reader :title
   xml_reader :description
-  xml_reader :publisher, Publisher
+  xml_reader :publisher, :as => Publisher
 end
 
 class BookPair
@@ -199,14 +199,14 @@ class BookPair
   xml_reader :title
   xml_reader :description
   xml_reader :author
-  xml_reader :book, Book
+  xml_reader :book, :as => Book
 end
 
 class Library
   include ROXML
 
   xml_reader :name
-  xml_reader :books, [BookWithContributions]
+  xml_reader :books, :as => [BookWithContributions]
 end
 
 class UppercaseLibrary
@@ -214,14 +214,14 @@ class UppercaseLibrary
 
   xml_name :library
   xml_reader :name, :from => 'NAME'
-  xml_reader :books, [BookWithContributions], :from => 'BOOK'
+  xml_reader :books, :as => [BookWithContributions], :from => 'BOOK'
 end
 
 class LibraryWithBooksOfUnderivableName
   include ROXML
 
   xml_accessor :name
-  xml_reader :novels, [NamelessBook]
+  xml_reader :novels, :as => [NamelessBook]
 end
 
 class NodeWithNameConflicts
@@ -247,7 +247,7 @@ class Person
   xml_accessor :name, :from => :content, :else => 'Unknown'
 
   def self.blank
-    returning new do |instance|
+    new.tap do |instance|
       instance.age = 21
       instance.name = 'Unknown'
     end
@@ -259,7 +259,7 @@ class PersonWithMother
 
   xml_name :person
   xml_reader :name
-  xml_reader :mother, PersonWithMother, :from => 'mother'
+  xml_reader :mother, :as => PersonWithMother, :from => 'mother'
 end
 
 class PersonWithGuardedMother
@@ -267,7 +267,7 @@ class PersonWithGuardedMother
 
   xml_name :person
   xml_reader :name
-  xml_reader :mother, PersonWithGuardedMother, :from => :person, :in => :mother
+  xml_reader :mother, :as => PersonWithGuardedMother, :from => :person, :in => :mother
 end
 
 class PersonWithMotherOrMissing
@@ -275,5 +275,5 @@ class PersonWithMotherOrMissing
 
   xml_reader :age, :from => :attr, :else => 21
   xml_reader :name, :else => 'Anonymous'
-  xml_reader :mother, PersonWithMotherOrMissing, :else => Person.blank
+  xml_reader :mother,:as => PersonWithMotherOrMissing, :else => Person.blank
 end

data/test/support/fixtures.rb

@@ -0,0 +1,11 @@
+def fixture(name)
+  File.read(fixture_path(name))
+end
+
+def xml_fixture(name)
+  ROXML::XML::Parser.parse_file(fixture_path(name)).root
+end
+
+def fixture_path(name)
+  "test/fixtures/#{name}.xml"
+end

data/test/test_helper.rb

@@ -1,22 +1,11 @@
-require "lib/roxml"
+require 'rubygems'
 require 'active_support/test_case'
 require 'test/mocks/mocks'
 require 'test/mocks/dictionaries'
-
-def fixture(name)
-  File.read(fixture_path(name))
-end
-
-def xml_fixture(name)
-  ROXML::XML::Parser.parse_file(fixture_path(name)).root
-end
-
-def fixture_path(name)
-  "test/fixtures/#{name}.xml"
-end
+require 'test/support/fixtures'
 
 def to_xml_test(*names)
-  names = names.first if names.one? && names.first.is_a?(Hash)
+  names = names.first if names.size == 1 && names.first.is_a?(Hash)
   names.each do |name, xml_name|
     xml_name ||= name