roxml 2.5.3 → 3.1.0

data/test/unit/xml_initialize_test.rb

@@ -1,7 +1,7 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require 'test/test_helper'
 
 class InheritedBookWithDepth < Book
-  xml_reader :depth, Measurement
+  xml_reader :depth, :as => Measurement
 end
 
 class BookWithXmlInitialize < BookWithDepth
@@ -14,10 +14,6 @@ class BookWithXmlInitialize < BookWithDepth
 end
 
 class TestXMLInitialize < ActiveSupport::TestCase
-  def test_xml_construct_not_in_use
-    assert Measurement.xml_construction_args_without_deprecation.empty?
-  end
-
   def test_initialize_is_run
     m = Measurement.from_xml('<measurement units="hundredths-meters">1130</measurement>')
     assert_equal 11.3, m.value

data/test/unit/xml_name_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require 'test/test_helper'
 
 #      Parent        |    Child
 #  :from  | no :from |
@@ -24,28 +24,28 @@ class ParentOfNamedChild
   include ROXML
 
   xml_name :parent
-  xml_accessor :child_accessor_name, NamedChild
+  xml_accessor :child_accessor_name, :as => NamedChild
 end
 
 class ParentOfNamedChildWithFrom
   include ROXML
 
   xml_name :parent
-  xml_accessor :child_accessor_name, NamedChild, :from => 'child_from_name'
+  xml_accessor :child_accessor_name, :as => NamedChild, :from => 'child_from_name'
 end
 
 class ParentOfUnnamedChild
   include ROXML
 
   xml_name :parent
-  xml_accessor :child_accessor_name, Child
+  xml_accessor :child_accessor_name, :as => Child
 end
 
 class ParentOfUnnamedChildWithFrom
   include ROXML
 
   xml_name :parent
-  xml_accessor :child_accessor_name, Child, :from => 'child_from_name'
+  xml_accessor :child_accessor_name,:as => Child, :from => 'child_from_name'
 end
 
 class TestXMLName < ActiveSupport::TestCase
@@ -104,31 +104,12 @@ class TestXMLName < ActiveSupport::TestCase
     assert_equal :dictionary, dict.class.tag_name
   end
 
-  def test_tag_refs
-    assert_equal 'definition', DictionaryOfTexts.tag_refs_without_deprecation.first.name
-    assert_equal 'word', DictionaryOfTexts.tag_refs_without_deprecation.first.hash.key.name
-    assert_equal 'meaning', DictionaryOfTexts.tag_refs_without_deprecation.first.hash.value.name
-
-    dict = DictionaryOfTexts.from_xml(fixture(:dictionary_of_texts))
-
-    assert_equal 'definition', dict.tag_refs_without_deprecation.first.name
-    assert_equal 'word', dict.tag_refs_without_deprecation.first.hash.key.name
-    assert_equal 'meaning', dict.tag_refs_without_deprecation.first.hash.value.name
-  end
-
   def test_roxml_attrs
     assert_equal 'definition', DictionaryOfTexts.roxml_attrs.first.name
     assert_equal 'word', DictionaryOfTexts.roxml_attrs.first.hash.key.name
     assert_equal 'meaning', DictionaryOfTexts.roxml_attrs.first.hash.value.name
   end
 
-  def test_xml_name_query_is_deprecated
-    # This query should go when the XML_NAME_WARNING stuff goes
-    assert_deprecated do
-      NamedChild.xml_name?
-    end
-  end
-
   def test_xml_name_should_not_be_conventionalized_if_explicitly_set
     reference = ROXML::XMLTextRef.new(ROXML::Definition.new(:name, :from => 'georss:name'), WrapModule::InstanceStandin.new)
     assert_equal "georss:name", reference.name

data/test/unit/xml_namespace_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require 'test/test_helper'
 
 class TestDefaultXMLNamespaces < ActiveSupport::TestCase
   def setup
@@ -17,14 +17,6 @@ class TestDefaultXMLNamespaces < ActiveSupport::TestCase
     end
   end
 
-  def test_that_rexml_follows_nameless_default_namespace
-    require 'rexml/document'
-    xml = REXML::Document.new(
-      '<container xmlns="http://fakenamespace.org"><node>Yeah, content</node></container>')
-
-    assert_equal "Yeah, content", xml.root.get_elements('node').first.text
-  end
-
   def test_default_namespace_on_root_node_should_be_found
     require 'libxml'
     xml = LibXML::XML::Parser.string(
@@ -37,40 +29,3 @@ class TestDefaultXMLNamespaces < ActiveSupport::TestCase
   rescue LoadError
   end
 end
-
-class NamespaceyObject
-  include ROXML
-  xml_namespace :aws
-
-  xml_reader :default_namespace
-  xml_reader :different_namespace, :from => 'different:namespace'
-  xml_reader :no_namespace, :from => 'no_namespace'
-end
-
-class TestXMLNamespaceDeclarations < ActiveSupport::TestCase
-  def setup
-    @instance = NamespaceyObject.from_xml(%{
-      <aws:book xmlns:aws="http://www.aws.com/aws" xmlns:different="http://www.aws.com/different">
-        <aws:default_namespace>default_value</aws:default_namespace>
-        <different:namespace>different_value</different:namespace>
-        <no_namespace>no_value</no_namespace>
-      </aws:book>
-    })
-  end
-
-  def test_namespace_is_accessible
-    assert_equal "aws", @instance.class.roxml_namespace
-  end
-
-  def test_namespace_declaration_should_be_followed_on_attributes
-    assert_equal "default_value", @instance.default_namespace
-  end
-
-  def test_namespace_declaration_can_be_overriden_for_different_namespace_elements
-    assert_equal "different_value", @instance.different_namespace
-  end
-
-  def test_namespace_declaration_can_be_overriden_for_no_namespace_elements
-    assert_equal "no_value", @instance.no_namespace
-  end
-end

data/test/unit/xml_object_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require 'test/test_helper'
 
 class EmptyCart
   include ROXML
@@ -13,7 +13,7 @@ end
 class CartHolder
   include ROXML
 
-  xml_reader :cart, EmptyCart, :required => true
+  xml_reader :cart, :as => EmptyCart, :required => true
 end
 
 class TestXMLObject < ActiveSupport::TestCase
@@ -120,24 +120,24 @@ class TestXMLObject < ActiveSupport::TestCase
     include ROXML
 
     xml_reader :name, :from => 'node_name'
-    xml_reader :nodes, [Node]
+    xml_reader :nodes, :as => [Node]
   end
 
   class Taxonomy
     include ROXML
 
     xml_reader :name, :from => 'taxonomy_name'
-    xml_reader :nodes, [Node]
+    xml_reader :nodes, :as => [Node]
   end
 
   class Taxonomies
     include ROXML
-    xml_reader :taxonomies, [Taxonomy]
+    xml_reader :taxonomies, :as => [Taxonomy]
   end
 
   def test_more_recursion
     # quiet the error handler
-    ROXML::XML::Error.reset_handler
+    ROXML::XML::Error.reset_handler if ROXML::XML::Error.respond_to?(:reset_handler)
     taxonomies = Taxonomies.from_xml(<<HERE)
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE taxonomies SYSTEM "taxonomy.dtd">

data/test/unit/xml_required_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require 'test/test_helper'
 
 class TestXMLRequired < ActiveSupport::TestCase
   def setup
@@ -70,7 +70,8 @@ BOOK
 
   def test_required_throws_on_attr_absence
     assert_raise ROXML::RequiredElementMissing do
-      BookWithRequired.from_xml(@book_missing_attr)
    end
+      BookWithRequired.from_xml(@book_missing_attr)
+    end
   end
 
   def test_required_throws_on_text_absence

data/test/unit/xml_text_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require 'test/test_helper'
 
 class TestXMLText < ActiveSupport::TestCase
   # Test a simple mapping with no composition
@@ -28,7 +28,7 @@ class TestXMLText < ActiveSupport::TestCase
     empty_array = Class.new do
       include ROXML
 
-      xml_reader :missing_array, [:text], :from => 'missing'
+      xml_reader :missing_array, :as => [], :from => 'missing'
     end
 
     obj = empty_array.from_xml('<empty_array></empty_array>')

data/website/index.html

@@ -49,7 +49,7 @@
       <span class="small">by <a href="http://github.com/Empact">Empact</a></small></h1>
 
     <div class="description">
-      ROXML is a module for binding Ruby classes to XML. It supports custom mapping and bidirectional marshaling between Ruby and XML using annotation-style class methods. ROXML supports the LibXML and REXML XML processors.
+      ROXML is a module for binding Ruby classes to XML. It supports custom mapping and bidirectional marshaling between Ruby and XML using annotation-style class methods. ROXML supports the Nokogiri and LibXML XML processors.
     </div>
 
     <p>We may not want to work with XML, but we don't always get to pick just how our data comes.  If you do need to do serious work with XML, ROXML is here to make it nice.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: roxml
 version: !ruby/object:Gem::Version 
-  version: 2.5.3
+  version: 3.1.0
 platform: ruby
 authors: 
 - Ben Woosley
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-17 00:00:00 -04:00
+date: 2009-10-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,24 +26,24 @@ dependencies:
         version: 2.1.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: libxml-ruby
+  name: nokogiri
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        version: 1.3.3
     version: 
 - !ruby/object:Gem::Dependency 
-  name: newgem
+  name: rspec
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.0
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
@@ -65,17 +65,13 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.2.2
     version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.8.0
-    version: 
-description: ROXML is a Ruby library designed to make it easier for Ruby developers to work with XML. Using simple annotations, it enables Ruby classes to be mapped to XML. ROXML takes care of the marshalling and unmarshalling of mapped attributes so that developers can focus on building first-class Ruby classes. As a result, ROXML simplifies the development of RESTful applications, Web Services, and XML-RPC.
+description: |
+  ROXML is a Ruby library designed to make it easier for Ruby developers to work with XML.
+  Using simple annotations, it enables Ruby classes to be mapped to XML. ROXML takes care
+  of the marshalling and unmarshalling of mapped attributes so that developers can focus on
+  building first-class Ruby classes. As a result, ROXML simplifies the development of
+  RESTful applications, Web Services, and XML-RPC.
+
 email: ben.woosley@gmail.com
 executables: []
 
@@ -83,22 +79,23 @@ extensions: []
 
 extra_rdoc_files: 
 - History.txt
-- Manifest.txt
 - README.rdoc
 files: 
+- .gitignore
+- .gitmodules
 - History.txt
 - MIT-LICENSE
-- Manifest.txt
 - README.rdoc
 - Rakefile
 - TODO
+- VERSION
 - config/website.yml
-- examples/active_record.rb
 - examples/amazon.rb
 - examples/current_weather.rb
 - examples/dashed_elements.rb
 - examples/library.rb
 - examples/posts.rb
+- examples/rails.rb
 - examples/twitter.rb
 - examples/xml/active_record.xml
 - examples/xml/amazon.xml
@@ -108,17 +105,10 @@ files:
 - examples/xml/twitter.xml
 - lib/roxml.rb
 - lib/roxml/definition.rb
-- lib/roxml/extensions.rb
-- lib/roxml/extensions/array.rb
-- lib/roxml/extensions/array/conversions.rb
-- lib/roxml/extensions/deprecation.rb
-- lib/roxml/extensions/string.rb
-- lib/roxml/extensions/string/conversions.rb
-- lib/roxml/extensions/string/iterators.rb
 - lib/roxml/hash_definition.rb
 - lib/roxml/xml.rb
 - lib/roxml/xml/parsers/libxml.rb
-- lib/roxml/xml/parsers/rexml.rb
+- lib/roxml/xml/parsers/nokogiri.rb
 - lib/roxml/xml/references.rb
 - roxml.gemspec
 - spec/definition_spec.rb
@@ -133,11 +123,15 @@ files:
 - spec/shared_specs.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/string_spec.rb
+- spec/support/libxml.rb
+- spec/support/nokogiri.rb
+- spec/xml/attributes_spec.rb
+- spec/xml/namespace_spec.rb
+- spec/xml/namespaces_spec.rb
 - spec/xml/parser_spec.rb
+- tasks/rdoc.rake
 - tasks/rspec.rake
 - tasks/test.rake
-- test/bugs/rexml_bugs.rb
 - test/fixtures/book_malformed.xml
 - test/fixtures/book_pair.xml
 - test/fixtures/book_text_with_attribute.xml
@@ -170,7 +164,7 @@ files:
 - test/fixtures/person_with_mothers.xml
 - test/mocks/dictionaries.rb
 - test/mocks/mocks.rb
-- test/release/dependencies_test.rb
+- test/support/fixtures.rb
 - test/test_helper.rb
 - test/unit/definition_test.rb
 - test/unit/deprecations_test.rb
@@ -178,7 +172,6 @@ files:
 - test/unit/xml_attribute_test.rb
 - test/unit/xml_block_test.rb
 - test/unit/xml_bool_test.rb
-- test/unit/xml_construct_test.rb
 - test/unit/xml_convention_test.rb
 - test/unit/xml_hash_test.rb
 - test/unit/xml_initialize_test.rb
@@ -187,17 +180,14 @@ files:
 - test/unit/xml_object_test.rb
 - test/unit/xml_required_test.rb
 - test/unit/xml_text_test.rb
-- vendor/override_rake_task/README
-- vendor/override_rake_task/init.rb
-- vendor/override_rake_task/install.rb
-- vendor/override_rake_task/lib/override_rake_task.rb
 - website/index.html
 has_rdoc: true
 homepage: http://roxml.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
-- --main
-- README.rdoc
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -215,23 +205,50 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: roxml
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Ruby Object to XML mapping library
 test_files: 
-- test/unit/xml_convention_test.rb
-- test/unit/xml_object_test.rb
-- test/unit/xml_required_test.rb
-- test/unit/xml_bool_test.rb
-- test/unit/xml_name_test.rb
+- spec/definition_spec.rb
+- spec/examples/active_record_spec.rb
+- spec/examples/amazon_spec.rb
+- spec/examples/current_weather_spec.rb
+- spec/examples/dashed_elements_spec.rb
+- spec/examples/library_spec.rb
+- spec/examples/post_spec.rb
+- spec/examples/twitter_spec.rb
+- spec/roxml_spec.rb
+- spec/shared_specs.rb
+- spec/spec_helper.rb
+- spec/support/libxml.rb
+- spec/support/nokogiri.rb
+- spec/xml/attributes_spec.rb
+- spec/xml/namespace_spec.rb
+- spec/xml/namespaces_spec.rb
+- spec/xml/parser_spec.rb
+- test/mocks/dictionaries.rb
+- test/mocks/mocks.rb
+- test/support/fixtures.rb
+- test/test_helper.rb
 - test/unit/definition_test.rb
-- test/unit/xml_construct_test.rb
-- test/unit/xml_namespace_test.rb
 - test/unit/deprecations_test.rb
-- test/unit/xml_text_test.rb
-- test/unit/xml_block_test.rb
+- test/unit/to_xml_test.rb
 - test/unit/xml_attribute_test.rb
-- test/unit/xml_initialize_test.rb
+- test/unit/xml_block_test.rb
+- test/unit/xml_bool_test.rb
+- test/unit/xml_convention_test.rb
 - test/unit/xml_hash_test.rb
-- test/unit/to_xml_test.rb
+- test/unit/xml_initialize_test.rb
+- test/unit/xml_name_test.rb
+- test/unit/xml_namespace_test.rb
+- test/unit/xml_object_test.rb
+- test/unit/xml_required_test.rb
+- test/unit/xml_text_test.rb
+- examples/amazon.rb
+- examples/current_weather.rb
+- examples/dashed_elements.rb
+- examples/library.rb
+- examples/posts.rb
+- examples/rails.rb
+- examples/twitter.rb