Empact-roxml 2.5.1 → 2.5.2

data/spec/examples/library_spec.rb

@@ -22,13 +22,18 @@ describe Library do
 
     context "when written to a file" do
       before :all do
+        @path = "spec/examples/library.xml"
         @doc = ROXML::XML::Document.new
         @doc.root = @lib.to_xml
-        @doc.save("spec/examples/library.xml")
+        @doc.save(@path)
       end
 
-      it "should be contain the expected xml" do
-        ROXML::XML::Parser.parse(File.read("spec/examples/library.xml")).to_s.should == ROXML::XML::Parser.parse(%{<?xml version="1.0"?><library><NAME><![CDATA[Favorite Books]]></NAME><novel ISBN='0201710897'><title>The PickAxe</title><description><![CDATA[Best Ruby book out there!]]></description><author>David Thomas, Andrew Hunt, Dave Thomas</author><publisher><name>Addison Wesley Longman, Inc.</name></publisher></novel></library>}).to_s
+     after :all do
+       FileUtils.rm @path
+     end
+
+     it "should be contain the expected xml" do
+        ROXML::XML::Parser.parse(File.read(@path)).to_s.should == ROXML::XML::Parser.parse(%{<?xml version="1.0"?><library><NAME><![CDATA[Favorite Books]]></NAME><novel ISBN='0201710897'><title>The PickAxe</title><description><![CDATA[Best Ruby book out there!]]></description><author>David Thomas, Andrew Hunt, Dave Thomas</author><publisher><name>Addison Wesley Longman, Inc.</name></publisher></novel></library>}).to_s
       end
 
       it "should be re-parsable via .from_xml" do

data/spec/examples/post_spec.rb

@@ -19,6 +19,6 @@ describe Post do
   end
 
   it "should extract time" do
-    @posts.each {|post| post.time.should be_an_instance_of(DateTime) }
+    @posts.each {|post| post.created_at.should be_an_instance_of(DateTime) }
   end
 end

data/spec/roxml_spec.rb

@@ -53,8 +53,8 @@ describe ROXML, "#xml" do
     xml_name :book
     xml_reader :isbn, :from => :attr
     xml_reader :title
-    xml_reader :description, DescriptionReadonly
-    xml_reader :contributions, [Contributor], :from => 'contributor', :in => "contributions"
+    xml_reader :description, :as => DescriptionReadonly
+    xml_reader :contributions, :as => [Contributor], :from => 'contributor', :in => "contributions"
   end
 
   class BookWithContributionsReadonly
@@ -63,8 +63,8 @@ describe ROXML, "#xml" do
     xml_name :book
     xml_reader :isbn, :from => :attr, :frozen => true
     xml_reader :title, :frozen => true
-    xml_reader :description, DescriptionReadonly, :frozen => true
-    xml_reader :contributions, [Contributor], :from => 'contributor', :in => "contributions", :frozen => true
+    xml_reader :description, :as => DescriptionReadonly, :frozen => true
+    xml_reader :contributions, :as => [Contributor], :from => 'contributor', :in => "contributions", :frozen => true
   end
 
   before do
@@ -106,7 +106,7 @@ describe ROXML, "#xml" do
       include ROXML
 
       xml_accessor :pages_with_as, :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
 
     #      to_xml_test :book_with_octal_pages
@@ -148,7 +148,7 @@ describe ROXML, "#xml" do
       class BookWithOctalPagesType
         include ROXML
 
-        xml_accessor :pages, OctalInteger, :required => true
+        xml_accessor :pages, :as => OctalInteger, :required => true
       end
 
       it "should apply filtering on input" do
@@ -216,7 +216,7 @@ describe ROXML, "#xml" do
         xml_reader :isbn, :from => :attr
         xml_reader :title
         xml_reader :description
-        xml_reader :contributors, [Contributor]
+        xml_reader :contributors, :as => [Contributor]
       end
 
       it "should look for elements :in the plural of name" do
@@ -239,7 +239,7 @@ describe ROXML, "#xml" do
       include ROXML
 
       xml_name :dictionary
-      xml_reader :definitions, {:key => :name,
+      xml_reader :definitions, :as => {:key => :name,
                                 :value => :content}, :in => :definitions
     end
 
@@ -247,7 +247,7 @@ describe ROXML, "#xml" do
       include ROXML
 
       xml_name :dictionary
-      xml_reader :definitions, {:key => :name,
+      xml_reader :definitions, :as => {:key => :name,
                                 :value => :content}, :in => :definitions, :frozen => true
     end
 
@@ -274,11 +274,11 @@ describe ROXML, "inheritance" do
   class Book
     include ROXML
 
-    xml_accessor :isbn, :attr => 'ISBN'
+    xml_accessor :isbn, :from => '@ISBN'
     xml_reader :title
-    xml_reader :description, :as => :cdata
+    xml_reader :description, :cdata => true
     xml_reader :author
-    xml_accessor :pages, :text => 'pagecount', :as => Integer
+    xml_accessor :pages, :from => 'pagecount', :as => Integer
   end
 
   class Measurement
@@ -315,7 +315,7 @@ describe ROXML, "inheritance" do
   end
 
   class InheritedBookWithDepth < Book
-    xml_reader :depth, Measurement
+    xml_reader :depth, :as => Measurement
   end
 
   before do
@@ -362,7 +362,7 @@ describe ROXML, "inheritance" do
 
     it "should include parent's attributes added after declaration" do
       Book.class_eval do
-        xml_reader :publisher, :require => true
+        xml_reader :publisher, :required => true
       end
 
       book = InheritedBookWithDepth.from_xml(@book_xml)

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/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
@@ -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/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?
@@ -8,36 +8,18 @@ class TestDefinition < Test::Unit::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 < Test::Unit::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 < Test::Unit::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 < Test::Unit::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 < Test::Unit::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 < Test::Unit::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 < Test::Unit::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,39 +210,25 @@ class TestDefinition < Test::Unit::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
   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})
+    opts = ROXML::Definition.new(:hash, :as => {:key => :content, :value => :name})
     assert_equal '.', opts.hash.key.name
     assert_equal :text, opts.hash.key.type
   end