Empact-roxml 2.5.1 → 2.5.2

data/test/unit/deprecations_test.rb

@@ -1,72 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', 'test_helper')
 
-class TestDefinition < Test::Unit::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
-
+class TestDeprecation < ActiveSupport::TestCase
   def test_as_array_not_deprecated
     assert_not_deprecated do
       opts = ROXML::Definition.new(:name, :as => [])
@@ -75,13 +9,6 @@ class TestDefinition < Test::Unit::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,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)
@@ -73,9 +73,9 @@ 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 < 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

@@ -3,18 +3,18 @@ require File.join(File.dirname(__FILE__), '..', '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
 
-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

@@ -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?
@@ -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_convention_test.rb

@@ -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,13 +88,13 @@ 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
 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

@@ -3,11 +3,11 @@ require File.join(File.dirname(__FILE__), '..', 'test_helper')
 class BookWithContributorHash
   include ROXML
 
-  xml_reader :contributors, {:key => {:attr => 'role'},
+  xml_reader :contributors, :as => {:key => '@role',
                              :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.'}
@@ -30,7 +30,7 @@ class TestXMLHash < Test::Unit::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 < Test::Unit::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 < Test::Unit::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 < Test::Unit::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}})

data/test/unit/xml_initialize_test.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '..', 'test_helper')
 
 class InheritedBookWithDepth < Book
-  xml_reader :depth, Measurement
+  xml_reader :depth, :as => Measurement
 end
 
 class BookWithXmlInitialize < BookWithDepth
@@ -13,11 +13,7 @@ class BookWithXmlInitialize < BookWithDepth
   end
 end
 
-class TestXMLInitialize < Test::Unit::TestCase
-  def test_xml_construct_not_in_use
-    assert Measurement.xml_construction_args_without_deprecation.empty?
-  end
-
+class TestXMLInitialize < ActiveSupport::TestCase
   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

@@ -24,31 +24,31 @@ 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 < 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
@@ -104,31 +104,12 @@ class TestXMLName < Test::Unit::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,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

@@ -13,10 +13,10 @@ end
 class CartHolder
   include ROXML
 
-  xml_reader :cart, EmptyCart, :required => true
+  xml_reader :cart, :as => 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))
@@ -120,19 +120,19 @@ class TestXMLObject < Test::Unit::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

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))
@@ -28,7 +28,7 @@ class TestXMLText < Test::Unit::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>')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Empact-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 -08:00
+date: 2009-03-12 00:00:00 -07: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
@@ -134,7 +133,6 @@ files:
 - 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
@@ -171,7 +169,6 @@ files:
 - 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
@@ -179,7 +176,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
@@ -221,18 +217,17 @@ signing_key:
 specification_version: 2
 summary: Ruby Object to XML mapping library
 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_bool_test.rb
+- test/unit/xml_name_test.rb
+- test/unit/definition_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