roxml 2.5.3 → 3.1.0

data/spec/examples/active_record_spec.rb

@@ -1,5 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require example('active_record')
+require 'spec/spec_helper'
+require 'examples/rails'
 
 describe ROXML, "under ActiveRecord" do
   before do

data/spec/examples/amazon_spec.rb

@@ -1,5 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require example('amazon')
+require 'spec/spec_helper'
+require 'examples/amazon'
 
 describe PITA::ItemSearchResponse do
   before do
@@ -21,6 +21,7 @@ describe PITA::ItemSearchResponse do
   describe "#items" do
     it "should return a collection of items" do
       @response.items.should be_an_instance_of(Array)
+      @response.items.size.should > 0
       @response.items.each {|item| item.should be_an_instance_of(PITA::Item) }
     end
 

data/spec/examples/current_weather_spec.rb

@@ -1,5 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require example('current_weather')
+require 'spec/spec_helper'
+require 'examples/current_weather'
 
 describe Weather do
   before do

data/spec/examples/dashed_elements_spec.rb

@@ -1,5 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require example('dashed_elements')
+require 'spec/spec_helper'
+require 'examples/dashed_elements'
 
 describe GitHub::Commit do
   before do

data/spec/examples/library_spec.rb

@@ -1,5 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require example('library')
+require 'spec/spec_helper'
+require 'examples/library'
 
 describe Library do
   before :all do
@@ -17,18 +17,23 @@ describe Library do
 
   describe "#to_xml" do
     it "should contain the expected information" do
-      @lib.to_xml.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
+      @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
     end
 
     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

@@ -1,5 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require example('posts')
+require 'spec/spec_helper'
+require 'examples/posts'
 
 describe Post do
   before do
@@ -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/examples/twitter_spec.rb

@@ -1,5 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require example('twitter')
+require 'spec/spec_helper'
+require 'examples/twitter'
 
 describe Statuses do
   describe Status do

data/spec/roxml_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
+require 'spec/spec_helper'
 
 describe ROXML, "#from_xml" do
   describe "from_xml call", :shared => true do
@@ -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/spec/shared_specs.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
+require 'spec/spec_helper'
 
 describe "freezable xml reference", :shared => true do
   describe "with :frozen option" do

data/spec/spec_helper.rb

@@ -1,33 +1,14 @@
+require 'rubygems'
 require 'pathname'
+require 'test/support/fixtures'
+require 'lib/roxml'
 
-module ROXML
-  SILENCE_XML_NAME_WARNING = true
-end
-
-DIR = Pathname.new(__FILE__ + '../..').expand_path.dirname
-LOAD_PATH = DIR.join('lib').to_s
-$LOAD_PATH.unshift(LOAD_PATH) unless
-  $LOAD_PATH.include?(LOAD_PATH) || $LOAD_PATH.include?(File.expand_path(LOAD_PATH))
-require 'roxml'
-
-require File.join(File.dirname(__FILE__), 'shared_specs')
-
-def example(name)
-  DIR.join("examples/#{name}.rb")
-end
+require 'spec/shared_specs' if defined?(Spec)
 
-def fixture(name)
-  File.read(fixture_path(name))
-end
-
-def xml_fixture(name)
-  ROXML::XML::Parser.parse_file(fixture_path(name)).root
+def xml_for(name)
+  Pathname.new(File.dirname(__FILE__)).expand_path.dirname.join("examples/xml/#{name}.xml")
 end
 
-def fixture_path(name)
-  "test/fixtures/#{name}.xml"
+class RoxmlObject
+  include ROXML
 end
-
-def xml_for(name)
-  DIR.join("examples/xml/#{name}.xml")
-end

data/spec/support/libxml.rb

@@ -0,0 +1,3 @@
+module ROXML
+  XML_PARSER = 'libxml'
+end

data/spec/support/nokogiri.rb

@@ -0,0 +1,3 @@
+module ROXML
+  XML_PARSER = 'nokogiri'
+end

data/spec/xml/attributes_spec.rb

@@ -0,0 +1,36 @@
+require 'spec/spec_helper'
+
+describe ROXML::XMLAttributeRef do
+  before do
+    @xml = ROXML::XML::Parser.parse %(
+    <myxml>
+      <node name="first" />
+      <node name="second" />
+      <node name="third" />
+    </myxml>
+    )
+  end
+  
+  context "plain vanilla" do
+    before do
+      @ref = ROXML::XMLAttributeRef.new(OpenStruct.new(:name => 'name', :wrapper => 'node', :array? => false), RoxmlObject.new)
+    end
+
+    it "should return one instance" do
+      @ref.send(:fetch_value, @xml).should == "first"
+    end
+    it "should output one instance"
+  end
+  
+  context "with :as => []" do
+    before do
+      @ref = ROXML::XMLAttributeRef.new(OpenStruct.new(:name => 'name', :wrapper => 'node', :array? => true), RoxmlObject.new)
+    end
+
+    it "should collect all instances" do
+      @ref.send(:fetch_value, @xml).should == ["first", "second", "third"]
+    end
+
+    it "should output all instances"
+  end
+end

data/spec/xml/namespace_spec.rb

@@ -0,0 +1,240 @@
+require 'spec/spec_helper.rb'
+
+describe ROXML, "with namespaces" do
+  context "when an included namespace is not defined in the xml" do
+    context "where the missing namespace is the default" do
+      it "should raise"
+
+      context "but the namespace is declared in the body" do
+        it "should succeed"
+      end
+    end
+    
+    context "where the missing namespace is included in a namespacey from" do
+      it "should raise"
+
+      context "but the namespace is declared in the body" do
+        it "should succeed"
+      end
+    end
+    
+    context "where the missing namespace is included in an explicit :namespace" do
+      it "should raise"
+
+      context "but the namespace is declared in the body" do
+        it "should succeed"
+      end
+    end
+  end
+  
+  describe "roxml namespacey declaration", :shared => true do
+    context "with a namespacey :from" do
+      context "and an explicit :namespace" do
+        it "should raise" do
+          proc do
+            Class.new do
+              include ROXML
+              xml_reader :default_namespace_with_namespacey_from_and_explicit_namespace, :from => 'namespacey:with_namespacey_from', :namespace => 'explicit'
+            end
+          end.should raise_error(ROXML::ContradictoryNamespaces)
+        end
+      end
+
+      context "and :namespace => false" do
+        it "should raise" do
+          proc do
+            Class.new do
+              include ROXML
+              xml_reader :default_namespace_with_namespacey_from_and_namespace_false, :from => 'namespacey:with_namespacey_from', :namespace => false
+            end
+          end.should raise_error(ROXML::ContradictoryNamespaces)
+        end
+      end
+    end
+  end
+
+  describe "roxml namespacey declaration with default", :shared => true do
+    it_should_behave_like "roxml namespacey declaration"
+    
+    it "should use the default namespace" do
+      @instance.default_namespace.should == 'default namespace node'
+    end
+    
+    context "and :namespace => false" do
+      it "should find the namespace-less node" do
+        @instance.default_namespace_with_namespace_false.should == 'namespaceless node'
+      end
+    end
+
+    context "with an explicit :namespace" do
+      it "should use the explicit namespace" do
+        @instance.default_and_explicit_namespace == 'explicit namespace node'
+      end
+    end
+
+    context "with a namespace-less :from" do
+      it "should use the default namespace" do
+        @instance.default_namespace_with_namespaceless_from.should == 'default namespace node'
+      end
+      
+      context "and :namespace => false" do
+        it "should find the namespace-less node" do
+          @instance.default_namespace_with_namespaceless_from_and_namespace_false.should == 'namespaceless node'
+        end
+      end
+
+      context "and an explicit :namespace" do
+        it "should use the explicit namespace" do
+          @instance.default_namespace_with_namespaceless_from_and_explicit_namespace.should == 'explicit namespace node'
+        end
+      end
+    end
+
+    context "with a namespacey :from" do
+      it "should use the :from namespace" do
+        @instance.default_namespace_with_namespacey_from.should == 'namespacey node'
+      end
+    end
+  end
+
+  context "with a default namespace declared" do
+    class DefaultNamespaceyObject
+      include ROXML
+      xml_namespace :default_declared
+
+      xml_reader :default_namespace
+      xml_reader :default_namespace_with_namespace_false, :namespace => false
+      xml_reader :default_and_explicit_namespace, :namespace => 'explicit'
+      xml_reader :default_namespace_with_namespaceless_from, :from => 'with_namespaceless_from'
+      xml_reader :default_namespace_with_namespaceless_from_and_explicit_namespace, :from => 'with_namespaceless_from', :namespace => 'explicit'
+      xml_reader :default_namespace_with_namespaceless_from_and_namespace_false, :from => 'with_namespaceless_from', :namespace => false
+      xml_reader :default_namespace_with_namespacey_from, :from => 'namespacey:with_namespacey_from'
+
+      # These are handled in the "roxml namespacey declaration" shared spec
+      # xml_reader :default_namespace_with_namespacey_from_and_namespace_false, :from => 'namespacey:with_namespaceless_from', :namespace => false
+      # xml_reader :default_namespace_with_namespacey_from_and_explicit_namespace, :from => 'namespacey:with_namespaceless_from', :namespace => 'explicit'
+    end
+
+    before do
+      @instance = DefaultNamespaceyObject.from_xml(%{
+        <book xmlns:namespacey="http://www.aws.com/aws" xmlns:default_declared="http://www.aws.com/default" xmlns:explicit="http://www.aws.com/different">
+          <default_declared:default_namespace>default namespace node</default_declared:default_namespace>
+          <namespacey:with_namespacey_from>namespacey node</namespacey:with_namespacey_from>
+          <explicit:with_namespaceless_from>explicit namespace node</explicit:with_namespaceless_from>
+          <with_namespaceless_from>namespaceless node</with_namespaceless_from>
+          <default_declared:with_namespaceless_from>default namespace node</default_declared:with_namespaceless_from>
+          <explicit:default_and_explicit_namespace>explicit namespace node</explicit:default_and_explicit_namespace>
+          <default_namespace_with_namespace_false>namespaceless node</default_namespace_with_namespace_false>
+        </book>
+      })
+    end
+    
+    it_should_behave_like "roxml namespacey declaration with default"
+  end
+
+  context "with a default namespace on the root node" do
+    class XmlDefaultNamespaceyObject
+      include ROXML
+      xml_reader :default_namespace
+      xml_reader :default_namespace_with_namespace_false, :namespace => false
+      xml_reader :default_and_explicit_namespace, :namespace => 'explicit'
+      xml_reader :default_namespace_with_namespaceless_from, :from => 'with_namespaceless_from'
+      xml_reader :default_namespace_with_namespaceless_from_and_explicit_namespace, :from => 'with_namespaceless_from', :namespace => 'explicit'
+      xml_reader :default_namespace_with_namespaceless_from_and_namespace_false, :from => 'with_namespaceless_from', :namespace => false
+      xml_reader :default_namespace_with_namespacey_from, :from => 'namespacey:with_namespacey_from'
+
+      # These are handled in the "roxml namespacey declaration" shared spec
+      # xml_reader :default_namespace_with_namespacey_from_and_namespace_false, :from => 'namespacey:with_namespaceless_from', :namespace => false
+      # xml_reader :default_namespace_with_namespacey_from_and_explicit_namespace, :from => 'namespacey:with_namespaceless_from', :namespace => 'explicit'
+    end
+
+    before do
+      @instance = XmlDefaultNamespaceyObject.from_xml(%{
+        <book xmlns="http://www.aws.com/xml_default" xmlns:namespacey="http://www.aws.com/aws" xmlns:default_declared="http://www.aws.com/default" xmlns:explicit="http://www.aws.com/different">
+          <default_namespace>default namespace node</default_namespace>
+          <namespacey:with_namespacey_from>namespacey node</namespacey:with_namespacey_from>
+          <explicit:with_namespaceless_from>explicit namespace node</explicit:with_namespaceless_from>
+          <with_namespaceless_from xmlns="">namespaceless node</with_namespaceless_from>
+          <with_namespaceless_from>default namespace node</with_namespaceless_from>
+          <explicit:default_and_explicit_namespace>explicit namespace node</explicit:default_and_explicit_namespace>
+          <default_namespace_with_namespace_false xmlns="">namespaceless node</default_namespace_with_namespace_false>
+        </book>
+      })
+    end
+
+    it_should_behave_like "roxml namespacey declaration with default"
+  end
+
+  context "without a default namespace" do
+    class NamespaceyObject
+      include ROXML
+
+      xml_reader :no_default_namespace
+      xml_reader :no_default_namespace_with_namespace_false, :namespace => false
+      xml_reader :no_default_but_an_explicit_namespace, :namespace => 'explicit'
+      xml_reader :no_default_namespace_with_namespaceless_from, :from => 'with_namespaceless_from'
+      xml_reader :no_default_namespace_with_namespaceless_from_and_explicit_namespace, :from => 'with_namespaceless_from', :namespace => 'explicit'
+      xml_reader :no_default_namespace_with_namespaceless_from_and_namespace_false, :from => 'with_namespaceless_from', :namespace => false
+      xml_reader :no_default_namespace_with_namespacey_from, :from => 'namespacey:with_namespacey_from'
+
+      # These are handled in the "roxml namespacey declaration" shared spec
+      # xml_reader :no_default_namespace_with_namespacey_from_and_explicit_namespace, :from => 'namespacey:with_namespacey_from', :namespace => 'explicit'
+      # xml_reader :no_default_namespace_with_namespacey_from_and_namespace_false, :from => 'namespacey:with_namespacey_from', :namespace => false
+    end
+
+    before do
+      @instance = NamespaceyObject.from_xml(%{
+        <book xmlns:namespacey="http://www.aws.com/aws" xmlns:explicit="http://www.aws.com/different">
+          <namespacey:with_namespacey_from>namespacey node</namespacey:with_namespacey_from>
+          <explicit:with_namespaceless_from>explicit namespace node</explicit:with_namespaceless_from>
+          <with_namespaceless_from>namespaceless node</with_namespaceless_from>
+          <explicit:no_default_but_an_explicit_namespace>explicit namespace node</explicit:no_default_but_an_explicit_namespace>
+          <no_default_namespace_with_namespace_false>namespaceless node</no_default_namespace_with_namespace_false>
+          <no_default_namespace>namespaceless node</no_default_namespace>
+        </book>
+      })
+    end
+    
+    it_should_behave_like "roxml namespacey declaration"
+
+    it "should find the namespace-less node" do
+      @instance.no_default_namespace.should == 'namespaceless node'
+    end
+
+    context "with :namespace => false" do
+      it "should find the namespace-less node" do
+        @instance.no_default_namespace_with_namespace_false.should == 'namespaceless node'
+      end
+    end
+
+    context "with an explicit :namespace" do
+      it "should use the explicit namespace" do
+        @instance.no_default_but_an_explicit_namespace.should == 'explicit namespace node'
+      end
+    end
+
+    context "with a namespace-less :from" do
+      it "should find the namespace-less node" do
+        @instance.no_default_namespace_with_namespaceless_from.should == 'namespaceless node'
+      end
+    
+      context "and an explicit :namespace" do
+        it "should use the explicit namespace" do
+          @instance.no_default_namespace_with_namespaceless_from_and_explicit_namespace.should == 'explicit namespace node'
+        end
+      end
+
+      context "with :namespace => false" do
+        it "should find the namespace-less node" do
+          @instance.no_default_namespace_with_namespaceless_from_and_namespace_false.should == 'namespaceless node'
+        end
+      end
+    end
+
+    context "with a namespacey :from" do
+      it "should use the :from namespace" do
+        @instance.no_default_namespace_with_namespacey_from.should == 'namespacey node'
+      end
+    end
+  end
+end