multi_xml 0.4.1 → 0.4.2

data/.rspec

@@ -1,3 +1,2 @@
 --color
---format=nested
---backtrace
+--order random

data/.travis.yml

@@ -1,7 +1,6 @@
 rvm:
   - 1.8.7
   - 1.9.2
+  - 1.9.3
   - jruby
-  - rbx
-  - rbx-2.0
   - ree

data/Gemfile

@@ -1,9 +1,9 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 group :development, :test do
-  gem 'libxml-ruby', '~> 2.0', :require => nil, :platforms => :mri
-  gem 'nokogiri', '~> 1.4', :require => nil
-  gem 'ox', '~> 1.3', :require => nil
+  gem 'libxml-ruby', :require => nil, :platforms => :mri
+  gem 'nokogiri', :require => nil
+  gem 'ox', :require => nil
 end
 
 gemspec

data/README.md

@@ -1,50 +1,53 @@
-# MultiXML
+# MultiXML [![Build Status](https://secure.travis-ci.org/sferik/multi_xml.png?branch=master)][travis] [![Dependency Status](https://gemnasium.com/sferik/multi_xml.png?travis)][gemnasium]
 A generic swappable back-end for XML parsing
 
-## <a name="installation">Installation</a>
+[travis]: http://travis-ci.org/sferik/multi_xml
+[gemnasium]: https://gemnasium.com/sferik/multi_xml
+
+## <a name="installation"></a>Installation
     gem install multi_xml
 
-## <a name="documentation">Documentation</a>
-[http://rdoc.info/gems/multi_xml](http://rdoc.info/gems/multi_xml)
+## <a name="documentation"></a>Documentation
+[http://rdoc.info/gems/multi_xml][documentation]
 
-## <a name="ci">Continuous Integration</a>
-[![Build Status](https://secure.travis-ci.org/sferik/multi_xml.png)](http://travis-ci.org/sferik/multi_xml)
+[documentation]: http://rdoc.info/gems/multi_xml
 
-## <a name="examples">Usage Examples</a>
+## <a name="examples"></a>Usage Examples
 Lots of Ruby libraries utilize XML parsing in some form, and everyone has their
 favorite XML library. In order to best support multiple XML parsers and
-libraries, <tt>multi_xml</tt> is a general-purpose swappable XML backend
-library. You use it like so:
+libraries, `multi_xml` is a general-purpose swappable XML backend library. You
+use it like so:
 
     require 'multi_xml'
 
-    MultiXml.parser = :libxml
-    MultiXml.parser = MultiXml::Parsers::Libxml # Same as above
-    MultiXml.parse('<tag>This is the contents</tag>') # Parsed using LibXML
+    MultiXml.parser = :ox MultiXml.parser = MultiXml::Parsers::Ox # Same as
+    above MultiXml.parse('<tag>This is the contents</tag>') # Parsed using Ox
+
+    MultiXml.parser = :libxml MultiXml.parser = MultiXml::Parsers::Libxml #
+    Same as above MultiXml.parse('<tag>This is the contents</tag>') # Parsed
+    using LibXML
 
-    MultiXml.parser = :nokogiri
-    MultiXml.parser = MultiXml::Parsers::Nokogiri # Same as above
-    MultiXml.parse('<tag>This is the contents</tag>') # Parsed using Nokogiri
+    MultiXml.parser = :nokogiri MultiXml.parser = MultiXml::Parsers::Nokogiri #
+    Same as above MultiXml.parse('<tag>This is the contents</tag>') # Parsed
+    using Nokogiri
 
-    MultiXml.parser = :ox
-    MultiXml.parser = MultiXml::Parsers::Ox # Same as above
-    MultiXml.parse('<tag>This is the contents</tag>') # Parsed using Ox
+    MultiXml.parser = :rexml MultiXml.parser = MultiXml::Parsers::Rexml # Same
+    as above MultiXml.parse('<tag>This is the contents</tag>') # Parsed using
+    REXML
 
-    MultiXml.parser = :rexml
-    MultiXml.parser = MultiXml::Parsers::Rexml # Same as above
-    MultiXml.parse('<tag>This is the contents</tag>') # Parsed using REXML
+The `parser` setter takes either a symbol or a class (to allow for custom XML
+parsers) that responds to `.parse` at the class level.
 
-The <tt>parser</tt> setter takes either a symbol or a class (to allow for custom XML parsers) that
-responds to <tt>.parse</tt> at the class level.
+MultiXML tries to have intelligent defaulting. That is, if you have any of the
+supported parsers already loaded, it will utilize them before attempting to
+load any. When loading, libraries are ordered by speed: first Ox, then LibXML,
+then Nokogiri, and finally REXML.
 
-MultiXML tries to have intelligent defaulting. That is, if you have any of the supported parsers
-already loaded, it will utilize them before attempting to load any. When loading, libraries are
-ordered by speed: first LibXML, then Nokogiri, then Ox, then REXML.
+## <a name="contributing"></a>Contributing
+In the spirit of [free software][free-sw] , **everyone** is encouraged to help
+improve this project.
 
-## <a name="contributing">Contributing</a>
-In the spirit of [free
-software](http://www.fsf.org/licensing/essays/free-sw.html), **everyone** is
-encouraged to help improve this project.
+[free-sw]: http://www.fsf.org/licensing/essays/free-sw.html
 
 Here are some ways *you* can contribute:
 
@@ -53,43 +56,52 @@ Here are some ways *you* can contribute:
 * by suggesting new features
 * by writing or editing documentation
 * by writing specifications
-* by writing code (**no patch is too small**: fix typos, add comments, clean up inconsistent whitespace)
+* by writing code (**no patch is too small**: fix typos, add comments, clean up
+  inconsistent whitespace)
 * by refactoring code
-* by resolving [issues](https://github.com/sferik/multi_xml/issues)
+* by resolving [issues][]
 * by reviewing patches
 
-## <a name="issues">Submitting an Issue</a>
-We use the [GitHub issue tracker](https://github.com/sferik/multi_xml/issues)
-to track bugs and features. Before submitting a bug report or feature request,
-check to make sure it hasn't already been submitted. You can indicate support
-for an existing issuse by voting it up. When submitting a bug report, please
-include a [Gist](https://gist.github.com/) that includes a stack trace and any
-details that may be necessary to reproduce the bug, including your gem version,
-Ruby version, and operating system. Ideally, a bug report should include a pull
-request with failing specs.
-
-## <a name="pulls">Submitting a Pull Request</a>
+[issues]: https://github.com/sferik/multi_xml/issues
+
+## <a name="issues"></a>Submitting an Issue
+We use the [GitHub issue tracker][issues] to track bugs and features. Before
+submitting a bug report or feature request, check to make sure it hasn't
+already been submitted. You can indicate support for an existing issue by
+voting it up. When submitting a bug report, please include a [Gist][] that
+includes a stack trace and any details that may be necessary to reproduce the
+bug, including your gem version, Ruby version, and operating system. Ideally, a
+bug report should include a pull request with failing specs.
+
+[gist]: https://gist.github.com/
+
+## <a name="pulls"></a>Submitting a Pull Request
 1. Fork the project.
 2. Create a topic branch.
 3. Implement your feature or bug fix.
 4. Add documentation for your feature or bug fix.
-5. Run <tt>bundle exec rake doc:yard</tt>. If your changes are not 100% documented, go back to step 4.
+5. Run `bundle exec rake doc:yard`. If your changes are not 100% documented, go
+   back to step 4.
 6. Add specs for your feature or bug fix.
-7. Run <tt>bundle exec rake spec</tt>. If your changes are not 100% covered, go back to step 6.
+7. Run `bundle exec rake spec`. If your changes are not 100% covered, go back
+   to step 6.
 8. Commit and push your changes.
-9. Submit a pull request. Please do not include changes to the gemspec, version, or history file. (If you want to create your own version for some reason, please do so in a separate commit.)
+9. Submit a pull request. Please do not include changes to the gemspec,
+   version, or history file. (If you want to create your own version for some
+   reason, please do so in a separate commit.)
 
-## <a name="rubies">Supported Rubies</a>
-This library aims to support and is [tested
-against](http://travis-ci.org/sferik/multi_xml) the following Ruby
+## <a name="versions"></a>Supported Ruby Versions
+This library aims to support and is [tested against][travis] the following Ruby
 implementations:
 
 * Ruby 1.8.7
-* Ruby 1.9.1
 * Ruby 1.9.2
-* [JRuby](http://www.jruby.org/)
-* [Rubinius](http://rubini.us/)
-* [Ruby Enterprise Edition](http://www.rubyenterpriseedition.com/)
+* Ruby 1.9.3
+* [JRuby][]
+* [Ruby Enterprise Edition][ree]
+
+[jruby]: http://www.jruby.org/
+[ree]: http://www.rubyenterpriseedition.com/
 
 If something doesn't work on one of these interpreters, it should be considered
 a bug.
@@ -105,9 +117,12 @@ implementation, you will be personally responsible for providing patches in a
 timely fashion. If critical issues for a particular implementation exist at the
 time of a major release, support for that Ruby version may be dropped.
 
-## <a name="inspiration">Inspiration</a>
-MultiXML was inspired by [MultiJSON](https://github.com/intridea/multi_json/).
+## <a name="inspiration"></a>Inspiration
+MultiXML was inspired by [MultiJSON][].
+
+[multijson]: https://github.com/intridea/multi_json/
+
+## <a name="copyright"></a>Copyright
+Copyright (c) 2010 Erik Michaels-Ober. See [LICENSE][] for details.
 
-## <a name="copyright">Copyright</a>
-Copyright (c) 2010 Erik Michaels-Ober.
-See [LICENSE](https://github.com/sferik/multi_xml/blob/master/LICENSE.md) for details.
+[license]: https://github.com/sferik/multi_xml/blob/master/LICENSE.md

data/lib/multi_xml.rb

@@ -9,9 +9,9 @@ module MultiXml
   class ParseError < StandardError; end
 
   REQUIREMENT_MAP = [
+    ['ox', :ox],
     ['libxml', :libxml],
     ['nokogiri', :nokogiri],
-    ['ox', :ox],
     ['rexml/document', :rexml]
   ] unless defined?(REQUIREMENT_MAP)
 
@@ -54,9 +54,9 @@ module MultiXml
     # if any parsers are already loaded, then checks
     # to see which are installed if none are loaded.
     def default_parser
+      return :ox if defined?(::Ox)
       return :libxml if defined?(::LibXML)
       return :nokogiri if defined?(::Nokogiri)
-      return :ox if defined?(::Ox)
 
       REQUIREMENT_MAP.each do |(library, parser)|
         begin
@@ -182,7 +182,21 @@ module MultiXml
       case value
       when Hash
         if value['type'] == 'array'
-          _, entries = value.detect {|key, _| key != 'type'}
+
+          # this commented-out suggestion helps to avoid the multiple attribute
+          # problem, but it breaks when there is only one item in the array.
+          #
+          # from: https://github.com/jnunemaker/httparty/issues/102
+          #
+          # _, entries = value.detect { |k, v| k != 'type' && v.is_a?(Array) }
+
+          # This attempt fails to consider the order that the detect method
+          # retrieves the entries.
+          #_, entries = value.detect {|key, _| key != 'type'}
+
+          # This approach ignores attribute entries that are not convertable
+          # to an Array which allows attributes to be ignored.
+          _, entries = value.detect {|k, v| k != 'type' && (v.is_a?(Array) || v.is_a?(Hash)) }
 
           if entries.nil? || (entries.is_a?(String) && entries.strip.empty?)
             []

data/lib/multi_xml/parsers/ox.rb

@@ -23,7 +23,7 @@ module MultiXml
     module Ox #:nodoc:
 
       extend self
-      
+
       def parse_error
         Exception
       end
@@ -40,7 +40,7 @@ module MultiXml
         def initialize()
           @stack = []
         end
-        
+
         def doc
           @stack[0]
         end

data/lib/multi_xml/version.rb

@@ -1,3 +1,3 @@
 module MultiXml
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/multi_xml.gemspec

@@ -2,14 +2,11 @@
 require File.expand_path('../lib/multi_xml/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.add_development_dependency 'libxml-ruby', '~> 2.0' unless RUBY_PLATFORM == 'java'
-  gem.add_development_dependency 'nokogiri', '~> 1.4'
-  gem.add_development_dependency 'ox', '~> 1.3'
-  gem.add_development_dependency 'rake', '~> 0.9'
-  gem.add_development_dependency 'rdiscount', '~> 1.6'
-  gem.add_development_dependency 'rspec', '~> 2.6'
-  gem.add_development_dependency 'simplecov', '~> 0.4'
-  gem.add_development_dependency 'yard', '~> 0.7'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rdiscount'
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'simplecov'
+  gem.add_development_dependency 'yard'
   gem.author = "Erik Michaels-Ober"
   gem.description = %q{A gem to provide swappable XML backends utilizing LibXML, Nokogiri, Ox, or REXML.}
   gem.email = 'sferik@gmail.com'

data/spec/parser_shared_example.rb

@@ -294,7 +294,7 @@ shared_examples_for "a parser" do |parser|
 
       context "with an attribute type=\"decimal\"" do
         before do
-          @xml = '<tag type="decimal">3.14159265358979323846264338327950288419716939937510</tag>'
+          @xml = '<tag type="decimal">3.14159265358979</tag>'
         end
 
         it "should return a BigDecimal" do
@@ -302,7 +302,7 @@ shared_examples_for "a parser" do |parser|
         end
 
         it "should return the correct number" do
-          MultiXml.parse(@xml)['tag'].should == 3.14159265358979323846264338327950288419716939937510
+          MultiXml.parse(@xml)['tag'].should == 3.14159265358979
         end
       end
 
@@ -392,6 +392,34 @@ shared_examples_for "a parser" do |parser|
         end
       end
 
+      context "with an attribute type=\"array\" in addition to other attributes" do
+        before do
+          @xml = '<users type="array" foo="bar"><user>Erik Michaels-Ober</user><user>Wynn Netherland</user></users>'
+        end
+
+        it "should return an Array" do
+          MultiXml.parse(@xml)['users'].should be_a(Array)
+        end
+
+        it "should return the correct array" do
+          MultiXml.parse(@xml)['users'].should == ["Erik Michaels-Ober", "Wynn Netherland"]
+        end
+      end
+
+      context "with an attribute type=\"array\" containing only one item" do
+        before do
+          @xml = '<users type="array"><user>Erik Michaels-Ober</user></users>'
+        end
+
+        it "should return an Array" do
+          MultiXml.parse(@xml)['users'].should be_a(Array)
+        end
+
+        it "should return the correct array" do
+          MultiXml.parse(@xml)['users'].should == ["Erik Michaels-Ober"]
+        end
+      end
+
       %w(integer boolean date datetime yaml file).each do |type|
         context "with an empty attribute type=\"#{type}\"" do
           before do

metadata

@@ -1,151 +1,103 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: multi_xml
-version: !ruby/object:Gem::Version 
-  hash: 13
+version: !ruby/object:Gem::Version
+  version: 0.4.2
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 1
-  version: 0.4.1
 platform: ruby
-authors: 
+authors:
 - Erik Michaels-Ober
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: libxml-ruby
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-03-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: ox
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdiscount
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rdiscount
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 6
-        version: "1.6"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 6
-        version: "2.6"
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: simplecov
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 4
-        version: "0.4"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        version: "0.7"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-description: A gem to provide swappable XML backends utilizing LibXML, Nokogiri, Ox, or REXML.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A gem to provide swappable XML backends utilizing LibXML, Nokogiri, Ox,
+  or REXML.
 email: sferik@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gemtest
 - .gitignore
 - .rspec
@@ -169,39 +121,31 @@ files:
 - spec/speed.rb
 homepage: https://github.com/sferik/multi_xml
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.18
 signing_key: 
 specification_version: 3
 summary: A generic swappable back-end for XML parsing
-test_files: 
+test_files:
 - spec/helper.rb
 - spec/multi_xml_spec.rb
 - spec/parser_shared_example.rb
 - spec/speed.rb
+has_rdoc: