roxml 3.2.2 → 3.3.0

data/History.txt

@@ -1,3 +1,9 @@
+== 3.3.0 (February 9, 2012)
+
+* major enhancement
+
+  * Don't extend/modify the XML parser
+
 == 3.1.6 (September 9, 2010)
 
 * bug fix

data/Rakefile

@@ -26,19 +26,15 @@ Jeweler::GemcutterTasks.new
 
 Dir['tasks/**/*.rake'].each { |t| load t }
 
-task :default => [:test, :spec, 'test:load']
-task :all => [:libxml, :nokogiri, 'test:load']
+task :default => [:test, :spec]
+task :all => [:libxml, :nokogiri]
 task :libxml => ['test:libxml', 'spec:libxml']
 task :nokogiri => ['test:nokogiri', 'spec:nokogiri']
 
 
 require 'rdoc/task'
 RDoc::Task.new do |rdoc|
-  if File.exist?('VERSION')
-    version = File.read('VERSION')
-  else
-    version = ""
-  end
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "roxml #{version}"
@@ -93,11 +89,6 @@ namespace :test do
     Rake::Task["test"].invoke
   end
 
-  task :load do
-    `ruby test/load_test.rb`
-    puts "Load Success!" if $?.success?
-  end
-
   desc "Runs tests under RCOV"
   task :rcov do
     system "rcov -T --no-html -x '^/'  #{FileList['test/unit/*_test.rb']}"

data/VERSION

@@ -1 +1 @@
-3.2.2
+3.3.0

data/lib/roxml.rb

@@ -14,7 +14,7 @@ require 'roxml/definition'
 require 'roxml/xml'
 
 module ROXML # :nodoc:
-  VERSION = '3.2.1'
+  VERSION = File.read('VERSION')
 
   def self.included(base) # :nodoc:
     base.class_eval do

data/lib/roxml/xml/parsers/libxml.rb

@@ -44,42 +44,26 @@ module ROXML
       def save_doc(doc, path)
         doc.save(path)
       end
-    end
 
-    Document = LibXML::XML::Document
-    Node = LibXML::XML::Node
+      def default_namespace(doc)
+        doc = doc.doc if doc.respond_to?(:doc)
+        default = doc.root.namespaces.default
+        default.prefix || 'xmlns' if default
+      end
 
-    module NamespacedSearch
-      def roxml_search(xpath, roxml_namespaces = {})
-        if namespaces.default
+      def search(xml, xpath, roxml_namespaces = {})
+        if xml.namespaces.default
           roxml_namespaces = {:xmlns => namespaces.default.href}.merge(roxml_namespaces)
         end
         if roxml_namespaces.present?
-          find(xpath, roxml_namespaces.map {|prefix, href| [prefix, href].join(':') })
+          xml.find(xpath, roxml_namespaces.map {|prefix, href| [prefix, href].join(':') })
         else
-          find(xpath)
+          xml.find(xpath)
         end
       end
     end
 
-    class Document
-      include NamespacedSearch
-      
-      def default_namespace
-        default = namespaces.default
-        default.prefix || 'xmlns' if default
-      end
-
-    private
-      delegate :namespaces, :to => :root
-    end
-
-    class Node
-      include NamespacedSearch
-
-      def default_namespace
-        doc.default_namespace
-      end
-    end
+    Document = LibXML::XML::Document
+    Node = LibXML::XML::Node
   end
 end

data/lib/roxml/xml/parsers/nokogiri.rb

@@ -46,37 +46,24 @@ module ROXML
           file << doc.serialize
         end
       end
-    end
-
-    Document = Nokogiri::XML::Document
-    Element = Nokogiri::XML::Element
-    Node = Nokogiri::XML::Node
-
-    class Document
-      alias :roxml_search :search
-
-      def default_namespace
-        'xmlns' if root.namespaces['xmlns']
-      end
-    end
 
-    module NodeExtensions
-      def roxml_search(xpath, roxml_namespaces = {})
-        xpath = "./#{xpath}"
-        (roxml_namespaces.present? ? search(xpath, roxml_namespaces) : search(xpath))
+      def default_namespace(doc)
+        doc = doc.document if doc.respond_to?(:document)
+        'xmlns' if doc.root.namespaces['xmlns']
       end
 
-      def default_namespace
-        document.default_namespace
+      def search(xml, xpath, roxml_namespaces = {})
+        case xml
+        when Nokogiri::XML::Document
+          xml.search(xpath, roxml_namespaces)
+        else
+          xpath = "./#{xpath}"
+          (roxml_namespaces.present? ? xml.search(xpath, roxml_namespaces) : xml.search(xpath))
+        end
       end
     end
 
-    class Element
-      include NodeExtensions
-    end
-
-    class Node
-      include NodeExtensions
-    end
+    Document = Nokogiri::XML::Document
+    Node = Nokogiri::XML::Node
   end
 end

data/lib/roxml/xml/references.rb

@@ -60,11 +60,9 @@ module ROXML
     end
 
     def apply_blocks(val)
-      begin
-        blocks.inject(val) {|val, block| block.call(val) }
-      rescue Exception => ex
-        raise ex, "#{accessor}: #{ex.message}"
-      end
+      blocks.inject(val) {|val, block| block.call(val) }
+    rescue Exception => ex
+      raise ex, "#{accessor}: #{ex.message}"
     end
 
     def freeze(val)
@@ -90,26 +88,25 @@ module ROXML
 
     def wrap(xml, opts = {:always_create => false})
       wrap_with = @auto_vals ? auto_wrapper : wrapper
-      
+
       return xml if !wrap_with || xml.name == wrap_with
 
       wraps = wrap_with.to_s.split('/')
-      wraps.inject(xml) do |node,wrap| 
-        if !opts[:always_create] && (child = node.children.find {|c| c.name == wrap }) 
+      wraps.inject(xml) do |node,wrap|
+        if !opts[:always_create] && (child = node.children.find {|c| c.name == wrap })
           child
         else
-          XML.add_node(node, wrap)    
+          XML.add_node(node, wrap)
         end
-      end    
-    
+      end
     end
 
     def nodes_in(xml)
-      @default_namespace = xml.default_namespace
-      vals = xml.roxml_search(xpath, @instance.class.roxml_namespaces)
+      @default_namespace = XML.default_namespace(xml)
+      vals = XML.search(xml, xpath, @instance.class.roxml_namespaces)
 
       if several? && vals.empty? && !wrapper && auto_xpath
-        vals = xml.roxml_search(auto_xpath, @instance.class.roxml_namespaces)
+        vals = XML.search(xml, auto_xpath, @instance.class.roxml_namespaces)
         @auto_vals = !vals.empty?
       end
 

data/roxml.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "roxml"
-  s.version = "3.2.2"
+  s.version = "3.3.0"
 
   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 = "2012-01-30"
+  s.date = "2012-02-10"
   s.description = "ROXML is a Ruby library designed to make it easier for Ruby developers to work with XML.\nUsing simple annotations, it enables Ruby classes to be mapped to XML. ROXML takes care\nof the marshalling and unmarshalling of mapped attributes so that developers can focus on\nbuilding first-class Ruby classes. As a result, ROXML simplifies the development of\nRESTful applications, Web Services, and XML-RPC.\n"
   s.email = "ben.woosley@gmail.com"
   s.extra_rdoc_files = [
@@ -107,7 +107,6 @@ Gem::Specification.new do |s|
     "test/fixtures/person.xml",
     "test/fixtures/person_with_guarded_mothers.xml",
     "test/fixtures/person_with_mothers.xml",
-    "test/load_test.rb",
     "test/mocks/dictionaries.rb",
     "test/mocks/mocks.rb",
     "test/support/fixtures.rb",

data/spec/examples/person_spec.rb

@@ -2,36 +2,36 @@ require 'spec_helper'
 require_relative './../../examples/person'
 
 describe Person do
-	
-	before do
-		@person = Person.new
-		@person.name = 'John Doe'
-		@person.lat = '40.715224'
-		@person.long = '-74.005966'
-		@person.street = 'Evergreen Terrace'
-		@person.city = 'Springfield'
-		@person.zip = '2342'
-	end
 
-	it 'should only contain one location element' do
-		@person.to_xml.roxml_search('location').count.should == 1
-	end
+  before do
+    @person = Person.new
+    @person.name = 'John Doe'
+    @person.lat = '40.715224'
+    @person.long = '-74.005966'
+    @person.street = 'Evergreen Terrace'
+    @person.city = 'Springfield'
+    @person.zip = '2342'
+  end
 
-	describe '#to_xml' do
-		before do
-			@xml_generated = @person.to_xml.to_s.gsub("\n",'').squeeze(' ')
-		end
+  it 'should only contain one location element' do
+    ROXML::XML.search(@person.to_xml, 'location').count.should == 1
+  end
 
-		it 'should generate the expected xml' do
-			xml_file = File.read(xml_for('person')).gsub("\n",'').squeeze(' ')
-			xml_file.should == @xml_generated
-		end
+  describe '#to_xml' do
+    before do
+      @xml_generated = @person.to_xml.to_s.gsub("\n",'').squeeze(' ')
+    end
 
-		it 'should generate identical xml after a full roundtrip' do	
-			p = Person.from_xml(@xml_generated)
-			xml_roundtrip = p.to_xml.to_s.gsub("\n",'').squeeze(' ')
-			xml_roundtrip.should == @xml_generated
-		end
-	end
+    it 'should generate the expected xml' do
+      xml_file = File.read(xml_for('person')).gsub("\n",'').squeeze(' ')
+      xml_file.should == @xml_generated
+    end
+
+    it 'should generate identical xml after a full roundtrip' do
+      p = Person.from_xml(@xml_generated)
+      xml_roundtrip = p.to_xml.to_s.gsub("\n",'').squeeze(' ')
+      xml_roundtrip.should == @xml_generated
+    end
+  end
 
 end

data/spec/roxml_spec.rb

@@ -1,34 +1,42 @@
 require_relative './spec_helper'
 
-describe ROXML, "#from_xml" 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"
-      book.contributors.map(&:name).should == ["David Thomas","Andrew Hunt","Chad Fowler"]
+describe ROXML do
+  describe "::VERSION" do
+    it "should be equal to the VERSION file contents" do
+      ROXML::VERSION.should == File.read('VERSION')
     end
   end
 
-  context "called with PathName" do
-    before do
-      @path = Pathname.new(fixture_path(:book_with_contributors))
+  describe "#from_xml" 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"
+        book.contributors.map(&:name).should == ["David Thomas","Andrew Hunt","Chad Fowler"]
+      end
     end
-    it_should_behave_like "from_xml call"
-  end
 
-  context "called with File" do
-    before do
-      @path = File.new(fixture_path(:book_with_contributors))
+    context "called with PathName" do
+      before do
+        @path = Pathname.new(fixture_path(:book_with_contributors))
+      end
+      it_should_behave_like "from_xml call"
     end
-    it_should_behave_like "from_xml call"
-  end
 
-  context "called with URI" do
-    before do
-      require 'uri'
-      @path = URI.parse("file://#{File.expand_path(File.expand_path(fixture_path(:book_with_contributors)))}")
+    context "called with File" do
+      before do
+        @path = File.new(fixture_path(:book_with_contributors))
+      end
+      it_should_behave_like "from_xml call"
+    end
+
+    context "called with URI" do
+      before do
+        require 'uri'
+        @path = URI.parse("file://#{File.expand_path(File.expand_path(fixture_path(:book_with_contributors)))}")
+      end
+      it_should_behave_like "from_xml call"
     end
-    it_should_behave_like "from_xml call"
   end
 end
 

data/spec/xml/parser_spec.rb

@@ -1,12 +1,6 @@
 require_relative './../spec_helper.rb'
 
 describe ROXML::XML do
-  it "should raise on malformed xml" do
-    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.new_node("entities")
     ROXML::XML.set_content(node, " < > ' \" & ")

data/test/unit/to_xml_test.rb

@@ -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.roxml_search('pagecount').first.content
+    assert_equal '357', ROXML::XML.search(xml, '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.roxml_search('pagecount').first.content
+    assert_equal '500', ROXML::XML.search(doc, 'pagecount').first.content
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roxml
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-30 00:00:00.000000000 Z
+date: 2012-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70164162904540 !ruby/object:Gem::Requirement
+  requirement: &70220601835920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70164162904540
+  version_requirements: *70220601835920
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70164162900300 !ruby/object:Gem::Requirement
+  requirement: &70220601835200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70164162900300
+  version_requirements: *70220601835200
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70164162909420 !ruby/object:Gem::Requirement
+  requirement: &70220601834620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70164162909420
+  version_requirements: *70220601834620
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70164162927020 !ruby/object:Gem::Requirement
+  requirement: &70220601834040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70164162927020
+  version_requirements: *70220601834040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70164162923220 !ruby/object:Gem::Requirement
+  requirement: &70220601833200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *70164162923220
+  version_requirements: *70220601833200
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70164162944020 !ruby/object:Gem::Requirement
+  requirement: &70220601832560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: 1.2.4
   type: :development
   prerelease: false
-  version_requirements: *70164162944020
+  version_requirements: *70220601832560
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70164162960820 !ruby/object:Gem::Requirement
+  requirement: &70220601831960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,7 +90,7 @@ dependencies:
         version: 2.2.2
   type: :development
   prerelease: false
-  version_requirements: *70164162960820
+  version_requirements: *70220601831960
 description: ! 'ROXML is a Ruby library designed to make it easier for Ruby developers
   to work with XML.
 
@@ -203,7 +203,6 @@ files:
 - test/fixtures/person.xml
 - test/fixtures/person_with_guarded_mothers.xml
 - test/fixtures/person_with_mothers.xml
-- test/load_test.rb
 - test/mocks/dictionaries.rb
 - test/mocks/mocks.rb
 - test/support/fixtures.rb

data/test/load_test.rb

@@ -1,6 +0,0 @@
-require 'fileutils'
-FileUtils.cd(File.dirname(__FILE__))
-
-require 'rubygems'
-require 'roxml'
-puts ROXML::VERSION