effective_orders 1.4.5 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b863396582c8b6dc004e50916344386322c721e4
-  data.tar.gz: 75223e7cb0bec3465f05ccf74d388b7cdeb6e6b1
+  metadata.gz: 87ba5d572d9c6252280ef318455a3c9ad73cec07
+  data.tar.gz: ce7b5f6096fcb1f02954573d75241e4c23fd8fb8
 SHA512:
-  metadata.gz: 8c85fe756ef8eee38e47278600a689b07725fdcaf265bd9aba1196109372fa6572c8eda940b03eb8c7df7e2493abd280a385b5d11791528689d61cc640491a3b
-  data.tar.gz: 11589512f20e9617056ead5bb1a711f11cb776681c85d109a433d41c754e97d6ec06dfde2fc632fc6506c9d99c94f940a6ed9f24ffc482a692535bebd96252f5
+  metadata.gz: c15b40d769f37947efb3614deaeef1b7de514737e7e009ec6476dd0e46fc5c19e668013bf8d791dba0f6f7d1b309c93f2a55933ba3b1875c70d5b3df4de24025
+  data.tar.gz: cfbf07a9b769fbb4d667cbae1db3e61dc3e3b54d149f943bcfc1d920e1d7070f35c5ce2e2355a27e6e47971a2b7d8fce0ca69149a3405020cb55285e15d9b44a

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

@@ -0,0 +1,47 @@
+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

@@ -0,0 +1,47 @@
+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

data/app/controllers/effective/carts_controller.rb

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

data/app/controllers/effective/orders_controller.rb

@@ -1,7 +1,7 @@
 module Effective
   class OrdersController < ApplicationController
     include EffectiveCartsHelper
-    acts_as_active_admin_controller('orders') if defined?(ActiveAdmin) && EffectiveOrders.use_active_admin == true
+    include ActiveAdminHelpers::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

@@ -43,9 +43,9 @@ module EffectiveOrders
     # ActiveAdmin (optional)
     # This prepends the load path so someone can override the assets.rb if they want.
     initializer 'effective_orders.active_admin' do
-      if defined?(ActiveAdmin) && EffectiveOrders.use_active_admin == true
-        ActionController::Base.extend(::ActsAsActiveAdminController::ActionController)
-        ActiveAdmin.application.load_paths.unshift Dir["#{config.root}/active_admin"]
+      if EffectiveOrders.use_active_admin
+        require 'active_admin'
+        ::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.5'.freeze
+  VERSION = '1.4.6'.freeze
 end

metadata

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

data/app/controllers/concerns/acts_as_active_admin_controller.rb

@@ -1,60 +0,0 @@
-module ActsAsActiveAdminController
-  extend ActiveSupport::Concern
-
-  module ActionController
-    def acts_as_active_admin_controller(key)
-      puts "== 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
-