action_policy 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e0d9085b8204e1846c9820dbc5eb7a9960fa9c512a51d942cc8aab16b065257
-  data.tar.gz: c85bf2348affc45eb365200070257bc31b873ded038033a0fb3d6f5ca8adb48d
+  metadata.gz: 911b1f7b929d458ae0bb95eb22fa11ff2a17925d9c797b626664bdad82b7abbc
+  data.tar.gz: 69bc6ead609db7cbcdc3d31455e7e17b88bf9037a51a8b1722e414a7e50c41e4
 SHA512:
-  metadata.gz: 2a1de70b5460eed8dc481a651ea52318e060fb486e604b0595f0fa09a4840a0eb93be2b90b7f20789cb135e62388f00a18650881e9739564ba311d11a3fbd131
-  data.tar.gz: 5cbcf29add9f224ce3b77a42a17ab403dec7f2f93a581f6ad25e13d8f1e75bc650d9889cb05dd247355fee6b6844fb400852f51b2d1118ac30076e5277b95e75
+  metadata.gz: e3cf8e4bd9347f052a34cee11fad004030ee80d9281c6bbbb9fe99b8f6665b0c611661d6ce3be8578345ef3171ad35d2c38fff8936bdd47efef48bb137a5a415
+  data.tar.gz: 63c4444667971ee445b60e2d9ffee89402021151ac730f00063f2066984c1ca75c15ae40b45fbce60ce9c4201826116bb417f6e62dbfd91f96a3f3974e26a458

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master
 
+## 0.5.4 (2020-12-09)
+
+- Add support for RSpec aliases detection when linting policy specs with `rubocop-rspec` 2.0 ([@pirj][])
+
+- Fix `strict_namespace: true` lookup option not finding policies in global namespace ([@Be-ngt-oH][])
+
 ## 0.5.0 (2020-09-29)
 
 - Move `deny!` / `allow!` to core. ([@palkan][])
@@ -37,7 +43,7 @@ This method is similar to `allowed_to?` but returns an authorization result obje
 
 Fixes [#122](https://github.com/palkan/action_policy/issues/122).
 
-- Separated `#classify`-based and `#camelize`-based symbol lookups. ([Be-ngt-oH][])
+- Separated `#classify`-based and `#camelize`-based symbol lookups. ([@Be-ngt-oH][])
 
 Only affects Rails apps. Now lookup for `:users` tries to find `UsersPolicy` first (camelize),
 and only then search for `UserPolicy` (classify).
@@ -429,3 +435,4 @@ This value is now stored in a cache (if any) instead of just the call result (`t
 [@nicolas-brousse]: https://github.com/nicolas-brousse
 [@somenugget]: https://github.com/somenugget
 [@Be-ngt-oH]: https://github.com/Be-ngt-oH
+[@pirj]: https://github.com/pirj

data/config/rubocop-rspec.yml

@@ -0,0 +1,17 @@
+RSpec:
+  Language:
+    ExampleGroups:
+      Regular:
+        - describe_rule
+      Focused:
+        - fdescribe_rule
+      Skipped:
+        - xdescribe_rule
+    Includes:
+      Examples:
+        - succeed
+        - failed
+        - fsucceed
+        - ffailed
+        - xsucceed
+        - xfailed

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
 
@@ -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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_policy
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-06 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-next-core
@@ -132,6 +132,7 @@ files:
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
+- config/rubocop-rspec.yml
 - 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