roxml 2.5.1 → 2.5.2

data/History.txt

@@ -1,3 +1,11 @@
+== 2.5.2 (March 12, 2009)
+
+* minor enhancements
+
+  * Remove dependency on an Object#try which conflicted with ActiveSupport 2.3's version
+  * Document the :to_xml option for attr references
+  * Require active_support directly,  as it's less brittle and plays nicer with other libraries
+
 == 2.5.1 (March 2, 2009)
 
 * minor enhancements

data/Manifest.txt

@@ -21,7 +21,6 @@ examples/xml/twitter.xml
 lib/roxml.rb
 lib/roxml/definition.rb
 lib/roxml/extensions.rb
-lib/roxml/extensions/active_support.rb
 lib/roxml/extensions/array.rb
 lib/roxml/extensions/array/conversions.rb
 lib/roxml/extensions/deprecation.rb

data/README.rdoc

@@ -1,5 +1,15 @@
-ROXML Ruby Object to XML mapping library. For more information
-visit http://roxml.rubyforge.org
+ROXML Ruby Object to XML mapping library.
+
+For more information visit:
+
+    http://roxml.rubyforge.org/rdoc/
+    http://empact.github.com/roxml/
+    http://rubyforge.org/projects/roxml/
+
+Progress on this project is (more or less) tracked at:
+
+    http://www.pivotaltracker.com/project/4109
+
 
 =Quick Start Guide
 

data/lib/roxml.rb

@@ -8,7 +8,7 @@ require 'uri'
 end
 
 module ROXML # :nodoc:
-  VERSION = '2.5.1'
+  VERSION = '2.5.2'
 
   def self.included(base) # :nodoc:
     base.extend ClassMethods::Accessors,
@@ -169,13 +169,19 @@ module ROXML # :nodoc:
       # but in this case an underscored version of the name is applied, for convenience.
       def xml_convention(to_proc_able = nil, &block)
         raise ArgumentError, "conventions are already set" if @roxml_naming_convention
-        raise ArgumentError, "only one conventions can be set" if to_proc_able.respond_to?(:to_proc) && block_given?
-        @roxml_naming_convention = to_proc_able.try(:to_proc)
-        @roxml_naming_convention = block if block_given?
+        @roxml_naming_convention =
+          if to_proc_able
+            raise ArgumentError, "only one conventions can be set" if block_given?
+            to_proc_able.to_proc
+          elsif block_given?
+            block
+          end
       end
 
       def roxml_naming_convention # :nodoc:
-        (@roxml_naming_convention || superclass.try(:roxml_naming_convention)).freeze
+        (@roxml_naming_convention || begin
+          superclass.roxml_naming_convention if superclass.respond_to?(:roxml_naming_convention)
+        end).freeze
       end
 
       # Declares a reference to a certain xml element, whether an attribute, a node,
@@ -440,6 +446,7 @@ module ROXML # :nodoc:
       # [:required] If true, throws RequiredElementMissing when the element isn't present
       # [:frozen] If true, all results are frozen (using #freeze) at parse-time.
       # [:cdata] True for values which should be input from or output as cdata elements
+      # [:to_xml] this proc is applied to the attributes value outputting the instance via #to_xml
       #
       def xml_attr(sym, type_and_or_opts = nil, opts = nil, &block)
         returning Definition.new(sym, *[type_and_or_opts, opts].compact, &block) do |attr|
@@ -526,18 +533,22 @@ module ROXML # :nodoc:
       end
 
       def roxml_tag_name # :nodoc:
-        @roxml_tag_name || superclass.try(:roxml_tag_name)
+        @roxml_tag_name || begin
+          superclass.roxml_tag_name if superclass.respond_to?(:roxml_tag_name)
+        end
       end
 
       def roxml_namespace # :nodoc:
-        @roxml_namespace || superclass.try(:roxml_namespace)
+        @roxml_namespace || begin
+          superclass.roxml_namespace if superclass.respond_to?(:roxml_namespace)
+        end
       end
 
       # Returns array of internal reference objects, such as attributes
       # and composed XML objects
       def roxml_attrs
         @roxml_attrs ||= []
-        (@roxml_attrs + (superclass.try(:roxml_attrs) || [])).freeze
+        (@roxml_attrs + (superclass.respond_to?(:roxml_attrs) ? superclass.roxml_attrs : [])).freeze
       end
 
       def tag_refs # :nodoc:
@@ -583,7 +594,7 @@ module ROXML # :nodoc:
                 ? inst.send(setter, value) \
                 : inst.instance_variable_set("@#{attr.variable_name}", value)
             end
-            inst.try(:after_parse)
+            inst.send(:after_parse) if inst.respond_to?(:after_parse, true)
           end
         end
       rescue ArgumentError => e

data/lib/roxml/definition.rb

@@ -45,7 +45,7 @@ module ROXML
       end
 
       @type = extract_type(args, opts)
-      if @type.try(:xml_name_without_deprecation?)
+      if @type.respond_to?(:xml_name_without_deprecation?) && @type.xml_name_without_deprecation?
         unless self.class.silence_xml_name_warning?
           warn "WARNING: As of 2.3, a breaking change has been in the naming of sub-objects. " +
                "ROXML now considers the xml_name of the sub-object before falling back to the accessor name of the parent. " +
@@ -140,7 +140,7 @@ module ROXML
     end
 
     def self.fetch_bool(value, default)
-      value = value.try(:downcase)
+      value = value.to_s.downcase
       if %w{true yes 1}.include? value
         true
       elsif %w{false no 0}.include? value
@@ -220,7 +220,7 @@ module ROXML
         as = (block ? :bool_combined : :bool_standalone)
       end
       as = self.class.block_shorthands.fetch(as) do
-        unless as.respond_to?(:from_xml) || as.try(:first).respond_to?(:from_xml) || (as.is_a?(Hash) && !(as.keys & HASH_KEYS).empty?)
+        unless as.respond_to?(:from_xml) || (as.respond_to?(:first) && as.first.respond_to?(:from_xml)) || (as.is_a?(Hash) && !(as.keys & [:key, :value]).empty?)
           ActiveSupport::Deprecation.warn "#{as.inspect} is not a valid type declaration. ROXML will raise in this case in version 3.0" unless as.nil?
         end
         nil

data/lib/roxml/extensions.rb

@@ -1,3 +1,6 @@
-%w(active_support deprecation array string).each do |file|
+require 'rubygems'
+require 'active_support'
+
+%w(deprecation array string).each do |file|
   require File.join(File.dirname(__FILE__), 'extensions', file)
 end

data/lib/roxml/xml/references.rb

@@ -48,8 +48,9 @@ module ROXML
     attr_reader :opts
 
     def conventionize(what)
-      if !what.blank? && @instance.try(:class).try(:roxml_naming_convention).respond_to?(:call)
-        URI.unescape(@instance.class.roxml_naming_convention.call(URI.escape(what, /\/|::/)))
+      convention ||= @instance.class.respond_to?(:roxml_naming_convention) && @instance.class.roxml_naming_convention
+      if !what.blank? && convention.respond_to?(:call)
+        URI.unescape(convention.call(URI.escape(what, /\/|::/)))
       else
         what
       end

data/roxml.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roxml}
-  s.version = "2.5.1"
+  s.version = "2.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Woosley", "Zak Mandhro", "Anders Engstrom", "Russ Olsen"]
-  s.date = %q{2009-03-02}
+  s.date = %q{2009-03-12}
   s.description = %q{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.}
   s.email = %q{ben.woosley@gmail.com}
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc"]
-  s.files = ["History.txt", "MIT-LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "TODO", "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/twitter.rb", "examples/xml/active_record.xml", "examples/xml/amazon.xml", "examples/xml/current_weather.xml", "examples/xml/dashed_elements.xml", "examples/xml/posts.xml", "examples/xml/twitter.xml", "lib/roxml.rb", "lib/roxml/definition.rb", "lib/roxml/extensions.rb", "lib/roxml/extensions/active_support.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/references.rb", "roxml.gemspec", "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.opts", "spec/spec_helper.rb", "spec/string_spec.rb", "spec/xml/parser_spec.rb", "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", "test/fixtures/book_valid.xml", "test/fixtures/book_with_authors.xml", "test/fixtures/book_with_contributions.xml", "test/fixtures/book_with_contributors.xml", "test/fixtures/book_with_contributors_attrs.xml", "test/fixtures/book_with_default_namespace.xml", "test/fixtures/book_with_depth.xml", "test/fixtures/book_with_octal_pages.xml", "test/fixtures/book_with_publisher.xml", "test/fixtures/book_with_wrapped_attr.xml", "test/fixtures/dictionary_of_attr_name_clashes.xml", "test/fixtures/dictionary_of_attrs.xml", "test/fixtures/dictionary_of_guarded_names.xml", "test/fixtures/dictionary_of_mixeds.xml", "test/fixtures/dictionary_of_name_clashes.xml", "test/fixtures/dictionary_of_names.xml", "test/fixtures/dictionary_of_texts.xml", "test/fixtures/library.xml", "test/fixtures/library_uppercase.xml", "test/fixtures/muffins.xml", "test/fixtures/nameless_ageless_youth.xml", "test/fixtures/node_with_attr_name_conflicts.xml", "test/fixtures/node_with_name_conflicts.xml", "test/fixtures/numerology.xml", "test/fixtures/person.xml", "test/fixtures/person_with_guarded_mothers.xml", "test/fixtures/person_with_mothers.xml", "test/mocks/dictionaries.rb", "test/mocks/mocks.rb", "test/release/dependencies_test.rb", "test/test_helper.rb", "test/unit/definition_test.rb", "test/unit/deprecations_test.rb", "test/unit/to_xml_test.rb", "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", "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", "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"]
+  s.files = ["History.txt", "MIT-LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "TODO", "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/twitter.rb", "examples/xml/active_record.xml", "examples/xml/amazon.xml", "examples/xml/current_weather.xml", "examples/xml/dashed_elements.xml", "examples/xml/posts.xml", "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/references.rb", "roxml.gemspec", "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.opts", "spec/spec_helper.rb", "spec/string_spec.rb", "spec/xml/parser_spec.rb", "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", "test/fixtures/book_valid.xml", "test/fixtures/book_with_authors.xml", "test/fixtures/book_with_contributions.xml", "test/fixtures/book_with_contributors.xml", "test/fixtures/book_with_contributors_attrs.xml", "test/fixtures/book_with_default_namespace.xml", "test/fixtures/book_with_depth.xml", "test/fixtures/book_with_octal_pages.xml", "test/fixtures/book_with_publisher.xml", "test/fixtures/book_with_wrapped_attr.xml", "test/fixtures/dictionary_of_attr_name_clashes.xml", "test/fixtures/dictionary_of_attrs.xml", "test/fixtures/dictionary_of_guarded_names.xml", "test/fixtures/dictionary_of_mixeds.xml", "test/fixtures/dictionary_of_name_clashes.xml", "test/fixtures/dictionary_of_names.xml", "test/fixtures/dictionary_of_texts.xml", "test/fixtures/library.xml", "test/fixtures/library_uppercase.xml", "test/fixtures/muffins.xml", "test/fixtures/nameless_ageless_youth.xml", "test/fixtures/node_with_attr_name_conflicts.xml", "test/fixtures/node_with_name_conflicts.xml", "test/fixtures/numerology.xml", "test/fixtures/person.xml", "test/fixtures/person_with_guarded_mothers.xml", "test/fixtures/person_with_mothers.xml", "test/mocks/dictionaries.rb", "test/mocks/mocks.rb", "test/release/dependencies_test.rb", "test/test_helper.rb", "test/unit/definition_test.rb", "test/unit/deprecations_test.rb", "test/unit/to_xml_test.rb", "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", "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", "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"]
   s.has_rdoc = true
   s.homepage = %q{http://roxml.rubyforge.org}
   s.rdoc_options = ["--main", "README.rdoc"]
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{roxml}
   s.rubygems_version = %q{1.3.1}
   s.summary = %q{Ruby Object to XML mapping library}
-  s.test_files = ["test/unit/definition_test.rb", "test/unit/deprecations_test.rb", "test/unit/to_xml_test.rb", "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", "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"]
+  s.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", "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/xml_attribute_test.rb", "test/unit/xml_initialize_test.rb", "test/unit/xml_hash_test.rb", "test/unit/to_xml_test.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/test/bugs/rexml_bugs.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', 'test_helper')
 
-class RexmlBugs < Test::Unit::TestCase
+class RexmlBugs < ActiveSupport::TestCase
   def test_that_some_illegal_chars_are_parsed_without_complaint
     p "REXML ignores illegal ']]>' brackets in xml content"
     assert_nothing_raised do

data/test/test_helper.rb

@@ -1,4 +1,5 @@
 require "lib/roxml"
+require 'active_support/test_case'
 require 'test/mocks/mocks'
 require 'test/mocks/dictionaries'
 

data/test/unit/definition_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', 'test_helper')
 
-class TestDefinition < Test::Unit::TestCase
+class TestDefinition < ActiveSupport::TestCase
   def assert_hash(opts, kvp)
     assert opts.hash?
     assert !opts.array?
@@ -300,7 +300,7 @@ class RoxmlObject
   include ROXML
 end
 
-class HashDefinitionTest < Test::Unit::TestCase
+class HashDefinitionTest < ActiveSupport::TestCase
   def test_content_detected_as_from
     opts = ROXML::Definition.new(:hash, {:key => :content, :value => :name})
     assert_equal '.', opts.hash.key.name

data/test/unit/deprecations_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', 'test_helper')
 
-class TestDefinition < Test::Unit::TestCase
+class TestDeprecation < ActiveSupport::TestCase
   def test_tag_refs_is_deprecated
     assert_deprecated do
       Class.new do

data/test/unit/to_xml_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', 'test_helper')
 
-class TestHashToXml < Test::Unit::TestCase
+class TestHashToXml < ActiveSupport::TestCase
   to_xml_test :dictionary_of_attrs,
               :dictionary_of_mixeds,
               :dictionary_of_texts,
@@ -10,7 +10,7 @@ class TestHashToXml < Test::Unit::TestCase
               :dictionary_of_attr_name_clashes
 end
 
-class TestOtherToXml < Test::Unit::TestCase
+class TestOtherToXml < ActiveSupport::TestCase
   to_xml_test :book => :book_valid,
               :book_with_author_text_attribute => :book_text_with_attribute,
               :uppercase_library => :library_uppercase
@@ -28,7 +28,7 @@ class TestOtherToXml < Test::Unit::TestCase
   to_xml_test :book_with_wrapped_attr
 end
 
-class TestToXmlWithDefaults < Test::Unit::TestCase
+class TestToXmlWithDefaults < ActiveSupport::TestCase
   def test_content_and_attr_defaults_are_represented_in_output
     dict = Person.from_xml(fixture(:nameless_ageless_youth))
 
@@ -37,7 +37,7 @@ class TestToXmlWithDefaults < Test::Unit::TestCase
   end
 end
 
-class TestToXmlWithBlocks < Test::Unit::TestCase
+class TestToXmlWithBlocks < ActiveSupport::TestCase
   def test_pagecount_serialized_properly_after_modification
     b = Book.from_xml(fixture(:book_valid))
     xml = xml_fixture(:book_valid)
@@ -76,6 +76,6 @@ class BookWithOctalPages
   xml_accessor :pages_with_type, OctalInteger, :required => true
 end
 
-class TestToXmlWithOverriddenOutput < Test::Unit::TestCase
+class TestToXmlWithOverriddenOutput < ActiveSupport::TestCase
   to_xml_test :book_with_octal_pages
 end

data/test/unit/xml_attribute_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', 'test_helper')
 
-class TestXMLAttribute < Test::Unit::TestCase
+class TestXMLAttribute < ActiveSupport::TestCase
   def test_attr_from
     # :attr => *
     book = Book.from_xml(fixture(:book_text_with_attribute))

data/test/unit/xml_block_test.rb

@@ -14,7 +14,7 @@ class ArrayWithBlock
   end
 end
 
-class TestXMLBlocks < Test::Unit::TestCase
+class TestXMLBlocks < ActiveSupport::TestCase
   def test_block_is_applied
     muffins = Muffins.from_xml(fixture(:muffins))
 

data/test/unit/xml_bool_test.rb

@@ -68,7 +68,7 @@ UNEXPECTED_VALUE_XML = %{
 }
 
 
-class TestXMLBool < Test::Unit::TestCase
+class TestXMLBool < ActiveSupport::TestCase
   def test_bool_results_for_various_inputs
     x = XmlBool.from_xml(BOOL_XML)
     assert_equal true, x.true_from_TRUE?

data/test/unit/xml_construct_test.rb

@@ -36,7 +36,7 @@ class InheritedBookWithDepthWithXmlConstruct < Book
   xml_reader :depth, MeasurementWithXmlConstruct
 end
 
-class TestXMLConstruct < Test::Unit::TestCase
+class TestXMLConstruct < ActiveSupport::TestCase
   def test_is_deprecated
     assert_deprecated do
       MeasurementWithXmlConstruct.xml_construction_args

data/test/unit/xml_convention_test.rb

@@ -94,7 +94,7 @@ end
 class InheritedBookCaseDefault < ParentBookCaseDefault
 end
 
-class TestXMLConstruct < Test::Unit::TestCase
+class TestXMLConvention < ActiveSupport::TestCase
   # TODO: Test convention applies to xml_name as well...
 
   def test_default_convention_is_underscore

data/test/unit/xml_hash_test.rb

@@ -7,7 +7,7 @@ class BookWithContributorHash
                              :value => 'name'}
 end
 
-class TestXMLHash < Test::Unit::TestCase
+class TestXMLHash < ActiveSupport::TestCase
   def setup
     @contents = {'quaquaversally' => 'adjective: (of a geological formation) sloping downward from the center in all directions.',
                  'tergiversate' => 'To use evasions or ambiguities; equivocate.'}

data/test/unit/xml_initialize_test.rb

@@ -13,7 +13,7 @@ class BookWithXmlInitialize < BookWithDepth
   end
 end
 
-class TestXMLInitialize < Test::Unit::TestCase
+class TestXMLInitialize < ActiveSupport::TestCase
   def test_xml_construct_not_in_use
     assert Measurement.xml_construction_args_without_deprecation.empty?
   end

data/test/unit/xml_name_test.rb

@@ -48,7 +48,7 @@ class ParentOfUnnamedChildWithFrom
   xml_accessor :child_accessor_name, Child, :from => 'child_from_name'
 end
 
-class TestXMLName < Test::Unit::TestCase
+class TestXMLName < ActiveSupport::TestCase
   def test_from_always_dominates_attribute_name_xml_name_or_not
     parent = ParentOfNamedChildWithFrom.new
     parent.child_accessor_name = Child.new

data/test/unit/xml_namespace_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', 'test_helper')
 
-class TestDefaultXMLNamespaces < Test::Unit::TestCase
+class TestDefaultXMLNamespaces < ActiveSupport::TestCase
   def setup
     @book = BookWithContributions.from_xml(fixture(:book_with_default_namespace))
   end
@@ -47,7 +47,7 @@ class NamespaceyObject
   xml_reader :no_namespace, :from => 'no_namespace'
 end
 
-class TestXMLNamespaceDeclarations < Test::Unit::TestCase
+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">

data/test/unit/xml_object_test.rb

@@ -16,7 +16,7 @@ class CartHolder
   xml_reader :cart, EmptyCart, :required => true
 end
 
-class TestXMLObject < Test::Unit::TestCase
+class TestXMLObject < ActiveSupport::TestCase
   # Test book with text and attribute
   def test_book_author_text_attribute
     book = BookWithAuthorTextAttribute.from_xml(fixture(:book_text_with_attribute))

data/test/unit/xml_required_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', 'test_helper')
 
-class TestXMLRequired < Test::Unit::TestCase
+class TestXMLRequired < ActiveSupport::TestCase
   def setup
     @full_book = <<BOOK
   <book ISBN="1234">

data/test/unit/xml_text_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', 'test_helper')
 
-class TestXMLText < Test::Unit::TestCase
+class TestXMLText < ActiveSupport::TestCase
   # Test a simple mapping with no composition
   def test_valid_simple
     book = Book.from_xml(fixture(:book_valid))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: roxml
 version: !ruby/object:Gem::Version 
-  version: 2.5.1
+  version: 2.5.2
 platform: ruby
 authors: 
 - Ben Woosley
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-02 00:00:00 -05:00
+date: 2009-03-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -109,7 +109,6 @@ files:
 - lib/roxml.rb
 - lib/roxml/definition.rb
 - lib/roxml/extensions.rb
-- lib/roxml/extensions/active_support.rb
 - lib/roxml/extensions/array.rb
 - lib/roxml/extensions/array/conversions.rb
 - lib/roxml/extensions/deprecation.rb

data/lib/roxml/extensions/active_support.rb

@@ -1,54 +0,0 @@
-require 'rubygems'
-require 'active_support/core_ext/symbol'
-require 'active_support/core_ext/blank'
-require 'active_support/core_ext/duplicable'
-require 'active_support/core_ext/array/extract_options'
-
-class Array #:nodoc:
-  include ActiveSupport::CoreExtensions::Array::ExtractOptions
-end
-
-require 'active_support/core_ext/hash/reverse_merge'
-require 'active_support/core_ext/module/delegation'
-require 'active_support/core_ext/module/aliasing'
-require 'active_support/core_ext/module/attribute_accessors'
-require 'active_support/core_ext/object/misc' # returning
-require 'active_support/inflector'
-require 'active_support/multibyte'
-require 'active_support/core_ext/string'
-class String
-  # This conflicts with builder, unless builder is required first, which we don't want to force on people
-  undef_method :to_xs if method_defined?(:to_xs)
-end
-
-class Module #:nodoc:
-  include ActiveSupport::CoreExtensions::Module if ActiveSupport::CoreExtensions.const_defined? :Module
-end
-
-class Hash #:nodoc:
-  include ActiveSupport::CoreExtensions::Hash::ReverseMerge
-end
-
-class Object #:nodoc:
-  unless method_defined?(:try)
-    # Taken from the upcoming ActiveSupport 2.3
-    #
-    # Tries to send the method only if object responds to it. Return +nil+ otherwise.
-    # It will also forward any arguments and/or block like Object#send does.
-    #
-    # ==== Example :
-    #
-    # # Without try
-    # @person ? @person.name : nil
-    #
-    # With try
-    # @person.try(:name)
-    #
-    # # try also accepts arguments/blocks for the method it is trying
-    # Person.try(:find, 1)
-    # @people.try(:map) {|p| p.name}
-    def try(method, *args, &block)
-      send(method, *args, &block) if respond_to?(method, true)
-    end
-  end
-end