nori 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e19155f25d041f2c528280d6985a66128069105
-  data.tar.gz: a0446834296e76ef56b850fda6d40f455c10bf3f
+  metadata.gz: 7a4585ff58e2073a1108c7961be22c7f3caf5c80
+  data.tar.gz: b9ab6223657d1839d7a2e4553b7d5a84452bf4c7
 SHA512:
-  metadata.gz: acdcd81ae0503f8efb3bfbba9975c7c686b3913ca570f7e3b037bd8625517e8be1918e1943223681563222ca6621db655d91423d8f80cd9ad17d979e8d4cf33e
-  data.tar.gz: 3e898eedb82cc8d3fe3041f69c3e2879522c9112bddd508da6c704374f652e3ccf05cdab511fa0d2ff881155cad6aee82eacac909af2f058a9ea503dc48b02f4
+  metadata.gz: 432b9de3992b4d4b16a6bfa2fa2e222dbaf11f478ebac4e1f73f8c565ff8d30952a03ee65d6bdd224fb409c82972340ed25817110aeb6ec396974ff50cb11709
+  data.tar.gz: aae0fa14740a20a9f4e5419261a22ad4733da0a2b841e56dbc080bad205f7bfc98a386bb4cf674d8457e20b6e1b7a6c38af9ee4f76b64fb14cd04d4ee1e6d1a5

data/.travis.yml

@@ -1,8 +1,11 @@
+# https://github.com/travis-ci/travis-ci/wiki/.travis.yml-options
+language: "ruby"
 script: "bundle exec rake"
 rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0
   - jruby-18mode
   - jruby-19mode
   - rbx-18mode

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.3.0 (2013-07-26)
+
+* Change: `Nori#find` now ignores namespace prefixes in Hash keys it is searching through.
+
+* Fix: Limited Nokogiri to < 1.6, because v1.6 dropped support for Ruby 1.8.
+
 # 2.2.0 (2013-04-25)
 
 * Feature: [#42](https://github.com/savonrb/nori/pull/42) adds the `:delete_namespace_attributes`

data/README.md

@@ -1,6 +1,12 @@
-Nori [![Build Status](https://secure.travis-ci.org/savonrb/nori.png)](http://travis-ci.org/savonrb/nori)
+Nori
 ====
 
+[![Build Status](https://secure.travis-ci.org/savonrb/nori.png)](http://travis-ci.org/savonrb/nori)
+[![Gem Version](https://badge.fury.io/rb/nori.png)](http://badge.fury.io/rb/nori)
+[![Code Climate](https://codeclimate.com/github/savonrb/nori.png)](https://codeclimate.com/github/savonrb/nori)
+[![Coverage Status](https://coveralls.io/repos/savonrb/nori/badge.png?branch=master)](https://coveralls.io/r/savonrb/nori)
+
+
 Really simple XML parsing ripped from Crack which ripped it from Merb.  
 Nori was created to bypass the stale development of Crack, improve its XML parser  
 and fix certain issues.
@@ -12,10 +18,10 @@ parser.parse("<tag>This is the contents</tag>")
 ```
 
 Nori supports pluggable parsers and ships with both REXML and Nokogiri implementations.  
-It defaults to REXML, but you can change it to use Nokogiri via:
+It defaults to Nokogiri since v2.0.0, but you can change it to use REXML via:
 
 ``` ruby
-Nori.new(:parser => :nokogiri)  # or :rexml
+Nori.new(:parser => :rexml)  # or :nokogiri
 ```
 
 Make sure Nokogiri is in your LOAD_PATH when parsing XML, because Nori tries to load it  

data/benchmark/benchmark.rb

@@ -9,11 +9,11 @@ Benchmark.bm 30 do |x|
   xml = File.read File.expand_path("../soap_response.xml", __FILE__)
 
   x.report "rexml parser" do
-    num.times { Nori.parse xml, :rexml }
+    num.times { Nori.new(parser: :rexml).parse xml }
   end
 
   x.report "nokogiri parser" do
-    num.times { Nori.parse xml, :nokogiri }
+    num.times { Nori.new(parser: :nokogiri).parse xml }
   end
 
 end

data/lib/nori.rb

@@ -32,8 +32,8 @@ class Nori
     key = path.shift
     key = self.class.hash_key(key, @options)
 
-    return nil unless hash.include? key
-    find(hash[key], *path)
+    value = find_value(hash, key)
+    find(value, *path) if value
   end
 
   def parse(xml)
@@ -60,4 +60,13 @@ class Nori
     end
   end
 
+  def find_value(hash, key)
+    hash.each do |k, v|
+      key_without_namespace = k.to_s.split(':').last
+      return v if key_without_namespace == key.to_s
+    end
+
+    nil
+  end
+
 end

data/lib/nori/parser/rexml.rb

@@ -1,4 +1,6 @@
 require "rexml/parsers/baseparser"
+require "rexml/text"
+require "rexml/document"
 
 class Nori
   module Parser
@@ -13,7 +15,7 @@ class Nori
         parser = ::REXML::Parsers::BaseParser.new(xml)
 
         while true
-          event = parser.pull
+          event = unnormalize(parser.pull)
           case event[0]
           when :end_document
             break
@@ -32,7 +34,18 @@ class Nori
         end
         stack.length > 0 ? stack.pop.to_hash : {}
       end
-    end
 
+      def self.unnormalize(event)
+        event.map! do |el|
+          if el.is_a?(String)
+            ::REXML::Text.unnormalize(el)
+          elsif el.is_a?(Hash)
+            el.each {|k,v| el[k] = ::REXML::Text.unnormalize(v)}
+          else
+            el
+          end
+        end
+      end
+    end
   end
 end

data/lib/nori/version.rb

@@ -1,5 +1,5 @@
 class Nori
 
-  VERSION = "2.2.0"
+  VERSION = "2.3.0"
 
 end

data/lib/nori/xml_utility_node.rb

@@ -1,5 +1,3 @@
-require "rexml/text"
-require "rexml/document"
 require "date"
 require "time"
 require "yaml"
@@ -83,12 +81,7 @@ class Nori
 
     self.available_typecasts = self.typecasts.keys
 
-    def initialize(options, name, normalized_attributes = {})
-      # unnormalize attribute values
-      attributes = Hash[* normalized_attributes.map do |key, value|
-        [ key, unnormalize_xml_entities(value) ]
-      end.flatten]
-
+    def initialize(options, name, attributes = {})
       @options = options
       @name = Nori.hash_key(name, options)
 
@@ -136,7 +129,7 @@ class Nori
       end
 
       if @text
-        t = typecast_value unnormalize_xml_entities(inner_html)
+        t = typecast_value(inner_html)
         t = advanced_typecasting(t) if t.is_a?(String) && @options[:advanced_typecasting]
 
         if t.is_a?(String)
@@ -250,11 +243,6 @@ class Nori
 
   private
 
-    # TODO: replace REXML
-    def unnormalize_xml_entities value
-      REXML::Text.unnormalize(value)
-    end
-
     def try_to_convert(value, &block)
       block.call(value)
     rescue ArgumentError

data/nori.gemspec

@@ -12,9 +12,10 @@ Gem::Specification.new do |s|
   s.description = s.summary
 
   s.rubyforge_project = "nori"
+  s.license = "MIT"
 
   s.add_development_dependency "rake",     "~> 10.0"
-  s.add_development_dependency "nokogiri", ">= 1.4.0"
+  s.add_development_dependency "nokogiri", ">= 1.4.0", "< 1.6"
   s.add_development_dependency "rspec",    "~> 2.12"
 
   s.files         = `git ls-files`.split("\n")

data/spec/nori/api_spec.rb

@@ -85,6 +85,14 @@ describe Nori do
 			result = @nori.find(@hash, 'userResponse', 'accountStatus')
 			expect(result).to eq("active")
 		end
+
+		it 'strips the namespaces from Hash keys' do
+			xml = '<v1:userResponse xmlns:v1="http://example.com"><v1:accountStatus>active</v1:accountStatus></v1:userResponse>'
+			hash = @nori.parse(xml)
+
+			result = @nori.find(hash, 'userResponse', 'accountStatus')
+			expect(result).to eq("active")
+		end
 	end
 
   context "#parse" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nori
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Daniel Harrington
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -33,6 +33,9 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -40,6 +43,9 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -89,7 +95,8 @@ files:
 - spec/nori/nori_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/savonrb/nori
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -107,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: nori
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: XML to Hash translator