action_policy 0.4.0 → 0.5.0

data/lib/action_policy/policy/reasons.rb

@@ -1,16 +1,8 @@
 # frozen_string_literal: true
 
-unless "".respond_to?(:then)
-  require "action_policy/ext/yield_self_then"
-  using ActionPolicy::Ext::YieldSelfThen
-end
-
-unless {}.respond_to?(:transform_keys)
-  require "action_policy/ext/hash_transform_keys"
-  using ActionPolicy::Ext::HashTransformKeys
-end
-
 module ActionPolicy
+  using RubyNext
+
   module Policy
     # Failures reasons store
     class FailureReasons
@@ -33,17 +25,11 @@ module ActionPolicy
 
       # Return Hash of the form:
       #   { policy_identifier => [rules, ...] }
-      def details
-        reasons.transform_keys(&:identifier)
-      end
+      def details() = reasons.transform_keys(&:identifier)
 
-      def empty?
-        reasons.empty?
-      end
+      def empty?() = reasons.empty?
 
-      def present?
-        !empty?
-      end
+      def present?() = !empty?
 
       private
 
@@ -82,6 +68,25 @@ module ActionPolicy
         @details = nil
       end
 
+      # Returns all the details merged together
+      def all_details
+        return @all_details if defined?(@all_details)
+
+        {}.tap do |all|
+          next unless defined?(@reasons)
+
+          reasons.reasons.each_value do |rules|
+            detailed_reasons = rules.last
+
+            next unless detailed_reasons.is_a?(Hash)
+
+            detailed_reasons.each_value do |details|
+              all.merge!(details)
+            end
+          end
+        end => @all_details
+      end
+
       # Add reasons to inspect
       def inspect
         super.then do |str|
@@ -189,12 +194,17 @@ module ActionPolicy
             policy.result
           end
 
-        result.reasons.add(policy, rule, res.details) if res.fail?
+        result&.reasons&.add(policy, rule, res.details) if res.fail?
 
         res.clear_details
 
         res.success?
       end
+
+      def deny!(reason = nil)
+        result&.reasons&.add(self, reason) if reason
+        super()
+      end
     end
   end
 end

data/lib/action_policy/policy/scoping.rb

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

data/lib/action_policy/rails/controller.rb

@@ -26,6 +26,7 @@ module ActionPolicy
       helper_method :allowed_to? if respond_to?(:helper_method)
 
       attr_writer :authorize_count
+      attr_reader :verify_authorized_skipped
 
       protected :authorize_count=, :authorize_count
     end
@@ -57,13 +58,17 @@ module ActionPolicy
 
     def verify_authorized
       raise UnauthorizedAction.new(controller_path, action_name) if
-        authorize_count.zero?
+        authorize_count.zero? && !verify_authorized_skipped
     end
 
     def authorize_count
       @authorize_count ||= 0
     end
 
+    def skip_verify_authorized!
+      @verify_authorized_skipped = true
+    end
+
     class_methods do
       # Adds after_action callback to check that
       # authorize! method has been called.

data/lib/action_policy/rails/ext/active_record.rb

@@ -7,4 +7,11 @@ ActiveRecord::Relation.include(Module.new do
   def policy_cache_key
     object_id
   end
+
+  # Explicitly define the policy_class method to avoid
+  # making Relation immutable (by initializing `arel` in `#respond_to_missing?).
+  # See https://github.com/palkan/action_policy/issues/101
+  def policy_class
+    nil
+  end
 end)

data/lib/action_policy/rails/policy/instrumentation.rb

@@ -11,7 +11,7 @@ module ActionPolicy # :nodoc:
         INIT_EVENT_NAME = "action_policy.init"
         APPLY_EVENT_NAME = "action_policy.apply_rule"
 
-        def initialize(*)
+        def initialize(record = nil, **params)
           event = {policy: self.class.name}
           ActiveSupport::Notifications.instrument(INIT_EVENT_NAME, event) { super }
         end

data/lib/action_policy/rspec/be_authorized_to.rb

@@ -45,16 +45,14 @@ module ActionPolicy
 
         @actual_calls = ActionPolicy::Testing::AuthorizeTracker.calls
 
-        actual_calls.any? { |call| call.matches?(policy, rule, target) }
+        actual_calls.any? { _1.matches?(policy, rule, target) }
       end
 
       def does_not_match?(*)
         raise "This matcher doesn't support negation"
       end
 
-      def supports_block_expectations?
-        true
-      end
+      def supports_block_expectations?() = true
 
       def failure_message
         "expected #{formatted_record} " \
@@ -72,14 +70,12 @@ module ActionPolicy
       end
 
       def formatted_calls
-        actual_calls.map do |acall|
-          " - #{acall.inspect}"
+        actual_calls.map do
+          " - #{_1.inspect}"
         end.join("\n")
       end
 
-      def formatted_record(record = target)
-        ::RSpec::Support::ObjectFormatter.format(record)
-      end
+      def formatted_record(record = target) = ::RSpec::Support::ObjectFormatter.format(record)
     end
   end
 end

data/lib/action_policy/rspec/dsl.rb

@@ -50,7 +50,7 @@ if defined?(::RSpec)
   ::RSpec.shared_context "action_policy:policy_context" do
     let(:record) { nil }
     let(:context) { {} }
-    let(:policy) { described_class.new(record, context) }
+    let(:policy) { described_class.new(record, **context) }
   end
 
   ::RSpec.shared_context "action_policy:policy_rule_context" do |policy_rule, *args, method: "describe", block: nil|
@@ -68,7 +68,7 @@ if defined?(::RSpec)
 
   ::RSpec.shared_examples_for "action_policy:policy_rule_example" do |success, the_caller|
     if success
-      specify do
+      specify "is allowed" do
         next if subject.success?
         raise(
           RSpec::Expectations::ExpectationNotMetError,
@@ -77,7 +77,7 @@ if defined?(::RSpec)
         )
       end
     else
-      specify do
+      specify "is denied" do
         next if subject.fail?
         raise(
           RSpec::Expectations::ExpectationNotMetError,

data/lib/action_policy/rspec/have_authorized_scope.rb

@@ -21,7 +21,7 @@ module ActionPolicy
     #
     class HaveAuthorizedScope < ::RSpec::Matchers::BuiltIn::BaseMatcher
       attr_reader :type, :name, :policy, :scope_options, :actual_scopes,
-                  :target_expectations
+        :target_expectations
 
       def initialize(type)
         @type = type
@@ -56,7 +56,7 @@ module ActionPolicy
 
         @actual_scopes = ActionPolicy::Testing::AuthorizeTracker.scopings
 
-        matching_scopes = actual_scopes.select { |scope| scope.matches?(policy, type, name, scope_options) }
+        matching_scopes = actual_scopes.select { _1.matches?(policy, type, name, scope_options) }
 
         return false if matching_scopes.empty?
 
@@ -75,9 +75,7 @@ module ActionPolicy
         raise "This matcher doesn't support negation"
       end
 
-      def supports_block_expectations?
-        true
-      end
+      def supports_block_expectations?() = true
 
       def failure_message
         "expected a scoping named :#{name} for type :#{type} " \
@@ -109,8 +107,8 @@ module ActionPolicy
       end
 
       def formatted_scopings
-        actual_scopes.map do |ascope|
-          " - #{ascope.inspect}"
+        actual_scopes.map do
+          " - #{_1.inspect}"
         end.join("\n")
       end
     end

data/lib/action_policy/testing.rb

@@ -15,7 +15,7 @@ module ActionPolicy
 
         def matches?(policy_class, actual_rule, target)
           policy_class == policy.class &&
-            target === policy.record &&
+            (target.is_a?(Class) ? target == policy.record : target === policy.record) &&
             rule == actual_rule
         end
 

data/lib/action_policy/utils/pretty_print.rb

@@ -16,10 +16,7 @@ ensure
 end
 
 module ActionPolicy
-  unless "".respond_to?(:then)
-    require "action_policy/ext/yield_self_then"
-    using ActionPolicy::Ext::YieldSelfThen
-  end
+  using RubyNext
 
   # Takes the object and a method name,
   # and returns the "annotated" source code for the method:
@@ -41,7 +38,7 @@ module ActionPolicy
   #  #=> AND
   #  #=> access_feed? #=> true
   module PrettyPrint
-    TRUE =  "\e[32mtrue\e[0m"
+    TRUE = "\e[32mtrue\e[0m"
     FALSE = "\e[31mfalse\e[0m"
 
     class Visitor
@@ -71,7 +68,7 @@ module ActionPolicy
 
       def expression_with_result(sexp)
         expression = Unparser.unparse(sexp)
-        "#{expression} #=> #{colorize(eval_exp(expression))}"
+        "#{expression} #=> #{PrettyPrint.colorize(eval_exp(expression))}"
       end
 
       def eval_exp(exp)
@@ -124,39 +121,39 @@ module ActionPolicy
 
       # Some lines should not be evaled
       def ignore_exp?(exp)
-        exp.match?(/^\s*binding\.(pry|irb)\s*$/)
-      end
-
-      def colorize(val)
-        return val unless $stdout.isatty
-        return TRUE if val.eql?(true)
-        return FALSE if val.eql?(false)
-        val
+        PrettyPrint.ignore_expressions.any? { exp.match?(_1) }
       end
     end
 
     class << self
+      attr_accessor :ignore_expressions
+
       if defined?(::Unparser) && defined?(::MethodSource)
-        def available?
-          true
-        end
+        def available?() = true
 
         def print_method(object, method_name)
-          ast = object.method(method_name).source.then(&Unparser.method(:parse))
+          ast = object.method(method_name).source.then(&Unparser.:parse)
           # outer node is a method definition itself
           body = ast.children[2]
 
           Visitor.new(object).collect(body)
         end
       else
-        def available?
-          false
-        end
+        def available?() = false
 
-        def print_method(_, _)
-          ""
-        end
+        def print_method(_, _) = ""
+      end
+
+      def colorize(val)
+        return val unless $stdout.isatty
+        return TRUE if val.eql?(true)
+        return FALSE if val.eql?(false)
+        val
       end
     end
+
+    self.ignore_expressions = [
+      /^\s*binding\.(pry|irb)\s*$/s
+    ]
   end
 end

data/lib/action_policy/utils/suggest_message.rb

@@ -13,9 +13,7 @@ module ActionPolicy
         suggestion ? "\nDid you mean? #{suggestion}" : ""
       end
     else
-      def suggest(*)
-        ""
-      end
+      def suggest(*) = ""
     end
   end
 end

data/lib/action_policy/version.rb

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

data/lib/generators/action_policy/install/templates/{application_policy.rb → application_policy.rb.tt}

@@ -5,7 +5,7 @@ class ApplicationPolicy < ActionPolicy::Base
   #
   #   authorize :account, optional: true
   #
-  # Read more about authoriztion context: https://actionpolicy.evilmartians.io/#/authorization_context
+  # Read more about authorization context: https://actionpolicy.evilmartians.io/#/authorization_context
 
   private
 

data/lib/generators/action_policy/policy/policy_generator.rb

@@ -8,7 +8,10 @@ module ActionPolicy
       source_root File.expand_path("templates", __dir__)
 
       def run_install_if_needed
-        return if ::Rails.root.join("app/policies/application_policy.rb").exist?
+        in_root do
+          return if File.exist?("app/policies/application_policy.rb")
+        end
+
         generate "action_policy:install"
       end
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: action_policy
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-12 00:00:00.000000000 Z
+date: 2020-09-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ruby-next-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.3
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
@@ -56,72 +70,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.67.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.67.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-md
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: standard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.39
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.39
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
@@ -157,68 +129,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitattributes"
-- ".github/FUNDING.yml"
-- ".github/ISSUE_TEMPLATE.md"
-- ".github/PULL_REQUEST_TEMPLATE.md"
-- ".gitignore"
-- ".rubocop.yml"
-- ".tidelift.yml"
-- ".travis.yml"
 - CHANGELOG.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- action_policy.gemspec
-- benchmarks/namespaced_lookup_cache.rb
-- bin/console
-- bin/setup
-- docs/.nojekyll
-- docs/CNAME
-- docs/README.md
-- docs/_sidebar.md
-- docs/aliases.md
-- docs/assets/docsify-search.js
-- docs/assets/docsify.min.js
-- docs/assets/fonts/FiraCode-Medium.woff
-- docs/assets/fonts/FiraCode-Regular.woff
-- docs/assets/images/banner.png
-- docs/assets/images/cache.png
-- docs/assets/images/cache.svg
-- docs/assets/images/layer.png
-- docs/assets/images/layer.svg
-- docs/assets/prism-ruby.min.js
-- docs/assets/styles.css
-- docs/assets/vue.min.css
-- docs/authorization_context.md
-- docs/behaviour.md
-- docs/caching.md
-- docs/controller_action_aliases.md
-- docs/custom_lookup_chain.md
-- docs/custom_policy.md
-- docs/debugging.md
-- docs/decorators.md
-- docs/favicon.ico
-- docs/graphql.md
-- docs/i18n.md
-- docs/index.html
-- docs/instrumentation.md
-- docs/lookup_chain.md
-- docs/namespaces.md
-- docs/non_rails.md
-- docs/pre_checks.md
-- docs/pundit_migration.md
-- docs/quick_start.md
-- docs/rails.md
-- docs/reasons.md
-- docs/scoping.md
-- docs/testing.md
-- docs/writing_policies.md
-- gemfiles/jruby.gemfile
-- gemfiles/rails42.gemfile
-- gemfiles/rails6.gemfile
-- gemfiles/railsmaster.gemfile
 - lib/action_policy.rb
 - lib/action_policy/authorizer.rb
 - lib/action_policy/base.rb
@@ -233,10 +146,8 @@ files:
 - lib/action_policy/ext/module_namespace.rb
 - lib/action_policy/ext/policy_cache_key.rb
 - lib/action_policy/ext/string_constantize.rb
-- lib/action_policy/ext/string_match.rb
 - lib/action_policy/ext/string_underscore.rb
-- lib/action_policy/ext/symbol_classify.rb
-- lib/action_policy/ext/yield_self_then.rb
+- lib/action_policy/ext/symbol_camelize.rb
 - lib/action_policy/i18n.rb
 - lib/action_policy/lookup_chain.rb
 - lib/action_policy/policy/aliases.rb
@@ -269,14 +180,14 @@ files:
 - lib/action_policy/version.rb
 - lib/generators/action_policy/install/USAGE
 - lib/generators/action_policy/install/install_generator.rb
-- lib/generators/action_policy/install/templates/application_policy.rb
+- lib/generators/action_policy/install/templates/application_policy.rb.tt
 - lib/generators/action_policy/policy/USAGE
 - lib/generators/action_policy/policy/policy_generator.rb
-- lib/generators/action_policy/policy/templates/policy.rb
+- lib/generators/action_policy/policy/templates/policy.rb.tt
 - lib/generators/rspec/policy_generator.rb
-- lib/generators/rspec/templates/policy_spec.rb
+- lib/generators/rspec/templates/policy_spec.rb.tt
 - lib/generators/test_unit/policy_generator.rb
-- lib/generators/test_unit/templates/policy_test.rb
+- lib/generators/test_unit/templates/policy_test.rb.tt
 homepage: https://github.com/palkan/action_policy
 licenses:
 - MIT
@@ -294,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="