action_policy 0.4.4 → 0.5.0

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.4"
+  VERSION = "0.5.0"
 end

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.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-07 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,69 +129,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitattributes"
-- ".github/ISSUE_TEMPLATE.md"
-- ".github/PULL_REQUEST_TEMPLATE.md"
-- ".github/bug_report_template.rb"
-- ".gitignore"
-- ".rubocop.yml"
-- ".tidelift.yml"
-- ".travis.yml"
 - CHANGELOG.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- action_policy.gemspec
-- benchmarks/namespaced_lookup_cache.rb
-- benchmarks/pre_checks.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
@@ -234,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_camelize.rb
-- lib/action_policy/ext/yield_self_then.rb
 - lib/action_policy/i18n.rb
 - lib/action_policy/lookup_chain.rb
 - lib/action_policy/policy/aliases.rb
@@ -270,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
@@ -295,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:
   - - ">="

data/.gitattributes

@@ -1,2 +0,0 @@
-docs/**/* linguist-vendored
-.github/**/* linguist-vendored

data/.github/ISSUE_TEMPLATE.md

@@ -1,21 +0,0 @@
-<!--
-  This template is for bug reports. If you are reporting a bug, please continue on. If you are here for another reason,
-  feel free to skip the rest of this template.
--->
-
-### Tell us about your environment
-
-**Ruby Version:**
-
-**Framework Version (Rails, whatever):**
-
-**Action Policy Version:**
-
-**Reproduction Script:** Use [this template](https://github.com/palkan/action_policy/blob/master/.github/bug_report_template.rb) to
-create a standalone reproduction script. That would help us to fix the problem quicker. Thanks!
-
-### What did you do?
-
-### What did you expect to happen?
-
-### What actually happened?

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,29 +0,0 @@
-<!--
-  First of all, thanks for contributing!
-
-  If it's a typo fix or minor documentation update feel free to skip the rest of this template!
--->
-
-<!--
-  If it's a bug fix, then link it to the issue, for example:
-
-  Fixes #xxx
--->
-
-
-<!--
-  Otherwise, describe the changes: 
-
-### What is the purpose of this pull request?
-
-### What changes did you make? (overview)
-
-### Is there anything you'd like reviewers to focus on?
-
--->
-
-PR checklist:
-
-- [ ] Tests included
-- [ ] Documentation updated
-- [ ] Changelog entry added

data/.github/bug_report_template.rb

@@ -1,175 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/inline"
-
-# This reproduction script allows you to test Action Policy with Rails.
-# It contains:
-#   - Headless User model
-#   - UserPolicy
-#   - UsersController
-#   - Example tests for the controller.
-#
-# Update the classes to reproduce the failing case.
-#
-# Run the script as follows:
-#
-#   $ ruby bug_report_template.rb
-gemfile(true) do
-  source "https://rubygems.org"
-
-  gem "rails", "~> 6.0"
-  gem "action_policy", "~> 0.4"
-
-  gem "pry-byebug", platform: :mri
-end
-
-require "rails"
-require "action_controller/railtie"
-require "action_policy"
-
-require "minitest/autorun"
-
-module Buggy
-  class Application < Rails::Application
-    config.logger = Logger.new("/dev/null")
-    config.eager_load = false
-
-    initializer "routes" do
-      Rails.application.routes.draw do
-        get ":controller(/:action)"
-      end
-    end
-  end
-end
-
-Rails.application.initialize!
-
-class User
-  include Comparable
-
-  attr_reader :name
-
-  def initialize(name)
-    @name = name
-  end
-
-  def admin?
-    name == "admin"
-  end
-
-  def <=>(other)
-    return super unless other.is_a?(User)
-    name <=> other.name
-  end
-end
-
-class UserPolicy < ActionPolicy::Base
-  def index?
-    true
-  end
-
-  def create?
-    user.admin?
-  end
-
-  def show?
-    true
-  end
-
-  def manage?
-    user.admin? && !record.admin?
-  end
-end
-
-class UsersController < ActionController::Base
-  authorize :user, through: :current_user
-
-  before_action :set_user, only: [:update, :show]
-
-  def index
-    authorize!
-    render plain: "OK"
-  end
-
-  def create
-    authorize!
-    render plain: "OK"
-  end
-
-  def update
-    render plain: "OK"
-  end
-
-  def show
-    if allowed_to?(:update?, @user)
-      render plain: "OK"
-    else
-      render plain: "Read-only"
-    end
-  end
-
-  def current_user
-    @current_user ||= User.new(params[:user])
-  end
-
-  private
-
-  def set_user
-    @user = User.new(params[:target])
-    authorize! @user
-  end
-end
-
-class TestBugReproduction < ActionController::TestCase
-  tests UsersController
-
-  def before_setup
-    @routes = Rails.application.routes
-    super
-  end
-
-  def teardown
-    ActionPolicy::PerThreadCache.clear_all
-  end
-
-  def test_index
-    get :index, params: {user: "guest"}
-    assert_equal "OK", response.body
-  end
-
-  def test_create_failed
-    e = assert_raises(ActionPolicy::Unauthorized) do
-      post :create, params: {user: "guest"}
-    end
-
-    assert_equal UserPolicy, e.policy
-    assert_equal :create?, e.rule
-    assert e.result.reasons.is_a?(::ActionPolicy::Policy::FailureReasons)
-  end
-
-  def test_create_succeed
-    post :create, params: {user: "admin"}
-    assert_equal "OK", response.body
-  end
-
-  def test_update_failed
-    assert_raises(ActionPolicy::Unauthorized) do
-      patch :update, params: {user: "admin", target: "admin"}
-    end
-  end
-
-  def test_update_succeed
-    patch :update, params: {user: "admin", target: "guest"}
-    assert_equal "OK", response.body
-  end
-
-  def test_show
-    get :show, params: {user: "admin", target: "guest"}
-    assert_equal "OK", response.body
-  end
-
-  def test_show_admin
-    get :show, params: {user: "admin", target: "admin"}
-    assert_equal "Read-only", response.body
-  end
-end