wash_out 0.5.2 → 0.5.3

data/.gitignore

@@ -1,3 +1,4 @@
+.rbx/
 .bundle/
 .idea/
 log/*.log

data/.rspec

@@ -0,0 +1 @@
+--tty --colour

data/.travis.yml

@@ -1,3 +1,4 @@
 rvm:
   - 1.9.3
   - jruby-19mode
+  - rbx-19mode

data/Gemfile

@@ -1,5 +1,2 @@
 source "http://rubygems.org"
-
-gem 'pry'
-
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wash_out (0.5.2)
+    wash_out (0.5.3)
       nori
 
 GEM
@@ -29,9 +29,18 @@ GEM
       bundler
       rake
     builder (3.0.0)
-    coderay (1.0.5)
+    coderay (1.0.8)
     diff-lcs (1.1.3)
     erubis (2.7.0)
+    ffi (1.1.5)
+    ffi (1.1.5-java)
+    guard (1.5.0)
+      listen (>= 0.4.2)
+      lumberjack (>= 1.0.2)
+      pry (>= 0.9.10)
+      thor (>= 0.14.6)
+    guard-rspec (1.2.1)
+      guard (>= 1.1)
     gyoku (0.4.4)
       builder (>= 2.1.2)
     hike (1.2.1)
@@ -41,19 +50,21 @@ GEM
     journey (1.0.3)
     json (1.6.5)
     json (1.6.5-java)
-    method_source (0.7.1)
+    listen (0.5.3)
+    lumberjack (1.0.2)
+    method_source (0.8.1)
     multi_json (1.1.0)
     nokogiri (1.5.0)
     nokogiri (1.5.0-java)
     nori (1.1.0)
-    pry (0.9.8.4)
+    pry (0.9.10)
       coderay (~> 1.0.5)
-      method_source (~> 0.7.1)
-      slop (>= 2.4.4, < 3)
-    pry (0.9.8.4-java)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
+    pry (0.9.10-java)
       coderay (~> 1.0.5)
-      method_source (~> 0.7.1)
-      slop (>= 2.4.4, < 3)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
       spoon (~> 0.0)
     rack (1.4.1)
     rack-cache (1.1)
@@ -69,7 +80,10 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    rake (0.9.2.2)
+    rake (10.0.2)
+    rb-fsevent (0.9.2)
+    rb-inotify (0.8.8)
+      ffi (>= 0.5.0)
     rdoc (3.12)
       json (~> 1.4)
     rspec (2.8.0)
@@ -93,7 +107,7 @@ GEM
       nokogiri (>= 1.4.0)
       nori (~> 1.1)
       wasabi (~> 2.1)
-    slop (2.4.4)
+    slop (3.3.3)
     spoon (0.0.1)
     sprockets (2.1.2)
       hike (~> 1.2)
@@ -111,7 +125,11 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
+  guard
+  guard-rspec
   pry
+  rb-fsevent
+  rb-inotify
   rspec-rails
   savon
   tzinfo

data/Guardfile

@@ -0,0 +1,12 @@
+# More info at https://github.com/guard/guard#readme
+
+# Could be changed to whatever you want.
+#  See: https://github.com/guard/guard#notification
+notification :off
+
+guard 'rspec' do
+  watch %r{^spec/.+_spec\.rb$}
+  watch %r{lib/} do 'spec' end
+end
+
+# vim:ft=ruby

data/README.md

@@ -6,19 +6,12 @@ But if you have a chance, please [http://stopsoap.com/](http://stopsoap.com/).
 
 ## Compatibility
 
-Rails >3.0 only.
+Rails >3.0 only. MRI 1.9, JRuby (--1.9), Rubinius (--1.9).
 
-WashOut should work like a charm on CRuby 1.9.x.
+Ruby 1.8 is not officially supported since 0.5.3. We will accept further compatibilty pull-requests but no upcoming versions will be tested against it.
 
 ![Travis CI](https://secure.travis-ci.org/roundlake/wash_out.png)
 
-We do support CRuby 1.8.7. However it is not a goal and it is not well supported by our specs. According to
-this fact it maybe sometimes broken from the start on major releases. You are welcome to hold on an old
-version and give us enough issues and pull-requests to make it work.
-
-All dependencies are JRuby-compatible so again it will work well in --1.9 mode but it can fail with
-fresh releases if you go --1.8.
-
 ## Installation
 
 In your Gemfile, add this line:
@@ -151,7 +144,7 @@ Available properties are:
 * **namespace**: SOAP namespace to use. Default is `urn:WashOut`.
 * **snakecase**: *(DEPRECATED SINCE 0.4.0)* Determines if WashOut should modify parameters keys to snakecase. Default is `false`.
 * **snakecase_input**: Determines if WashOut should modify parameters keys to snakecase. Default is `false`.
-* **camelize_wsdl**: Determinse if WashOut should camelize types within WSDL and responses. Default is `false`.
+* **camelize_wsdl**: Determines if WashOut should camelize types within WSDL and responses. Default is `false`.
 
 ### Camelization
 

data/lib/wash_out/dispatcher.rb

@@ -8,6 +8,7 @@ module WashOut
     # A SOAPError exception can be raised to return a correct SOAP error
     # response.
     class SOAPError < Exception; end
+    class ProgrammerError < Exception; end
 
     # This filter parses the SOAP request and puts it into +params+ array.
     def _parse_soap_parameters
@@ -122,12 +123,26 @@ module WashOut
 
           # Inline array of complex structures
           elsif param.struct? && param.multiplied
-            data ||= {} #fallback in case no data is given
+            if data.nil?
+              data = {} # when no data is given
+            elsif data.is_a?(Array)
+              raise ProgrammerError,
+                "SOAP response used #{data.inspect} (which is an Array), " +
+                "in the context where a Hash with key of '#{param.raw_name}' " +
+                "was expected."
+            end
             data[param.raw_name] = [] unless data[param.raw_name].is_a?(Array)
             result_spec[i].map = data[param.raw_name].map{|e| inject.call(e, param.map)}
 
           else
-            result_spec[i].value = data[param.raw_name]
+            val = data[param.raw_name]
+            if param.multiplied and val and not val.is_a?(Array)
+              raise ProgrammerError,
+                "SOAP response tried to use '#{val.inspect}' " +
+                "(which is of type #{val.class}), as the value for " +
+                "'#{param.raw_name}' (which expects an Array)."
+            end
+            result_spec[i].value = val
           end
         end
 

data/lib/wash_out/param.rb

@@ -70,7 +70,7 @@ module WashOut
           else raise RuntimeError, "Invalid WashOut simple type: #{type}"
         end
 
-        if operation.nil?
+        if operation.nil? || data.nil?
           data
         elsif @multiplied
           data.map{|x| x.send(operation)}
@@ -156,6 +156,10 @@ module WashOut
 
     # Used to load an entire structure.
     def map_struct(data)
+      unless data.is_a?(Hash)
+        raise WashOut::Dispatcher::SOAPError, "SOAP message structure is broken"
+      end
+
       data   = data.with_indifferent_access
       struct = {}.with_indifferent_access
 

data/lib/wash_out/router.rb

@@ -13,7 +13,8 @@ module WashOut
         # RUBY18 1.8 does not have force_encoding.
         soap_action.force_encoding('UTF-8') if soap_action.respond_to? :force_encoding
 
-        soap_action.gsub!(/^\"(.*)\"$/, '\1')
+        namespace = Regexp.escape WashOut::Engine.namespace.to_s
+        soap_action.gsub!(/^\"(namespace\/?)?(.*)\"$/, '\2')
 
         env['wash_out.soap_action'] = soap_action
       end

data/lib/wash_out/type.rb

@@ -15,13 +15,14 @@ module WashOut
 
     def self.wash_out_param_name
       @param_type_name ||= name.underscore
-      @param_type_name
 
       if WashOut::Engine.camelize_wsdl.to_s == 'lower'
         @param_type_name = @param_type_name.camelize(:lower)
       elsif WashOut::Engine.camelize_wsdl
         @param_type_name = @param_type_name.camelize
       end
+      
+      @param_type_name
     end
   end
 end

data/lib/wash_out/version.rb

@@ -1,3 +1,3 @@
 module WashOut
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/spec/{wash_out → lib/wash_out}/dispatcher_spec.rb

@@ -62,4 +62,4 @@ describe WashOut::Dispatcher do
     dispatcher.params[:request][:entities].should == {:foo=>{:bar=>"1"}, :sub=>{:foo=>"1", :@id=>"id2"}, :@id=>"id1"}
   end
 
-end
+end

data/spec/lib/wash_out/param_spec.rb

@@ -0,0 +1,37 @@
+#encoding:utf-8
+
+require 'spec_helper'
+
+describe WashOut::Param do
+
+  class Abraka1 < WashOut::Type
+    map(
+      :test => :string
+    )
+  end
+  class Abraka2 < WashOut::Type
+    type_name 'test'
+    map :foo => Abraka1
+  end
+
+  it "loads custom_types" do
+    map = WashOut::Param.parse_def Abraka2
+
+    map.should be_a_kind_of(Array)
+    map[0].name.should == 'value'
+    map[0].map[0].name.should == 'foo'
+    map[0].map[0].map[0].name.should == 'test'
+  end
+
+  it "respects camelization setting" do
+    WashOut::Engine.camelize_wsdl = true
+
+    map = WashOut::Param.parse_def Abraka2
+
+    map.should be_a_kind_of(Array)
+    map[0].name.should == 'Value'
+    map[0].map[0].name.should == 'Foo'
+    map[0].map[0].map[0].name.should == 'Test'
+  end
+
+end

data/spec/{wash_out → lib/wash_out}/type_spec.rb

@@ -13,10 +13,10 @@ describe WashOut::Type do
       map :foo => Abraka1
     end
 
-    Abraka1.wash_out_param_name.should == 'Abraka1'
+    Abraka1.wash_out_param_name.should == 'abraka1'
     Abraka1.wash_out_param_map.should == {:test => :string}
 
-    Abraka2.wash_out_param_name.should == 'Test'
+    Abraka2.wash_out_param_name.should == 'test'
     Abraka2.wash_out_param_map.should == {:foo => Abraka1}
   end
 

data/spec/{wash_out_spec.rb → lib/wash_out_spec.rb}

@@ -6,7 +6,7 @@ describe WashOut do
   before(:each) do
     WashOut::Engine.snakecase_input = true
     WashOut::Engine.camelize_wsdl   = true
-    WashOut::Engine.namespace = false
+    WashOut::Engine.namespace       = false
   end
 
   it "should be valid" do
@@ -49,13 +49,13 @@ describe WashOut do
 
     # Savon underscores method names so we
     # get back just what we have at controller
-    client.wsdl.soap_actions.should == [:result, :get_area, :rocky]
+    client.wsdl.soap_actions.map{|x| x.to_s}.sort.should == [:result, :get_area, :rocky].map{|x| x.to_s}.sort
 
     x = xml[:definitions][:types][:schema][:complex_type].find{|x| x[:'@name'] == 'Center'}[:sequence][:element].find{|x| x[:'@name'] == 'X'}
     x[:'@min_occurs'].should == "0"
     x[:'@max_occurs'].should == "unbounded"
 
-    xml[:definitions][:binding][:operation].map{|e| e[:'@name']}.should == ['Result', 'getArea', 'rocky']
+    xml[:definitions][:binding][:operation].map{|e| e[:'@name']}.sort.should == ['Result', 'getArea', 'rocky'].sort
 
     client.wsdl.xml.include?('<xsd:complexType name="Circle1">').should == true
   end
@@ -119,6 +119,23 @@ describe WashOut do
     end.to_hash[:check_answer_response][:value].should == false
   end
 
+  it "handles incorrect requests" do
+    mock_controller do
+      soap_action "duty", 
+        :args => {:bad => {:a => :string, :b => :string}, :good => {:a => :string, :b => :string}},
+        :return => nil
+      def duty
+        render :soap => nil
+      end
+    end
+
+    lambda {
+      client.request(:duty) do
+        soap.body = { :bad => 42, :good => nil }
+      end
+    }.should raise_exception(Savon::SOAP::Fault)
+  end
+
   it "should handle snakecase option properly" do
     WashOut::Engine.snakecase_input = false
     WashOut::Engine.camelize_wsdl   = false
@@ -496,7 +513,7 @@ describe WashOut do
         :args   => :date,
         :return => :nil
       def date
-        params[:value].should == Date.parse('2000-12-30')
+        params[:value].should == Date.parse('2000-12-30') unless params[:value].blank?
         render :soap => nil
       end
     end
@@ -506,6 +523,14 @@ describe WashOut do
         :value => '2000-12-30'
       }
     end
+
+    lambda {
+      client.request(:date) do
+        soap.body = {
+          :value => nil
+        }
+      end
+    }.should_not raise_exception
   end
 
   describe "ws-security" do
@@ -609,4 +634,53 @@ describe WashOut do
 
   end
 
+  it 'will not let you pass an Array in the place of a Hash' do
+    mock_controller do
+      soap_action 'bad', :args => :integer, :return => {
+        :basic => :string,
+        :stallions => {
+          :stallion => [
+            :name => :string,
+            :wyldness => :integer,
+          ]
+        },
+      }
+      def bad
+        render :soap => {
+          :basic => 'hi',
+          :stallions => [{:name => 'ted', :wyldness => 11}]
+        }
+      end
+    end
+
+    lambda {
+      client.request(:bad).to_hash(:bad_response)
+    }.should raise_exception(
+      WashOut::Dispatcher::ProgrammerError,
+      /SOAP response .*wyldness.*Array.*Hash.*stallion/
+    )
+  end
+
+  it 'loudly fails if you return a string in place of an Array' do
+    mock_controller do
+      soap_action 'bad2', :args => :integer, :return => {
+        :basic => :string,
+        :telephone_booths => [:string]
+      }
+      def bad2
+        render :soap => {
+          :basic => 'hihi',
+          :telephone_booths => 'oops'
+        }
+      end
+    end
+
+    lambda {
+      client.request(:bad2).to_hash[:bad_response]
+    }.should raise_exception(
+      WashOut::Dispatcher::ProgrammerError,
+      /SOAP response .*oops.*String.*telephone_booths.*Array/
+    )
+  end
+
 end

data/spec/spec_helper.rb

@@ -18,6 +18,12 @@ RSpec.configure do |config|
 
   # == Mock Framework
   config.mock_with :rspec
+
+  config.before(:all) do
+    WashOut::Engine.snakecase_input = false
+    WashOut::Engine.camelize_wsdl   = false
+    WashOut::Engine.namespace       = false
+  end
 end
 
 require 'savon'

data/wash_out.gemspec

@@ -14,8 +14,13 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency("nori")
-  s.add_development_dependency("rspec-rails")
-  s.add_development_dependency("appraisal")
-  s.add_development_dependency("tzinfo")
-  s.add_development_dependency("savon")
+  %w(
+    savon
+    rspec-rails guard guard-rspec rb-inotify rb-fsevent
+    appraisal
+    tzinfo
+    pry
+  ).each do |dep|
+    s.add_development_dependency(dep)
+  end
 end

metadata

@@ -1,84 +1,180 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: wash_out
-version: !ruby/object:Gem::Version
-  version: 0.5.2
+version: !ruby/object:Gem::Version 
+  hash: 1063984129097862891
   prerelease: 
+  segments: 
+  - 0
+  - 5
+  - 3
+  version: 0.5.3
 platform: ruby
-authors:
+authors: 
 - Boris Staal
 - Peter Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-21 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-12-01 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: nori
-  requirement: &70188738989080 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2002549777813010636
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: savon
   prerelease: false
-  version_requirements: *70188738989080
-- !ruby/object:Gem::Dependency
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2002549777813010636
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rspec-rails
-  requirement: &70188738988660 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2002549777813010636
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: guard
   prerelease: false
-  version_requirements: *70188738988660
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: &70188738988240 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2002549777813010636
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: guard-rspec
   prerelease: false
-  version_requirements: *70188738988240
-- !ruby/object:Gem::Dependency
-  name: tzinfo
-  requirement: &70188738987780 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2002549777813010636
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rb-inotify
   prerelease: false
-  version_requirements: *70188738987780
-- !ruby/object:Gem::Dependency
-  name: savon
-  requirement: &70188738987360 !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2002549777813010636
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rb-fsevent
   prerelease: false
-  version_requirements: *70188738987360
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2002549777813010636
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: appraisal
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2002549777813010636
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: tzinfo
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2002549777813010636
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: pry
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2002549777813010636
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id010
 description: Dead simple Rails 3 SOAP server library
 email: boris@roundlake.ru
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
+- .rspec
 - .travis.yml
 - Appraisals
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -124,35 +220,45 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
+- spec/lib/wash_out/dispatcher_spec.rb
+- spec/lib/wash_out/param_spec.rb
+- spec/lib/wash_out/type_spec.rb
+- spec/lib/wash_out_spec.rb
 - spec/spec_helper.rb
 - spec/support/httpi-rack.rb
-- spec/wash_out/dispatcher_spec.rb
-- spec/wash_out/param_spec.rb
-- spec/wash_out/type_spec.rb
-- spec/wash_out_spec.rb
 - wash_out.gemspec
 homepage: http://roundlake.github.com/wash_out/
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 2002549777813010636
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 2002549777813010636
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Dead simple Rails 3 SOAP server library
 test_files: []
+

data/spec/wash_out/param_spec.rb

@@ -1,26 +0,0 @@
-#encoding:utf-8
-
-require 'spec_helper'
-
-describe WashOut::Param do
-
-  it "loads custom_types" do
-    class Abraka1 < WashOut::Type
-      map(
-        :test => :string
-      )
-    end
-    class Abraka2 < WashOut::Type
-      type_name 'test'
-      map :foo => Abraka1
-    end
-
-    map = WashOut::Param.parse_def Abraka2
-
-    map.should be_a_kind_of(Array)
-    map[0].name.should == 'Value'
-    map[0].map[0].name.should == 'Foo'
-    map[0].map[0].map[0].name.should == 'Test'
-  end
-
-end