Empact-roxml 2.1 → 2.2

data/test/unit/xml_name_test.rb

@@ -2,13 +2,33 @@ require File.join(File.dirname(__FILE__), '..', 'test_helper')
 
 class TestXMLName < Test::Unit::TestCase
   def test_named_books_picked_up
-    named = Library.parse(fixture(:library))
+    named = Library.from_xml(fixture(:library))
     assert named.books
     assert_equal :book, named.books.first.tag_name
   end
 
   def test_nameless_books_missing
-    nameless = LibraryWithBooksOfUnderivableName.parse(fixture(:library))
+    nameless = LibraryWithBooksOfUnderivableName.from_xml(fixture(:library))
     assert nameless.novels.empty?
   end
+
+  def test_tag_name
+    assert_equal :dictionary, DictionaryOfTexts.tag_name
+
+    dict = DictionaryOfTexts.from_xml(fixture(:dictionary_of_texts))
+
+    assert_equal :dictionary, dict.tag_name
+  end
+
+  def test_tag_refs
+    assert_equal 'definition', DictionaryOfTexts.tag_refs.only.name
+    assert_equal 'word', DictionaryOfTexts.tag_refs.only.hash.key.name
+    assert_equal 'meaning', DictionaryOfTexts.tag_refs.only.hash.value.name
+
+    dict = DictionaryOfTexts.from_xml(fixture(:dictionary_of_texts))
+
+    assert_equal 'definition', dict.tag_refs.only.name
+    assert_equal 'word', dict.tag_refs.only.hash.key.name
+    assert_equal 'meaning', dict.tag_refs.only.hash.value.name
+  end
 end

data/test/unit/xml_namespace_test.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '..', 'test_helper')
 
 class TestXMLNamespaces < Test::Unit::TestCase
   def setup
-    @book = BookWithContributions.parse(fixture(:book_with_default_namespace))
+    @book = BookWithContributions.from_xml(fixture(:book_with_default_namespace))
   end
 
   def test_default_namespace_doesnt_interfere_with_normal_operation
@@ -29,8 +29,9 @@ class TestXMLNamespaces < Test::Unit::TestCase
     xml = LibXML::XML::Parser.string(
       '<container xmlns="http://defaultnamespace.org"><node>Yeah, content</node><node><subnode>Another</subnode></node></container>').parse
 
-    assert_equal nil, xml.find_first('container')
-    assert_equal "Yeah, content", xml.find_first('container:node', 'container:http://defaultnamespace.org').content
-    assert_equal "Another", xml.find_first('container:node/container:subnode', 'container:http://defaultnamespace.org').content
+    assert_equal nil, xml.find_first('node')
+    assert_equal "Yeah, content", xml.find_first('ns:node', 'ns:http://defaultnamespace.org').content
+    assert_equal nil, xml.find_first('ns:node/subnode', 'ns:http://defaultnamespace.org')
+    assert_equal "Another", xml.find_first('ns:node/ns:subnode', 'ns:http://defaultnamespace.org').content
   end
 end

data/test/unit/xml_object_test.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '..', 'test_helper')
 class TestXMLObject < Test::Unit::TestCase
   # Test book with text and attribute
   def test_book_author_text_attribute
-    book = BookWithAuthorTextAttribute.parse(fixture(:book_text_with_attribute))
+    book = BookWithAuthorTextAttribute.from_xml(fixture(:book_text_with_attribute))
     assert_equal("primary",book.author.role)
     assert_equal("David Thomas",book.author.text)
   end
@@ -12,7 +12,7 @@ class TestXMLObject < Test::Unit::TestCase
   # In this case, book with contibutions
   def test_one_to_many_with_container
     expected_authors = ["David Thomas","Andrew Hunt","Chad Fowler"]
-    book = BookWithContributions.parse(fixture(:book_with_contributions))
+    book = BookWithContributions.from_xml(fixture(:book_with_contributions))
     assert_equal("Programming Ruby - 2nd Edition", book.title)
     book.contributions.each do |contributor|
       assert expected_authors.include?(contributor.name)
@@ -23,24 +23,46 @@ class TestXMLObject < Test::Unit::TestCase
   # In this case, book with contibutions
   def test_one_to_many_without_container
     expected_contributors = ["David Thomas","Andrew Hunt","Chad Fowler"]
-    book = BookWithContributors.parse(fixture(:book_with_contributors))
+    book = BookWithContributors.from_xml(fixture(:book_with_contributors))
     assert_equal("Programming Ruby - 2nd Edition", book.title)
     book.contributors.each do |contributor|
       assert(expected_contributors.include?(contributor.name))
     end
   end
 
+  # when building objects that contain arrays, the second object seems to
+  # inherit data from the first
+  #
+  def test_one_to_many_without_container_sequence
+    contrib = WriteableContributor.new
+    contrib.name = "David Thomas"
+
+    book_one = WriteableBookWithContributors.new
+    book_one.isbn = "9781843549161"
+    book_one.title = "Anathem"
+    book_one.description = "A new title from Neal Stephenson"
+    book_one.contributors << contrib
+
+    # this book should be completely empty
+    book_two = WriteableBookWithContributors.new
+
+    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)
+  end
+
   # Test XML object containing one other XML object (one-to-one)
   # In this case, book with publisher
   def test_one_to_one
-    book = BookWithPublisher.parse(fixture(:book_with_publisher))
+    book = BookWithPublisher.from_xml(fixture(:book_with_publisher))
     assert_equal("Programming Ruby - 2nd Edition", book.title)
     assert_equal("Pragmatic Bookshelf", book.publisher.name)
   end
 
   # Test XML object containing type of self (self-reference)
   def test_self_reference
-    book = BookPair.parse(fixture(:book_pair))
+    book = BookPair.from_xml(fixture(:book_pair))
     assert_equal("Programming Ruby - 2nd Edition", book.title)
     assert_equal("Agile Web Development with Rails", book.book.title)
   end
@@ -49,7 +71,7 @@ class TestXMLObject < Test::Unit::TestCase
   def test_one_to_many_to_many
     expected_contributors = ["David Thomas","Andrew Hunt","Chad Fowler", "David Heinemeier Hansson"]
     expected_books = ["Programming Ruby - 2nd Edition", "Agile Web Development with Rails"]
-    library = Library.parse(fixture(:library))
+    library = Library.from_xml(fixture(:library))
     assert_equal("Ruby library", library.name)
     assert !library.books.empty?
     library.books.each do |book|
@@ -61,17 +83,17 @@ class TestXMLObject < Test::Unit::TestCase
   end
 
   def test_without_needed_from
-    assert_equal [], UppercaseLibrary.parse(fixture(:library)).books
-    assert_equal [], Library.parse(fixture(:library_uppercase)).books
+    assert_equal [], UppercaseLibrary.from_xml(fixture(:library)).books
+    assert_equal [], Library.from_xml(fixture(:library_uppercase)).books
   end
 
   def test_with_needed_from
-    assert Library.parse(fixture(:library)).books
-    assert UppercaseLibrary.parse(fixture(:library_uppercase)).books
+    assert Library.from_xml(fixture(:library)).books
+    assert UppercaseLibrary.from_xml(fixture(:library_uppercase)).books
   end
 
   def test_with_recursion
-    p = PersonWithMother.parse(fixture(:person_with_mothers))
+    p = PersonWithMother.from_xml(fixture(:person_with_mothers))
     assert_equal 'Ben Franklin', p.name
     assert_equal 'Abiah Folger', p.mother.name
     assert_equal 'Madeup Mother', p.mother.mother.name
@@ -79,7 +101,7 @@ class TestXMLObject < Test::Unit::TestCase
   end
 
   def test_with_guarded_recursion
-    p = PersonWithGuardedMother.parse(fixture(:person_with_guarded_mothers))
+    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
@@ -87,8 +109,8 @@ class TestXMLObject < Test::Unit::TestCase
   end
 
   def test_recursive_with_default_initialization
-    p = PersonWithMotherOrMissing.parse(fixture(:person_with_mothers))
+    p = PersonWithMotherOrMissing.from_xml(fixture(:person_with_mothers))
     assert_equal 'Unknown', p.mother.mother.mother.name
     assert_equal Person, p.mother.mother.mother.class
   end
-end
+end

data/test/unit/xml_text_test.rb

@@ -3,26 +3,26 @@ require File.join(File.dirname(__FILE__), '..', 'test_helper')
 class TestXMLText < Test::Unit::TestCase
   # Test a simple mapping with no composition
   def test_valid_simple
-    book = Book.parse(fixture(:book_valid))
+    book = Book.from_xml(fixture(:book_valid))
     assert_equal("The PickAxe", book.title)
   end
 
   def test_without_needed_from
-    assert !Library.parse(fixture(:library_uppercase)).name
+    assert !Library.from_xml(fixture(:library_uppercase)).name
   end
 
   def test_with_needed_from
-    assert_equal "Ruby library", Library.parse(fixture(:library)).name
-    assert_equal "Ruby library", UppercaseLibrary.parse(fixture(:library_uppercase)).name
+    assert_equal "Ruby library", Library.from_xml(fixture(:library)).name
+    assert_equal "Ruby library", UppercaseLibrary.from_xml(fixture(:library_uppercase)).name
   end
 
   def test_as_array
     assert_equal ["David Thomas","Andrew Hunt","Dave Thomas"].sort,
-                 BookWithAuthors.parse(fixture(:book_with_authors)).authors.sort
+                 BookWithAuthors.from_xml(fixture(:book_with_authors)).authors.sort
   end
 
   def test_text_modification
-    person = Person.parse(fixture(:person))
+    person = Person.from_xml(fixture(:person))
     assert_equal("Ben Franklin", person.name)
     person.name = "Fred"
     xml=person.to_xml.to_s
@@ -30,27 +30,27 @@ class TestXMLText < Test::Unit::TestCase
   end
 
   def test_default_initialization
-    person = PersonWithMotherOrMissing.parse(fixture(:nameless_ageless_youth))
+    person = PersonWithMotherOrMissing.from_xml(fixture(:nameless_ageless_youth))
     assert_equal "Anonymous", person.name
   end
 
   def test_default_initialization_of_content
-    person = Person.parse(fixture(:nameless_ageless_youth))
+    person = Person.from_xml(fixture(:nameless_ageless_youth))
     assert_equal "Unknown", person.name
   end
 
   def test_recursive_with_default_initialization
-    p = PersonWithMotherOrMissing.parse(fixture(:person_with_mothers))
+    p = PersonWithMotherOrMissing.from_xml(fixture(:person_with_mothers))
     assert_equal 'Unknown', p.mother.mother.mother.name
   end
 
   def test_get_with_block
-    p = Book.parse(fixture(:book_valid))
+    p = Book.from_xml(fixture(:book_valid))
     assert_equal 357, p.pages
   end
 
   def test_no_name_clashes
-    n = NodeWithNameConflicts.parse(fixture(:node_with_name_conflicts))
+    n = NodeWithNameConflicts.from_xml(fixture(:node_with_name_conflicts))
     assert_equal "Just junk... really", n.content
     assert_equal "Cartwheel", n.name
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Empact-roxml
 version: !ruby/object:Gem::Version 
-  version: "2.1"
+  version: "2.2"
 platform: ruby
 authors: 
 - Ben Woosley
@@ -12,10 +12,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-13 00:00:00 -07:00
+date: 2008-10-27 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: extensions
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.6.0
+    version: 
 description: 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.
 email: ben.woosley@gmail.com
 executables: []
@@ -30,9 +38,13 @@ files:
 - Rakefile
 - roxml.gemspec
 - lib/roxml.rb
-- lib/roxml/array.rb
+- lib/roxml/extensions/array.rb
+- lib/roxml/extensions/array/conversions.rb
+- lib/roxml/extensions/string.rb
+- lib/roxml/extensions/string/conversions.rb
+- lib/roxml/extensions/string/iterators.rb
+- lib/roxml/extensions/deprecation.rb
 - lib/roxml/options.rb
-- lib/roxml/string.rb
 - lib/roxml/xml.rb
 - lib/roxml/xml/libxml.rb
 - lib/roxml/xml/rexml.rb
@@ -47,11 +59,18 @@ files:
 - test/fixtures/book_with_default_namespace.xml
 - test/fixtures/book_with_depth.xml
 - test/fixtures/book_with_publisher.xml
+- test/fixtures/book_with_wrapped_attr.xml
 - test/fixtures/dictionary_of_attrs.xml
+- test/fixtures/dictionary_of_attr_name_clashes.xml
+- test/fixtures/dictionary_of_guarded_names.xml
 - test/fixtures/dictionary_of_mixeds.xml
+- test/fixtures/dictionary_of_names.xml
+- test/fixtures/dictionary_of_name_clashes.xml
 - test/fixtures/dictionary_of_texts.xml
 - test/fixtures/library_uppercase.xml
 - test/fixtures/library.xml
+- test/fixtures/node_with_attr_name_conflicts.xml
+- test/fixtures/node_with_name_conflicts.xml
 - test/fixtures/nameless_ageless_youth.xml
 - test/fixtures/person_with_guarded_mothers.xml
 - test/fixtures/person_with_mothers.xml

data/lib/roxml/array.rb

@@ -1,15 +0,0 @@
-class Array
-  # Translates an array into a hash, where each element of the array is
-  # an array with 2 elements:
-  #
-  #   >> [[:key, :value], [1, 2], ['key', 'value']].to_h
-  #   => {:key => :value, 1 => 2, 'key' => 'value}
-  #
-  def to_h
-    returning({}) do |result|
-      each do |(k, v)|
-        result[k] = v
-      end
-    end
-  end
-end

data/lib/roxml/string.rb

@@ -1,35 +0,0 @@
-# Extension of String class to handle conversion from/to
-# UTF-8/ISO-8869-1
-class Object
-  require 'iconv'
-
-  #
-  # Return an utf-8 representation of this string.
-  #
-  def to_utf
-    begin
-      Iconv.new("utf-8", "iso-8859-1").iconv(to_s)
-    rescue Iconv::IllegalSequence
-      STDERR << "!! Failed converting from UTF-8 -> ISO-8859-1 (#{self}). Already the right charset?"
-      self
-    end
-  end
-
-  #
-  # Convert this string to iso-8850-1
-  #
-  def to_latin
-    begin
-      Iconv.new("iso-8859-1", "utf-8").iconv(to_s)
-    rescue Iconv::IllegalSequence
-      STDERR << "!! Failed converting from ISO-8859-1 -> UTF-8 (#{self}). Already the right charset?"
-      self
-    end
-  end
-end
-
-class String
-  def between(separator, &block)
-    split(separator).collect(&block).join(separator)
-  end
-end