multi_xml 0.5.1 → 0.5.2

data/.rspec

@@ -1,2 +1,3 @@
 --color
+--fail-fast
 --order random

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
-matrix:
-  allow_failures:
-    - rvm: ruby-head
 rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
   - ruby-head
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/CONTRIBUTING.md

@@ -0,0 +1,49 @@
+## Contributing
+In the spirit of [free software][free-sw] , **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:
+
+* by using alpha, beta, and prerelease versions
+* by reporting bugs
+* 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 refactoring code
+* by resolving [issues][]
+* by reviewing patches
+
+[issues]: https://github.com/sferik/multi_xml/issues
+
+## 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. 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/
+
+## 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 doc: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/

data/README.md

@@ -17,24 +17,25 @@ 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
 use it like so:
+```ruby
+require 'multi_xml'
 
-    require 'multi_xml'
+MultiXml.parser = :ox
+MultiXml.parser = MultiXml::Parsers::Ox # Same as above
+MultiXml.parse('<tag>This is the contents</tag>') # Parsed using Ox
 
-    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 = :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 = :rexml MultiXml.parser = MultiXml::Parsers::Rexml # Same
-    as above MultiXml.parse('<tag>This is the contents</tag>') # Parsed using
-    REXML
+MultiXml.parser = :nokogiri
+MultiXml.parser = MultiXml::Parsers::Nokogiri # Same as above
+MultiXml.parse('<tag>This is the contents</tag>') # Parsed using Nokogiri
 
+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.
 
@@ -43,56 +44,6 @@ 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.
 
-## Contributing
-In the spirit of [free software][free-sw] , **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:
-
-* by using alpha, beta, and prerelease versions
-* by reporting bugs
-* 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 refactoring code
-* by resolving [issues][]
-* by reviewing patches
-
-[issues]: https://github.com/sferik/multi_xml/issues
-
-## 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. 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/
-
-## 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:

data/Rakefile

@@ -10,7 +10,7 @@ task :default => :spec
 namespace :doc do
   require 'yard'
   YARD::Rake::YardocTask.new do |task|
-    task.files   = ['LICENSE.md', 'lib/**/*.rb']
+    task.files   = ['lib/**/*.rb', '-', 'LICENSE.md']
     task.options = [
       '--no-private',
       '--protected',

data/lib/multi_xml.rb

@@ -7,6 +7,11 @@ require 'yaml'
 
 module MultiXml
   class ParseError < StandardError; end
+  class DisallowedTypeError < StandardError
+    def initialize(type)
+      super "Disallowed type attribute: #{type.inspect}"
+    end
+  end
 
   REQUIREMENT_MAP = [
     ['ox', :ox],
@@ -54,6 +59,8 @@ module MultiXml
     'Hash'       => 'hash'
   } unless defined?(TYPE_NAMES)
 
+  DISALLOWED_XML_TYPES = %w(symbol yaml)
+
   class << self
     # Get the current parser class.
     def parser
@@ -105,6 +112,8 @@ module MultiXml
     # <b>Options</b>
     #
     # <tt>:symbolize_keys</tt> :: If true, will use symbols instead of strings for the keys.
+    #
+    # <tt>:disallowed_types</tt> :: Types to disallow from being typecasted. Defaults to `['yaml', 'symbol']`. Use `[]` to allow all types.
     def parse(xml, options={})
       xml ||= ''
 
@@ -116,7 +125,9 @@ module MultiXml
         return {} if char.nil?
         xml.ungetc(char)
 
-        hash = typecast_xml_value(undasherize_keys(parser.parse(xml))) || {}
+        hash = typecast_xml_value(undasherize_keys(parser.parse(xml)), options[:disallowed_types]) || {}
+      rescue DisallowedTypeError
+        raise
       rescue parser.parse_error => error
         raise ParseError, error.to_s, error.backtrace
       end
@@ -191,9 +202,15 @@ module MultiXml
       end
     end
 
-    def typecast_xml_value(value)
+    def typecast_xml_value(value, disallowed_types=nil)
+      disallowed_types ||= DISALLOWED_XML_TYPES
+
       case value
       when Hash
+        if value.include?('type') && !value['type'].is_a?(Hash) && disallowed_types.include?(value['type'])
+          raise DisallowedTypeError, value['type']
+        end
+
         if value['type'] == 'array'
 
           # this commented-out suggestion helps to avoid the multiple attribute
@@ -216,9 +233,9 @@ module MultiXml
           else
             case entries
             when Array
-              entries.map {|entry| typecast_xml_value(entry)}
+              entries.map {|entry| typecast_xml_value(entry, disallowed_types)}
             when Hash
-              [typecast_xml_value(entries)]
+              [typecast_xml_value(entries, disallowed_types)]
             else
               raise "can't typecast #{entries.class.name}: #{entries.inspect}"
             end
@@ -252,7 +269,7 @@ module MultiXml
           nil
         else
           xml_value = value.inject({}) do |hash, (k, v)|
-            hash[k] = typecast_xml_value(v)
+            hash[k] = typecast_xml_value(v, disallowed_types)
             hash
           end
 
@@ -261,7 +278,7 @@ module MultiXml
           xml_value['file'].is_a?(StringIO) ? xml_value['file'] : xml_value
         end
       when Array
-        value.map!{|i| typecast_xml_value(i)}
+        value.map!{|i| typecast_xml_value(i, disallowed_types)}
         value.length > 1 ? value : value.first
       when String
         value

data/lib/multi_xml/version.rb

@@ -1,3 +1,3 @@
 module MultiXml
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/multi_xml.gemspec

@@ -1,21 +1,22 @@
 # encoding: utf-8
 require File.expand_path('../lib/multi_xml/version', __FILE__)
 
-Gem::Specification.new do |gem|
-  gem.add_development_dependency 'maruku'
-  gem.add_development_dependency 'rake'
-  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'
-  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.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.version = MultiXml::VERSION
+Gem::Specification.new do |spec|
+  spec.add_development_dependency 'kramdown'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'yard'
+  spec.author = "Erik Michaels-Ober"
+  spec.description = %q{Provides swappable XML backends utilizing LibXML, Nokogiri, Ox, or REXML.}
+  spec.email = 'sferik@gmail.com'
+  spec.files = `git ls-files`.split("\n")
+  spec.homepage = 'https://github.com/sferik/multi_xml'
+  spec.licenses = ['MIT']
+  spec.name = 'multi_xml'
+  spec.platform = Gem::Platform::RUBY
+  spec.require_paths = ['lib']
+  spec.summary = %q{A generic swappable back-end for XML parsing}
+  spec.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  spec.version = MultiXml::VERSION
 end

data/spec/helper.rb

@@ -4,4 +4,12 @@ unless ENV['CI']
     add_filter 'spec'
   end
 end
+
 require 'multi_xml'
+require 'rspec'
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end

data/spec/multi_xml_spec.rb

@@ -5,28 +5,28 @@ class MockDecoder; end
 
 describe "MultiXml" do
   context "Parsers" do
-    it "should pick a default parser" do
-      MultiXml.parser.should be_kind_of(Module)
-      MultiXml.parser.should respond_to(:parse)
+    it "picks a default parser" do
+      expect(MultiXml.parser).to be_kind_of(Module)
+      expect(MultiXml.parser).to respond_to(:parse)
     end
 
-    it "should default to the best available gem" do
+    it "defaults to the best available gem" do
       pending
-      MultiXml.parser.name.should be == 'MultiXml::Parsers::Rexml'
+      expect(MultiXml.parser.name).to eq('MultiXml::Parsers::Rexml')
       require 'nokogiri'
-      MultiXml.parser.name.should be == 'MultiXml::Parsers::Nokogiri'
+      expect(MultiXml.parser.name).to eq('MultiXml::Parsers::Nokogiri')
       require 'libxml'
-      MultiXml.parser.name.should == 'MultiXml::Parsers::Libxml'
+      expect(MultiXml.parser.name).to eq('MultiXml::Parsers::Libxml')
     end
 
-    it "should be settable via a symbol" do
+    it "is settable via a symbol" do
       MultiXml.parser = :nokogiri
-      MultiXml.parser.name.should == 'MultiXml::Parsers::Nokogiri'
+      expect(MultiXml.parser.name).to eq('MultiXml::Parsers::Nokogiri')
     end
 
-    it "should be settable via a class" do
+    it "is settable via a class" do
       MultiXml.parser = MockDecoder
-      MultiXml.parser.name.should == 'MockDecoder'
+      expect(MultiXml.parser.name).to eq('MockDecoder')
     end
   end
 
@@ -37,7 +37,7 @@ describe "MultiXml" do
     begin
       require parser.last
       context "#{parser.first} parser" do
-        it_should_behave_like "a parser", parser.first
+        it_behaves_like "a parser", parser.first
       end
     rescue LoadError => e
       puts "Tests not run for #{parser.first} due to a LoadError"

data/spec/parser_shared_example.rb

@@ -14,8 +14,8 @@ shared_examples_for "a parser" do |parser|
         @xml = ''
       end
 
-      it "should return an empty Hash" do
-        MultiXml.parse(@xml).should == {}
+      it "returns an empty Hash" do
+        expect(MultiXml.parse(@xml)).to eq({})
       end
     end
 
@@ -24,8 +24,8 @@ shared_examples_for "a parser" do |parser|
         @xml = ' '
       end
 
-      it "should return an empty Hash" do
-        MultiXml.parse(@xml).should == {}
+      it "returns an empty Hash" do
+        expect(MultiXml.parse(@xml)).to eq({})
       end
     end
 
@@ -34,10 +34,8 @@ shared_examples_for "a parser" do |parser|
         @xml = '<open></close>'
       end
 
-      it "should raise MultiXml::ParseError" do
-        lambda do
-          MultiXml.parse(@xml)
-        end.should raise_error(MultiXml::ParseError)
+      it "raises MultiXml::ParseError" do
+        expect{MultiXml.parse(@xml)}.to raise_error(MultiXml::ParseError)
       end
     end
 
@@ -46,8 +44,8 @@ shared_examples_for "a parser" do |parser|
         @xml = '<user/>'
       end
 
-      it "should parse correctly" do
-        MultiXml.parse(@xml).should == {'user' => nil}
+      it "parses correctly" do
+        expect(MultiXml.parse(@xml)).to eq({'user' => nil})
       end
 
       context "with CDATA" do
@@ -55,8 +53,8 @@ shared_examples_for "a parser" do |parser|
           @xml = '<user><![CDATA[Erik Michaels-Ober]]></user>'
         end
 
-        it "should return the correct CDATA" do
-          MultiXml.parse(@xml)['user'].should == "Erik Michaels-Ober"
+        it "returns the correct CDATA" do
+          expect(MultiXml.parse(@xml)['user']).to eq("Erik Michaels-Ober")
         end
       end
 
@@ -65,8 +63,8 @@ shared_examples_for "a parser" do |parser|
           @xml = '<user>Erik Michaels-Ober</user>'
         end
 
-        it "should return the correct content" do
-          MultiXml.parse(@xml)['user'].should == "Erik Michaels-Ober"
+        it "returns the correct content" do
+          expect(MultiXml.parse(@xml)['user']).to eq("Erik Michaels-Ober")
         end
       end
 
@@ -75,8 +73,8 @@ shared_examples_for "a parser" do |parser|
           @xml = '<user name="Erik Michaels-Ober"/>'
         end
 
-        it "should return the correct attribute" do
-          MultiXml.parse(@xml)['user']['name'].should == "Erik Michaels-Ober"
+        it "returns the correct attribute" do
+          expect(MultiXml.parse(@xml)['user']['name']).to eq("Erik Michaels-Ober")
         end
       end
 
@@ -85,9 +83,9 @@ shared_examples_for "a parser" do |parser|
           @xml = '<user name="Erik Michaels-Ober" screen_name="sferik"/>'
         end
 
-        it "should return the correct attributes" do
-          MultiXml.parse(@xml)['user']['name'].should be == "Erik Michaels-Ober"
-          MultiXml.parse(@xml)['user']['screen_name'].should be == "sferik"
+        it "returns the correct attributes" do
+          expect(MultiXml.parse(@xml)['user']['name']).to eq("Erik Michaels-Ober")
+          expect(MultiXml.parse(@xml)['user']['screen_name']).to eq("sferik")
         end
       end
 
@@ -96,8 +94,8 @@ shared_examples_for "a parser" do |parser|
           @xml = '<user><name>Erik Michaels-Ober</name></user>'
         end
 
-        it "should symbolize keys" do
-          MultiXml.parse(@xml, :symbolize_keys => true).should == {:user => {:name => "Erik Michaels-Ober"}}
+        it "symbolizes keys" do
+          expect(MultiXml.parse(@xml, :symbolize_keys => true)).to eq({:user => {:name => "Erik Michaels-Ober"}})
         end
       end
 
@@ -107,8 +105,8 @@ shared_examples_for "a parser" do |parser|
           @xml = '<tag>true</tag>'
         end
 
-        it "should return true" do
-          MultiXml.parse(@xml)['tag'].should be_true
+        it "returns true" do
+          expect(MultiXml.parse(@xml)['tag']).to be_true
         end
       end
 
@@ -118,8 +116,8 @@ shared_examples_for "a parser" do |parser|
           @xml = '<tag>false</tag>'
         end
 
-        it "should return false" do
-          MultiXml.parse(@xml)['tag'].should be_false
+        it "returns false" do
+          expect(MultiXml.parse(@xml)['tag']).to be_false
         end
       end
 
@@ -129,12 +127,12 @@ shared_examples_for "a parser" do |parser|
           @xml = '<id>1</id>'
         end
 
-        it "should return a Fixnum" do
-          MultiXml.parse(@xml)['id'].should be_a(Fixnum)
+        it "returns a Fixnum" do
+          expect(MultiXml.parse(@xml)['id']).to be_a(Fixnum)
         end
 
-        it "should return the correct number" do
-          MultiXml.parse(@xml)['id'].should == 1
+        it "returns the correct number" do
+          expect(MultiXml.parse(@xml)['id']).to eq(1)
         end
       end
 
@@ -144,21 +142,21 @@ shared_examples_for "a parser" do |parser|
           @xml = '<tag_id>1</tag_id>'
         end
 
-        it "should return a Fixnum" do
-          MultiXml.parse(@xml)['tag_id'].should be_a(Fixnum)
+        it "returns a Fixnum" do
+          expect(MultiXml.parse(@xml)['tag_id']).to be_a(Fixnum)
         end
 
-        it "should return the correct number" do
-          MultiXml.parse(@xml)['tag_id'].should == 1
+        it "returns the correct number" do
+          expect(MultiXml.parse(@xml)['tag_id']).to eq(1)
         end
       end
 
       context "with an attribute type=\"boolean\"" do
         %w(true false).each do |boolean|
           context "when #{boolean}" do
-            it "should return #{boolean}" do
+            it "returns #{boolean}" do
               xml = "<tag type=\"boolean\">#{boolean}</tag>"
-              MultiXml.parse(xml)['tag'].should instance_eval("be_#{boolean}")
+              expect(MultiXml.parse(xml)['tag']).to instance_eval("be_#{boolean}")
             end
           end
         end
@@ -168,8 +166,8 @@ shared_examples_for "a parser" do |parser|
             @xml = '<tag type="boolean">1</tag>'
           end
 
-          it "should return true" do
-            MultiXml.parse(@xml)['tag'].should be_true
+          it "returns true" do
+            expect(MultiXml.parse(@xml)['tag']).to be_true
           end
         end
 
@@ -178,8 +176,8 @@ shared_examples_for "a parser" do |parser|
             @xml = '<tag type="boolean">0</tag>'
           end
 
-          it "should return false" do
-            MultiXml.parse(@xml)['tag'].should be_false
+          it "returns false" do
+            expect(MultiXml.parse(@xml)['tag']).to be_false
           end
         end
       end
@@ -190,16 +188,16 @@ shared_examples_for "a parser" do |parser|
             @xml = '<tag type="integer">1</tag>'
           end
 
-          it "should return a Fixnum" do
-            MultiXml.parse(@xml)['tag'].should be_a(Fixnum)
+          it "returns a Fixnum" do
+            expect(MultiXml.parse(@xml)['tag']).to be_a(Fixnum)
           end
 
-          it "should return a positive number" do
-            MultiXml.parse(@xml)['tag'].should > 0
+          it "returns a positive number" do
+            expect(MultiXml.parse(@xml)['tag']).to be > 0
           end
 
-          it "should return the correct number" do
-            MultiXml.parse(@xml)['tag'].should == 1
+          it "returns the correct number" do
+            expect(MultiXml.parse(@xml)['tag']).to eq(1)
           end
         end
 
@@ -208,16 +206,16 @@ shared_examples_for "a parser" do |parser|
             @xml = '<tag type="integer">-1</tag>'
           end
 
-          it "should return a Fixnum" do
-            MultiXml.parse(@xml)['tag'].should be_a(Fixnum)
+          it "returns a Fixnum" do
+            expect(MultiXml.parse(@xml)['tag']).to be_a(Fixnum)
           end
 
-          it "should return a negative number" do
-            MultiXml.parse(@xml)['tag'].should < 0
+          it "returns a negative number" do
+            expect(MultiXml.parse(@xml)['tag']).to be < 0
           end
 
-          it "should return the correct number" do
-            MultiXml.parse(@xml)['tag'].should == -1
+          it "returns the correct number" do
+            expect(MultiXml.parse(@xml)['tag']).to eq(-1)
           end
         end
       end
@@ -227,12 +225,12 @@ shared_examples_for "a parser" do |parser|
           @xml = '<tag type="string"></tag>'
         end
 
-        it "should return a String" do
-          MultiXml.parse(@xml)['tag'].should be_a(String)
+        it "returns a String" do
+          expect(MultiXml.parse(@xml)['tag']).to be_a(String)
         end
 
-        it "should return the correct string" do
-          MultiXml.parse(@xml)['tag'].should == ""
+        it "returns the correct string" do
+          expect(MultiXml.parse(@xml)['tag']).to eq("")
         end
       end
 
@@ -241,12 +239,12 @@ shared_examples_for "a parser" do |parser|
           @xml = '<tag type="date">1970-01-01</tag>'
         end
 
-        it "should return a Date" do
-          MultiXml.parse(@xml)['tag'].should be_a(Date)
+        it "returns a Date" do
+          expect(MultiXml.parse(@xml)['tag']).to be_a(Date)
         end
 
-        it "should return the correct date" do
-          MultiXml.parse(@xml)['tag'].should == Date.parse('1970-01-01')
+        it "returns the correct date" do
+          expect(MultiXml.parse(@xml)['tag']).to eq(Date.parse('1970-01-01'))
         end
       end
 
@@ -255,12 +253,12 @@ shared_examples_for "a parser" do |parser|
           @xml = '<tag type="datetime">1970-01-01 00:00</tag>'
         end
 
-        it "should return a Time" do
-          MultiXml.parse(@xml)['tag'].should be_a(Time)
+        it "returns a Time" do
+          expect(MultiXml.parse(@xml)['tag']).to be_a(Time)
         end
 
-        it "should return the correct time" do
-          MultiXml.parse(@xml)['tag'].should == Time.parse('1970-01-01 00:00')
+        it "returns the correct time" do
+          expect(MultiXml.parse(@xml)['tag']).to eq(Time.parse('1970-01-01 00:00'))
         end
       end
 
@@ -269,12 +267,12 @@ shared_examples_for "a parser" do |parser|
           @xml = '<tag type="datetime">1970-01-01 00:00</tag>'
         end
 
-        it "should return a Time" do
-          MultiXml.parse(@xml)['tag'].should be_a(Time)
+        it "returns a Time" do
+          expect(MultiXml.parse(@xml)['tag']).to be_a(Time)
         end
 
-        it "should return the correct time" do
-          MultiXml.parse(@xml)['tag'].should == Time.parse('1970-01-01 00:00')
+        it "returns the correct time" do
+          expect(MultiXml.parse(@xml)['tag']).to eq(Time.parse('1970-01-01 00:00'))
         end
       end
 
@@ -283,12 +281,12 @@ shared_examples_for "a parser" do |parser|
           @xml = '<tag type="double">3.14159265358979</tag>'
         end
 
-        it "should return a Float" do
-          MultiXml.parse(@xml)['tag'].should be_a(Float)
+        it "returns a Float" do
+          expect(MultiXml.parse(@xml)['tag']).to be_a(Float)
         end
 
-        it "should return the correct number" do
-          MultiXml.parse(@xml)['tag'].should == 3.14159265358979
+        it "returns the correct number" do
+          expect(MultiXml.parse(@xml)['tag']).to eq(3.14159265358979)
         end
       end
 
@@ -297,12 +295,12 @@ shared_examples_for "a parser" do |parser|
           @xml = '<tag type="decimal">3.14159265358979</tag>'
         end
 
-        it "should return a BigDecimal" do
-          MultiXml.parse(@xml)['tag'].should be_a(BigDecimal)
+        it "returns a BigDecimal" do
+          expect(MultiXml.parse(@xml)['tag']).to be_a(BigDecimal)
         end
 
-        it "should return the correct number" do
-          MultiXml.parse(@xml)['tag'].should == 3.14159265358979
+        it "returns the correct number" do
+          expect(MultiXml.parse(@xml)['tag']).to eq(3.14159265358979)
         end
       end
 
@@ -311,26 +309,40 @@ shared_examples_for "a parser" do |parser|
           @xml = '<tag type="base64Binary">aW1hZ2UucG5n</tag>'
         end
 
-        it "should return a String" do
-          MultiXml.parse(@xml)['tag'].should be_a(String)
+        it "returns a String" do
+          expect(MultiXml.parse(@xml)['tag']).to be_a(String)
         end
 
-        it "should return the correct string" do
-          MultiXml.parse(@xml)['tag'].should == "image.png"
+        it "returns the correct string" do
+          expect(MultiXml.parse(@xml)['tag']).to eq("image.png")
         end
       end
 
       context "with an attribute type=\"yaml\"" do
         before do
-          @xml = "<tag type=\"yaml\">--- \n1: should return an integer\n:message: Have a nice day\narray: \n- should-have-dashes: true\n  should_have_underscores: true\n</tag>"
+          @xml = "<tag type=\"yaml\">--- \n1: returns an integer\n:message: Have a nice day\narray: \n- has-dashes: true\n  has_underscores: true\n</tag>"
         end
 
-        it "should return a Hash" do
-          MultiXml.parse(@xml)['tag'].should be_a(Hash)
+        it "raises MultiXML::DisallowedTypeError by default" do
+          expect{ MultiXml.parse(@xml)['tag'] }.to raise_error(MultiXml::DisallowedTypeError)
         end
 
-        it "should return the correctly parsed YAML" do
-          MultiXml.parse(@xml)['tag'].should == {:message => "Have a nice day", 1 => "should return an integer", "array" => [{"should-have-dashes" => true, "should_have_underscores" => true}]}
+        it "returns the correctly parsed YAML when the type is allowed" do
+          expect(MultiXml.parse(@xml, :disallowed_types => [])['tag']).to eq({:message => "Have a nice day", 1 => "returns an integer", "array" => [{"has-dashes" => true, "has_underscores" => true}]})
+        end
+      end
+
+      context "with an attribute type=\"symbol\"" do
+        before do
+          @xml = "<tag type=\"symbol\">my_symbol</tag>"
+        end
+
+        it "raises MultiXML::DisallowedTypeError" do
+          expect{ MultiXml.parse(@xml)['tag'] }.to raise_error(MultiXml::DisallowedTypeError)
+        end
+
+        it "returns the correctly parsed Symbol when the type is allowed" do
+          expect(MultiXml.parse(@xml, :disallowed_types => [])['tag']).to eq(:my_symbol)
         end
       end
 
@@ -339,20 +351,20 @@ shared_examples_for "a parser" do |parser|
           @xml = '<tag type="file" name="data.txt" content_type="text/plain">ZGF0YQ==</tag>'
         end
 
-        it "should return a StringIO" do
-          MultiXml.parse(@xml)['tag'].should be_a(StringIO)
+        it "returns a StringIO" do
+          expect(MultiXml.parse(@xml)['tag']).to be_a(StringIO)
         end
 
-        it "should be decoded correctly" do
-          MultiXml.parse(@xml)['tag'].string.should == 'data'
+        it "is decoded correctly" do
+          expect(MultiXml.parse(@xml)['tag'].string).to eq('data')
         end
 
-        it "should have the correct file name" do
-          MultiXml.parse(@xml)['tag'].original_filename.should == 'data.txt'
+        it "has the correct file name" do
+          expect(MultiXml.parse(@xml)['tag'].original_filename).to eq('data.txt')
         end
 
-        it "should have the correct content type" do
-          MultiXml.parse(@xml)['tag'].content_type.should == 'text/plain'
+        it "has the correct content type" do
+          expect(MultiXml.parse(@xml)['tag'].content_type).to eq('text/plain')
         end
 
         context "with missing name and content type" do
@@ -360,20 +372,20 @@ shared_examples_for "a parser" do |parser|
             @xml = '<tag type="file">ZGF0YQ==</tag>'
           end
 
-          it "should return a StringIO" do
-            MultiXml.parse(@xml)['tag'].should be_a(StringIO)
+          it "returns a StringIO" do
+            expect(MultiXml.parse(@xml)['tag']).to be_a(StringIO)
           end
 
-          it "should be decoded correctly" do
-            MultiXml.parse(@xml)['tag'].string.should == 'data'
+          it "is decoded correctly" do
+            expect(MultiXml.parse(@xml)['tag'].string).to eq('data')
           end
 
-          it "should have the default file name" do
-            MultiXml.parse(@xml)['tag'].original_filename.should == 'untitled'
+          it "has the default file name" do
+            expect(MultiXml.parse(@xml)['tag'].original_filename).to eq('untitled')
           end
 
-          it "should have the default content type" do
-            MultiXml.parse(@xml)['tag'].content_type.should == 'application/octet-stream'
+          it "has the default content type" do
+            expect(MultiXml.parse(@xml)['tag'].content_type).to eq('application/octet-stream')
           end
         end
       end
@@ -383,12 +395,12 @@ shared_examples_for "a parser" do |parser|
           @xml = '<users type="array"><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)
+        it "returns an Array" do
+          expect(MultiXml.parse(@xml)['users']).to be_a(Array)
         end
 
-        it "should return the correct array" do
-          MultiXml.parse(@xml)['users'].should == ["Erik Michaels-Ober", "Wynn Netherland"]
+        it "returns the correct array" do
+          expect(MultiXml.parse(@xml)['users']).to eq(["Erik Michaels-Ober", "Wynn Netherland"])
         end
       end
 
@@ -397,12 +409,12 @@ shared_examples_for "a parser" do |parser|
           @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)
+        it "returns an Array" do
+          expect(MultiXml.parse(@xml)['users']).to be_a(Array)
         end
 
-        it "should return the correct array" do
-          MultiXml.parse(@xml)['users'].should == ["Erik Michaels-Ober", "Wynn Netherland"]
+        it "returns the correct array" do
+          expect(MultiXml.parse(@xml)['users']).to eq(["Erik Michaels-Ober", "Wynn Netherland"])
         end
       end
 
@@ -411,23 +423,39 @@ shared_examples_for "a parser" do |parser|
           @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)
+        it "returns an Array" do
+          expect(MultiXml.parse(@xml)['users']).to be_a(Array)
         end
 
-        it "should return the correct array" do
-          MultiXml.parse(@xml)['users'].should == ["Erik Michaels-Ober"]
+        it "returns the correct array" do
+          expect(MultiXml.parse(@xml)['users']).to eq(["Erik Michaels-Ober"])
         end
       end
 
-      %w(integer boolean date datetime yaml file).each do |type|
+      %w(integer boolean date datetime file).each do |type|
         context "with an empty attribute type=\"#{type}\"" do
           before do
             @xml = "<tag type=\"#{type}\"/>"
           end
 
-          it "should return nil" do
-            MultiXml.parse(@xml)['tag'].should be_nil
+          it "returns nil" do
+            expect(MultiXml.parse(@xml)['tag']).to be_nil
+          end
+        end
+      end
+
+      %w{yaml symbol}.each do |type|
+        context "with an empty attribute type=\"#{type}\"" do
+          before do
+            @xml = "<tag type=\"#{type}\"/>"
+          end
+
+          it "raises MultiXml::DisallowedTypeError by default" do
+            expect{ MultiXml.parse(@xml)['tag']}.to raise_error(MultiXml::DisallowedTypeError)
+          end
+
+          it "returns nil when the type is allowed" do
+            expect(MultiXml.parse(@xml, :disallowed_types => [])['tag']).to be_nil
           end
         end
       end
@@ -437,8 +465,8 @@ shared_examples_for "a parser" do |parser|
           @xml = '<tag type="array"/>'
         end
 
-        it "should return an empty Array" do
-          MultiXml.parse(@xml)['tag'].should == []
+        it "returns an empty Array" do
+          expect(MultiXml.parse(@xml)['tag']).to eq([])
         end
 
         context "with whitespace" do
@@ -446,8 +474,8 @@ shared_examples_for "a parser" do |parser|
             @xml = '<tag type="array"> </tag>'
           end
 
-          it "should return an empty Array" do
-            MultiXml.parse(@xml)['tag'].should == []
+          it "returns an empty Array" do
+            expect(MultiXml.parse(@xml)['tag']).to eq([])
           end
         end
       end
@@ -464,19 +492,19 @@ shared_examples_for "a parser" do |parser|
         end
 
         context "in content" do
-          it "should return unescaped XML entities" do
+          it "returns unescaped XML entities" do
             @xml_entities.each do |key, value|
               xml = "<tag>#{value}</tag>"
-              MultiXml.parse(xml)['tag'].should == key
+              expect(MultiXml.parse(xml)['tag']).to eq(key)
             end
           end
         end
 
         context "in attribute" do
-          it "should return unescaped XML entities" do
+          it "returns unescaped XML entities" do
             @xml_entities.each do |key, value|
               xml = "<tag attribute=\"#{value}\"/>"
-              MultiXml.parse(xml)['tag']['attribute'].should == key
+              expect(MultiXml.parse(xml)['tag']['attribute']).to eq(key)
             end
           end
         end
@@ -488,8 +516,8 @@ shared_examples_for "a parser" do |parser|
           @xml = '<tag-1/>'
         end
 
-        it "should return undasherize tag" do
-          MultiXml.parse(@xml).keys.should include('tag_1')
+        it "returns undasherize tag" do
+          expect(MultiXml.parse(@xml).keys).to include('tag_1')
         end
       end
 
@@ -498,8 +526,8 @@ shared_examples_for "a parser" do |parser|
           @xml = '<tag attribute-1="1"></tag>'
         end
 
-        it "should return undasherize attribute" do
-          MultiXml.parse(@xml)['tag'].keys.should include('attribute_1')
+        it "returns undasherize attribute" do
+          expect(MultiXml.parse(@xml)['tag'].keys).to include('attribute_1')
         end
       end
 
@@ -509,8 +537,8 @@ shared_examples_for "a parser" do |parser|
             @xml = '<users><user name="Erik Michaels-Ober"/></users>'
           end
 
-          it "should return the correct attributes" do
-            MultiXml.parse(@xml)['users']['user']['name'].should == "Erik Michaels-Ober"
+          it "returns the correct attributes" do
+            expect(MultiXml.parse(@xml)['users']['user']['name']).to eq("Erik Michaels-Ober")
           end
         end
 
@@ -519,8 +547,8 @@ shared_examples_for "a parser" do |parser|
             @xml = '<user><name>Erik Michaels-Ober</name></user>'
           end
 
-          it "should return the correct text" do
-            MultiXml.parse(@xml)['user']['name'].should == "Erik Michaels-Ober"
+          it "returns the correct text" do
+            expect(MultiXml.parse(@xml)['user']['name']).to eq("Erik Michaels-Ober")
           end
         end
 
@@ -529,8 +557,8 @@ shared_examples_for "a parser" do |parser|
             @xml = '<user type="admin"><name>Erik Michaels-Ober</name></user>'
           end
 
-          it "should pass through the type" do
-            MultiXml.parse(@xml)['user']['type'].should == 'admin'
+          it "passes through the type" do
+            expect(MultiXml.parse(@xml)['user']['type']).to eq('admin')
           end
         end
 
@@ -546,11 +574,11 @@ shared_examples_for "a parser" do |parser|
               @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'
+            it "adds the attributes to the value hash" do
+              expect(@parsed_xml['options']['value'][0]['__content__']).to eq('123')
+              expect(@parsed_xml['options']['value'][0]['currency']).to eq('USD')
+              expect(@parsed_xml['options']['value'][1]['__content__']).to eq('0.123')
+              expect(@parsed_xml['options']['value'][1]['number']).to eq('percent')
             end
           end
 
@@ -566,13 +594,13 @@ shared_examples_for "a parser" do |parser|
               @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'
+            it "adds the attributes to the value hash passing through the type" do
+              expect(@parsed_xml['options']['value'][0]['__content__']).to eq('123')
+              expect(@parsed_xml['options']['value'][0]['type']).to eq('USD')
+              expect(@parsed_xml['options']['value'][1]['__content__']).to eq('0.123')
+              expect(@parsed_xml['options']['value'][1]['type']).to eq('percent')
+              expect(@parsed_xml['options']['value'][2]['__content__']).to eq('123')
+              expect(@parsed_xml['options']['value'][2]['currency']).to eq('USD')
             end
           end
 
@@ -588,12 +616,12 @@ shared_examples_for "a parser" do |parser|
               @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'
+            it "adds the attributes to the value hash passing through the type" do
+              expect(@parsed_xml['options']['value'][0]['__content__']).to eq('123')
+              expect(@parsed_xml['options']['value'][0]['type']).to eq('USD')
+              expect(@parsed_xml['options']['value'][1]['__content__']).to eq('0.123')
+              expect(@parsed_xml['options']['value'][1]['type']).to eq('percent')
+              expect(@parsed_xml['options']['value'][2]).to eq('123')
             end
           end
 
@@ -607,9 +635,9 @@ shared_examples_for "a parser" do |parser|
               @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'
+            it "adds the the non-type attribute and remove the recognized type attribute and do the typecast" do
+              expect(@parsed_xml['options']['value']['__content__']).to eq(123)
+              expect(@parsed_xml['options']['value']['number']).to eq('USD')
             end
           end
 
@@ -623,10 +651,10 @@ shared_examples_for "a parser" do |parser|
               @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'
+            it "adds the the non-type attributes and type attribute to the value hash" do
+              expect(@parsed_xml['options']['value']['__content__']).to eq('123')
+              expect(@parsed_xml['options']['value']['number']).to eq('USD')
+              expect(@parsed_xml['options']['value']['type']).to eq('currency')
             end
           end
         end
@@ -640,8 +668,8 @@ shared_examples_for "a parser" do |parser|
             XML
           end
 
-          it "should parse correctly" do
-            MultiXml.parse(@xml).should == {"user" => {"name" => "Erik Michaels-Ober"}}
+          it "parses correctly" do
+            expect(MultiXml.parse(@xml)).to eq({"user" => {"name" => "Erik Michaels-Ober"}})
           end
         end
 
@@ -651,8 +679,8 @@ shared_examples_for "a parser" do |parser|
             @xml = '<users><user name="Erik Michaels-Ober"><status text="Hello"/></user></users>'
           end
 
-          it "should parse correctly" do
-            MultiXml.parse(@xml).should == {"users" => {"user" => {"name" => "Erik Michaels-Ober", "status" => {"text" => "Hello"}}}}
+          it "parses correctly" do
+            expect(MultiXml.parse(@xml)).to eq({"users" => {"user" => {"name" => "Erik Michaels-Ober", "status" => {"text" => "Hello"}}}})
           end
         end
       end
@@ -662,12 +690,12 @@ shared_examples_for "a parser" do |parser|
           @xml = '<users><user>Erik Michaels-Ober</user><user>Wynn Netherland</user></users>'
         end
 
-        it "should return an Array" do
-          MultiXml.parse(@xml)['users']['user'].should be_a(Array)
+        it "returns an Array" do
+          expect(MultiXml.parse(@xml)['users']['user']).to be_a(Array)
         end
 
-        it "should parse correctly" do
-          MultiXml.parse(@xml).should == {"users" => {"user" => ["Erik Michaels-Ober", "Wynn Netherland"]}}
+        it "parses correctly" do
+          expect(MultiXml.parse(@xml)).to eq({"users" => {"user" => ["Erik Michaels-Ober", "Wynn Netherland"]}})
         end
       end