roxml 2.4.3 → 2.5.0

data/test/unit/deprecations_test.rb

@@ -0,0 +1,97 @@
+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
+
+  def test_as_array_not_deprecated
+    assert_not_deprecated do
+      opts = ROXML::Definition.new(:name, :as => [])
+      assert_equal :text, opts.type
+      assert opts.array?
+    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'})
+      assert opts.hash?
+    end
+  end
+
+  def test_as_object_with_from_xml_not_deprecated
+    assert_not_deprecated do
+      ROXML::Definition.new(:name, :as => OctalInteger)
+    end
+  end
+end

data/test/unit/to_xml_test.rb

@@ -49,4 +49,33 @@ class TestToXmlWithBlocks < Test::Unit::TestCase
     doc.root = b.to_xml
     assert_equal '500', doc.search('pagecount').first.content
   end
-end
+end
+
+class OctalInteger
+  def self.from_xml(val)
+    new(Integer(val.content))
+  end
+
+  def initialize(value)
+    @val = value
+  end
+
+  def ==(other)
+    @val == other
+  end
+
+  def to_xml
+    sprintf("%#o", @val)
+  end
+end
+
+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
+end
+
+class TestToXmlWithOverriddenOutput < Test::Unit::TestCase
+  to_xml_test :book_with_octal_pages
+end

data/test/unit/xml_bool_test.rb

@@ -11,10 +11,10 @@ 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 :true_from_one?, :attr => 'attr_for_one', :to_xml => PROC_1
+  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 :true_from_True?, :attr => 'attr_for_True', :in => 'container', :to_xml => PROC_True
-  xml_reader :false_from_False?, :text => 'false_from_cdata_False', :as => :cdata, :to_xml => PROC_True
+  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 :true_from_true?, :to_xml => PROC_true
   xml_reader :false_from_false?, :to_xml => PROC_true
   xml_reader :missing?
@@ -106,5 +106,17 @@ class TestXMLBool < Test::Unit::TestCase
     end
   end
 
+  def test_writable_references_properly_handle_punctuation
+    klass = Class.new do
+      include ROXML
+      xml_accessor :punctuation?
+    end
+
+    instance = klass.from_xml("<xml><punctuation>True</punctuation></xml>")
+    assert_equal true, instance.punctuation?
+    instance.punctuation = false
+    assert_equal false, instance.punctuation?
+  end
+
   to_xml_test XmlBool => BOOL_XML
 end

data/test/unit/xml_construct_test.rb

@@ -3,8 +3,8 @@ require File.join(File.dirname(__FILE__), '..', 'test_helper')
 class MeasurementWithXmlConstruct
   include ROXML
 
-  xml_reader :units, :attr
-  xml_reader :value, :content
+  xml_reader :units, :from => :attr
+  xml_reader :value, :from => :content
 
   xml_construct_without_deprecation :value, :units
 
@@ -25,9 +25,9 @@ end
 class BookWithDepthWithXmlConstruct
   include ROXML
 
-  xml_reader :isbn, :attr => 'ISBN'
+  xml_reader :isbn, :from => '@ISBN'
   xml_reader :title
-  xml_reader :description, :as => :cdata
+  xml_reader :description, :cdata => true
   xml_reader :author
   xml_reader :depth, MeasurementWithXmlConstruct
 end
@@ -64,9 +64,9 @@ class TestXMLConstruct < Test::Unit::TestCase
       Class.new do
         include ROXML
 
-        xml_reader :bar, :attr => 'Foo'
+        xml_reader :bar, :from => '@Foo'
         xml_reader :foo, :text => 'Foo'
-        xml_reader :baz, :attr => 'Bar'
+        xml_reader :baz, :from => '@Bar'
 
         xml_construct_without_deprecation :baz, :bar, :foo
         def initialize(baz, bar, foo)

data/test/unit/xml_hash_test.rb

@@ -103,4 +103,22 @@ class TestXMLHash < Test::Unit::TestCase
       </dict>
     }).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}})
+      assert opts.hash?
+      assert_equal OctalInteger, opts.hash.value.type
+      assert_equal 'value', opts.hash.value.name
+    end
+  end
 end

data/test/unit/xml_initialize_test.rb

@@ -1,5 +1,9 @@
 require File.join(File.dirname(__FILE__), '..', 'test_helper')
 
+class InheritedBookWithDepth < Book
+  xml_reader :depth, Measurement
+end
+
 class BookWithXmlInitialize < BookWithDepth
   attr_reader :created_at, :creator
 
@@ -7,7 +11,6 @@ class BookWithXmlInitialize < BookWithDepth
     @created_at = created_at
     @creator = creator
   end
-  alias_method :xml_initialize, :initialize
 end
 
 class TestXMLInitialize < Test::Unit::TestCase
@@ -32,8 +35,8 @@ class TestXMLInitialize < Test::Unit::TestCase
   end
 
   def test_initialize_fails_on_missing_required_arg
-    assert_raises(ArgumentError) do
-      b = BookWithXmlInitialize.from_xml(fixture(:book_with_depth))
+    assert_raise ArgumentError do
+      BookWithXmlInitialize.from_xml(fixture(:book_with_depth))
     end
   end
 

data/test/unit/xml_object_test.rb

@@ -57,7 +57,7 @@ class TestXMLObject < Test::Unit::TestCase
     book_one.isbn = "9781843549161"
     book_one.title = "Anathem"
     book_one.description = "A new title from Neal Stephenson"
-    book_one.contributors << contrib
+    book_one.contributors = [contrib]
 
     # this book should be completely empty
     book_two = WriteableBookWithContributors.new
@@ -65,7 +65,7 @@ class TestXMLObject < Test::Unit::TestCase
     assert_equal(nil, book_two.isbn)
     assert_equal(nil, book_two.title)
     assert_equal(nil, book_two.description)
-    assert_equal(0, book_two.contributors.size)
+    assert_equal(nil, book_two.contributors)
   end
 
   # Test XML object containing one other XML object (one-to-one)
@@ -116,11 +116,72 @@ class TestXMLObject < Test::Unit::TestCase
     assert_equal nil, p.mother.mother.mother
   end
 
+  class Node
+    include ROXML
+
+    xml_reader :name, :from => 'node_name'
+    xml_reader :nodes, [Node]
+  end
+
+  class Taxonomy
+    include ROXML
+
+    xml_reader :name, :from => 'taxonomy_name'
+    xml_reader :nodes, [Node]
+  end
+
+  class Taxonomies
+    include ROXML
+    xml_reader :taxonomies, [Taxonomy]
+  end
+
+  def test_more_recursion
+    # quiet the error handler
+    ROXML::XML::Error.reset_handler
+    taxonomies = Taxonomies.from_xml(<<HERE)
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE taxonomies SYSTEM "taxonomy.dtd">
+<taxonomies>
+	<taxonomy>
+		<taxonomy_name>World</taxonomy_name>
+		<node node_id="2" content_object_id="82534" object_type_id="2">
+			<node_name lang_iso="eng">Africa</node_name>
+			<node node_id="331" content_object_id="11" object_type_id="4">
+				<node_name lang_iso="eng">Algeria</node_name>
+				<node node_id="7271" content_object_id="117629" object_type_id="8">
+					<node_name lang_iso="eng">Algiers</node_name>
+				</node>
+				<node node_id="7272" content_object_id="117630" object_type_id="8">
+					<node_name lang_iso="eng">Gharda&#239;a</node_name>
+				</node>
+				<node node_id="7871" content_object_id="1000713999" object_type_id="8">
+					<node_name lang_iso="eng">El Oued</node_name>
+				</node>
+				<node node_id="7872" content_object_id="1000714008" object_type_id="8">
+					<node_name lang_iso="eng">Timimoun</node_name>
+				</node>
+				<node node_id="8903" content_object_id="1000565565" object_type_id="8">
+					<node_name lang_iso="eng">Annaba</node_name>
+				</node>
+			</node>
+		</node>
+	</taxonomy>
+</taxonomies>
+HERE
+    assert_equal 1, taxonomies.taxonomies.size
+    assert_equal 'World', taxonomies.taxonomies.first.name
+    node = taxonomies.taxonomies.first.nodes.first
+    assert_equal 'Africa', node.name
+    assert_equal 'Algeria', node.nodes.first.name
+    assert_equal ['Algiers', "Gharda\303\257a", 'El Oued', 'Timimoun', 'Annaba'],
+      node.nodes.first.nodes.map(&:name)
+  end
+
   def test_with_guarded_recursion
     p = PersonWithGuardedMother.from_xml(fixture(:person_with_guarded_mothers))
-    assert_equal 'Ben Franklin', p.name
-    assert_equal 'Abiah Folger', p.mother.name
-    assert_equal 'Madeup Mother', p.mother.mother.name
+    assert_equal 'Ben "Benji" Franklin', p.name
+    assert_equal 'Abiah \'Abby\' Folger', p.mother.name
+    assert_equal 'Madeup Mother < the third >', p.mother.mother.name
     assert_equal nil, p.mother.mother.mother
   end
 

data/test/unit/xml_text_test.rb

@@ -5,6 +5,9 @@ class TestXMLText < Test::Unit::TestCase
   def test_valid_simple
     book = Book.from_xml(fixture(:book_valid))
     assert_equal("The PickAxe", book.title)
+    assert_equal("David Thomas, Andrew Hunt & Dave Thomas", book.author)
+
+    assert_equal xml_fixture(:book_valid).to_s.gsub("\n", ''), book.to_xml.to_s.gsub("\n", '')
   end
 
   def test_without_needed_from

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: roxml
 version: !ruby/object:Gem::Version 
-  version: 2.4.3
+  version: 2.5.0
 platform: ruby
 authors: 
 - Ben Woosley
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-01 00:00:00 -05:00
+date: 2009-03-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +25,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.1.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: libxml-ruby
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.8.6
+    version: 
 - !ruby/object:Gem::Dependency 
   name: newgem
   type: :development
@@ -63,11 +73,13 @@ files:
 - Rakefile
 - TODO
 - config/website.yml
+- examples/active_record.rb
 - examples/amazon.rb
 - examples/current_weather.rb
 - examples/dashed_elements.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
@@ -89,13 +101,19 @@ files:
 - 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/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
@@ -133,13 +151,8 @@ files:
 - test/mocks/mocks.rb
 - test/release/dependencies_test.rb
 - test/test_helper.rb
-- test/unit/array_test.rb
 - test/unit/definition_test.rb
-- test/unit/freeze_test.rb
-- test/unit/inheritance_test.rb
-- test/unit/overriden_output_test.rb
-- test/unit/roxml_test.rb
-- test/unit/string_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
@@ -181,28 +194,23 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: roxml
-rubygems_version: 1.3.1.xported
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Ruby Object to XML mapping library
 test_files: 
-- test/unit/freeze_test.rb
-- test/unit/array_test.rb
 - 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/roxml_test.rb
 - test/unit/xml_name_test.rb
 - test/unit/definition_test.rb
 - test/unit/xml_construct_test.rb
-- test/unit/string_test.rb
 - test/unit/xml_namespace_test.rb
+- test/unit/deprecations_test.rb
 - test/unit/xml_text_test.rb
-- test/unit/overriden_output_test.rb
 - test/unit/xml_block_test.rb
 - test/unit/xml_attribute_test.rb
-- test/unit/inheritance_test.rb
 - test/unit/xml_initialize_test.rb
 - test/unit/xml_hash_test.rb
 - test/unit/to_xml_test.rb