effective_orders 1.4.8 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90f4d410052692513e6d97431511392a842f90fd
-  data.tar.gz: 0b76a1f812247ea785443054d58b490b63ba8cf9
+  metadata.gz: f1a47576086e85e24dc44de2c8c6e2c6bc78e074
+  data.tar.gz: 2eda2b07e901a0a0af711768a2d0e6210fac5791
 SHA512:
-  metadata.gz: e0c19301b8f074a34edd09e605b659ec43e1e5e9a0f51543f9dee0b8766eb395f58f7f3b12b435f498c4c5af2746924700db652e82b90e9aeefcb5d000bc424a
-  data.tar.gz: 8fa3a64a12f9d8ff24c354ba17373c048381d60c4b0af744b7a9803a630b0963099fe55ce5ec8e0709ad2c4473bcec7676ce5ace06e65643e879319f9b82f55a
+  metadata.gz: 4597fbb04b3808a5de5cd7e6f3e6034c5b1405491b1705dfd96cedf9d3dbedd8909d3ce8ba2f11b6fd6f3ffa262dc8e70a6a71f6284622bd85e3a7db4f815e43
+  data.tar.gz: f8e2772c836c2becb559ba5a4659a23311dc156d48f0d7730e94687c26488f94b99c8f28626323073b465d6d115a073f317584e507fe728634613122b080b679

data/app/controllers/concerns/acts_as_active_admin_controller.rb

@@ -0,0 +1,58 @@
+module ActsAsActiveAdminController
+  extend ActiveSupport::Concern
+
+  module ActionController
+    def acts_as_active_admin_controller(key)
+      @active_admin_resource_element_lookup_key = key
+      include ::ActsAsActiveAdminController
+    end
+  end
+
+  included do
+    include ::ActiveAdmin::BaseController::Menu
+    include ::ActiveAdmin::BaseController::Authorization
+
+    helper ::ActiveAdmin::ViewHelpers
+    helper_method :active_admin_config, :active_admin_namespace, :current_active_admin_user
+
+    resource_key = @active_admin_resource_element_lookup_key.to_s
+    self.send(:define_method, :active_admin_resource_element_key) { resource_key }
+
+    resource_ivar = '@' + resource_key.singularize
+    self.send(:define_method, :resource) { instance_variable_get(resource_ivar) }
+
+    resource_path = "effective_orders.#{resource_key.singularize}_path"
+
+    if resource_path == 'effective_orders.cart_path'
+      self.send(:define_method, :resource_path) { |resource| effective_orders.cart_path }
+    else
+      self.send(:define_method, :resource_path) { |resource| public_send(resource_path, resource) }
+    end
+
+    helper_method :resource, :resource_path
+  end
+
+  module ClassMethods
+  end
+
+  def active_admin_namespace
+    ::ActiveAdmin.application.namespaces[EffectiveOrders.active_admin_namespace || :root]
+  end
+
+  def active_admin_config
+    active_admin_namespace.resources[active_admin_resource_key]
+  end
+
+  def active_admin_resource_key
+    @active_admin_resource_key ||= begin
+      namespace = ::ActiveAdmin.application.namespaces[EffectiveOrders.active_admin_namespace || :root]
+      namespace.resources.keys.find { |resource| resource.element == active_admin_resource_element_key }
+    end
+  end
+
+  def current_active_admin_user
+    send(active_admin_namespace.current_user_method) if active_admin_namespace.current_user_method
+  end
+
+end
+

data/app/controllers/effective/carts_controller.rb

@@ -1,7 +1,7 @@
 module Effective
   class CartsController < ApplicationController
     include EffectiveCartsHelper
-    include ActiveAdminHelpers::Carts if EffectiveOrders.use_active_admin
+    acts_as_active_admin_controller('carts') if EffectiveOrders.use_active_admin
 
     layout (EffectiveOrders.layout.kind_of?(Hash) ? EffectiveOrders.layout[:carts] : EffectiveOrders.layout)
 

data/app/controllers/effective/orders_controller.rb

@@ -1,7 +1,7 @@
 module Effective
   class OrdersController < ApplicationController
     include EffectiveCartsHelper
-    include ActiveAdminHelpers::Orders if EffectiveOrders.use_active_admin
+    acts_as_active_admin_controller('orders') if EffectiveOrders.use_active_admin
 
     include Providers::Moneris if EffectiveOrders.moneris_enabled
     include Providers::Paypal if EffectiveOrders.paypal_enabled

data/lib/effective_orders/engine.rb

@@ -7,6 +7,10 @@ module EffectiveOrders
     # Include Helpers to base application
     initializer 'effective_orders.action_controller' do |app|
       ActiveSupport.on_load :action_controller do
+        if EffectiveOrders.use_active_admin
+          ActionController::Base.extend(ActsAsActiveAdminController::ActionController)
+        end
+
         helper EffectiveOrdersHelper
         helper EffectiveCartsHelper
         helper EffectivePaypalHelper if EffectiveOrders.paypal_enabled
@@ -45,13 +49,7 @@ module EffectiveOrders
     initializer 'effective_orders.active_admin' do
       if EffectiveOrders.use_active_admin
         require 'activeadmin'
-        puts "AM HERE IN EFFECTIVE ORDERS"
-
-        ActiveAdmin::Event.subscribe ActiveAdmin::Application::BeforeLoadEvent do
-          puts "SUBSCRIBED ACTIVEADMIN EVENT"
-          ::ActiveAdmin.application.load_paths.unshift Dir["#{config.root}/active_admin"]
-        end
-
+        ::ActiveAdmin.application.load_paths.unshift Dir["#{config.root}/active_admin"]
       end
     end
 

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '1.4.8'.freeze
+  VERSION = '1.5.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 1.4.8
+  version: 1.5.0
 platform: ruby
 authors:
 - Code and Effect
@@ -327,8 +327,7 @@ files:
 - app/controllers/admin/customers_controller.rb
 - app/controllers/admin/order_items_controller.rb
 - app/controllers/admin/orders_controller.rb
-- app/controllers/effective/active_admin_helpers/carts.rb
-- app/controllers/effective/active_admin_helpers/orders.rb
+- app/controllers/concerns/acts_as_active_admin_controller.rb
 - app/controllers/effective/carts_controller.rb
 - app/controllers/effective/orders_controller.rb
 - app/controllers/effective/providers/moneris.rb

data/app/controllers/effective/active_admin_helpers/carts.rb

@@ -1,47 +0,0 @@
-module Effective
-  module ActiveAdminHelpers
-    module Carts
-      extend ActiveSupport::Concern
-
-      included do
-        include ::ActiveAdmin::BaseController::Menu
-        include ::ActiveAdmin::BaseController::Authorization
-
-        helper ::ActiveAdmin::ViewHelpers
-        helper_method :active_admin_config, :active_admin_namespace, :current_active_admin_user
-        helper_method :resource, :resource_path
-      end
-
-      module ClassMethods
-      end
-
-      def resource
-        instance_variable_get(@cart)
-      end
-
-      def resource_path(resource)
-        effective_orders.cart_path
-      end
-
-      def active_admin_namespace
-        ::ActiveAdmin.application.namespaces[EffectiveOrders.active_admin_namespace || :root]
-      end
-
-      def active_admin_config
-        active_admin_namespace.resources[active_admin_resource_key]
-      end
-
-      def active_admin_resource_key
-        @active_admin_resource_key ||= begin
-          namespace = ::ActiveAdmin.application.namespaces[EffectiveOrders.active_admin_namespace || :root]
-          namespace.resources.keys.find { |resource| resource.element == 'carts' }
-        end
-      end
-
-      def current_active_admin_user
-        send(active_admin_namespace.current_user_method) if active_admin_namespace.current_user_method
-      end
-
-    end
-  end
-end

data/app/controllers/effective/active_admin_helpers/orders.rb

@@ -1,47 +0,0 @@
-module Effective
-  module ActiveAdminHelpers
-    module Orders
-      extend ActiveSupport::Concern
-
-      included do
-        include ::ActiveAdmin::BaseController::Menu
-        include ::ActiveAdmin::BaseController::Authorization
-
-        helper ::ActiveAdmin::ViewHelpers
-        helper_method :active_admin_config, :active_admin_namespace, :current_active_admin_user
-        helper_method :resource, :resource_path
-      end
-
-      module ClassMethods
-      end
-
-      def resource
-        instance_variable_get(@order)
-      end
-
-      def resource_path(resource)
-        effective_orders.order_path(resource)
-      end
-
-      def active_admin_namespace
-        ::ActiveAdmin.application.namespaces[EffectiveOrders.active_admin_namespace || :root]
-      end
-
-      def active_admin_config
-        active_admin_namespace.resources[active_admin_resource_key]
-      end
-
-      def active_admin_resource_key
-        @active_admin_resource_key ||= begin
-          namespace = ::ActiveAdmin.application.namespaces[EffectiveOrders.active_admin_namespace || :root]
-          namespace.resources.keys.find { |resource| resource.element == 'orders' }
-        end
-      end
-
-      def current_active_admin_user
-        send(active_admin_namespace.current_user_method) if active_admin_namespace.current_user_method
-      end
-
-    end
-  end
-end