wash_out 0.9.0.beta.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b640e8dbbc4f8e47d5b4bf02e02a8eddb87f4022
-  data.tar.gz: d262ad3bd148080fc799e202ceacafde106413ec
+  metadata.gz: fb290b5f2914d741a1cc5ba218d0eab0b87415fc
+  data.tar.gz: 336edc510428d18429908b002c22d8c84ab5ec41
 SHA512:
-  metadata.gz: 6b50419b1b9249d150c5adc7a85ea40e0ca05cd88efd5596e3ec0a1f94606ade0cf88fa8997daca86c4bfb993e11db2052f0c6421047d19cdd4d1526e04cad4a
-  data.tar.gz: b8f74d77676cb1e6ae2084444dee8d8034bff01337c3a573727d9fbccd8675f677be2e19308d1faf5eeb80696344a9fea1da75e0ee573bee6e8d6749e2be16c2
+  metadata.gz: 2a06e7e53d7b0ed436951a97dbd29cb7592d1ee39743c4bb60c194e347435f6514368744540d9fafd413c906bf0337271ff897ffb7c158280c16dbe30156b32f
+  data.tar.gz: 658031ea5d90bec54848b5ceebdf03b65ecdc3ecf46a6312f5b8adf0e523944332e81ebb5c7e4ce03c47c8cb3e948b7d550cb49170cde363ec9bab896eb3632d

data/README.md

@@ -102,11 +102,9 @@ require 'savon'
 
 client = Savon::Client.new(wsdl: "http://localhost:3000/rumbas/wsdl")
 
-client.wsdl.soap_actions # => [:integer_to_string, :concat, :add_circle]
+client.operations # => [:integer_to_string, :concat, :add_circle]
 
-result = client.request(:concat) do
-  soap.body = { :a => "123", :b => "abc" }
-end
+result = client.call(:concat, message: { :a => "123", :b => "abc" })
 
 # actual wash_out
 result.to_hash # => {:concat_reponse => {:value=>"123abc"}}
@@ -180,3 +178,5 @@ soap_action "foo" # this will be passed as is
 ## License
 
 It is free software, and may be redistributed under the terms of MIT license.
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/inossidabile/wash_out/trend.png)](https://bitdeli.com/free "Bitdeli Badge")

data/lib/wash_out/param.rb

@@ -61,13 +61,14 @@ module WashOut
         end
       else
         operation = case type
-          when 'string';    :to_s
-          when 'integer';   :to_i
-          when 'double';    :to_f
-          when 'boolean';   lambda{|dat| dat === "0" ? false : !!dat}
-          when 'date';      :to_date
-          when 'datetime';  :to_datetime
-          when 'time';      :to_time
+          when 'string';       :to_s
+          when 'integer';      :to_i
+          when 'double';       :to_f
+          when 'boolean';      lambda{|dat| dat === "0" ? false : !!dat}
+          when 'date';         :to_date
+          when 'datetime';     :to_datetime
+          when 'time';         :to_time
+          when 'base64Binary'; lambda{|dat| Base64.decode64(dat)}
           else raise RuntimeError, "Invalid WashOut simple type: #{type}"
         end
 

data/lib/wash_out/router.rb

@@ -15,10 +15,10 @@ module WashOut
     def parse_soap_action(env)
       return env['wash_out.soap_action'] if env['wash_out.soap_action']
 
-      soap_action = env['HTTP_SOAPACTION']
+      soap_action = env['HTTP_SOAPACTION'].to_s.gsub(/^"(.*)"$/, '\1')
 
       if soap_action.blank?
-        soap_action = parse_soap_parameters(env)
+        soap_action = nori.parse(soap_body env)
             .values_at(:envelope, :Envelope).compact.first
             .values_at(:body, :Body).compact.first
             .keys.first.to_s
@@ -29,25 +29,33 @@ module WashOut
 
       if controller.soap_config.namespace
         namespace = Regexp.escape controller.soap_config.namespace.to_s
-        soap_action.gsub!(/^"?(#{namespace}(\/|#)?)?([^"]*)"?$/, '\3')
-      else
-        soap_action = soap_action[1...-1] if soap_action.starts_with?('"')
+        soap_action.gsub!(/^(#{namespace}(\/|#)?)?([^"]*)$/, '\3')
       end
 
       env['wash_out.soap_action'] = soap_action
     end
 
-    def parse_soap_parameters(env)
-      return env['wash_out.soap_data'] if env['wash_out.soap_data']
-
-      nori_parser = Nori.new(
+    def nori(snakecase=false)
+      Nori.new(
         :parser => controller.soap_config.parser,
         :strip_namespaces => true,
         :advanced_typecasting => true,
-        :convert_tags_to => ( controller.soap_config.snakecase_input ? lambda { |tag| tag.snakecase.to_sym } : lambda { |tag| tag.to_sym } ))
+        :convert_tags_to => (
+          snakecase ? lambda { |tag| tag.snakecase.to_sym } 
+                    : lambda { |tag| tag.to_sym }
+        )
+      )
+    end
+
+    def soap_body(env)
+      env['rack.input'].respond_to?(:string) ? env['rack.input'].string
+                                             : env['rack.input'].read
+    end
+
+    def parse_soap_parameters(env)
+      return env['wash_out.soap_data'] if env['wash_out.soap_data']
 
-      env['wash_out.soap_data'] = if env['rack.input'].respond_to? :string then env['rack.input'].string else env['rack.input'].read end
-      env['wash_out.soap_data'] = nori_parser.parse(env['wash_out.soap_data'])
+      env['wash_out.soap_data'] = nori(controller.soap_config.snakecase_input).parse(soap_body env)
       references = WashOut::Dispatcher.deep_select(env['wash_out.soap_data']){|k,v| v.is_a?(Hash) && v.has_key?(:@id)}
 
       unless references.blank?

data/lib/wash_out/type.rb

@@ -2,7 +2,7 @@ module WashOut
   class Type
 
     def self.type_name(value)
-      @param_type_name = value
+      @param_type_name = value.to_s
     end
 
     def self.map(value)

data/lib/wash_out/version.rb

@@ -1,3 +1,3 @@
 module WashOut
-  VERSION = "0.9.0.beta.2"
+  VERSION = "0.9.0"
 end

data/spec/lib/wash_out_spec.rb

@@ -451,6 +451,19 @@ describe WashOut do
         savon(:date, :value => '2000-12-30')
         lambda { savon(:date) }.should_not raise_exception
       end
+
+      it "recognize base64Binary" do
+        mock_controller do
+          soap_action "base64", :args => :base64Binary, :return => :nil
+          def base64
+            params[:value].should == 'test' unless params[:value].blank?
+            render :soap => nil
+          end
+        end
+
+        savon(:base64, :value => Base64.encode64('test'))
+        lambda { savon(:base64) }.should_not raise_exception
+      end
     end
 
     context "errors" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wash_out
 version: !ruby/object:Gem::Version
-  version: 0.9.0.beta.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Boris Staal
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-29 00:00:00.000000000 Z
+date: 2013-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nori
@@ -108,9 +108,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3