roxml 3.1.5 → 3.1.6

data/spec/xml/encoding_spec.rb

@@ -1,22 +1,53 @@
-require 'spec/spec_helper'
+# encoding: utf-8
+require_relative './../spec_helper'
 
 describe ROXML, "encoding" do
   class TestResult
     include ROXML
     xml_accessor :message
   end
-
+  
   context "when provided non-latin characters" do
     it "should output those characters as input via methods" do
       res = TestResult.new
       res.message = "sadfk одловыа jjklsd " #random russian  and english charecters
-      res.to_xml.at('message').inner_text.should == "sadfk одловыа jjklsd "
+      doc = ROXML::XML::Document.new
+      doc.root = res.to_xml
+      if defined?(Nokogiri)
+        doc.at('message').inner_text
+      else
+        doc.find_first('message').inner_xml
+      end.should == "sadfk одловыа jjklsd "
     end
-
+  
     it "should output those characters as input via xml" do
       res = TestResult.from_xml("<test_result><message>sadfk одловыа jjklsd </message></test_result>")
-      res.to_xml.at('message').inner_text.should == "sadfk одловыа jjklsd "
+      doc = ROXML::XML::Document.new
+      doc.root = res.to_xml
+      if defined?(Nokogiri)
+        doc.at('message').inner_text
+      else
+        doc.find_first('message').inner_xml
+      end.should == "sadfk одловыа jjklsd "
+    end
+  
+    it "should allow override via the document" do
+      res = TestResult.from_xml("<test_result><message>sadfk одловыа jjklsd </message></test_result>")
+      if defined?(Nokogiri)
+        xml = res.to_xml
+        doc = xml.document
+        doc.root = xml
+        doc.encoding = 'ISO-8859-1'
+        doc.to_s.should include('ISO-8859-1')
+        doc.at('message').inner_text
+      else
+        doc = LibXML::XML::Document.new
+        doc.encoding = LibXML::XML::Encoding::ASCII
+        doc.root = res.to_xml
+        pending "Libxml bug"
+        doc.to_s.should include('ISO-8859-1')
+        doc.find_first('message').inner_xml
+      end.should == "sadfk одловыа jjklsd "
     end
   end
-
-end
+end

data/spec/xml/namespace_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper.rb'
+require_relative './../spec_helper.rb'
 
 describe ROXML, "with namespaces" do
   describe "for writing" do
@@ -52,12 +52,12 @@ EOS
         output = ROXML::XML::Document.new
         output.root = VApp.from_xml(@xml).to_xml
         pending "Full namespace write support"
-        output.should == ROXML::XML::Parser.parse(@xml)
+        output.should == ROXML::XML.parse_string(@xml)
       end
     end
   end
 
-  describe "roxml namespacey declaration", :shared => true do
+  shared_examples_for "roxml namespacey declaration" do
     context "with a namespacey :from" do
       context "and an explicit :namespace" do
         it "should raise" do
@@ -83,7 +83,7 @@ EOS
     end
   end
 
-  describe "roxml namespacey declaration with default", :shared => true do
+  shared_examples_for "roxml namespacey declaration with default" do
     it_should_behave_like "roxml namespacey declaration"
     
     it "should use the default namespace" do

data/spec/xml/namespaces_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper.rb'
+require_relative './../spec_helper.rb'
 
 describe ROXML, "#xml_namespaces" do
   describe "for reading" do

data/spec/xml/object_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require_relative './../spec_helper'
 
 describe ROXML::XMLObjectRef do
   class SubObject
@@ -12,7 +12,7 @@ describe ROXML::XMLObjectRef do
   end
 
   before do
-    @xml = ROXML::XML::Parser.parse %(
+    @xml = ROXML::XML.parse_string %(
 <myxml>
   <node>
     <name value="first" />
@@ -43,7 +43,7 @@ describe ROXML::XMLObjectRef do
     end
 
     it "should output all instances" do
-      xml = ROXML::XML::Node.create('myxml')
+      xml = ROXML::XML.new_node('myxml')
       @ref.update_xml(xml, ["first", "second", "third"].map {|value| SubObject.new(value) })
       xml.to_s.squeeze(' ').should == @xml.root.to_s.squeeze(' ')
     end
@@ -51,7 +51,7 @@ describe ROXML::XMLObjectRef do
   
   context "when the namespaces are different" do
     before do
-      @xml = ROXML::XML::Parser.parse %(
+      @xml = ROXML::XML.parse_string %(
       <myxml xmlns="http://example.com/three" xmlns:one="http://example.com/one" xmlns:two="http://example.com/two">
         <node>
           <one:name>first</one:name>
@@ -73,7 +73,7 @@ describe ROXML::XMLObjectRef do
 
       it "should output all instances with namespaces" do
         pending "Full namespace write support"
-        xml = ROXML::XML::Node.create('myxml')
+        xml = ROXML::XML.new_node('myxml')
         @ref.update_xml(xml, ["first", "second", "third"].map {|value| SubObject.new(value) })
         xml.should == @xml.root
       end

data/spec/xml/parser_spec.rb

@@ -1,26 +1,21 @@
-require 'spec/spec_helper.rb'
+require_relative './../spec_helper.rb'
 
-describe ROXML::XML::Parser do
-  before do
-    # quiet the error handler
-    ROXML::XML::Error.reset_handler if ROXML::XML::Error.respond_to?(:reset_handler)
-  end
-  
+describe ROXML::XML do
   it "should raise on malformed xml" do
-    unless ROXML::XML_PARSER == 'nokogiri' # nokogiri is less strict and auto-closes for some reason
-      proc { Book.from_xml(fixture(:book_malformed)) }.should raise_error(ROXML::XML::Error)
+    if ROXML::XML_PARSER == 'libxml' # nokogiri is less strict and auto-closes for some reason
+      proc { Book.from_xml(fixture(:book_malformed)) }.should raise_error(LibXML::XML::Error)
     end
   end
 
   it "should escape invalid characters on output to text node" do
-    node = ROXML::XML::Node.create("entities")
-    node.content = " < > ' \" & "
+    node = ROXML::XML.new_node("entities")
+    ROXML::XML.set_content(node, " < > ' \" & ")
     node.to_s.should == "<entities> &lt; &gt; ' \" &amp; </entities>"
   end
 
   it "should esape invalid characters for attribute name" do
-    node = ROXML::XML::Node.create("attr_holder")
-    node.attributes["entities"] = "\"'<>&"
+    node = ROXML::XML.new_node("attr_holder")
+    ROXML::XML.set_attribute(node, "entities", "\"'<>&")
     node.to_s.should == %{<attr_holder entities="&quot;'&lt;&gt;&amp;"/>}
   end
 end

data/spec/xml/text_spec.rb

@@ -1,8 +1,8 @@
-require 'spec/spec_helper'
+require_relative './../spec_helper'
 
 describe ROXML::XMLTextRef do
   before do
-    @xml = ROXML::XML::Parser.parse %(
+    @xml = ROXML::XML.parse_string %(
 <myxml>
   <node>
     <name>first</name>
@@ -33,7 +33,7 @@ describe ROXML::XMLTextRef do
     end
 
     it "should output all instances" do
-      xml = ROXML::XML::Node.create('myxml')
+      xml = ROXML::XML.new_node('myxml')
       @ref.update_xml(xml, ["first", "second", "third"])
       xml.to_s.squeeze(' ').should == @xml.root.to_s.squeeze(' ')
     end
@@ -41,7 +41,7 @@ describe ROXML::XMLTextRef do
   
   context "when the namespaces are different" do
     before do
-      @xml = ROXML::XML::Parser.parse %(
+      @xml = ROXML::XML.parse_string %(
       <myxml xmlns="http://example.com/three" xmlns:one="http://example.com/one" xmlns:two="http://example.com/two">
         <node>
           <one:name>first</one:name>
@@ -62,7 +62,7 @@ describe ROXML::XMLTextRef do
 
       it "should output all instances with namespaces" do
         pending "Full namespace write support"
-        xml = ROXML::XML::Node.create('myxml')
+        xml = ROXML::XML.new_node('myxml')
         @ref.update_xml(xml, ["first", "second", "third"])
         xml.should == @xml.root
       end

data/test/mocks/dictionaries.rb

@@ -1,4 +1,4 @@
-require 'lib/roxml'
+require_relative "./../../lib/roxml"
 
 class DictionaryOfAttrs
   include ROXML

data/test/mocks/mocks.rb

@@ -1,4 +1,4 @@
-require "lib/roxml"
+require_relative "./../../lib/roxml"
 
 class Muffins
   include ROXML

data/test/support/fixtures.rb

@@ -3,7 +3,7 @@ def fixture(name)
 end
 
 def xml_fixture(name)
-  ROXML::XML::Parser.parse_file(fixture_path(name)).root
+  ROXML::XML.parse_file(fixture_path(name)).root
 end
 
 def fixture_path(name)

data/test/test_helper.rb

@@ -1,8 +1,8 @@
 require 'rubygems'
 require 'active_support/test_case'
-require 'test/mocks/mocks'
-require 'test/mocks/dictionaries'
-require 'test/support/fixtures'
+require_relative './mocks/mocks'
+require_relative './mocks/dictionaries'
+require_relative './support/fixtures'
 
 def to_xml_test(*names)
   names = names.first if names.size == 1 && names.first.is_a?(Hash)
@@ -21,11 +21,11 @@ def to_xml_test(*names)
 end
 
 def remove_children(xml)
-  xml = ROXML::XML::Parser.parse(xml).root if xml.is_a?(String)
+  xml = ROXML::XML.parse_string(xml).root if xml.is_a?(String)
   return unless xml.respond_to? :children
   xml.children.each do |child|
     if child.to_s.blank?
-      child.remove!
+      defined?(Nokogiri) ? child.remove : child.remove!
     else
       remove_children(child)
     end

data/test/unit/definition_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require_relative './../test_helper'
 
 class TestDefinition < ActiveSupport::TestCase
   def assert_hash(opts, kvp)
@@ -24,7 +24,7 @@ class TestDefinition < ActiveSupport::TestCase
     opts = ROXML::Definition.new(:intarray, :as => [Integer])
     assert opts.array?
     assert_equal :text, opts.sought_type
-    assert 1, opts.blocks.size
+    assert_equal 1, opts.blocks.size
   end
 
   def test_required
@@ -173,17 +173,17 @@ class TestDefinition < ActiveSupport::TestCase
 
   def test_default_works
     opts = ROXML::Definition.new(:missing, :else => true)
-    assert_equal true, opts.to_ref(RoxmlObject.new).value_in(ROXML::XML::Parser.parse('<xml></xml>'))
+    assert_equal true, opts.to_ref(RoxmlObject.new).value_in(ROXML::XML.parse_string('<xml></xml>'))
   end
 
   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_equal [], opts.to_ref(RoxmlObject.new).value_in(ROXML::XML.parse_string('<xml></xml>'))
   end
 
   def test_default_works_for_recursive_objects
     opts = ROXML::Definition.new(:missing, :as => RecursiveObject, :else => false)
-    assert_equal false, opts.to_ref(RoxmlObject.new).value_in(ROXML::XML::Parser.parse('<xml></xml>'))
+    assert_equal false, opts.to_ref(RoxmlObject.new).value_in(ROXML::XML.parse_string('<xml></xml>'))
   end
 
   def test_content_is_accepted_as_from

data/test/unit/deprecations_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require_relative './../test_helper'
 
 class TestDeprecation < ActiveSupport::TestCase
   def test_as_array_not_deprecated

data/test/unit/to_xml_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require_relative './../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.to_s, dict.to_xml.to_s
+    assert_equal ROXML::XML.parse_string(xml).root.to_s, dict.to_xml.to_s
   end
 end
 
@@ -41,13 +41,13 @@ class TestToXmlWithBlocks < ActiveSupport::TestCase
   def test_pagecount_serialized_properly_after_modification
     b = Book.from_xml(fixture(:book_valid))
     xml = xml_fixture(:book_valid)
-    assert_equal '357', xml.search('pagecount').first.content
+    assert_equal '357', xml.roxml_search('pagecount').first.content
     assert_equal 357, b.pages
 
     b.pages = 500
     doc = ROXML::XML::Document.new()
     doc.root = b.to_xml
-    assert_equal '500', doc.search('pagecount').first.content
+    assert_equal '500', doc.roxml_search('pagecount').first.content
   end
 end
 

data/test/unit/xml_attribute_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require_relative './../test_helper'
 
 class TestXMLAttribute < ActiveSupport::TestCase
   def test_attr_from

data/test/unit/xml_block_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require_relative './../test_helper'
 
 class ArrayWithBlockShorthand
   include ROXML

data/test/unit/xml_bool_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require_relative './../test_helper'
 
 PROC_TRUE = proc {|val| val ? 'TRUE' : 'FALSE'}
 PROC_True = proc {|val| val ? 'True' : 'False'}

data/test/unit/xml_convention_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require_relative './../test_helper'
 
 XML_CAMELLOWER = %{
   <bookCase name="Jonas' Books">

data/test/unit/xml_hash_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require_relative './../test_helper'
 
 class BookWithContributorHash
   include ROXML

data/test/unit/xml_initialize_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require_relative './../test_helper'
 
 class InheritedBookWithDepth < Book
   xml_reader :depth, :as => Measurement

data/test/unit/xml_name_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require_relative './../test_helper'
 
 #      Parent        |    Child
 #  :from  | no :from |
@@ -117,7 +117,7 @@ class TestXMLName < ActiveSupport::TestCase
 
   def test_xml_name_not_screwed_up_by_xml_convention
     reference = ROXML::XMLTextRef.new(ROXML::Definition.new(:name, :in => './'), WrapModule::InstanceStandin.new)
-    assert_equal "name value", reference.value_in(ROXML::XML::Parser.parse(%(
+    assert_equal "name value", reference.value_in(ROXML::XML.parse_string(%(
       <Wrapper>
          <MoreStuff>
             <DeepWrapper>

data/test/unit/xml_namespace_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require_relative './../test_helper'
 
 class TestDefaultXMLNamespaces < ActiveSupport::TestCase
   def setup

data/test/unit/xml_object_test.rb

@@ -1,4 +1,5 @@
-require 'test/test_helper'
+# encoding: utf-8
+require_relative './../test_helper'
 
 class EmptyCart
   include ROXML
@@ -136,8 +137,6 @@ class TestXMLObject < ActiveSupport::TestCase
   end
 
   def test_more_recursion
-    # quiet the error handler
-    ROXML::XML::Error.reset_handler if ROXML::XML::Error.respond_to?(:reset_handler)
     taxonomies = Taxonomies.from_xml(<<HERE)
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE taxonomies SYSTEM "taxonomy.dtd">
@@ -173,7 +172,7 @@ HERE
     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'],
+    assert_equal ['Algiers', "Ghardaïa", 'El Oued', 'Timimoun', 'Annaba'],
       node.nodes.first.nodes.map(&:name)
   end
 

data/test/unit/xml_required_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require_relative './../test_helper'
 
 class TestXMLRequired < ActiveSupport::TestCase
   def setup

data/test/unit/xml_text_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require_relative './../test_helper'
 
 class TestXMLText < ActiveSupport::TestCase
   # Test a simple mapping with no composition

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: roxml
 version: !ruby/object:Gem::Version 
-  version: 3.1.5
+  prerelease: false
+  segments: 
+  - 3
+  - 1
+  - 6
+  version: 3.1.6
 platform: ruby
 authors: 
 - Ben Woosley
@@ -12,59 +17,84 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-18 00:00:00 -05:00
+date: 2010-11-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 0
         version: 2.3.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 3
         version: 1.3.3
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 4
         version: 1.2.4
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 2
+        - 2
         version: 2.2.2
-    version: 
+  type: :development
+  version_requirements: *id005
 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
@@ -83,6 +113,7 @@ extra_rdoc_files:
 files: 
 - .gitignore
 - .gitmodules
+- .rspec
 - History.txt
 - LICENSE
 - README.rdoc
@@ -120,10 +151,10 @@ files:
 - spec/examples/twitter_spec.rb
 - spec/roxml_spec.rb
 - spec/shared_specs.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/libxml.rb
 - spec/support/nokogiri.rb
+- spec/xml/array_spec.rb
 - spec/xml/attributes_spec.rb
 - spec/xml/encoding_spec.rb
 - spec/xml/namespace_spec.rb
@@ -191,21 +222,25 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: roxml
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby Object to XML mapping library
@@ -223,6 +258,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/libxml.rb
 - spec/support/nokogiri.rb
+- spec/xml/array_spec.rb
 - spec/xml/attributes_spec.rb
 - spec/xml/encoding_spec.rb
 - spec/xml/namespace_spec.rb