wash_out 0.5.4 → 0.5.6

data/Gemfile.lock

@@ -1,62 +1,64 @@
 PATH
   remote: .
   specs:
-    wash_out (0.5.3)
-      nori
+    wash_out (0.5.5)
+      nori (~> 1.1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
+    actionpack (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
+      journey (~> 1.0.4)
       rack (~> 1.4.0)
-      rack-cache (~> 1.1)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.1)
-      activesupport (= 3.2.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
-    activesupport (3.2.1)
+    activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    akami (1.0.0)
+    akami (1.2.0)
       gyoku (>= 0.4.0)
-    appraisal (0.4.1)
+      nokogiri (>= 1.4.0)
+    appraisal (0.5.1)
       bundler
       rake
-    builder (3.0.0)
+    builder (3.0.4)
     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)
+    ffi (1.2.0)
+    ffi (1.2.0-java)
+    guard (1.6.1)
+      listen (>= 0.6.0)
       lumberjack (>= 1.0.2)
       pry (>= 0.9.10)
       thor (>= 0.14.6)
-    guard-rspec (1.2.1)
+    guard-rspec (2.3.3)
       guard (>= 1.1)
-    gyoku (0.4.4)
+      rspec (~> 2.11)
+    gyoku (1.0.0)
       builder (>= 2.1.2)
     hike (1.2.1)
-    httpi (0.9.6)
+    httpi (0.9.7)
       rack
-    i18n (0.6.0)
-    journey (1.0.3)
-    json (1.6.5)
-    json (1.6.5-java)
-    listen (0.5.3)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.7.5)
+    json (1.7.5-java)
+    listen (0.6.0)
     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)
+    multi_json (1.5.0)
+    nokogiri (1.5.6)
+    nokogiri (1.5.6-java)
+    nori (1.1.3)
     pry (0.9.10)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -67,38 +69,40 @@ GEM
       slop (~> 3.3.1)
       spoon (~> 0.0)
     rack (1.4.1)
-    rack-cache (1.1)
+    rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    railties (3.2.1)
-      actionpack (= 3.2.1)
-      activesupport (= 3.2.1)
+    railties (3.2.9)
+      actionpack (= 3.2.9)
+      activesupport (= 3.2.9)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (10.0.2)
+      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.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    rspec-rails (2.8.1)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.1)
+    rspec-rails (2.12.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.8.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
     savon (0.9.9)
       akami (~> 1.0)
       builder (>= 2.1.2)
@@ -109,13 +113,14 @@ GEM
       wasabi (~> 2.1)
     slop (3.3.3)
     spoon (0.0.1)
-    sprockets (2.1.2)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.14.6)
+    thor (0.16.0)
     tilt (1.3.3)
-    tzinfo (0.3.31)
+    tzinfo (0.3.35)
     wasabi (2.1.0)
       nokogiri (>= 1.4.0)
 
@@ -131,6 +136,7 @@ DEPENDENCIES
   rb-fsevent
   rb-inotify
   rspec-rails
-  savon
+  savon (= 0.9.9)
   tzinfo
+  wasabi (= 2.1.0)
   wash_out!

data/README.md

@@ -10,7 +10,7 @@ Rails >3.0 only. MRI 1.9, JRuby (--1.9), Rubinius (--1.9).
 
 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)
+![Travis CI](https://secure.travis-ci.org/inossidabile/wash_out.png)
 
 ## Installation
 
@@ -109,8 +109,6 @@ result.to_hash # => {:concat_reponse => {:value=>"123abc"}}
 result.to_hash # => {:value=>"123abc"}
 ```
 
-Take a look at [WashOut sample application](https://github.com/roundlake/wash_out-sample).
-
 ## Reusable types
 
 Basic inline types definition is fast and furious for the simple cases. You have an option to describe SOAP types
@@ -141,6 +139,7 @@ Use `config.wash_out...` inside your environment configuration to setup WashOut.
 
 Available properties are:
 
+* **catch_xml_errors**: intercept Rails parsing exceptions to return correct XML response for corrupt XML input. Default is `false`.
 * **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`.
@@ -168,6 +167,7 @@ soap_action "foo" # this will be passed as is
 * Tobias Bielohlawek ([@rngtng](https://github.com/rngtng))
 * Francesco Negri ([@dhinus](https://github.com/dhinus))
 * Edgars Beigarts ([@ebeigarts](https://github.com/ebeigarts))
+* [Exad](https://github.com/exad) ([@wknechtel](https://github.com/wknechtel) and [@☈king](https://github.com/rking))
 
 ## LICENSE
 

data/lib/wash_out/engine.rb

@@ -2,8 +2,10 @@ module WashOut
   class Engine < ::Rails::Engine
     class << self
       attr_accessor :namespace
-      attr_accessor :snakecase, :snakecase_input, :camelize_wsdl
+      attr_accessor :snakecase, :camelize_output
+      attr_accessor :snakecase_input, :camelize_wsdl
       attr_accessor :wsse_username, :wsse_password
+      attr_accessor :catch_xml_errors
     end
 
     self.namespace = 'urn:WashOut'
@@ -22,9 +24,19 @@ module WashOut
         self.class.send "#{key}=", value
       end
 
+      app.config.wash_out.catch_xml_errors ||= false
+
       unless self.class.snakecase.nil?
         raise "Usage of wash_out.snakecase is deprecated. You should use wash_out.snakecase_input and wash_out.camelize_wsdl"
       end
+
+      unless self.class.camelize_output.nil?
+        raise "Usage of wash_out.camelize_output is deprecated. You should use wash_out.camelize_wsdl option instead"
+      end
+
+      if self.class.catch_xml_errors
+        app.config.middleware.insert_after 'ActionDispatch::ShowExceptions', WashOut::Middleware
+      end
     end
   end
 end

data/lib/wash_out/middleware.rb

@@ -0,0 +1,41 @@
+class WashOut::Middleware
+  def initialize app
+    @app = app
+  end
+
+  def call env
+    begin
+      @app.call env
+    rescue REXML::ParseException => e
+      self.class.raise_or_render_rexml_parse_error e, env
+    end
+  end
+
+  def self.raise_or_render_rexml_parse_error e, env
+    raise e unless env.has_key? 'HTTP_SOAPACTION'
+  
+    # Normally input would be a StringIO, but Passenger has a different API:
+    input = env['rack.input']
+    req = if input.respond_to? :string then input.string else input.read end
+
+    env['rack.errors'].puts <<-EOERR
+WashOut::Exception: #{e.continued_exception} for:
+#{req}
+    EOERR
+    [400, {'Content-Type' => 'text/xml'},
+      [render_client_soap_fault("Error parsing SOAP Request XML")]]
+  end
+
+  def self.render_client_soap_fault msg
+    xml = Builder::XmlMarkup.new
+    xml.tag! 'soap:Envelope', 'xmlns:soap' => 'http://schemas.xmlsoap.org/soap/envelope/',
+      'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance' do
+        xml.tag! 'soap:Body' do
+          xml.tag! 'soap:Fault', :encodingStyle => 'http://schemas.xmlsoap.org/soap/encoding/' do
+            xml.faultcode 'Client'
+            xml.faultstring msg
+          end
+        end
+      end
+  end
+end

data/lib/wash_out/model.rb

@@ -1,5 +1,9 @@
 module WashOut
   module Model
+    def wash_out_columns
+      columns_hash
+    end
+
     def wash_out_param_map
       types = {
         :text      => :string,
@@ -9,7 +13,7 @@ module WashOut
       }
       map = {}
 
-      columns_hash.each do |key, column|
+      wash_out_columns.each do |key, column|
         type = column.type
         type = types[type] if types.has_key?(type)
         map[key] = type

data/lib/wash_out/version.rb

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

data/lib/wash_out.rb

@@ -6,6 +6,7 @@ require 'wash_out/router'
 require 'wash_out/type'
 require 'wash_out/model'
 require 'wash_out/wsse'
+require 'wash_out/middleware'
 
 module ActionDispatch::Routing
   class Mapper

data/spec/lib/wash_out/middleware_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+require 'wash_out/middleware'
+require 'rexml/document'
+
+describe WashOut::Middleware do
+  it 'handles Rack environment variables' do
+    err = begin
+      REXML::Document.new '<hi>'
+    rescue REXML::ParseException => e
+      e
+    end
+
+    env = {}
+    lambda {
+      WashOut::Middleware.raise_or_render_rexml_parse_error err, env
+    }.should raise_exception
+
+    env['HTTP_SOAPACTION'] = 'pretend_action'
+    env['rack.errors'] = double 'logger', {:puts => true} 
+    env['rack.input'] = double 'basic-rack-input', {:string => '<hi>'} 
+    result = WashOut::Middleware.raise_or_render_rexml_parse_error err, env
+    result[0].should == 400
+    result[1]['Content-Type'].should == 'text/xml'
+    msg = result[2][0]
+    msg.should include 'Error parsing SOAP Request XML'
+    msg.should include 'soap:Fault'
+    msg.should_not include __FILE__
+    
+    env['rack.input'] = double 'passenger-input', {:read => '<hi>'}
+    result = WashOut::Middleware.raise_or_render_rexml_parse_error err, env
+    result[0].should == 400
+  end
+end

data/spec/spec_helper.rb

@@ -4,6 +4,8 @@ ENV["RAILS_ENV"] = "test"
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
 require "rspec/rails"
+require "pry"
+require "savon"
 
 Rails.backtrace_cleaner.remove_silencers!
 
@@ -26,8 +28,6 @@ RSpec.configure do |config|
   end
 end
 
-require 'savon'
-
 Savon.configure do |config|
   config.log = false            # disable logging
 end

data/wash_out.gemspec

@@ -6,16 +6,17 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.summary     = "Dead simple Rails 3 SOAP server library"
   s.email       = "boris@roundlake.ru"
-  s.homepage    = "http://roundlake.github.com/wash_out/"
+  s.homepage    = "http://github.com/inossidabile/wash_out/"
   s.description = "Dead simple Rails 3 SOAP server library"
   s.authors     = ['Boris Staal', 'Peter Zotov']
 
   s.files         = `git ls-files`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency("nori")
+  s.add_dependency("nori", "~> 1.1.0")
+  s.add_development_dependency("wasabi", "= 2.1.0")
+  s.add_development_dependency("savon", "= 0.9.9")
   %w(
-    savon
     rspec-rails guard guard-rspec rb-inotify rb-fsevent
     appraisal
     tzinfo

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wash_out
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,33 +10,44 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2012-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nori
-  requirement: &70206231773920 !ruby/object:Gem::Requirement
+  requirement: &70304481328780 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70206231773920
+  version_requirements: *70304481328780
+- !ruby/object:Gem::Dependency
+  name: wasabi
+  requirement: &70304481328280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: *70304481328280
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &70206231773180 !ruby/object:Gem::Requirement
+  requirement: &70304481327820 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.9
   type: :development
   prerelease: false
-  version_requirements: *70206231773180
+  version_requirements: *70304481327820
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70206231772680 !ruby/object:Gem::Requirement
+  requirement: &70304481327280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206231772680
+  version_requirements: *70304481327280
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70206231772160 !ruby/object:Gem::Requirement
+  requirement: &70304481326840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206231772160
+  version_requirements: *70304481326840
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70206231771680 !ruby/object:Gem::Requirement
+  requirement: &70304481326440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206231771680
+  version_requirements: *70304481326440
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &70206231771200 !ruby/object:Gem::Requirement
+  requirement: &70304481326040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206231771200
+  version_requirements: *70304481326040
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70206231770680 !ruby/object:Gem::Requirement
+  requirement: &70304481325640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206231770680
+  version_requirements: *70304481325640
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70206231770140 !ruby/object:Gem::Requirement
+  requirement: &70304481325240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206231770140
+  version_requirements: *70304481325240
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70206231769520 !ruby/object:Gem::Requirement
+  requirement: &70304481324840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206231769520
+  version_requirements: *70304481324840
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70206231768740 !ruby/object:Gem::Requirement
+  requirement: &70304481340800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,7 +132,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206231768740
+  version_requirements: *70304481340800
 description: Dead simple Rails 3 SOAP server library
 email: boris@roundlake.ru
 executables: []
@@ -151,6 +162,7 @@ files:
 - lib/wash_out.rb
 - lib/wash_out/dispatcher.rb
 - lib/wash_out/engine.rb
+- lib/wash_out/middleware.rb
 - lib/wash_out/model.rb
 - lib/wash_out/param.rb
 - lib/wash_out/router.rb
@@ -182,13 +194,14 @@ files:
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
 - spec/lib/wash_out/dispatcher_spec.rb
+- spec/lib/wash_out/middleware_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
 - wash_out.gemspec
-homepage: http://roundlake.github.com/wash_out/
+homepage: http://github.com/inossidabile/wash_out/
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -213,3 +226,4 @@ signing_key:
 specification_version: 3
 summary: Dead simple Rails 3 SOAP server library
 test_files: []
+has_rdoc: