roxml 3.1.5 → 3.1.6

data/lib/roxml/xml/references.rb

@@ -1,7 +1,7 @@
 module ROXML
   class RequiredElementMissing < Exception # :nodoc:
   end
-  
+
   #
   # Internal base class that represents an XML - Class binding.
   #
@@ -52,7 +52,7 @@ module ROXML
     def namespacify(what)
       if what.to_s.present? && !what.to_s.include?(':') && opts.namespace != false
         [opts.namespace, @instance.class.roxml_namespace, @default_namespace].each do |namespace|
-          return opts.namespace == '*' ? "*[local-name()='#{what}']" : "#{namespace}:#{what}" if namespace
+          return opts.namespace == '*' ? (what == '*' ? "*" : "*[local-name()='#{what}']") : "#{namespace}:#{what}" if namespace
         end
       end
       what
@@ -98,15 +98,15 @@ module ROXML
       if !opts[:always_create] && (child = xml.children.find {|c| c.name == wrap_with })
        return child
       end
-      xml.add_child(XML::Node.create(wrap_with.to_s))
+      XML.add_node(xml, wrap_with.to_s)
     end
 
     def nodes_in(xml)
       @default_namespace = xml.default_namespace
-      vals = xml.search(xpath, @instance.class.roxml_namespaces)
+      vals = xml.roxml_search(xpath, @instance.class.roxml_namespaces)
 
       if several? && vals.empty? && !wrapper && auto_xpath
-        vals = xml.search(auto_xpath, @instance.class.roxml_namespaces)
+        vals = xml.roxml_search(auto_xpath, @instance.class.roxml_namespaces)
         @auto_vals = !vals.empty?
       end
 
@@ -136,12 +136,12 @@ module ROXML
       if array?
         values.each do |value|
           wrap(xml, :always_create => true).tap do |node|
-            node.attributes[name] = value.to_s
+            XML.set_attribute(node, name, value.to_s)
           end
         end
       else
         wrap(xml).tap do |xml|
-          xml.attributes[name] = values.to_s
+          XML.set_attribute(xml, name, values.to_s)
         end
       end
     end
@@ -177,10 +177,10 @@ module ROXML
           xml.name = value
         elsif array?
           value.each do |v|
-            add(xml.add_child(XML::Node.create(name)), v)
+            add(XML.add_node(xml, name), v)
           end
         else
-          add(xml.add_child(XML::Node.create(name)), value)
+          add(XML.add_node(xml, name), value)
         end
       end
     end
@@ -210,13 +210,20 @@ module ROXML
 
     def add(dest, value)
       if cdata?
-        dest.add_child(XML::Node.new_cdata(value.to_s))
+        XML.add_cdata(dest, value.to_s)
       else
-        dest.content = value.to_s
+        XML.set_content(dest, value.to_s)
       end
     end
   end
 
+  class XMLNameSpaceRef < XMLRef # :nodoc:
+    private
+      def fetch_value(xml)
+        xml.namespace.prefix
+      end
+  end
+
   class XMLHashRef < XMLTextRef # :nodoc:
     delegate :hash, :to => :opts
 
@@ -235,7 +242,7 @@ module ROXML
     def update_xml(xml, value)
       wrap(xml).tap do |xml|
         value.each_pair do |k, v|
-          node = xml.add_child(XML::Node.create(hash.wrapper))
+          node = XML.add_node(xml, hash.wrapper)
           @key.update_xml(node, k)
           @value.update_xml(node, v)
         end
@@ -289,14 +296,14 @@ module ROXML
         params = {:name => name, :namespace => opts.namespace}
         if array?
           value.each do |v|
-            xml.add_child(v.to_xml(params))
+            XML.add_child(xml, v.to_xml(params))
           end
         elsif value.is_a?(ROXML)
-          xml.add_child(value.to_xml(params))
+          XML.add_child(xml, value.to_xml(params))
         else
-          node = XML::Node.create(name)
-          node.content = value.to_xml
-          xml.add_child(node)
+          XML.add_node(xml, name).tap do |node|
+            XML.set_content(node, value.to_xml)
+          end
         end
       end
     end
@@ -312,4 +319,4 @@ module ROXML
       end
     end
   end
-end
+end

data/roxml.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roxml}
-  s.version = "3.1.5"
+  s.version = "3.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Woosley", "Zak Mandhro", "Anders Engstrom", "Russ Olsen"]
-  s.date = %q{2009-12-18}
+  s.date = %q{2010-11-03}
   s.description = %q{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
@@ -24,6 +24,7 @@ RESTful applications, Web Services, and XML-RPC.
   s.files = [
     ".gitignore",
      ".gitmodules",
+     ".rspec",
      "History.txt",
      "LICENSE",
      "README.rdoc",
@@ -61,10 +62,10 @@ RESTful applications, Web Services, and XML-RPC.
      "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",
@@ -127,7 +128,7 @@ RESTful applications, Web Services, and XML-RPC.
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{roxml}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Ruby Object to XML mapping library}
   s.test_files = [
     "spec/definition_spec.rb",
@@ -143,6 +144,7 @@ RESTful applications, Web Services, and XML-RPC.
      "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",
@@ -182,23 +184,23 @@ RESTful applications, Web Services, and XML-RPC.
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.3.3"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 1.2.4"])
       s.add_development_dependency(%q<activerecord>, [">= 2.2.2"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.3.0"])
       s.add_dependency(%q<nokogiri>, [">= 1.3.3"])
-      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 2.0.0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.4"])
       s.add_dependency(%q<activerecord>, [">= 2.2.2"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3.0"])
     s.add_dependency(%q<nokogiri>, [">= 1.3.3"])
-    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 2.0.0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.4"])
     s.add_dependency(%q<activerecord>, [">= 2.2.2"])
   end

data/spec/definition_spec.rb

@@ -1,4 +1,5 @@
-require 'spec/spec_helper'
+# encoding: utf-8
+require_relative './spec_helper'
 
 describe ROXML::Definition do
   describe "#name_explicit?" do
@@ -13,7 +14,7 @@ describe ROXML::Definition do
     end
   end
 
-  describe "DateTime reference", :shared => true do
+  shared_examples_for "DateTime reference" do
     it "should return nil on empty string" do
       @subject.blocks.first.call("  ").should be_nil
     end
@@ -29,7 +30,7 @@ describe ROXML::Definition do
     end
   end
 
-  describe "Date reference", :shared => true do
+  shared_examples_for "Date reference" do
     it "should return nil on empty string" do
       @subject.blocks.first.call("  ").should be_nil
     end
@@ -128,7 +129,7 @@ describe ROXML::Definition do
     end
 
     describe "=> {}" do
-      describe "hash options declaration", :shared => true do
+      shared_examples_for "hash options declaration" do
         it "should represent a hash" do
           @opts.hash?.should be_true
         end
@@ -210,7 +211,7 @@ describe ROXML::Definition do
         proc { ROXML::Definition.new(:count, :as => :foat) }.should raise_error(ArgumentError)
       end
 
-      describe "block shorthand type declaration", :shared => true do
+      shared_examples_for "block shorthand type declaration" do
         it "should translate nil to nil" do
           @definition.blocks.first.call(nil).should be_nil
         end
@@ -390,7 +391,7 @@ describe ROXML::Definition do
   end
 
   describe ":from" do
-    describe "attribute reference", :shared => true do
+    shared_examples_for "attribute reference" do
       it "should be interpreted as :attr" do
         @opts.sought_type.should == :attr
       end
@@ -450,7 +451,7 @@ describe ROXML::Definition do
 
   describe "options" do
 
-    describe "boolean option", :shared => true do
+    shared_examples_for "boolean option" do
       it "should be recognized" do
         ROXML::Definition.new(:author, :from => :content, @option => true).respond_to?(:"#{@option}?")
         ROXML::Definition.new(:author, :from => :content, @option => true).send(:"#{@option}?").should be_true

data/spec/examples/active_record_spec.rb

@@ -1,5 +1,6 @@
-require 'spec/spec_helper'
-require 'examples/rails'
+require 'fileutils'
+require_relative './../spec_helper'
+require_relative './../../examples/rails'
 
 describe ROXML, "under ActiveRecord" do
   before do

data/spec/examples/amazon_spec.rb

@@ -1,5 +1,5 @@
-require 'spec/spec_helper'
-require 'examples/amazon'
+require_relative './../spec_helper'
+require_relative './../../examples/amazon'
 
 describe PITA::ItemSearchResponse do
   before do

data/spec/examples/current_weather_spec.rb

@@ -1,5 +1,5 @@
-require 'spec/spec_helper'
-require 'examples/current_weather'
+require_relative './../spec_helper'
+require_relative './../../examples/current_weather'
 
 describe Weather do
   before do

data/spec/examples/dashed_elements_spec.rb

@@ -1,5 +1,5 @@
-require 'spec/spec_helper'
-require 'examples/dashed_elements'
+require_relative './../spec_helper'
+require_relative './../../examples/dashed_elements'
 
 describe GitHub::Commit do
   before do

data/spec/examples/library_spec.rb

@@ -1,5 +1,5 @@
-require 'spec/spec_helper'
-require 'examples/library'
+require_relative './../spec_helper'
+require_relative './../../examples/library'
 
 describe Library do
   before :all do
@@ -17,7 +17,7 @@ describe Library do
 
   describe "#to_xml" do
     it "should contain the expected information" do
-      @lib.to_xml.to_s.should == ROXML::XML::Parser.parse(%{<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>}).root.to_s
+      @lib.to_xml.to_s.should == ROXML::XML.parse_string(%{<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>}).root.to_s
     end
 
     context "when written to a file" do
@@ -25,7 +25,7 @@ describe Library do
         @path = "spec/examples/library.xml"
         @doc = ROXML::XML::Document.new
         @doc.root = @lib.to_xml
-        @doc.save(@path)
+        ROXML::XML.save_doc(@doc, @path)
       end
 
      after :all do
@@ -33,7 +33,7 @@ describe Library do
      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
+        ROXML::XML.parse_string(File.read(@path)).to_s.should == ROXML::XML.parse_string(%{<?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

@@ -1,5 +1,5 @@
-require 'spec/spec_helper'
-require 'examples/posts'
+require_relative './../spec_helper'
+require_relative './../../examples/posts'
 
 describe Post do
   before do

data/spec/examples/twitter_spec.rb

@@ -1,5 +1,5 @@
-require 'spec/spec_helper'
-require 'examples/twitter'
+require_relative './../spec_helper'
+require_relative './../../examples/twitter'
 
 describe Statuses do
   describe Status do

data/spec/roxml_spec.rb

@@ -1,7 +1,7 @@
-require 'spec/spec_helper'
+require_relative './spec_helper'
 
 describe ROXML, "#from_xml" do
-  describe "from_xml call", :shared => true do
+  shared_examples_for "from_xml call" do
     it "should fetch values" do
       book = BookWithContributors.from_xml(@path)
       book.title.should == "Programming Ruby - 2nd Edition"

data/spec/shared_specs.rb

@@ -1,6 +1,6 @@
-require 'spec/spec_helper'
+require_relative './spec_helper'
 
-describe "freezable xml reference", :shared => true do
+shared_examples_for "freezable xml reference" do
   describe "with :frozen option" do
     it "should be frozen" do
       @frozen.frozen?.should be_true

data/spec/spec_helper.rb

@@ -1,9 +1,8 @@
 require 'rubygems'
 require 'pathname'
-require 'test/support/fixtures'
-require 'lib/roxml'
-
-require 'spec/shared_specs' if defined?(Spec)
+require_relative './../test/support/fixtures'
+require_relative './../lib/roxml'
+require_relative './shared_specs'
 
 def xml_for(name)
   Pathname.new(File.dirname(__FILE__)).expand_path.dirname.join("examples/xml/#{name}.xml")

data/spec/xml/array_spec.rb

@@ -0,0 +1,36 @@
+require_relative './../spec_helper'
+
+module ArraySpec
+  class Book
+    include ROXML
+    xml_reader :id, :as => Integer
+    xml_reader :title
+  end
+
+  class Store
+    include ROXML
+    xml_reader :books, :from => 'books', :as => [Book]
+  end
+
+  class MyXml
+    include ROXML
+    xml_reader :store, :as => Store
+  end
+end
+
+
+describe ":as => []" do
+  context "with plural from" do
+    it "should accept the plural name as the name for each item" do
+      ArraySpec::MyXml.from_xml(%(
+      <myxml>
+        <store>
+          <books><id>1</id><title>first book</title></books>
+          <books><id>2</id><title>second book</title></books>
+          <books><id>3</id><title>third book</title></books>
+        </store>
+      </myxml>
+      )).store.books.size.should == 3
+    end
+  end
+end

data/spec/xml/attributes_spec.rb

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