roxml 2.5.3 → 3.1.0

data/test/unit/definition_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require 'test/test_helper'
 
 class TestDefinition < ActiveSupport::TestCase
   def assert_hash(opts, kvp)
@@ -8,36 +8,18 @@ class TestDefinition < ActiveSupport::TestCase
                        opts.hash.value.type => opts.hash.value.name}
   end
 
-  def test_text_in_array_means_as_array_for_text
-    opts = ROXML::Definition.new(:authors, [:text])
-    assert opts.array?
-    assert_equal :text, opts.type
-  end
-
   def test_empty_array_means_as_array_for_text
-    opts = ROXML::Definition.new(:authors, [])
+    opts = ROXML::Definition.new(:authors, :as => [])
     assert opts.array?
     assert_equal :text, opts.type
   end
 
   def test_attr_in_array_means_as_array_for_attr
-    opts = ROXML::Definition.new(:authors, [:attr])
+    opts = ROXML::Definition.new(:authors, :as => [], :from => :attr)
     assert opts.array?
     assert_equal :attr, opts.type
   end
 
-  def test_object_in_array_means_as_array_for_object
-    opts = ROXML::Definition.new(:authors, [Hash])
-    assert opts.array?
-    assert_equal Hash, opts.type
-  end
-
-  def test_literal_as_array_is_deprecated
-    assert_deprecated do
-      assert ROXML::Definition.new(:authors, :as => :array).array?
-    end
-  end
-
   def test_block_shorthand_in_array_means_array
     opts = ROXML::Definition.new(:intarray, :as => [Integer])
     assert opts.array?
@@ -61,30 +43,30 @@ class TestDefinition < ActiveSupport::TestCase
   end
 
   def test_hash_of_attrs
-    opts = ROXML::Definition.new(:attributes, {:attrs => [:name, :value]})
+    opts = ROXML::Definition.new(:attributes, :as => {:key => '@name', :value => '@value'})
     assert_hash(opts, :attr => 'name', :attr => 'value')
   end
 
   def test_hash_with_attr_key_and_text_val
-    opts = ROXML::Definition.new(:attributes, {:key => {:attr => :name},
+    opts = ROXML::Definition.new(:attributes, :as => {:key => '@name',
                                          :value => :value})
     assert_hash(opts, :attr => 'name', :text => 'value')
   end
 
   def test_hash_with_string_class_for_type
-    opts = ROXML::Definition.new(:attributes, {:key => {String => 'name'},
-                                         :value => {String => 'value'}})
+    opts = ROXML::Definition.new(:attributes, :as => {:key => 'name',
+                                         :value => 'value'})
     assert_hash(opts, :text => 'name', :text => 'value')
   end
 
   def test_hash_with_attr_key_and_content_val
-    opts = ROXML::Definition.new(:attributes, {:key => {:attr => :name},
+    opts = ROXML::Definition.new(:attributes, :as => {:key => '@name',
                                          :value => :content})
     assert_hash(opts, :attr => 'name', :text => '.')
   end
 
   def test_hash_with_options
-    opts = ROXML::Definition.new(:definitions, {:attrs => [:dt, :dd]},
+    opts = ROXML::Definition.new(:definitions, :as => {:key => '@dt', :value => '@dd'},
                            :in => :definitions, :from => 'definition')
     assert_hash(opts, :attr => 'dt', :attr => 'dd')
     assert_equal 'definition', opts.hash.wrapper
@@ -92,12 +74,6 @@ class TestDefinition < ActiveSupport::TestCase
 
   def test_no_block_shorthand_means_no_block
     assert ROXML::Definition.new(:count).blocks.empty?
-    assert_deprecated do
-      assert ROXML::Definition.new(:count, :as => :intager).blocks.empty?
-    end
-    assert_deprecated do
-      assert ROXML::Definition.new(:count, :as => :foat).blocks.empty?
-    end
   end
 
   def test_block_integer_shorthand
@@ -133,15 +109,6 @@ class TestDefinition < ActiveSupport::TestCase
     assert_equal 2, ROXML::Definition.new(:count, :as => Float) {|val| val.object_id }.blocks.size
   end
 
-  def test_symbol_shorthands_are_deprecated
-    assert_deprecated do
-      ROXML::Definition.new(:junk, :as => :integer)
-    end
-    assert_deprecated do
-      ROXML::Definition.new(:junk, :as => :float)
-    end
-  end
-
   def test_block_shorthand_supports_bool
     assert_equal true, ROXML::Definition.new(:floatvalue, :as => :bool).blocks.first.call("1")
     assert_equal [true, false, nil], ROXML::Definition.new(:floatvalue, :as => :bool).blocks.first.call(["TrUe", "0", "328"])
@@ -196,27 +163,12 @@ class TestDefinition < ActiveSupport::TestCase
     assert ROXML::Definition.new(:manufacturer, :cdata => true).cdata?
   end
 
-  def test_as_cdata_is_deprecated
-    assert_deprecated do
-      assert ROXML::Definition.new(:manufacturer, :as => :cdata).cdata?
-    end
-    assert_deprecated do
-      assert ROXML::Definition.new(:manufacturer, :as => [Integer, :cdata]).cdata?
-    end
-  end
-
   def test_as_supports_generic_roxml_types
     assert_equal RoxmlObject, ROXML::Definition.new(:type, :as => RoxmlObject).type
-    assert_deprecated do
-      assert_equal RoxmlObject, ROXML::Definition.new(:type, RoxmlObject).type
-    end
   end
 
   def test_as_supports_generic_roxml_types_in_arrays
     assert_equal RoxmlObject, ROXML::Definition.new(:types, :as => [RoxmlObject]).type
-    assert_deprecated do
-      assert_equal RoxmlObject, ROXML::Definition.new(:types, [RoxmlObject]).type
-    end
   end
 
   def test_default_works
@@ -227,14 +179,6 @@ class TestDefinition < ActiveSupport::TestCase
   def test_default_works_for_arrays
     opts = ROXML::Definition.new(:missing, :as => [])
     assert_equal [], opts.to_ref(RoxmlObject.new).value_in(ROXML::XML::Parser.parse('<xml></xml>'))
-    assert_deprecated do
-      opts = ROXML::Definition.new(:missing, [])
-      assert_equal [], opts.to_ref(RoxmlObject.new).value_in(ROXML::XML::Parser.parse('<xml></xml>'))
-    end
-    assert_deprecated do
-      opts = ROXML::Definition.new(:missing, :as => :array)
-      assert_equal [], opts.to_ref(RoxmlObject.new).value_in(ROXML::XML::Parser.parse('<xml></xml>'))
-    end
   end
 
   def test_default_works_for_recursive_objects
@@ -248,20 +192,16 @@ class TestDefinition < ActiveSupport::TestCase
   end
 
   def test_content_is_a_recognized_type
-    assert_deprecated do
-      opts = ROXML::Definition.new(:author, :content)
-      assert opts.content?
-      assert_equal '.', opts.name
-      assert_equal :text, opts.type
-    end
+    opts = ROXML::Definition.new(:author, :from => :content)
+    assert opts.content?
+    assert_equal '.', opts.name
+    assert_equal :text, opts.type
   end
 
   def test_content_symbol_as_target_is_translated_to_string
-    assert_deprecated do
-      opts = ROXML::Definition.new(:content, :attr => :content)
-      assert_equal 'content', opts.name
-      assert_equal :attr, opts.type
-    end
+    opts = ROXML::Definition.new(:content, :from => :attr)
+    assert_equal 'content', opts.name
+    assert_equal :attr, opts.type
   end
 
   def test_attr_is_accepted_as_from
@@ -270,30 +210,16 @@ class TestDefinition < ActiveSupport::TestCase
   end
 
   def test_attr_is_a_recognized_type
-    assert_deprecated do
-      opts = ROXML::Definition.new(:author, :attr)
-      assert_equal 'author', opts.name
-      assert_equal :attr, opts.type
-    end
-  end
-
-  def test_name_ending_with_on_warns_of_coming_date_default
-    assert_deprecated do
-      assert_equal :text, ROXML::Definition.new(:created_at).type
-    end
-  end
-
-  def test_name_ending_with_at_warns_of_coming_datetime_default
-    assert_deprecated do
-      assert_equal :text, ROXML::Definition.new(:created_on).type
-    end
+    opts = ROXML::Definition.new(:author, :from => :attr)
+    assert_equal 'author', opts.name
+    assert_equal :attr, opts.type
   end
 end
 
 class RecursiveObject
   include ROXML
 
-  xml_reader :next, RecursiveObject, :else => true
+  xml_reader :next, :as => RecursiveObject, :else => true
 end
 
 class RoxmlObject
@@ -302,7 +228,7 @@ end
 
 class HashDefinitionTest < ActiveSupport::TestCase
   def test_content_detected_as_from
-    opts = ROXML::Definition.new(:hash, {:key => :content, :value => :name})
+    opts = ROXML::Definition.new(:hash, :as => {:key => :content, :value => :name})
     assert_equal '.', opts.hash.key.name
     assert_equal :text, opts.hash.key.type
   end

data/test/unit/deprecations_test.rb

@@ -1,72 +1,6 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require 'test/test_helper'
 
 class TestDeprecation < ActiveSupport::TestCase
-  def test_tag_refs_is_deprecated
-    assert_deprecated do
-      Class.new do
-        include ROXML
-      end.tag_refs
-    end
-  end
-
-  def test_literal_as_array_is_deprecated
-    assert_deprecated do
-      assert ROXML::Definition.new(:authors, :as => :array).array?
-    end
-  end
-
-  def test_no_block_shorthand_means_no_block
-    assert_deprecated do
-      assert ROXML::Definition.new(:count, :as => :intager).blocks.empty?
-    end
-    assert_deprecated do
-      assert ROXML::Definition.new(:count, :as => :foat).blocks.empty?
-    end
-  end
-
-  def test_symbol_shorthands_are_deprecated
-    assert_deprecated do
-      ROXML::Definition.new(:junk, :as => :integer)
-    end
-    assert_deprecated do
-      ROXML::Definition.new(:junk, :as => :float)
-    end
-  end
-  
-  def test_as_cdata_is_deprecated
-    assert_deprecated do
-      assert ROXML::Definition.new(:manufacturer, :as => :cdata).cdata?
-    end
-    assert_deprecated do
-      assert ROXML::Definition.new(:manufacturer, :as => [Integer, :cdata]).cdata?
-    end
-  end
-
-  def test_content_is_a_recognized_type
-    assert_deprecated do
-      opts = ROXML::Definition.new(:author, :content)
-      assert opts.content?
-      assert_equal '.', opts.name
-      assert_equal :text, opts.type
-    end
-  end
-
-  def test_content_symbol_as_target_is_translated_to_string
-    assert_deprecated do
-      opts = ROXML::Definition.new(:content, :attr => :content)
-      assert_equal 'content', opts.name
-      assert_equal :attr, opts.type
-    end
-  end
-
-  def test_attr_is_a_recognized_type
-    assert_deprecated do
-      opts = ROXML::Definition.new(:author, :attr)
-      assert_equal 'author', opts.name
-      assert_equal :attr, opts.type
-    end
-  end
-
   def test_as_array_not_deprecated
     assert_not_deprecated do
       opts = ROXML::Definition.new(:name, :as => [])
@@ -75,13 +9,6 @@ class TestDeprecation < ActiveSupport::TestCase
     end
   end
 
-  def test_as_hash_of_attrs_deprecated
-    assert_deprecated do
-      opts = ROXML::Definition.new(:name, :as => {:attrs => [:dt, :dd]})
-      assert opts.hash?
-    end
-  end
-
   def test_as_hash_not_deprecated
     assert_not_deprecated do
       opts = ROXML::Definition.new(:name, :as => {:key => '@dt', :value => '@dd'})

data/test/unit/to_xml_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require 'test/test_helper'
 
 class TestHashToXml < ActiveSupport::TestCase
   to_xml_test :dictionary_of_attrs,
@@ -33,7 +33,7 @@ class TestToXmlWithDefaults < ActiveSupport::TestCase
     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
+    assert_equal ROXML::XML::Parser.parse(xml).root.to_s, dict.to_xml.to_s
   end
 end
 
@@ -73,7 +73,7 @@ class BookWithOctalPages
   include ROXML
 
   xml_accessor :pages_with_to_xml_proc, :as => Integer, :to_xml => proc {|val| sprintf("%#o", val) }, :required => true
-  xml_accessor :pages_with_type, OctalInteger, :required => true
+  xml_accessor :pages_with_type, :as => OctalInteger, :required => true
 end
 
 class TestToXmlWithOverriddenOutput < ActiveSupport::TestCase

data/test/unit/xml_attribute_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require 'test/test_helper'
 
 class TestXMLAttribute < ActiveSupport::TestCase
   def test_attr_from

data/test/unit/xml_block_test.rb

@@ -1,15 +1,15 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require 'test/test_helper'
 
 class ArrayWithBlockShorthand
   include ROXML
 
-  xml_reader :array, [:text], :from => 'number', :as => Integer
+  xml_reader :array, :as => [Integer], :from => 'number'
 end
 
 class ArrayWithBlock
   include ROXML
 
-  xml_reader :array, [:text], :from => 'number' do |arr|
+  xml_reader :array, :as => [], :from => 'number' do |arr|
     arr.map(&:to_i).reverse
   end
 end

data/test/unit/xml_bool_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require 'test/test_helper'
 
 PROC_TRUE = proc {|val| val ? 'TRUE' : 'FALSE'}
 PROC_True = proc {|val| val ? 'True' : 'False'}
@@ -10,11 +10,11 @@ class XmlBool
 
   xml_name 'xml_bool'
   xml_reader :true_from_TRUE?, :to_xml => PROC_TRUE
-  xml_reader :false_from_FALSE?, :text => 'text_for_FALSE', :to_xml => PROC_TRUE
+  xml_reader :false_from_FALSE?, :from => 'text_for_FALSE', :to_xml => PROC_TRUE
   xml_reader :true_from_one?, :from => '@attr_for_one', :to_xml => PROC_1
-  xml_reader :false_from_zero?, :text => 'text_for_zero', :in => 'container', :to_xml => PROC_1
+  xml_reader :false_from_zero?, :from => 'text_for_zero', :in => 'container', :to_xml => PROC_1
   xml_reader :true_from_True?, :from => '@attr_for_True', :in => 'container', :to_xml => PROC_True
-  xml_reader :false_from_False?, :text => 'false_from_cdata_False', :cdata => true, :to_xml => PROC_True
+  xml_reader :false_from_False?, :from => 'false_from_cdata_False', :cdata => true, :to_xml => PROC_True
   xml_reader :true_from_true?, :to_xml => PROC_true
   xml_reader :false_from_false?, :to_xml => PROC_true
   xml_reader :missing?

data/test/unit/xml_convention_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require 'test/test_helper'
 
 XML_CAMELLOWER = %{
   <bookCase name="Jonas' Books">
@@ -54,7 +54,7 @@ class BookCase
   include ROXML
 
   xml_reader :book_count, :as => Integer, :required => true
-  xml_reader :big_books, [:text], :required => true
+  xml_reader :big_books, :as => [], :required => true
 end
 
 class BookCaseCamelCase < BookCase
@@ -88,7 +88,7 @@ class ParentBookCaseDefault
   include ROXML
 
   xml_reader :book_count, :as => Integer, :required => true
-  xml_reader :big_books, [:text], :required => true
+  xml_reader :big_books, :as => [], :required => true
 end
 
 class InheritedBookCaseDefault < ParentBookCaseDefault

data/test/unit/xml_hash_test.rb

@@ -1,9 +1,9 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require 'test/test_helper'
 
 class BookWithContributorHash
   include ROXML
 
-  xml_reader :contributors, {:key => {:attr => 'role'},
+  xml_reader :contributors, :as => {:key => '@role',
                              :value => 'name'}
 end
 
@@ -30,7 +30,7 @@ class TestXMLHash < ActiveSupport::TestCase
       Class.new do
         include ROXML
 
-        xml_reader :object_key_to_text, {:key => BookWithContributorHash,
+        xml_reader :object_key_to_text, :as => {:key => BookWithContributorHash,
                                          :value => 'text_node'}
       end
     end
@@ -41,7 +41,7 @@ class TestXMLHash < ActiveSupport::TestCase
       Class.new do
         include ROXML
 
-        xml_reader :key_to_object_value, {:key => {:attr => 'text_node'},
+        xml_reader :key_to_object_value, :as => {:key => '@text_node',
                                           :value => BookWithContributorHash}
       end
     end
@@ -93,7 +93,7 @@ class TestXMLHash < ActiveSupport::TestCase
     dict = Class.new do
       include ROXML
 
-      xml_reader :missing_hash, {:key => :name, :value => :content}, :in => 'EmptyDictionary'
+      xml_reader :missing_hash, :as => {:key => :name, :value => :content}, :in => 'EmptyDictionary'
     end
 
     assert_equal({}, dict.from_xml(%{
@@ -104,15 +104,6 @@ class TestXMLHash < ActiveSupport::TestCase
     }).missing_hash)
   end
 
-  def test_as_hash_of_type_keys_deprecated
-    assert_deprecated do
-      opts = ROXML::Definition.new(:name, :as => {:key => :name, :value => {OctalInteger => 'value'}})
-      assert opts.hash?
-      assert_equal OctalInteger, opts.hash.value.type
-      assert_equal 'value', opts.hash.value.name
-    end
-  end
-
   def test_as_hash_of_as_type_not_deprecated
     assert_not_deprecated do
       opts = ROXML::Definition.new(:name, :as => {:key => :name, :value => {:from => 'value', :as => OctalInteger}})