Merge pull request #279 from seand7565/rename_decorators

Move decorators to the correct folders and add EngineExtensions
nebulab · Nov 6, 2020 · 356c8b2 · 356c8b2
2 parents 720f2d1 + 846591f
commit 356c8b2
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 8 deletions.
diff --git a/...ee/admin_payments_controller_decorator.rb → ...ee/admin_payments_controller_decorator.rb b/...ee/admin_payments_controller_decorator.rb → ...ee/admin_payments_controller_decorator.rb
diff --git a/...raintree/checkout_controller_decorator.rb → ...raintree/checkout_controller_decorator.rb b/...raintree/checkout_controller_decorator.rb → ...raintree/checkout_controller_decorator.rb
diff --git a/...pal_braintree/client_tokens_controller.rb → ...pal_braintree/client_tokens_controller.rb b/...pal_braintree/client_tokens_controller.rb → ...pal_braintree/client_tokens_controller.rb
diff --git a/..._braintree/orders_controller_decorator.rb → ..._braintree/orders_controller_decorator.rb b/..._braintree/orders_controller_decorator.rb → ..._braintree/orders_controller_decorator.rb
diff --git a/...paypal_braintree/spree/store_decorator.rb → ...paypal_braintree/spree/store_decorator.rb b/...paypal_braintree/spree/store_decorator.rb → ...paypal_braintree/spree/store_decorator.rb
diff --git a/..._paypal_braintree/spree/user_decorator.rb → ..._paypal_braintree/spree/user_decorator.rb b/..._paypal_braintree/spree/user_decorator.rb → ..._paypal_braintree/spree/user_decorator.rb
diff --git a/lib/solidus_paypal_braintree/engine.rb b/lib/solidus_paypal_braintree/engine.rb
@@ -4,6 +4,8 @@
 
 module SolidusPaypalBraintree
   class Engine < Rails::Engine
+    include SolidusSupport::EngineExtensions
+
     isolate_namespace SolidusPaypalBraintree
     engine_name 'solidus_paypal_braintree'
 
@@ -21,14 +23,6 @@ class Engine < Rails::Engine
       Spree::PermittedAttributes.source_attributes.concat [:nonce, :payment_type]
     end
 
-    def self.activate
-      Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')).sort.each do |c|
-        Rails.configuration.cache_classes ? require(c) : load(c)
-      end
-    end
-
-    config.to_prepare(&method(:activate).to_proc)
-
     if SolidusSupport.frontend_available?
       config.assets.precompile += [
         'solidus_paypal_braintree/checkout.js',