nori 2.0.4 → 2.1.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 2.1.0 (2013-04-21)
+
+* Feature: Added `Nori.hash_key` and `Nori#find` to work with Hash keys generated by Nori.
+  Original issue: [savonrb/savon#393](https://github.com/savonrb/savon/pull/393)
+
 # 2.0.4 (2013-02-26)
 
 * Fix: [#37](https://github.com/savonrb/nori/issues/37) special characters
@@ -40,6 +45,17 @@ Please make sure to read the updated README for how to use the new version.
 
 * Fix: [#16](https://github.com/savonrb/nori/issues/16) strip XML passed to Nori.
 
+## 1.1.5 (2013-03-03)
+
+* Fix: [#37](https://github.com/savonrb/nori/issues/37) special characters
+  problem on Ruby 1.9.3-p392.
+
+## 1.1.4 (2013-01-10)
+
+* 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!
+
 ## 1.1.3 (2012-07-12)
 
 * Fix: Merged [pull request 21](https://github.com/savonrb/nori/pull/21) to fix an

data/Gemfile

@@ -1,4 +1,2 @@
-source :rubygems
-
-# Specify your gem's dependencies in nori.gemspec
+source 'https://rubygems.org'
 gemspec

data/lib/nori.rb

@@ -4,6 +4,13 @@ require "nori/xml_utility_node"
 
 class Nori
 
+  def self.hash_key(name, 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
+    name
+  end
+
   PARSERS = { :rexml => "REXML", :nokogiri => "Nokogiri" }
 
   def initialize(options = {})
@@ -18,6 +25,16 @@ class Nori
     @options = defaults.merge(options)
   end
 
+  def find(hash, *path)
+    return hash if path.empty?
+
+    key = path.shift
+    key = self.class.hash_key(key, @options)
+
+    return nil unless hash.include? key
+    find(hash[key], *path)
+  end
+
   def parse(xml)
     cleaned_xml = xml.strip
     return {} if cleaned_xml.empty?

data/lib/nori/version.rb

@@ -1,5 +1,5 @@
 class Nori
 
-  VERSION = "2.0.4"
+  VERSION = "2.1.0"
 
 end

data/lib/nori/xml_utility_node.rb

@@ -90,9 +90,7 @@ class Nori
       end.flatten]
 
       @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
+      @name = Nori.hash_key(name, options)
 
       # 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"]

data/spec/nori/api_spec.rb

@@ -62,6 +62,31 @@ describe Nori do
     end
   end
 
+	context '#find' do
+		before do
+      upcase = lambda { |tag| tag.upcase }
+			@nori = nori(:convert_tags_to => upcase)
+
+      xml = '<userResponse id="1"><accountStatus>active</accountStatus></userResponse>'
+			@hash = @nori.parse(xml)
+		end
+
+		it 'returns the Hash when the path is empty' do
+			result = @nori.find(@hash)
+			expect(result).to eq("USERRESPONSE" => { "ACCOUNTSTATUS" => "active", "@ID" => "1" })
+		end
+
+		it 'returns the result for a single key' do
+			result = @nori.find(@hash, 'userResponse')
+			expect(result).to eq("ACCOUNTSTATUS" => "active", "@ID" => "1")
+		end
+
+		it 'returns the result for nested keys' do
+			result = @nori.find(@hash, 'userResponse', 'accountStatus')
+			expect(result).to eq("active")
+		end
+	end
+
   context "#parse" do
     it "defaults to use advanced typecasting" do
       hash = nori.parse("<value>true</value>")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nori
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -109,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1629927021843471619
+      hash: 2288822480346077713
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1629927021843471619
+      hash: 2288822480346077713
 requirements: []
 rubyforge_project: nori
 rubygems_version: 1.8.24