RubyGems - multi_xml - Versions diffs - 0.3.0 → 0.4.0 - Mend

multi_xml 0.3.0 → 0.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of multi_xml might be problematic. Click here for more details.

Files changed (12) hide show

data/.travis.yml +1 -0
data/Gemfile +2 -1
data/README.md +30 -35
data/Rakefile +0 -0
data/lib/multi_xml.rb +13 -6
data/lib/multi_xml/parsers/ox.rb +49 -0
data/lib/multi_xml/version.rb +1 -1
data/multi_xml.gemspec +8 -10
data/spec/multi_xml_spec.rb +2 -1
data/spec/parser_shared_example.rb +2 -0
metadata +22 -35
data/.autotest +0 -1

data/.travis.yml CHANGED

@@ -2,6 +2,7 @@ rvm:
   - 1.8.7
   - 1.9.1
   - 1.9.2
+  - jruby
   - rbx
   - rbx-2.0
   - ree

data/Gemfile CHANGED

@@ -2,7 +2,8 @@ source 'http://rubygems.org'
 group :development, :test do
   gem 'libxml-ruby', "~> 2.0", :require => nil, :platforms => :mri
-  gem 'nokogiri',    "~> 1.4", :require => nil
+  gem 'nokogiri', "~> 1.4", :require => nil
+  gem 'ox', ["~> 1.2", ">= 1.2.15"], :require => nil
 end
 gemspec

data/README.md CHANGED

@@ -1,24 +1,20 @@
-MultiXML
-========
+# MultiXML
 A generic swappable back-end for XML parsing
-Installation
-------------
+## <a name="installation">Installation</a>
     gem install multi_xml
-Documentation
--------------
+## <a name="documentation">Documentation</a>
 [http://rdoc.info/gems/multi_xml](http://rdoc.info/gems/multi_xml)
-Continuous Integration
-----------------------
-[![Build Status](https://secure.travis-ci.org/sferik/multi_xml.png)](http://travis-ci.org/sferik/multi_xml)
+## <a name="ci">Continuous Integration</a>
+[![Build Status](https://travis-ci.org/sferik/multi_xml.png)](http://travis-ci.org/sferik/multi_xml)
-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:
+## <a name="examples">Usage Examples</a>
+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:
     require 'multi_xml'
@@ -41,9 +37,10 @@ MultiXML tries to have intelligent defaulting. That is, if you have any of the s
 already loaded, it will utilize them before attempting to load any. When loading, libraries are
 ordered by speed: first LibXML, then Nokogiri, then REXML.
-Contributing
-------------
-In the spirit of [free software](http://www.fsf.org/licensing/essays/free-sw.html), **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.
 Here are some ways *you* can contribute:
@@ -57,17 +54,17 @@ Here are some ways *you* can contribute:
 * by resolving [issues](https://github.com/sferik/multi_xml/issues)
 * by reviewing patches
-Submitting an Issue
--------------------
-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.
-Submitting a Pull Request
--------------------------
+## <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>
 1. Fork the project.
 2. Create a topic branch.
 3. Implement your feature or bug fix.
@@ -78,8 +75,7 @@ Submitting a Pull Request
 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.)
-Supported Rubies
-----------------
+## <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
 implementations:
@@ -87,7 +83,8 @@ implementations:
 * Ruby 1.8.7
 * Ruby 1.9.1
 * Ruby 1.9.2
-* [Rubinius](http://rubini.us)
+* [JRuby](http://www.jruby.org/)
+* [Rubinius](http://rubini.us/)
 * [Ruby Enterprise Edition](http://www.rubyenterpriseedition.com/)
 If something doesn't work on one of these interpreters, it should be considered
@@ -104,11 +101,9 @@ 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.
-Inspiration
------------
+## <a name="inspiration">Inspiration</a>
 MultiXML was inspired by [MultiJSON](https://github.com/intridea/multi_json/).
-Copyright
----------
+## <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.

data/Rakefile CHANGED

File without changes

data/lib/multi_xml.rb CHANGED

@@ -11,6 +11,7 @@ module MultiXml
   REQUIREMENT_MAP = [
     ['libxml', :libxml],
     ['nokogiri', :nokogiri],
+    ['ox', :ox],
     ['rexml/document', :rexml]
   ] unless defined?(REQUIREMENT_MAP)
@@ -71,6 +72,7 @@ module MultiXml
     #
     # * <tt>:libxml</tt>
     # * <tt>:nokogiri</tt>
+    # * <tt>:ox</tt>
     # * <tt>:rexml</tt>
     def parser=(new_parser)
       case new_parser
@@ -94,14 +96,19 @@ module MultiXml
       xml.strip! if xml.respond_to?(:strip!)
-      xml = StringIO.new(xml) unless xml.respond_to?(:read)
+      begin
+        if parser.respond_to?(:string_parser?) and parser.string_parser?
+          raw_hash = parser.parse(xml)
+        else
+          xml = StringIO.new(xml) unless xml.respond_to?(:read)
-      char = xml.getc
-      return {} if char.nil?
-      xml.ungetc(char)
+          char = xml.getc
+          return {} if char.nil?
+          xml.ungetc(char)
-      begin
-        hash = typecast_xml_value(undasherize_keys(parser.parse(xml))) || {}
+          raw_hash = parser.parse(xml)
+        end
+        hash = typecast_xml_value(undasherize_keys(raw_hash)) || {}
       rescue parser.parse_error => error
         raise ParseError, error.to_s, error.backtrace
       end

data/lib/multi_xml/parsers/ox.rb ADDED

@@ -0,0 +1,49 @@
+require 'ox' unless defined?(Ox)
+module MultiXml
+  module Parsers
+    module Ox #:nodoc:
+      extend self
+      def parse_error
+        Exception
+      end
+      def parse(xml)
+        doc = ::Ox.parse(xml)
+        h = { }
+        element_to_hash(doc, h) unless doc.nil?
+        h
+      end
+      def element_to_hash(e, h)
+        content = { }
+        e.attributes.each do |k,v|
+          content[k.to_s] = v
+        end
+        e.nodes.each do |n|
+          if n.is_a?(::Ox::Element)
+            element_to_hash(n, content)
+          elsif n.is_a?(String)
+            content['__content__'] = n
+          elsif n.is_a?(::Ox::Node)
+            content['__content__'] = n.value
+          end
+        end
+        if (ex = h[e.name]).nil?
+          h[e.name] = content
+        elsif ex.is_a?(Array)
+          ex << content
+        else
+          h[e.name] = [ex, content]
+        end
+      end
+      def string_parser?
+        true
+      end
+    end
+  end
+end

data/lib/multi_xml/version.rb CHANGED

@@ -1,3 +1,3 @@
 module MultiXml
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/multi_xml.gemspec CHANGED

@@ -1,24 +1,22 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 require File.expand_path('../lib/multi_xml/version', __FILE__)
 Gem::Specification.new do |gem|
-  gem.add_development_dependency 'ZenTest', '~> 4.5'
-  gem.add_development_dependency 'maruku', '~> 0.6'
   gem.add_development_dependency 'nokogiri', '~> 1.4'
   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.name = 'multi_xml'
-  gem.version = MultiXml::VERSION
-  gem.platform = Gem::Platform::RUBY
   gem.author = "Erik Michaels-Ober"
+  gem.description = %q{A gem to provide swappable XML backends utilizing LibXML, Nokogiri, or REXML.}
   gem.email = '[email protected]'
+  gem.files = `git ls-files`.split("\n")
   gem.homepage = 'https://github.com/sferik/multi_xml'
+  gem.name = 'multi_xml'
+  gem.platform = Gem::Platform::RUBY
+  gem.require_paths = ['lib']
   gem.summary = %q{A generic swappable back-end for XML parsing}
-  gem.description = %q{A gem to provide swappable XML backends utilizing LibXML, Nokogiri, or REXML.}
-  gem.files = `git ls-files`.split("\n")
   gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  gem.require_paths = ['lib']
+  gem.version = MultiXml::VERSION
 end

data/spec/multi_xml_spec.rb CHANGED

@@ -27,7 +27,8 @@ describe "MultiXml" do
   [['LibXML', 'libxml'],
    ['REXML', 'rexml/document'],
-   ['Nokogiri', 'nokogiri']].each do |parser|
+   ['Nokogiri', 'nokogiri'],
+   ['Ox', 'ox']].each do |parser|
     begin
       require parser.last
       context "#{parser.first} parser" do

data/spec/parser_shared_example.rb CHANGED

@@ -454,6 +454,7 @@ shared_examples_for "a parser" do |parser|
         end
       end
       context "with dasherized tag" do
         before do
           @xml = '<tag-1/>'
@@ -544,6 +545,7 @@ shared_examples_for "a parser" do |parser|
           MultiXml.parse(@xml).should == {"users" => {"user" => ["Erik Michaels-Ober", "Wynn Netherland"]}}
         end
       end
     end
   end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_xml
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease:
 platform: ruby
 authors:
@@ -9,56 +9,44 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-08-08 00:00:00.000000000 -07:00
-default_executable:
+date: 2011-09-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ZenTest
-  requirement: &70225559600760 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.5'
-  type: :development
-  prerelease: false
-  version_requirements: *70225559600760
-- !ruby/object:Gem::Dependency
-  name: maruku
-  requirement: &70225559600260 !ruby/object:Gem::Requirement
+  name: nokogiri
+  requirement: &70174632551180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.4'
   type: :development
   prerelease: false
-  version_requirements: *70225559600260
+  version_requirements: *70174632551180
 - !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: &70225559599800 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &70174632547160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70225559599800
+  version_requirements: *70174632547160
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70225559599340 !ruby/object:Gem::Requirement
+  name: rdiscount
+  requirement: &70174632529880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *70225559599340
+  version_requirements: *70174632529880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70225559598880 !ruby/object:Gem::Requirement
+  requirement: &70174632527760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +54,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70225559598880
+  version_requirements: *70174632527760
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70225559598420 !ruby/object:Gem::Requirement
+  requirement: &70174632526060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +65,10 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70225559598420
+  version_requirements: *70174632526060
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70225559597960 !ruby/object:Gem::Requirement
+  requirement: &70174632525380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,7 +76,7 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *70225559597960
+  version_requirements: *70174632525380
 description: A gem to provide swappable XML backends utilizing LibXML, Nokogiri, or
   REXML.
 email: [email protected]
@@ -96,7 +84,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .autotest
 - .gemtest
 - .gitignore
 - .rspec
@@ -110,13 +97,13 @@ files:
 - lib/multi_xml/parsers/libxml.rb
 - lib/multi_xml/parsers/libxml2_parser.rb
 - lib/multi_xml/parsers/nokogiri.rb
+- lib/multi_xml/parsers/ox.rb
 - lib/multi_xml/parsers/rexml.rb
 - lib/multi_xml/version.rb
 - multi_xml.gemspec
 - spec/helper.rb
 - spec/multi_xml_spec.rb
 - spec/parser_shared_example.rb
-has_rdoc: true
 homepage: https://github.com/sferik/multi_xml
 licenses: []
 post_install_message:
@@ -137,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key:
 specification_version: 3
 summary: A generic swappable back-end for XML parsing

data/.autotest DELETED

	@@ -1 +0,0 @@
1	- require 'autotest/bundler'