wash_out 0.5.6 → 0.6.0

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.6.0
+
+* Switched to Savon2 family
+* Main spec refactored greatly
+
 ## 0.5.4
 
 * Ability to manually specify `response_tag` for `soap_action` [@inossidabile][]

data/Gemfile

@@ -1,2 +1,15 @@
 source "http://rubygems.org"
+
 gemspec
+
+gem 'wasabi'
+gem 'savon'
+gem 'httpi', :git => 'git://github.com/savonrb/httpi.git'
+
+gem 'rspec-rails'
+gem 'guard'
+gem 'guard-rspec'
+gem 'rb-fsevent'
+gem 'appraisal'
+gem 'tzinfo'
+gem 'pry'

data/Gemfile.lock

@@ -1,8 +1,15 @@
+GIT
+  remote: git://github.com/savonrb/httpi.git
+  revision: 6536d498160ecb0e969bb161ad091c49493f6bc2
+  specs:
+    httpi (2.0.0)
+      rack
+
 PATH
   remote: .
   specs:
-    wash_out (0.5.5)
-      nori (~> 1.1.0)
+    wash_out (0.6.0)
+      nori (~> 2.0.0)
 
 GEM
   remote: http://rubygems.org/
@@ -33,8 +40,6 @@ GEM
     coderay (1.0.8)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    ffi (1.2.0)
-    ffi (1.2.0-java)
     guard (1.6.1)
       listen (>= 0.6.0)
       lumberjack (>= 1.0.2)
@@ -46,8 +51,6 @@ GEM
     gyoku (1.0.0)
       builder (>= 2.1.2)
     hike (1.2.1)
-    httpi (0.9.7)
-      rack
     i18n (0.6.1)
     journey (1.0.4)
     json (1.7.5)
@@ -58,7 +61,7 @@ GEM
     multi_json (1.5.0)
     nokogiri (1.5.6)
     nokogiri (1.5.6-java)
-    nori (1.1.3)
+    nori (2.0.0)
     pry (0.9.10)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -84,8 +87,6 @@ GEM
       thor (>= 0.14.6, < 2.0)
     rake (10.0.3)
     rb-fsevent (0.9.2)
-    rb-inotify (0.8.8)
-      ffi (>= 0.5.0)
     rdoc (3.12)
       json (~> 1.4)
     rspec (2.12.0)
@@ -103,14 +104,14 @@ GEM
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
       rspec-mocks (~> 2.12.0)
-    savon (0.9.9)
-      akami (~> 1.0)
+    savon (2.0.2)
+      akami (~> 1.2.0)
       builder (>= 2.1.2)
-      gyoku (>= 0.4.0)
-      httpi (~> 0.9)
+      gyoku (~> 1.0.0)
+      httpi (~> 2.0.0)
       nokogiri (>= 1.4.0)
-      nori (~> 1.1)
-      wasabi (~> 2.1)
+      nori (~> 2.0.0)
+      wasabi (~> 3.0.0)
     slop (3.3.3)
     spoon (0.0.1)
     sprockets (2.2.2)
@@ -121,7 +122,8 @@ GEM
     thor (0.16.0)
     tilt (1.3.3)
     tzinfo (0.3.35)
-    wasabi (2.1.0)
+    wasabi (3.0.0)
+      httpi (~> 2.0)
       nokogiri (>= 1.4.0)
 
 PLATFORMS
@@ -132,11 +134,11 @@ DEPENDENCIES
   appraisal
   guard
   guard-rspec
+  httpi!
   pry
   rb-fsevent
-  rb-inotify
   rspec-rails
-  savon (= 0.9.9)
+  savon
   tzinfo
-  wasabi (= 2.1.0)
+  wasabi
   wash_out!

data/lib/wash_out/dispatcher.rb

@@ -12,34 +12,22 @@ module WashOut
 
     # This filter parses the SOAP request and puts it into +params+ array.
     def _parse_soap_parameters
-      # Do not interfere with project-space Nori setup
-      strip    = Nori.strip_namespaces?
-      convert  = Nori.convert_tags?
-      typecast = Nori.advanced_typecasting?
-
-      Nori.strip_namespaces = true
-      Nori.advanced_typecasting = false
-
-      if WashOut::Engine.snakecase_input
-        Nori.convert_tags_to { |tag| tag.snakecase.to_sym }
-      else
-        Nori.convert_tags_to { |tag| tag.to_sym }
-      end
-
-      request_body = request.body.read
-      @_params = Nori.parse(request_body)
-
+      parser = Nori.new(
+        :strip_namespaces => true,
+        :advanced_typecasting => true,
+        :convert_tags_to => (
+          WashOut::Engine.snakecase_input ? lambda { |tag| tag.snakecase.to_sym }
+                                          : lambda { |tag| tag.to_sym }
+        )
+      )
+
+      @_params = parser.parse(request.body.read)
       references = WashOut::Dispatcher.deep_select(@_params){|k,v| v.is_a?(Hash) && v.has_key?(:@id)}
 
       unless references.blank?
         replaces = {}; references.each{|r| replaces['#'+r[:@id]] = r}
         @_params = WashOut::Dispatcher.deep_replace_href(@_params, replaces)
       end
-
-      # Reset Nori setup to project-space
-      Nori.strip_namespaces = strip
-      Nori.advanced_typecasting = typecast
-      Nori.convert_tags_to convert
     end
 
     def _authenticate_wsse

data/lib/wash_out/param.rb

@@ -63,7 +63,7 @@ module WashOut
           when 'string';    :to_s
           when 'integer';   :to_i
           when 'double';    :to_f
-          when 'boolean';   lambda { |v| v == 'true' }
+          when 'boolean';   nil
           when 'date';      :to_date
           when 'datetime';  :to_datetime
           when 'time';      :to_time

data/lib/wash_out/version.rb

@@ -1,3 +1,3 @@
 module WashOut
-  VERSION = "0.5.6"
+  VERSION = "0.6.0"
 end

data/lib/wash_out/wsse.rb

@@ -36,7 +36,7 @@ module WashOut
 
       # Token should not be accepted if timestamp is older than 5 minutes ago
       # http://www.oasis-open.org/committees/download.php/16782/wss-v1.1-spec-os-UsernameTokenProfile.pdf
-      offset_in_minutes = ((DateTime.now - DateTime.parse(timestamp))* 24 * 60).to_i
+      offset_in_minutes = ((DateTime.now - timestamp)* 24 * 60).to_i
       return false if offset_in_minutes >= 5
 
       # There are a few different implementations of the digest calculation
@@ -44,11 +44,11 @@ module WashOut
       flavors = Array.new
 
       # Ruby / Savon
-      token = nonce + timestamp + expected_password
+      token = nonce + timestamp.to_s + expected_password
       flavors << Base64.encode64(Digest::SHA1.hexdigest(token)).chomp!
 
       # Java
-      token = Base64.decode64(nonce) + timestamp + expected_password
+      token = Base64.decode64(nonce) + timestamp.to_s + expected_password
       flavors << Base64.encode64(Digest::SHA1.digest(token)).chomp!
 
       flavors.each do |f|

data/spec/lib/wash_out/dispatcher_spec.rb

@@ -4,22 +4,12 @@ require 'spec_helper'
 
 describe WashOut::Dispatcher do
 
-  class TestBody
-    attr_accessor :read
-    def initialize(read); @read = read; end
-  end
-
-  class TestRequest
-    attr_accessor :body
-    def initialize(body); @body = body; end
-  end
-
   class Dispatcher < ApplicationController
     include WashOut::SOAP
 
     def self.mock(text="")
       dispatcher = self.new
-      dispatcher.request = TestRequest.new(TestBody.new(text))
+      dispatcher.request = OpenStruct.new(:body => OpenStruct.new(:read => text))
       dispatcher
     end
 
@@ -46,20 +36,26 @@ describe WashOut::Dispatcher do
 
   it "parses href request" do
     dispatcher = Dispatcher.mock <<-XML
-      <request>
-        <entities href="#id1">
-        </entities>
-      </request>
-      <entity id="id1">
-        <foo><bar>1</bar></foo>
-        <sub href="#id2" />
-      </entity>
-      <ololo id="id2">
-        <foo>1</foo>
-      </ololo>
+      <root>
+        <request>
+          <entities href="#id1">
+          </entities>
+        </request>
+        <entity id="id1">
+          <foo><bar>1</bar></foo>
+          <sub href="#id2" />
+        </entity>
+        <ololo id="id2">
+          <foo>1</foo>
+        </ololo>
+      </root>
     XML
     dispatcher._parse_soap_parameters
-    dispatcher.params[:request][:entities].should == {:foo=>{:bar=>"1"}, :sub=>{:foo=>"1", :@id=>"id2"}, :@id=>"id1"}
+    dispatcher.params[:root][:request][:entities].should == {
+      :foo => {:bar=>"1"},
+      :sub => {:foo=>"1", :@id=>"id2"},
+      :@id => "id1"
+    }
   end
 
 end