effective_resources 1.7.6 → 1.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56a161aa8bd3ad423f84fbe6f5a10b3b029eec746f72c186683472b5992d7357
-  data.tar.gz: d7826fbdaaeeca49f15e0fac3f76ac949086c3760048ca8c7d98bf3d295fa6c9
+  metadata.gz: 43a2e065a385451ee58c4cf054e18ffb3b2d67618aef4c6e3a417b221b7a6839
+  data.tar.gz: fa379b94d613fa510aa5261c44877a344dfff0ac6de0202a64c90d692b9157aa
 SHA512:
-  metadata.gz: 3accf197802ebe5e8bd825aad59759db334efb1c80bbce300625d391a3ca4a9075be45cc87410b1b536d8c6b817f9df11feccec7e36e6b045fdc77cdc58dffe3
-  data.tar.gz: 798d95af974616b3cfddf193b35cbbce8df47f74d73171dfae4a1de4b4445cfec5a97765e8b3ffa275dc57c5d3064cc6a0c0672c6e760a855bab006c0ccaa48b
+  metadata.gz: a0ed3d10e90f30f5a7b4dd9d837fe21ca6d07c557850d1931ec97c839fbb39a78e11fa795331af247cc5fa929fccdf5aec3f6f05dfd8b68d35e3e0682de0c732
+  data.tar.gz: 53d62815fc3e7fa7718fa1094b7fcb721d772631b1ec1899a9ad7a4f601705091b9efba194b59c4ebead8f0a260b9791b0b83cce9d4962a523361abe46697ef0

data/lib/effective_resources.rb

@@ -1,25 +1,24 @@
 require 'effective_resources/engine'
 require 'effective_resources/version'
+require 'effective_resources/effective_gem'
 
 module EffectiveResources
 
-  # The following are all valid config keys
-  mattr_accessor :authorization_method
-  mattr_accessor :default_submits
-
-  def self.setup
-    yield self
+  def self.config_keys
+    [:authorization_method, :default_submits]
   end
 
+  include EffectiveGem
+
   def self.authorized?(controller, action, resource)
-    @_exceptions ||= [Effective::AccessDenied, (CanCan::AccessDenied if defined?(CanCan)), (Pundit::NotAuthorizedError if defined?(Pundit))].compact
+    @exceptions ||= [Effective::AccessDenied, (CanCan::AccessDenied if defined?(CanCan)), (Pundit::NotAuthorizedError if defined?(Pundit))].compact
 
     return !!authorization_method unless authorization_method.respond_to?(:call)
     controller = controller.controller if controller.respond_to?(:controller)
 
     begin
       !!(controller || self).instance_exec((controller || self), action, resource, &authorization_method)
-    rescue *@_exceptions
+    rescue *@exceptions
       false
     end
   end
@@ -29,9 +28,7 @@ module EffectiveResources
   end
 
   def self.default_submits
-    @_default_submits ||= begin
-      (['Save', 'Continue', 'Add New'] & Array(@@default_submits)).inject({}) { |h, v| h[v] = true; h }
-    end
+    (['Save', 'Continue', 'Add New'] & Array(config.default_submits)).inject({}) { |h, v| h[v] = true; h }
   end
 
 end

data/lib/effective_resources/effective_gem.rb

@@ -0,0 +1,42 @@
+# Effective Engine concern
+
+module EffectiveGem
+  extend ActiveSupport::Concern
+
+  included do
+    raise("expected self.config_keys method") unless respond_to?(:config_keys)
+
+    config_keys.each do |key|
+      self.class.define_method(key) { config()[key] }
+    end
+  end
+
+  module ClassMethods
+    def config(namespace = nil)
+      namespace ||= Tenant.current if defined?(Tenant)
+      @config.dig(namespace) || @config
+    end
+
+    def setup(namespace = nil, &block)
+      @config ||= ActiveSupport::OrderedOptions.new
+      namespace ||= Tenant.current if defined?(Tenant)
+
+      if namespace
+        @config[namespace] ||= ActiveSupport::OrderedOptions.new
+      end
+
+      yield(config(namespace))
+
+      if(unsupported = (config(namespace).keys - config_keys)).present?
+        if unsupported.include?(:authorization_method)
+          raise("config.authorization_method has been removed. This gem will call EffectiveResources.authorization_method instead. Please double check the config.authorization_method setting in config/initializers/effective_resources.rb and remove it from this file.")
+        end
+
+        raise("unsupported config keys: #{unsupported}\n supported keys: #{config_keys}")
+      end
+
+      true
+    end
+  end
+
+end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.7.6'.freeze
+  VERSION = '1.7.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.7.6
+  version: 1.7.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2021-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -180,6 +180,7 @@ files:
 - app/views/effective/resource/_actions_glyphicons.html.haml
 - config/effective_resources.rb
 - lib/effective_resources.rb
+- lib/effective_resources/effective_gem.rb
 - lib/effective_resources/engine.rb
 - lib/effective_resources/version.rb
 - lib/generators/effective_resources/install_generator.rb