action_policy 0.5.0 → 0.5.5

data/lib/action_policy/behaviours/thread_memoized.rb

@@ -40,7 +40,7 @@ module ActionPolicy
           base.prepend InstanceMethods
         end
 
-        alias included prepended
+        alias_method :included, :prepended
       end
 
       module InstanceMethods # :nodoc:

data/lib/action_policy/lookup_chain.rb

@@ -36,8 +36,7 @@ module ActionPolicy
           if strict
             put_if_absent(:strict, namespace, policy, &block)
           else
-            cached_policy = put_if_absent(:strict, namespace, policy, &block)
-            put_if_absent(:flexible, namespace, policy) { cached_policy }
+            put_if_absent(:flexible, namespace, policy, &block)
           end
         end
 
@@ -53,7 +52,7 @@ module ActionPolicy
     class << self
       attr_accessor :chain, :namespace_cache_enabled
 
-      alias namespace_cache_enabled? namespace_cache_enabled
+      alias_method :namespace_cache_enabled?, :namespace_cache_enabled
 
       def call(record, **opts)
         chain.each do |probe|
@@ -66,22 +65,17 @@ module ActionPolicy
       private
 
       def lookup_within_namespace(policy_name, namespace, strict: false)
-        return unless namespace
-        NamespaceCache.fetch(namespace.name, policy_name, strict: strict) do
+        NamespaceCache.fetch(namespace&.name || "Kernel", policy_name, strict: strict) do
           mod = namespace
           loop do
-            policy = "#{mod.name}::#{policy_name}".safe_constantize
-            break policy unless policy.nil?
+            policy = [mod&.name, policy_name].compact.join("::").safe_constantize
+            break policy if policy || mod.nil? || strict
+
             mod = mod.namespace
-            break if mod.nil? || strict
           end
         end
       end
 
-      def objectify_policy(policy_name, strict: false)
-        policy_name.safe_constantize unless strict
-      end
-
       def policy_class_name_for(record)
         return record.policy_name.to_s if record.respond_to?(:policy_name)
 
@@ -110,17 +104,10 @@ module ActionPolicy
       record.class.policy_class if record.class.respond_to?(:policy_class)
     }
 
-    # Lookup within namespace when provided
-    NAMESPACE_LOOKUP = ->(record, namespace: nil, **) {
-      next if namespace.nil?
-
-      policy_name = policy_class_name_for(record)
-      lookup_within_namespace(policy_name, namespace)
-    }
-
     # Infer from class name
-    INFER_FROM_CLASS = ->(record, **) {
-      policy_class_name_for(record).safe_constantize
+    INFER_FROM_CLASS = ->(record, namespace: nil, strict_namespace: false, **) {
+      policy_name = policy_class_name_for(record)
+      lookup_within_namespace(policy_name, namespace, strict: strict_namespace)
     }
 
     # Infer from passed symbol
@@ -128,8 +115,7 @@ module ActionPolicy
       next unless record.is_a?(Symbol)
 
       policy_name = "#{record.camelize}Policy"
-      lookup_within_namespace(policy_name, namespace, strict: strict_namespace) ||
-        objectify_policy(policy_name, strict: strict_namespace)
+      lookup_within_namespace(policy_name, namespace, strict: strict_namespace)
     }
 
     # (Optional) Infer using String#classify if available
@@ -137,8 +123,7 @@ module ActionPolicy
       next unless record.is_a?(Symbol)
 
       policy_name = "#{record.to_s.classify}Policy"
-      lookup_within_namespace(policy_name, namespace, strict: strict_namespace) ||
-        objectify_policy(policy_name, strict: strict_namespace)
+      lookup_within_namespace(policy_name, namespace, strict: strict_namespace)
     }
 
     self.chain = [
@@ -146,7 +131,6 @@ module ActionPolicy
       (CLASSIFY_SYMBOL_LOOKUP if String.method_defined?(:classify)),
       INSTANCE_POLICY_CLASS,
       CLASS_POLICY_CLASS,
-      NAMESPACE_LOOKUP,
       INFER_FROM_CLASS
     ].compact
   end

data/lib/action_policy/policy/aliases.rb

@@ -53,11 +53,11 @@ module ActionPolicy
         def rules_aliases
           return @rules_aliases if instance_variable_defined?(:@rules_aliases)
 
-          if superclass.respond_to?(:rules_aliases)
+          @rules_aliases = if superclass.respond_to?(:rules_aliases)
             superclass.rules_aliases.dup
           else
             {}
-          end => @rules_aliases
+          end
         end
 
         def method_added(name)

data/lib/action_policy/policy/authorization.rb

@@ -75,11 +75,11 @@ module ActionPolicy
         def authorization_targets
           return @authorization_targets if instance_variable_defined?(:@authorization_targets)
 
-          if superclass.respond_to?(:authorization_targets)
+          @authorization_targets = if superclass.respond_to?(:authorization_targets)
             superclass.authorization_targets.dup
           else
             {}
-          end => @authorization_targets
+          end
         end
       end
     end

data/lib/action_policy/policy/cache.rb

@@ -89,11 +89,11 @@ module ActionPolicy # :nodoc:
         def cached_rules
           return @cached_rules if instance_variable_defined?(:@cached_rules)
 
-          if superclass.respond_to?(:cached_rules)
+          @cached_rules = if superclass.respond_to?(:cached_rules)
             superclass.cached_rules.dup
           else
             {}
-          end => @cached_rules
+          end
         end
       end
     end

data/lib/action_policy/policy/pre_check.rb

@@ -150,11 +150,11 @@ module ActionPolicy
         def pre_checks
           return @pre_checks if instance_variable_defined?(:@pre_checks)
 
-          if superclass.respond_to?(:pre_checks)
+          @pre_checks = if superclass.respond_to?(:pre_checks)
             superclass.pre_checks.dup
           else
             []
-          end => @pre_checks
+          end
         end
       end
     end

data/lib/action_policy/policy/reasons.rb

@@ -72,7 +72,7 @@ module ActionPolicy
       def all_details
         return @all_details if defined?(@all_details)
 
-        {}.tap do |all|
+        @all_details = {}.tap do |all|
           next unless defined?(@reasons)
 
           reasons.reasons.each_value do |rules|
@@ -84,7 +84,7 @@ module ActionPolicy
               all.merge!(details)
             end
           end
-        end => @all_details
+        end
       end
 
       # Add reasons to inspect
@@ -185,10 +185,12 @@ module ActionPolicy
       def allowed_to?(rule, record = :__undef__, **options)
         res =
           if (record == :__undef__ || record == self.record) && options.empty?
+            rule = resolve_rule(rule)
             policy = self
             with_clean_result { apply(rule) }
           else
             policy = policy_for(record: record, **options)
+            rule = policy.resolve_rule(rule)
 
             policy.apply(rule)
             policy.result

data/lib/action_policy/policy/scoping.rb

@@ -148,11 +148,11 @@ module ActionPolicy
         def scope_matchers
           return @scope_matchers if instance_variable_defined?(:@scope_matchers)
 
-          if superclass.respond_to?(:scope_matchers)
+          @scope_matchers = if superclass.respond_to?(:scope_matchers)
             superclass.scope_matchers.dup
           else
             []
-          end => @scope_matchers
+          end
         end
       end
     end

data/lib/action_policy/test_helper.rb

@@ -21,6 +21,7 @@ module ActionPolicy
         yield scopes.first.target
       end
     end
+
     # Asserts that the given policy was used to authorize the given target.
     #
     #   def test_authorize

data/lib/action_policy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActionPolicy
-  VERSION = "0.5.0"
+  VERSION = "0.5.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_policy
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.5
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-29 00:00:00.000000000 Z
+date: 2020-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-next-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
@@ -132,6 +132,31 @@ files:
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
+- config/rubocop-rspec.yml
+- lib/.rbnext/1995.next/action_policy/behaviours/policy_for.rb
+- lib/.rbnext/1995.next/action_policy/behaviours/scoping.rb
+- lib/.rbnext/1995.next/action_policy/policy/authorization.rb
+- lib/.rbnext/1995.next/action_policy/utils/pretty_print.rb
+- lib/.rbnext/2.7/action_policy/behaviours/policy_for.rb
+- lib/.rbnext/2.7/action_policy/i18n.rb
+- lib/.rbnext/2.7/action_policy/policy/cache.rb
+- lib/.rbnext/2.7/action_policy/policy/pre_check.rb
+- lib/.rbnext/2.7/action_policy/rspec/be_authorized_to.rb
+- lib/.rbnext/2.7/action_policy/rspec/have_authorized_scope.rb
+- lib/.rbnext/2.7/action_policy/utils/pretty_print.rb
+- lib/.rbnext/3.0/action_policy/behaviours/thread_memoized.rb
+- lib/.rbnext/3.0/action_policy/ext/policy_cache_key.rb
+- lib/.rbnext/3.0/action_policy/policy/aliases.rb
+- lib/.rbnext/3.0/action_policy/policy/cache.rb
+- lib/.rbnext/3.0/action_policy/policy/core.rb
+- lib/.rbnext/3.0/action_policy/policy/defaults.rb
+- lib/.rbnext/3.0/action_policy/policy/execution_result.rb
+- lib/.rbnext/3.0/action_policy/policy/pre_check.rb
+- lib/.rbnext/3.0/action_policy/policy/reasons.rb
+- lib/.rbnext/3.0/action_policy/rspec/be_authorized_to.rb
+- lib/.rbnext/3.0/action_policy/rspec/have_authorized_scope.rb
+- lib/.rbnext/3.0/action_policy/utils/pretty_print.rb
+- lib/.rbnext/3.0/action_policy/utils/suggest_message.rb
 - lib/action_policy.rb
 - lib/action_policy/authorizer.rb
 - lib/action_policy/base.rb