nori 1.1.5 → 2.0.0

data/CHANGELOG.md

@@ -1,17 +1,29 @@
-## 1.1.5 (2013-03-03)
+# 2.0 (2012-12-12)
 
-* Fix: [#37](https://github.com/savonrb/nori/issues/37) special characters
-  problem on Ruby 1.9.3-p392.
+Please make sure to read the updated README for how to use the new version.
 
-## 1.1.4 (2013-01-10)
+* Change: Nori now defaults to use the Nokogiri parser.
 
-* Fix for remote code execution bug. For more in-depth information, read about the
-  recent [Rails hotfix](https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/61bkgvnSGTQ).
-  Please make sure to upgrade now!
+* Refactoring: Changed the `Nori` module to a class. This might cause problems if you
+  included the `Nori` module somewhere in your application. This use case was removed
+  for overall simplicity.
+
+* Refactoring: Changed the interface to remove any global state. The global configuration
+  is gone and replaced with simple options to be passed to `Nori.new`.
+
+    ``` ruby
+    parser = Nori.new(strip_namespaces: true)
+    parser.parse(xml)
+    ```
+
+* Refactoring: Removed the `Nori::Parser` module methods. After refactoring the rest,
+  there was only a single method left for this module and that was moved to `Nori`.
+
+* Fix: [#16](https://github.com/savonrb/nori/issues/16) strip XML passed to Nori.
 
 ## 1.1.3 (2012-07-12)
 
-* Fix: Merged [pull request 21](https://github.com/rubiii/nori/pull/21) to fix an
+* Fix: Merged [pull request 21](https://github.com/savonrb/nori/pull/21) to fix an
   issue with date/time/datetime regexes not matching positive time zone offsets and
   datetime strings with seconds.
 
@@ -21,15 +33,15 @@
 
 ## 1.1.1 (2012-06-29) - yanked
 
-* Fix: Merged [pull request 17](https://github.com/rubiii/nori/pull/17) for improved
+* Fix: Merged [pull request 17](https://github.com/savonrb/nori/pull/17) for improved
   xs:time/xs:date/xs:dateTime regular expression matchers.
 
 ## 1.1.0 (2012-02-17)
 
-* Improvement: Merged [pull request 9](https://github.com/rubiii/nori/pull/9) to
+* Improvement: Merged [pull request 9](https://github.com/savonrb/nori/pull/9) to
   allow multiple configurations of Nori.
 
-* Fix: Merged [pull request 10](https://github.com/rubiii/nori/pull/10) to handle
+* Fix: Merged [pull request 10](https://github.com/savonrb/nori/pull/10) to handle
   date/time parsing errors. Fixes a couple of similar error reports.
 
 ## 1.0.2 (2011-07-04)
@@ -88,7 +100,7 @@
 
 ## 0.2.1 (2011-05-15)
 
-* Fix: Changed XML attributes converted to Hash keys to be prefixed with an @-sign.
+* Fix: Changed XML attributes converted to Hash keys to be prefixed with an @-sign.  
   This avoids problems with attributes and child nodes having the same name.
 
       <multiRef id="id1">

data/README.md

@@ -1,4 +1,4 @@
-Nori [![Build Status](https://secure.travis-ci.org/rubiii/nori.png)](http://travis-ci.org/rubiii/nori)
+Nori [![Build Status](https://secure.travis-ci.org/savonrb/nori.png)](http://travis-ci.org/savonrb/nori)
 ====
 
 Really simple XML parsing ripped from Crack which ripped it from Merb.  
@@ -6,7 +6,8 @@ Nori was created to bypass the stale development of Crack, improve its XML parse
 and fix certain issues.
 
 ``` ruby
-Nori.parse("<tag>This is the contents</tag>")
+parser = Nori.new
+parser.parse("<tag>This is the contents</tag>")
 # => { 'tag' => 'This is the contents' }
 ```
 
@@ -14,7 +15,7 @@ Nori supports pluggable parsers and ships with both REXML and Nokogiri implement
 It defaults to REXML, but you can change it to use Nokogiri via:
 
 ``` ruby
-Nori.parser = :nokogiri
+Nori.new(:parser => :nokogiri)  # or :rexml
 ```
 
 Make sure Nokogiri is in your LOAD_PATH when parsing XML, because Nori tries to load it  
@@ -33,7 +34,7 @@ Besides regular typecasting, Nori features somewhat "advanced" typecasting:
 You can disable this feature via:
 
 ``` ruby
-Nori.advanced_typecasting = false
+Nori.new(:advanced_typecasting => false)
 ```
 
 
@@ -44,7 +45,7 @@ Nori can strip the namespaces from your XML tags. This feature might raise
 problems and is therefore disabled by default. Enable it via:
 
 ``` ruby
-Nori.strip_namespaces = true
+Nori.new(:strip_namespaces => true)
 ```
 
 
@@ -55,10 +56,8 @@ Nori lets you specify a custom formula to convert XML tags to Hash keys.
 Let me give you an example:
 
 ``` ruby
-Nori.configure do |config|
-  config.convert_tags_to { |tag| tag.snake_case.to_sym }
-end
+parser = Nori.new(:convert_tags_to => lambda { |tag| tag.snake_case.to_sym })
 
 xml = '<userResponse><accountStatus>active</accountStatus></userResponse>'
-Nori.parse(xml)  # => { :user_response => { :account_status => "active" }
+parser.parse(xml)  # => { :user_response => { :account_status => "active" }
 ```

data/benchmark/benchmark.rb

@@ -5,7 +5,7 @@ require "benchmark"
 
 Benchmark.bm 30 do |x|
 
-  num = 250
+  num = 500
   xml = File.read File.expand_path("../soap_response.xml", __FILE__)
 
   x.report "rexml parser" do

data/lib/nori.rb

@@ -1,59 +1,45 @@
 require "nori/version"
 require "nori/core_ext"
-require "nori/parser"
 require "nori/xml_utility_node"
 
-module Nori
-  extend self
+class Nori
 
-  # Translates the given +xml+ to a Hash. Accepts an optional +parser+ to use.
-  def parse(xml, parser = nil)
-    return {} if xml.blank?
-    Parser.parse xml, parser, self
-  end
+  PARSERS = { :rexml => "REXML", :nokogiri => "Nokogiri" }
 
-  # Sets the +parser+ to use.
-  def parser=(parser)
-    Parser.use = parser
-  end
+  def initialize(options = {})
+    defaults = {
+      :strip_namespaces     => false,
+      :convert_tags_to      => nil,
+      :advanced_typecasting => true,
+      :parser               => :nokogiri
+    }
 
-  # Yields +self+ for configuration.
-  def configure
-    yield self
+    validate_options! defaults.keys, options.keys
+    @options = defaults.merge(options)
   end
 
-  # Sets whether to use advanced typecasting.
-  attr_writer :advanced_typecasting
+  def parse(xml)
+    cleaned_xml = xml.strip
+    return {} if cleaned_xml.empty?
 
-  # Returns whether to use advanced typecasting.
-  # Defaults to +true+.
-  def advanced_typecasting?
-    @advanced_typecasting != false
+    parser = load_parser @options[:parser]
+    parser.parse(cleaned_xml, @options)
   end
 
-  # Sets whether to strip namespaces.
-  attr_writer :strip_namespaces
+  private
 
-  # Returns whether to strip namespaces.
-  # Defaults to +false+.
-  def strip_namespaces?
-    @strip_namespaces
+  def load_parser(parser)
+    require "nori/parser/#{parser}"
+    Parser.const_get PARSERS[parser]
   end
 
-  # Expects a +block+ which receives a tag to convert.
-  # Accepts +nil+ for a reset to the default behavior of not converting tags.
-  def convert_tags_to(reset = nil, &block)
-    @convert_tag = reset || block
-  end
-
-  # Transforms a given +tag+ using the specified conversion formula.
-  def convert_tag(tag)
-    @convert_tag.call(tag)
-  end
+  def validate_options!(available_options, options)
+    spurious_options = options - available_options
 
-  # Returns whether to convert tags.
-  def convert_tags?
-    @convert_tag
+    unless spurious_options.empty?
+      raise ArgumentError, "Spurious options: #{spurious_options.inspect}\n" \
+                           "Available options are: #{available_options.inspect}"
+    end
   end
 
 end

data/lib/nori/core_ext/hash.rb

@@ -1,6 +1,6 @@
 require "uri"
 
-module Nori
+class Nori
   module CoreExt
     module Hash
 

data/lib/nori/core_ext/object.rb

@@ -1,4 +1,4 @@
-module Nori
+class Nori
   module CoreExt
     module Object
 

data/lib/nori/core_ext/string.rb

@@ -1,4 +1,4 @@
-module Nori
+class Nori
   module CoreExt
     module String
 

data/lib/nori/parser/nokogiri.rb

@@ -1,6 +1,6 @@
 require "nokogiri"
 
-module Nori
+class Nori
   module Parser
 
     # = Nori::Parser::Nokogiri
@@ -9,14 +9,14 @@ module Nori
     module Nokogiri
 
       class Document < ::Nokogiri::XML::SAX::Document
-        attr_accessor :nori
+        attr_accessor :options
 
         def stack
           @stack ||= []
         end
 
         def start_element(name, attrs = [])
-          stack.push Nori::XMLUtilityNode.new(nori, name, Hash[*attrs.flatten])
+          stack.push Nori::XMLUtilityNode.new(options, name, Hash[*attrs.flatten])
         end
 
         def end_element(name)
@@ -34,11 +34,9 @@ module Nori
 
       end
 
-      def self.parse(xml, nori)
-        return {} if xml.strip.empty?
-
+      def self.parse(xml, options)
         document = Document.new
-        document.nori = nori
+        document.options = options
         parser = ::Nokogiri::XML::SAX::Parser.new document
         parser.parse xml
         document.stack.length > 0 ? document.stack.pop.to_hash : {}

data/lib/nori/parser/rexml.rb

@@ -1,6 +1,6 @@
 require "rexml/parsers/baseparser"
 
-module Nori
+class Nori
   module Parser
 
     # = Nori::Parser::REXML
@@ -8,7 +8,7 @@ module Nori
     # REXML pull parser.
     module REXML
 
-      def self.parse(xml, nori)
+      def self.parse(xml, options)
         stack = []
         parser = ::REXML::Parsers::BaseParser.new(xml)
 
@@ -20,7 +20,7 @@ module Nori
           when :end_doctype, :start_doctype
             # do nothing
           when :start_element
-            stack.push Nori::XMLUtilityNode.new(nori, event[1], event[2])
+            stack.push Nori::XMLUtilityNode.new(options, event[1], event[2])
           when :end_element
             if stack.size > 1
               temp = stack.pop

data/lib/nori/string_io_file.rb

@@ -1,4 +1,4 @@
-module Nori
+class Nori
   class StringIOFile < StringIO
 
     attr_accessor :original_filename, :content_type

data/lib/nori/string_with_attributes.rb

@@ -1,4 +1,4 @@
-module Nori
+class Nori
   class StringWithAttributes < String
 
     attr_accessor :attributes

data/lib/nori/version.rb

@@ -1,5 +1,5 @@
-module Nori
+class Nori
 
-  VERSION = "1.1.5"
+  VERSION = "2.0.0"
 
 end

data/lib/nori/xml_utility_node.rb

@@ -1,5 +1,4 @@
 require "rexml/text"
-require "rexml/document"
 require "date"
 require "time"
 require "yaml"
@@ -8,7 +7,7 @@ require "bigdecimal"
 require "nori/string_with_attributes"
 require "nori/string_io_file"
 
-module Nori
+class Nori
 
   # This is a slighly modified version of the XMLUtilityNode from
   # http://merb.devjavu.com/projects/merb/ticket/95 (has.sox@gmail.com)
@@ -78,21 +77,23 @@ module Nori
     self.typecasts["decimal"]       = lambda { |v| v.nil? ? nil : BigDecimal(v.to_s) }
     self.typecasts["double"]        = lambda { |v| v.nil? ? nil : v.to_f }
     self.typecasts["float"]         = lambda { |v| v.nil? ? nil : v.to_f }
+    self.typecasts["symbol"]        = lambda { |v| v.nil? ? nil : v.to_sym }
     self.typecasts["string"]        = lambda { |v| v.to_s }
+    self.typecasts["yaml"]          = lambda { |v| v.nil? ? nil : YAML.load(v) }
     self.typecasts["base64Binary"]  = lambda { |v| v.unpack('m').first }
 
     self.available_typecasts = self.typecasts.keys
 
-    def initialize(nori, name, normalized_attributes = {})
+    def initialize(options, name, normalized_attributes = {})
       # unnormalize attribute values
       attributes = Hash[* normalized_attributes.map do |key, value|
         [ key, unnormalize_xml_entities(value) ]
       end.flatten]
 
-      @nori = nori
-      @name = name.tr("-", "_")
-      @name = @name.split(":").last if @nori.strip_namespaces?
-      @name = @nori.convert_tag(@name) if @nori.convert_tags?
+      @options = options
+      @name    = name.tr("-", "_")
+      @name    = @name.split(":").last if @options[:strip_namespaces]
+      @name    = @options[:convert_tags_to].call(@name) if @options[:convert_tags_to].respond_to? :call
 
       # leave the type alone if we don't know what it is
       @type = self.class.available_typecasts.include?(attributes["type"]) ? attributes.delete("type") : attributes["type"]
@@ -119,7 +120,8 @@ module Nori
     end
 
     def prefixed_attribute_name(attribute)
-      @nori.convert_tags? ? @nori.convert_tag(attribute) : attribute
+      return attribute unless @options[:convert_tags_to].respond_to? :call
+      @options[:convert_tags_to].call(attribute)
     end
 
     def add_node(node)
@@ -137,7 +139,7 @@ module Nori
 
       if @text
         t = typecast_value unnormalize_xml_entities(inner_html)
-        t = advanced_typecasting(t) if t.is_a?(String) && @nori.advanced_typecasting?
+        t = advanced_typecasting(t) if t.is_a?(String) && @options[:advanced_typecasting]
 
         if t.is_a?(String)
           t = StringWithAttributes.new(t)

data/nori.gemspec

@@ -7,15 +7,15 @@ Gem::Specification.new do |s|
   s.version     = Nori::VERSION
   s.authors     = ["Daniel Harrington", "John Nunemaker", "Wynn Netherland"]
   s.email       = "me@rubiii.com"
-  s.homepage    = "http://github.com/rubiii/nori"
+  s.homepage    = "https://github.com/savonrb/nori"
   s.summary     = "XML to Hash translator"
   s.description = s.summary
 
   s.rubyforge_project = "nori"
 
-  s.add_development_dependency "rake",     "~> 0.8.7"
+  s.add_development_dependency "rake",     "~> 10.0"
   s.add_development_dependency "nokogiri", ">= 1.4.0"
-  s.add_development_dependency "rspec",    "~> 2.5.0"
+  s.add_development_dependency "rspec",    "~> 2.12"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/nori/api_spec.rb

@@ -0,0 +1,108 @@
+require "spec_helper"
+
+describe Nori do
+
+  describe "PARSERS" do
+    it "should return a Hash of parser details" do
+      Nori::PARSERS.should == { :rexml => "REXML", :nokogiri => "Nokogiri" }
+    end
+  end
+
+  context ".new" do
+    it "defaults to not strip any namespace identifiers" do
+      xml = <<-XML
+        <history xmlns:ns10="http://ns10.example.com">
+          <ns10:case>a_case</ns10:case>
+        </history>
+      XML
+
+      nori.parse(xml)["history"]["ns10:case"].should == "a_case"
+    end
+
+    it "defaults to not change XML tags" do
+      xml = '<userResponse id="1"><accountStatus>active</accountStatus></userResponse>'
+      nori.parse(xml).should == { "userResponse" => { "@id" => "1", "accountStatus" => "active" } }
+    end
+
+    it "raises when passed unknown global options" do
+      expect { Nori.new(:invalid => true) }.
+        to raise_error(ArgumentError, /Spurious options: \[:invalid\]/)
+    end
+  end
+
+  context ".new with :strip_namespaces" do
+    it "strips the namespace identifiers when set to true" do
+      xml = '<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"></soap:Envelope>'
+      nori(:strip_namespaces => true).parse(xml).should have_key("Envelope")
+    end
+
+    it "still converts namespaced entries to array elements" do
+      xml = <<-XML
+        <history
+            xmlns:ns10="http://ns10.example.com"
+            xmlns:ns11="http://ns10.example.com">
+          <ns10:case><ns10:name>a_name</ns10:name></ns10:case>
+          <ns11:case><ns11:name>another_name</ns11:name></ns11:case>
+        </history>
+      XML
+
+      expected = [{ "name" => "a_name" }, { "name" => "another_name" }]
+      nori(:strip_namespaces => true).parse(xml)["history"]["case"].should == expected
+    end
+  end
+
+  context ".new with :convert_tags_to" do
+    it "converts all tags by a given formula" do
+      xml = '<userResponse id="1"><accountStatus>active</accountStatus></userResponse>'
+
+      snakecase_symbols = lambda { |tag| tag.snakecase.to_sym }
+      nori = nori(:convert_tags_to => snakecase_symbols)
+
+      nori.parse(xml).should == { :user_response => { :@id => "1", :account_status => "active" } }
+    end
+  end
+
+  context "#parse" do
+    it "defaults to use advanced typecasting" do
+      hash = nori.parse("<value>true</value>")
+      hash["value"].should == true
+    end
+
+    it "defaults to use the Nokogiri parser" do
+      # parsers are loaded lazily by default
+      require "nori/parser/nokogiri"
+
+      Nori::Parser::Nokogiri.should_receive(:parse).once
+      nori.parse("<any>thing</any>")
+    end
+
+    it "strips the XML" do
+      xml = double("xml")
+      xml.should_receive(:strip).and_return("<any>thing</any>")
+
+      nori.parse(xml).should == { "any" => "thing" }
+    end
+  end
+
+  context "#parse without :advanced_typecasting" do
+    it "can be changed to not typecast too much" do
+      hash = nori(:advanced_typecasting => false).parse("<value>true</value>")
+      hash["value"].should == "true"
+    end
+  end
+
+  context "#parse with :parser" do
+    it "can be configured to use the REXML parser" do
+      # parsers are loaded lazily by default
+      require "nori/parser/rexml"
+
+      Nori::Parser::REXML.should_receive(:parse).once
+      nori(:parser => :rexml).parse("<any>thing</any>")
+    end
+  end
+
+  def nori(options = {})
+    Nori.new(options)
+  end
+
+end

data/spec/nori/nori_spec.rb

@@ -2,16 +2,11 @@ require "spec_helper"
 
 describe Nori do
 
-  Nori::Parser::PARSERS.each do |parser, class_name|
+  Nori::PARSERS.each do |parser, class_name|
     context "using the :#{parser} parser" do
 
       let(:parser) { parser }
 
-      it "should work with unnormalized characters" do
-        xml = '<root>&amp;</root>'
-        parse(xml).should == { 'root' => "&" }
-      end
-
       it "should transform a simple tag with content" do
         xml = "<tag>This is the contents</tag>"
         parse(xml).should == { 'tag' => 'This is the contents' }
@@ -92,40 +87,33 @@ describe Nori do
       end
 
       context "without advanced typecasting" do
-        around do |example|
-          Nori.advanced_typecasting = false
-          example.run
-          Nori.advanced_typecasting = true
-        end
-
         it "should not transform 'true'" do
-          parse("<value>true</value>")["value"].should == "true"
+          hash = parse("<value>true</value>", :advanced_typecasting => false)
+          hash["value"].should == "true"
         end
 
         it "should not transform 'false'" do
-          parse("<value>false</value>")["value"].should == "false"
+          hash = parse("<value>false</value>", :advanced_typecasting => false)
+          hash["value"].should == "false"
         end
 
         it "should not transform Strings matching the xs:time format" do
-          parse("<value>09:33:55Z</value>")["value"].should == "09:33:55Z"
+          hash = parse("<value>09:33:55Z</value>", :advanced_typecasting => false)
+          hash["value"].should == "09:33:55Z"
         end
 
         it "should not transform Strings matching the xs:date format" do
-          parse("<value>1955-04-18-05:00</value>")["value"].should == "1955-04-18-05:00"
+          hash = parse("<value>1955-04-18-05:00</value>", :advanced_typecasting => false)
+          hash["value"].should == "1955-04-18-05:00"
         end
 
         it "should not transform Strings matching the xs:dateTime format" do
-          parse("<value>1955-04-18T11:22:33-05:00</value>")["value"].should == "1955-04-18T11:22:33-05:00"
+          hash = parse("<value>1955-04-18T11:22:33-05:00</value>", :advanced_typecasting => false)
+          hash["value"].should == "1955-04-18T11:22:33-05:00"
         end
       end
 
       context "with advanced typecasting" do
-        around do |example|
-          Nori.advanced_typecasting = true
-          example.run
-          Nori.advanced_typecasting = false
-        end
-
         it "should transform 'true' to TrueClass" do
           parse("<value>true</value>")["value"].should == true
         end
@@ -294,46 +282,6 @@ describe Nori do
         parse(xml)['tag_1'].keys.should include('@attr_1')
       end
 
-      context "with strip_namespaces set to true" do
-        around do |example|
-          Nori.strip_namespaces = true
-          example.run
-          Nori.strip_namespaces = false
-        end
-
-        it "should strip the namespace from every tag" do
-          xml = '<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"></soap:Envelope>'
-          parse(xml).should have_key("Envelope")
-        end
-
-        it "converts namespaced entries to array elements" do
-          xml = <<-XML
-            <history
-                xmlns:ns10="http://ns10.example.com"
-                xmlns:ns11="http://ns10.example.com">
-              <ns10:case><ns10:name>a_name</ns10:name></ns10:case>
-              <ns11:case><ns11:name>another_name</ns11:name></ns11:case>
-            </history>
-          XML
-
-          expected_case = [{ "name" => "a_name" }, { "name" => "another_name" }]
-          parse(xml)["history"]["case"].should == expected_case
-        end
-      end
-
-      context "with convert_tags_to set to a custom formula" do
-        around do |example|
-          Nori.convert_tags_to { |tag| tag.snakecase.to_sym }
-          example.run
-          Nori.convert_tags_to(nil)
-        end
-
-        it "transforms the tags to snakecase Symbols" do
-          xml = '<userResponse id="1"><accountStatus>active</accountStatus></userResponse>'
-          parse(xml).should == { :user_response => { :@id => "1", :account_status => "active" } }
-        end
-      end
-
       it "should render nested content correctly" do
         xml = "<root><tag1>Tag1 Content <em><strong>This is strong</strong></em></tag1></root>"
         parse(xml)['root']['tag1'].should == "Tag1 Content <em><strong>This is strong</strong></em>"
@@ -400,8 +348,7 @@ describe Nori do
           'approved'   => nil,
           'written_on' => nil,
           'viewed_at'  => nil,
-          # don't execute arbitary YAML code
-          'content'    => { "@type" => "yaml" },
+          'content'    => nil,
           'parent_id'  => nil,
           'nil_true'   => nil,
           'namespaced' => nil
@@ -420,7 +367,7 @@ describe Nori do
             <replies-close-in type="integer">2592000000</replies-close-in>
             <written-on type="date">2003-07-16</written-on>
             <viewed-at type="datetime">2003-07-16T09:28:00+0000</viewed-at>
-            <content type="yaml">--- \n1: should be an integer\n:message: Have a nice day\narray: \n- should-have-dashes: true\n  should_have_underscores: true</content>
+            <content type="yaml">--- \n1: should be an integer\n:message: Have a nice day\narray: \n- should-have-dashes: true\n  should_have_underscores: true\n</content>
             <author-email-address>david@loudthinking.com</author-email-address>
             <parent-id></parent-id>
             <ad-revenue type="decimal">1.5</ad-revenue>
@@ -441,13 +388,12 @@ describe Nori do
           # Changed this line where the key is :message.  The yaml specifies this as a symbol, and who am I to change what you specify
           # The line in ActiveSupport is
           # 'content' => { 'message' => "Have a nice day", 1 => "should be an integer", "array" => [{ "should-have-dashes" => true, "should_have_underscores" => true }] },
-          'content' => "--- \n1: should be an integer\n:message: Have a nice day\narray: \n- should-have-dashes: true\n  should_have_underscores: true",
+          'content' => { :message => "Have a nice day", 1 => "should be an integer", "array" => [{ "should-have-dashes" => true, "should_have_underscores" => true }] },
           'author_email_address' => "david@loudthinking.com",
           'parent_id' => nil,
           'ad_revenue' => BigDecimal("1.50"),
           'optimum_viewing_angle' => 135.0,
-          # don't create symbols from arbitary remote code
-          'resident' => "yes"
+          'resident' => :yes
         }
 
         parse(topic_xml)["topic"].each do |k,v|
@@ -667,29 +613,11 @@ describe Nori do
       end
 
     end
-
-    describe "using different nori" do
-      let(:parser) { parser }
-      let(:different_nori) do
-        module DifferentNori
-          extend Nori
-        end
-        DifferentNori.configure do |config|
-          config.convert_tags_to { |tag| tag.upcase }
-        end
-        DifferentNori
-      end
-
-      it "should transform with different nori" do
-        xml = "<SomeThing>xml</SomeThing>"
-        parse(xml).should == { "SomeThing" => "xml" }
-        different_nori.parse(xml, parser).should == { "SOMETHING" => "xml" }
-      end
-    end
   end
 
-  def parse(xml)
-    Nori.parse xml, parser
+  def parse(xml, options = {})
+    defaults = { :parser => parser }
+    Nori.new(defaults.merge(options)).parse(xml)
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nori
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-03 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -20,7 +20,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,7 +28,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -60,7 +60,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '2.12'
 description: XML to Hash translator
 email: me@rubiii.com
 executables: []
@@ -82,7 +82,6 @@ files:
 - lib/nori/core_ext/hash.rb
 - lib/nori/core_ext/object.rb
 - lib/nori/core_ext/string.rb
-- lib/nori/parser.rb
 - lib/nori/parser/nokogiri.rb
 - lib/nori/parser/rexml.rb
 - lib/nori/string_io_file.rb
@@ -90,13 +89,13 @@ files:
 - lib/nori/version.rb
 - lib/nori/xml_utility_node.rb
 - nori.gemspec
+- spec/nori/api_spec.rb
 - spec/nori/core_ext/hash_spec.rb
 - spec/nori/core_ext/object_spec.rb
 - spec/nori/core_ext/string_spec.rb
 - spec/nori/nori_spec.rb
-- spec/nori/parser_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/rubiii/nori
+homepage: https://github.com/savonrb/nori
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -110,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2754004364554343980
+      hash: 378604752016210991
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -119,17 +118,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2754004364554343980
+      hash: 378604752016210991
 requirements: []
 rubyforge_project: nori
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: XML to Hash translator
 test_files:
+- spec/nori/api_spec.rb
 - spec/nori/core_ext/hash_spec.rb
 - spec/nori/core_ext/object_spec.rb
 - spec/nori/core_ext/string_spec.rb
 - spec/nori/nori_spec.rb
-- spec/nori/parser_spec.rb
 - spec/spec_helper.rb

data/lib/nori/parser.rb

@@ -1,51 +0,0 @@
-module Nori
-
-  # = Nori::Parser
-  #
-  # Manages the parser classes. Currently supports:
-  #
-  # * REXML
-  # * Nokogiri
-  module Parser
-
-    # The default parser.
-    DEFAULT = :rexml
-
-    # List of available parsers.
-    PARSERS = { :rexml => "REXML", :nokogiri => "Nokogiri" }
-
-    # Returns the parser to use. Defaults to <tt>Nori::Parser::REXML</tt>.
-    def self.use
-      @use ||= DEFAULT
-    end
-
-    # Sets the +parser+ to use. Raises an +ArgumentError+ unless the +parser+ exists.
-    def self.use=(parser)
-      validate_parser! parser
-      @use = parser
-    end
-
-    # Returns the parsed +xml+ using the parser to use. Raises an +ArgumentError+
-    # unless the optional or default +parser+ exists.
-    def self.parse(xml, parser = nil, nori = Nori)
-      load_parser(parser).parse(xml, nori)
-    end
-
-  private
-
-    # Raises an +ArgumentError+ unless the +parser+ exists.
-    def self.validate_parser!(parser)
-      raise ArgumentError, "Invalid Nori parser: #{parser}" unless PARSERS[parser]
-    end
-
-    # Requires and returns the +parser+ to use.
-    def self.load_parser(parser)
-      parser ||= use
-      validate_parser! parser
-
-      require "nori/parser/#{parser}"
-      const_get PARSERS[parser]
-    end
-
-  end
-end

data/spec/nori/parser_spec.rb

@@ -1,54 +0,0 @@
-require "spec_helper"
-
-describe Nori::Parser do
-  let(:parser) { Nori::Parser }
-
-  describe "::PARSERS" do
-    it "should return a Hash of parser details" do
-      Nori::Parser::PARSERS.should == { :rexml => "REXML", :nokogiri => "Nokogiri" }
-    end
-  end
-
-  describe ".use" do
-    it "should default to REXML" do
-      parser.use.should == Nori::Parser::DEFAULT
-    end
-
-    it "should accept a parser to use" do
-      parser.use = :nokogiri
-      parser.use.should == :nokogiri
-
-      # reset to default
-      parser.use = Nori::Parser::DEFAULT
-      parser.use.should == Nori::Parser::DEFAULT
-    end
-
-    it "should raise an ArgumentError in case of an invalid parser" do
-      lambda { parser.use = :unknown }.should raise_error(ArgumentError)
-    end
-  end
-
-  describe ".parse" do
-    it "should load the parser to use and parse the given xml" do
-      parser.parse("<some>xml</some>").should == { "some" => "xml" }
-    end
-  end
-
-  describe ".parse with different nori" do
-    let(:other_nori) do
-      module OtherNori
-        extend Nori
-      end
-      OtherNori.configure do |config|
-        config.convert_tags_to { |tag| tag.upcase }
-      end
-      OtherNori
-    end
-
-    it "should load the parser to use and parse the given xml" do
-      parser.parse("<SomeThing>xml</SomeThing>").should == { "SomeThing" => "xml" }
-      parser.parse("<SomeThing>xml</SomeThing>", nil, other_nori).should == { "SOMETHING" => "xml" }
-    end
-  end
-
-end