Skip to content

Commit

Permalink
Merge branch 'release/v0.8.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
bogdanRada committed Dec 9, 2013
2 parents fd72047 + ddd492a commit 4109731
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 11 deletions.
1 change: 0 additions & 1 deletion lib/washout_builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ def wash_out(controller_name, options={})



WashOut::Dispatcher::SOAPError.send :include, ActiveModel::MassAssignmentSecurity if defined?(WashOut::Dispatcher)
WashOut::SOAPError.send :include, ActiveModel::MassAssignmentSecurity if defined?(WashOut::SOAPError)


Expand Down
6 changes: 2 additions & 4 deletions lib/washout_builder/engine.rb
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
module WashoutBuilder
class Engine < ::Rails::Engine
config.wash_out = ActiveSupport::OrderedOptions.new
initializer "wash_out.configuration" do |app|
app.routes.append do
match "/washout" => "washout_builder#all", :via => :get, :format => false
match "/washout" => "washout_builder#all", :via => :get, :format => false
end
if app.config.wash_out[:catch_xml_errors]
app.config.middleware.insert_after 'ActionDispatch::ShowExceptions', WashOut::Middleware if defined?(WashOut::Middleware)
app.config.middleware.insert_after 'ActionDispatch::ShowExceptions', WashOut::Middlewares::Catcher if defined?(WashOut::Middlewares::Catcher)
app.config.middleware.insert_after 'ActionDispatch::ShowExceptions', WashOut::Middlewares::Catcher
end
end
end
Expand Down
7 changes: 2 additions & 5 deletions lib/washout_builder/soap.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,12 @@
module WashoutBuilder
module SOAP
extend ActiveSupport::Concern
include WashOut::SOAP if defined?(WashOut::SOAP)
include WashOut::Rails::Controller if defined?(WashOut::Rails::Controller)

include WashOut::Rails::Controller




included do
include WashOut::Configurable if defined?(WashOut::Configurable)
include WashOut::Dispatcher if defined?(WashOut::Dispatcher)
include WashoutBuilder::Dispatcher
self.soap_actions = {}
end
Expand Down
2 changes: 1 addition & 1 deletion lib/washout_builder/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module WashoutBuilder
VERSION = "0.8.1"
VERSION = "0.8.2"
end

0 comments on commit 4109731

Please sign in to comment.