aggcat 0.2.1 → 0.2.2

data/aggcat.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.required_rubygems_version = '>= 1.3.6'
 
   spec.add_dependency 'oauth', '>= 0.4'
-  spec.add_dependency 'nori', '>= 2.0'
+  spec.add_dependency 'xmlhasher', '>= 0.0.4'
   spec.add_dependency 'nokogiri', '>= 1.5'
   spec.add_dependency 'builder', '>= 3.0'
   spec.add_dependency 'activesupport', '>= 3.2'

data/lib/aggcat/base.rb

@@ -4,10 +4,10 @@ require 'base64'
 require 'cgi'
 require 'net/https'
 require 'nokogiri'
-require 'nori'
 require 'oauth'
 require 'openssl'
 require 'securerandom'
+require 'xmlhasher'
 require 'uri'
 
 module Aggcat
@@ -76,21 +76,8 @@ module Aggcat
 
     def parse_xml(data)
       return data if data.nil? || data.to_s.empty?
-      @parser ||= Nori.new(:parser => :nokogiri,
-                           :strip_namespaces => true,
-                           :convert_tags_to => lambda { |tag| tag.snakecase.to_sym })
-      cleanup(@parser.parse(data))
-    end
-
-    def cleanup(hash)
-      hash.each do |k, v|
-        if k.to_s[/^@xmlns/]
-          hash.delete(k)
-        elsif v.respond_to?(:keys)
-          cleanup(v)
-        end
-      end
-      hash
+      @parser ||= XmlHasher::Parser.new(snakecase: true, ignore_namespaces: true)
+      @parser.parse(data)
     end
   end
 end

data/lib/aggcat/version.rb

@@ -1,3 +1,3 @@
 module Aggcat
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/test/aggcat/client_test.rb

@@ -179,9 +179,9 @@ class ClientTest < Test::Unit::TestCase
     challenge_session_id = '1234'
     challenge_node_id = '4321'
     answer = 'answer'
-    parser = Nori.new(:parser => :nokogiri, :strip_namespaces => true, :convert_tags_to => lambda { |tag| tag.snakecase.to_sym })
+    parser = XmlHasher::Parser.new(snakecase: true, ignore_namespaces: true)
     stub_get("/institutions/#{institution_id}").to_return(:body => fixture('institution.xml'), :headers => {:content_type => 'application/xml; charset=utf-8'})
-    stub_post("/institutions/#{institution_id}/logins").to_return(:body => lambda { |request| assert_equal(parser.parse(fixture('challenge.xml').read), parser.parse(request.body)) })
+    stub_post("/institutions/#{institution_id}/logins").to_return(:body => lambda { |request| assert_equal(parser.parse(fixture('challenge.xml')), parser.parse(request.body)) })
     @client.account_confirmation(institution_id, challenge_session_id, challenge_node_id, answer)
   end
 
@@ -191,8 +191,8 @@ class ClientTest < Test::Unit::TestCase
     challenge_node_id = '4321'
     answer = 'answer'
     validator = lambda do |request|
-      parser = Nori.new(:parser => :nokogiri, :strip_namespaces => true, :convert_tags_to => lambda { |tag| tag.snakecase.to_sym })
-      assert_equal(parser.parse(fixture('challenge.xml').read), parser.parse(request.body))
+      parser = XmlHasher::Parser.new(snakecase: true, ignore_namespaces: true)
+      assert_equal(parser.parse(fixture('challenge.xml')), parser.parse(request.body))
       assert_equal(challenge_session_id, request.headers['Challengesessionid'])
       assert_equal(challenge_node_id, request.headers['Challengenodeid'])
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aggcat
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
@@ -28,13 +28,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: nori
+  name: xmlhasher
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement