From ddd492ad1e262544a6d0af79026209f1ea5d069f Mon Sep 17 00:00:00 2001 From: bogdanRada Date: Mon, 9 Dec 2013 13:25:28 +0200 Subject: [PATCH] remove useless code --- lib/washout_builder.rb | 1 - lib/washout_builder/engine.rb | 6 ++---- lib/washout_builder/soap.rb | 7 ++----- lib/washout_builder/version.rb | 2 +- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/lib/washout_builder.rb b/lib/washout_builder.rb index c6cac5a..10484f4 100644 --- a/lib/washout_builder.rb +++ b/lib/washout_builder.rb @@ -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) diff --git a/lib/washout_builder/engine.rb b/lib/washout_builder/engine.rb index 6c9bdb1..0c42c6f 100644 --- a/lib/washout_builder/engine.rb +++ b/lib/washout_builder/engine.rb @@ -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 diff --git a/lib/washout_builder/soap.rb b/lib/washout_builder/soap.rb index 356d1a0..e9f847e 100644 --- a/lib/washout_builder/soap.rb +++ b/lib/washout_builder/soap.rb @@ -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 diff --git a/lib/washout_builder/version.rb b/lib/washout_builder/version.rb index 64f7d7d..83891e5 100644 --- a/lib/washout_builder/version.rb +++ b/lib/washout_builder/version.rb @@ -1,3 +1,3 @@ module WashoutBuilder - VERSION = "0.8.1" + VERSION = "0.8.2" end