multi_xml 0.4.4 → 0.5.0

data/.travis.yml

@@ -1,6 +1,10 @@
 language: ruby
+matrix:
+  allow_failures:
+    - rvm: ruby-head
 rvm:
+  - jruby-18mode
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - jruby-18mode
+  - ruby-head

data/README.md

@@ -4,15 +4,15 @@ A generic swappable back-end for XML parsing
 [travis]: http://travis-ci.org/sferik/multi_xml
 [gemnasium]: https://gemnasium.com/sferik/multi_xml
 
-## <a name="installation"></a>Installation
+## Installation
     gem install multi_xml
 
-## <a name="documentation"></a>Documentation
+## Documentation
 [http://rdoc.info/gems/multi_xml][documentation]
 
 [documentation]: http://rdoc.info/gems/multi_xml
 
-## <a name="examples"></a>Usage Examples
+## 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, `multi_xml` is a general-purpose swappable XML backend library. You
@@ -43,7 +43,7 @@ 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.
 
-## <a name="contributing"></a>Contributing
+## Contributing
 In the spirit of [free software][free-sw] , **everyone** is encouraged to help
 improve this project.
 
@@ -64,33 +64,36 @@ Here are some ways *you* can contribute:
 
 [issues]: https://github.com/sferik/multi_xml/issues
 
-## <a name="issues"></a>Submitting an Issue
+## 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.
+already been submitted. 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 `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 `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.)
-
-## <a name="versions"></a>Supported Ruby Versions
+## Submitting a Pull Request
+1. [Fork the repository.][fork]
+2. [Create a topic branch.][branch]
+3. Add specs for your unimplemented feature or bug fix.
+4. Run `bundle exec rake spec`. If your specs pass, return to step 3.
+5. Implement your feature or bug fix.
+6. Run `bundle exec rake spec`. If your specs fail, return to step 5.
+7. Run `open coverage/index.html`. If your changes are not completely covered
+   by your tests, return to step 3.
+8. Add documentation for your feature or bug fix.
+9. Run `bundle exec rake yard`. If your changes are not 100% documented, go
+   back to step 8.
+10. Add, commit, and push your changes.
+11. [Submit a pull request.][pr]
+
+[fork]: http://help.github.com/fork-a-repo/
+[branch]: http://learn.github.com/p/branching.html
+[pr]: http://help.github.com/send-pull-requests/
+
+## Supported Ruby Versions
 This library aims to support and is [tested against][travis] the following Ruby
 implementations:
 
@@ -115,12 +118,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"></a>Inspiration
+## Inspiration
 MultiXML was inspired by [MultiJSON][].
 
 [multijson]: https://github.com/intridea/multi_json/
 
-## <a name="copyright"></a>Copyright
+## Copyright
 Copyright (c) 2010 Erik Michaels-Ober. See [LICENSE][] for details.
 
 [license]: https://github.com/sferik/multi_xml/blob/master/LICENSE.md

data/Rakefile

@@ -1,5 +1,3 @@
-#!/usr/bin/env rake
-
 require 'bundler'
 Bundler::GemHelper.install_tasks
 

data/lib/multi_xml.rb

@@ -57,7 +57,7 @@ module MultiXml
   class << self
     # Get the current parser class.
     def parser
-      return @@parser if defined?(@@parser)
+      return @@parser unless @@parser.nil?
       self.parser = self.default_parser
       @@parser
     end
@@ -226,9 +226,19 @@ module MultiXml
         elsif value.has_key?(CONTENT_ROOT)
           content = value[CONTENT_ROOT]
           if block = PARSING[value['type']]
-            block.arity == 1 ? block.call(content) : block.call(content, value)
+            if block.arity == 1
+              value.delete('type') if PARSING[value['type']]
+              if value.keys.size > 1
+                value[CONTENT_ROOT] = block.call(content)
+                value
+              else
+                block.call(content)
+              end
+            else
+              block.call(content, value)
+            end
           else
-            content
+            value.keys.size > 1 ? value : content
           end
         elsif value['type'] == 'string' && value['nil'] != 'true'
           ''

data/lib/multi_xml/version.rb

@@ -1,3 +1,3 @@
 module MultiXml
-  VERSION = "0.4.4"
+  VERSION = "0.5.0"
 end

data/spec/helper.rb

@@ -1,5 +1,7 @@
 unless ENV['CI']
   require 'simplecov'
-  SimpleCov.start
+  SimpleCov.start do
+    add_filter 'spec'
+  end
 end
 require 'multi_xml'

data/spec/multi_xml_spec.rb

@@ -5,6 +5,15 @@ class MockDecoder; end
 
 describe "MultiXml" do
   context "Parsers" do
+    before do
+      MultiXml.send :class_variable_set, :@@parser, nil
+    end
+
+    it "should pick a default parser" do
+      MultiXml.parser.should be_kind_of(Module)
+      MultiXml.parser.should respond_to(:parse)
+    end
+
     it "should default to the best available gem" do
       pending
       MultiXml.parser.name.should be == 'MultiXml::Parsers::Rexml'

data/spec/parser_shared_example.rb

@@ -534,6 +534,103 @@ shared_examples_for "a parser" do |parser|
           end
         end
 
+        context "with attribute tags on content nodes" do
+          context "non 'type' attributes" do
+            before do
+              @xml = <<-XML
+                <options>
+                  <value currency='USD'>123</value>
+                  <value number='percent'>0.123</value>
+                </options>
+              XML
+              @parsed_xml = MultiXml.parse(@xml)
+            end
+
+            it "should add the attributes to the value hash" do
+              @parsed_xml['options']['value'][0]['__content__'].should == '123'
+              @parsed_xml['options']['value'][0]['currency'].should == 'USD'
+              @parsed_xml['options']['value'][1]['__content__'].should == '0.123'
+              @parsed_xml['options']['value'][1]['number'].should == 'percent'
+            end
+          end
+
+          context "unrecognized type attributes" do
+            before do
+              @xml = <<-XML
+                <options>
+                  <value type='USD'>123</value>
+                  <value type='percent'>0.123</value>
+                  <value currency='USD'>123</value>
+                </options>
+              XML
+              @parsed_xml = MultiXml.parse(@xml)
+            end
+
+            it "should add the attributes to the value hash passing through the type" do
+              @parsed_xml['options']['value'][0]['__content__'].should == '123'
+              @parsed_xml['options']['value'][0]['type'].should == 'USD'
+              @parsed_xml['options']['value'][1]['__content__'].should == '0.123'
+              @parsed_xml['options']['value'][1]['type'].should == 'percent'
+              @parsed_xml['options']['value'][2]['__content__'].should == '123'
+              @parsed_xml['options']['value'][2]['currency'].should == 'USD'
+            end
+          end
+
+          context "mixing attributes and non-attributes content nodes type attributes" do
+            before do
+              @xml = <<-XML
+                <options>
+                  <value type='USD'>123</value>
+                  <value type='percent'>0.123</value>
+                  <value>123</value>
+                </options>
+              XML
+              @parsed_xml = MultiXml.parse(@xml)
+            end
+
+            it "should add the attributes to the value hash passing through the type" do
+              @parsed_xml['options']['value'][0]['__content__'].should == '123'
+              @parsed_xml['options']['value'][0]['type'].should == 'USD'
+              @parsed_xml['options']['value'][1]['__content__'].should == '0.123'
+              @parsed_xml['options']['value'][1]['type'].should == 'percent'
+              @parsed_xml['options']['value'][2].should == '123'
+            end
+          end
+
+          context "mixing recognized type attribute and non-type attributes on content nodes" do
+            before do
+              @xml = <<-XML
+                <options>
+                  <value number='USD' type='integer'>123</value>
+                </options>
+              XML
+              @parsed_xml = MultiXml.parse(@xml)
+            end
+
+            it "should add the the non-type attribute and remove the recognized type attribute and do the typecast" do
+              @parsed_xml['options']['value']['__content__'].should == 123
+              @parsed_xml['options']['value']['number'].should == 'USD'
+            end
+          end
+
+          context "mixing unrecognized type attribute and non-type attributes on content nodes" do
+            before do
+              @xml = <<-XML
+                <options>
+                  <value number='USD' type='currency'>123</value>
+                </options>
+              XML
+              @parsed_xml = MultiXml.parse(@xml)
+            end
+
+            it "should add the the non-type attributes and type attribute to the value hash" do
+              @parsed_xml['options']['value']['__content__'].should == '123'
+              @parsed_xml['options']['value']['number'].should == 'USD'
+              @parsed_xml['options']['value']['type'].should == 'currency'
+            end
+          end
+        end
+
         context "with newlines and whitespace" do
           before do
             @xml = <<-XML

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_xml
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-16 00:00:00.000000000 Z
+date: 2012-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maruku
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A generic swappable back-end for XML parsing