can_can_dry 0.4.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6d616a9b6ad397897fac85697703891c64d112c1f35d1a0dccd1440d1ef104a
-  data.tar.gz: f0ee05bb9187e61f33137e0b3ae8b86c5a9b262ed02cbf31afd02587814afaec
+  metadata.gz: 1d7ed26d5f02337ebace3524ca99ef836d92bb71d2f09a3d8f050b844fa84652
+  data.tar.gz: f931490d6a1147f24e55faaefb1f5b0d45df45e7e44051ebdca55ed86c13500b
 SHA512:
-  metadata.gz: '0170885cc2ebe41ba704a6a47a3b9f4dc4e7281f2591defe4460981169abe4176f1f244041c41df44ec054eebb9af4775885cc1fbf62b6f2bcb546b7ffab667d'
-  data.tar.gz: 4845274bc917347ce95087f940d8e154ec928f5062a7e2f488d254406d581c220b30a13bc218ad914e85ad7b3e75fad3384f40a1c06d8adba91f1389d9f16d4a
+  metadata.gz: ed2245fdc58ce7d5ed07366976a26e640d4df2b6a81c8c8ac6975d311633692070de45527201d510db193f838d89e7e3c105d0bfc2f7df5b731e9cf47243ab9f
+  data.tar.gz: a24fb419ec2a72d746f711d7c6784896a46a73f95ff71c981145615b40220646ec6cf68d0d3127f6b16b9002485d56585513d3ca0a4ff2cebe9c51aea160bdbb

data/app/helpers/can_can_dry_helper.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module CanCanDryHelper
+  def ability_mapping
+    @ability_mapping ||= ::AbilityMapping.new # rubocop:disable Rails/HelperInstanceVariable
+  end
+
+  def can_by_path?(path, method = :get)
+    can_by_can_args(ability_mapping.can_args_by_path(main_app.root_path, path, method))
+  end
+
+  def can_by_path_hash?(path_hash)
+    can_by_can_args(ability_mapping.can_args_by_path_hash(path_hash))
+  end
+
+  def link_or_text(name = nil, options = nil, html_options = nil)
+    link_or_default(name, name, options, html_options)
+  end
+
+  def link_or_nil(name = nil, options = nil, html_options = nil)
+    link_or_default(name, nil, options, html_options)
+  end
+
+  private
+
+  def link_or_default(name, default, options, html_options)
+    if can_by_link_options?(options, html_options)
+      link_to(name, options, html_options)
+    else
+      default
+    end
+  end
+
+  def can_by_link_options?(options, html_options)
+    can_by_path?(url_for(options), link_method(options, html_options))
+  end
+
+  def link_method(*hashs)
+    hashs.each do |h|
+      return h[:method] if h.is_a?(Hash) && h[:method]
+    end
+    :get
+  end
+
+  def can_by_can_args(can_args_args)
+    assert_can_method
+    can_args_args.each do |c|
+      next if c.empty?
+      return true if can?(*c)
+    end
+    false
+  end
+
+  def assert_can_method
+    return if respond_to?('can?')
+
+    singleton_class.include(::CanCanDry::NoControllerCanCanAdditions)
+  end
+end

data/lib/can_can_dry.rb

@@ -12,10 +12,7 @@ module CanCanDry
   require_dependency 'can_can_dry/ability_mapping'
   require_dependency 'can_can_dry/ability_mapping/path_mapping_not_found'
   require_dependency 'can_can_dry/ability_mapping/action_mapping_not_found'
-  require_dependency 'can_can_dry/helpers/can_can_dry_helper'
+  require_dependency 'can_can_dry/engine'
   require_dependency 'can_can_dry/no_controller_can_can_additions'
   require_dependency 'can_can_dry/path_recognizer'
-
-  require_dependency 'action_view'
-  ActionView::Base.include CanCanDry::Helpers::CanCanDryHelper
 end

data/lib/can_can_dry/ability_mapping_sets/devise.rb

@@ -4,8 +4,12 @@ module CanCanDry
   module AbilityMappingSets
     module Devise
       def map_devise
+        map_resources 'Devise::Confirmation'
+        map_resources 'Devise::OmniauthCallback'
+        map_resources 'Devise::Registration'
         map_resources 'Devise::Session'
         map_resources 'Devise::Password'
+        map_resources 'Devise::Unlock'
       end
     end
   end

data/lib/can_can_dry/ability_mapping_sets/devise_invitable.rb

@@ -4,6 +4,7 @@ module CanCanDry
   module AbilityMappingSets
     module DeviseInvitable
       def map_devise_invitable
+        map_resources 'Devise::Invitations'
         map_resources 'DeviseInvitable::Registration'
       end
     end

data/lib/can_can_dry/controller_authorization.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
-require_dependency 'can_can_dry/helpers/can_can_dry_helper'
-
 module CanCanDry
   module ControllerAuthorization
-    include CanCanDry::Helpers::CanCanDryHelper
+    extend ::ActiveSupport::Concern
+
+    included do
+      include ::CanCanDryHelper
+    end
 
     def authorize_by_ability_mapping
       raise CanCan::AccessDenied, "Falhou ao tentar acessar #{path_hash}" unless

data/lib/can_can_dry/engine.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module CanCanDry
+  class Engine < ::Rails::Engine; end
+end

data/lib/can_can_dry/path_recognizer.rb

@@ -1,55 +1,76 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/core_ext'
+
 module CanCanDry
   # Copiado de https://github.com/appirits/awesome_admin_layout
   # /lib/awesome_admin_layout/recognize_path.rb
-  module PathRecognizer
+  class PathRecognizer
     class << self
       def recognize(root_path, path, options = {})
-        path = remove_root_path(root_path, path)
-        Rails.application.routes.recognize_path(path, options)
-      rescue ActionController::RoutingError
-        Rails::Engine.subclasses.each do |engine|
-          recognized_path = engine_recognize(engine, path, options)
-          return recognized_path if recognized_path
-        end
-        raise "Path not recognized: \"#{path}\" (Options: #{options})"
+        new(root_path, path, options).recognize_or_raise
       end
 
-      private
-
       def remove_root_path(root_path, path)
         path = path.gsub(/\A#{Regexp.quote(root_path)}/, '')
         path.gsub(%r{\A/*}, '/')
       end
+    end
+
+    common_constructor :root_path, :path, :options do
+      self.path = self.class.remove_root_path(root_path, path)
+    end
+
+    def recognize_or_raise
+      recognize || raise("Path not recognized: \"#{path}\" (Options: #{options})")
+    end
+
+    def recognize
+      core_recognize || engines_recognize
+    end
+
+    private
 
-      def engine_recognize(engine, path, options)
-        engine_path = path_for_engine(engine.instance.class, path)
-        return unless engine_path
+    def core_recognize
+      Rails.application.routes.recognize_path(path, options)
+    rescue ActionController::RoutingError
+      nil
+    end
 
-        begin
-          return engine.instance.routes.recognize_path(engine_path, options)
-        rescue ActionController::RoutingError => e
-          Rails.logger.debug "[#{engine}] ActionController::RoutingError: #{e.message}"
-        end
-        nil
+    def engines_recognize
+      Rails::Engine.subclasses.each do |engine|
+        recognized_path = engine_recognize(engine)
+        return recognized_path if recognized_path
       end
+      nil
+    end
 
-      def path_for_engine(engine_class, path)
-        engine_route = Rails.application.routes.routes.find { |r| app_class_for(r) == engine_class }
-        return unless engine_route
+    def engine_recognize(engine)
+      engine_path = path_for_engine(engine.instance.class)
+      return unless engine_path
 
-        path.gsub(/^#{engine_route.path.spec}/, '')
+      begin
+        return engine.instance.routes.recognize_path(engine_path, options)
+      rescue ActionController::RoutingError => e
+        Rails.logger.debug "[#{engine}] ActionController::RoutingError: #{e.message}"
       end
+      nil
+    end
+
+    def path_for_engine(engine_class)
+      engine_route = Rails.application.routes.routes.find { |r| app_class_for(r) == engine_class }
+      return unless engine_route
+
+      path.gsub(/^#{engine_route.path.spec}/, '')
+    end
 
-      def app_class_for(route)
-        if Rails.version =~ /\A4\.2\./
-          # for Rails 4.2
-          route.app.app
-        else
-          # for Rails 4.1, 4.0, 3.2
-          route.app
-        end
+    def app_class_for(route)
+      if Rails.version >= '4.2'
+        # for Rails 4.2
+        route.app.app
+      else
+        # for Rails 4.1, 4.0, 3.2
+        route.app
       end
     end
   end

data/lib/can_can_dry/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CanCanDry
-  VERSION = '0.4.1'
+  VERSION = '0.5.3'
 end

data/spec/lib/rubocop_check_spec.rb

@@ -1,7 +1,3 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_gem_support/spec/examples/rubocop_check'
-
-RSpec.describe ::RuboCop do
-  include_examples 'rubocop_check', ::File.expand_path('../..', __dir__)
-end
+::EacRubyUtils::Rspec.default_setup.describe_rubocop

data/spec/spec_helper.rb

@@ -1,100 +1,4 @@
 # frozen_string_literal: true
 
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# The generated `.rspec` file contains `--require spec_helper` which will cause
-# this file to always be loaded, without a need to explicitly require it in any
-# files.
-#
-# Given that it is always loaded, you are encouraged to keep this file as
-# light-weight as possible. Requiring heavyweight dependencies from this file
-# will add to the boot time of your test suite on EVERY test run, even for an
-# individual file that may not need all of that loaded. Instead, consider making
-# a separate helper file that requires the additional dependencies and performs
-# the additional setup, and require it from the spec files that actually need
-# it.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-RSpec.configure do |config|
-  # rspec-expectations config goes here. You can use an alternate
-  # assertion/expectation library such as wrong or the stdlib/minitest
-  # assertions if you prefer.
-  config.expect_with :rspec do |expectations|
-    # This option will default to `true` in RSpec 4. It makes the `description`
-    # and `failure_message` of custom matchers include text for helper methods
-    # defined using `chain`, e.g.:
-    #     be_bigger_than(2).and_smaller_than(4).description
-    #     # => "be bigger than 2 and smaller than 4"
-    # ...rather than:
-    #     # => "be bigger than 2"
-    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
-  end
-
-  # rspec-mocks config goes here. You can use an alternate test double
-  # library (such as bogus or mocha) by changing the `mock_with` option here.
-  config.mock_with :rspec do |mocks|
-    # Prevents you from mocking or stubbing a method that does not exist on
-    # a real object. This is generally recommended, and will default to
-    # `true` in RSpec 4.
-    mocks.verify_partial_doubles = true
-  end
-
-  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
-  # have no way to turn it off -- the option exists only for backwards
-  # compatibility in RSpec 3). It causes shared context metadata to be
-  # inherited by the metadata hash of host groups and examples, rather than
-  # triggering implicit auto-inclusion in groups with matching metadata.
-  config.shared_context_metadata_behavior = :apply_to_host_groups
-
-  # The settings below are suggested to provide a good initial experience
-  # with RSpec, but feel free to customize to your heart's content.
-  #   # This allows you to limit a spec run to individual examples or groups
-  #   # you care about by tagging them with `:focus` metadata. When nothing
-  #   # is tagged with `:focus`, all examples get run. RSpec also provides
-  #   # aliases for `it`, `describe`, and `context` that include `:focus`
-  #   # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
-  #   config.filter_run_when_matching :focus
-  #
-  #   # Allows RSpec to persist some state between runs in order to support
-  #   # the `--only-failures` and `--next-failure` CLI options. We recommend
-  #   # you configure your source control system to ignore this file.
-  #   config.example_status_persistence_file_path = "spec/examples.txt"
-  #
-  #   # Limits the available syntax to the non-monkey patched syntax that is
-  #   # recommended. For more details, see:
-  #   #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
-  #   #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
-  #   config.disable_monkey_patching!
-  #
-  #   # This setting enables warnings. It's recommended, but in some cases may
-  #   # be too noisy due to issues in dependencies.
-  #   config.warnings = true
-  #
-  #   # Many RSpec users commonly either run the entire suite or an individual
-  #   # file, and it's useful to allow more verbose output when running an
-  #   # individual spec file.
-  #   if config.files_to_run.one?
-  #     # Use the documentation formatter for detailed output,
-  #     # unless a formatter has already been configured
-  #     # (e.g. via a command-line flag).
-  #     config.default_formatter = "doc"
-  #   end
-  #
-  #   # Print the 10 slowest examples and example groups at the
-  #   # end of the spec run, to help surface which specs are running
-  #   # particularly slow.
-  #   config.profile_examples = 10
-  #
-  #   # Run specs in random order to surface order dependencies. If you find an
-  #   # order dependency and want to debug it, you can fix the order by providing
-  #   # the seed, which is printed after each run.
-  #   #     --seed 1234
-  #   config.order = :random
-  #
-  #   # Seed global randomization in this process using the `--seed` CLI option.
-  #   # Setting this allows you to use `--seed` to deterministically reproduce
-  #   # test failures related to randomization by passing the same `--seed` value
-  #   # as the one that triggered the failure.
-  #   Kernel.srand config.seed
-end
+require 'eac_ruby_utils/rspec/default_setup'
+::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: can_can_dry
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-22 00:00:00.000000000 Z
+date: 2021-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cancancan
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.72'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.72'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -58,20 +58,27 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
 description: 
 email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/helpers/can_can_dry_helper.rb
 - lib/can_can_dry.rb
 - lib/can_can_dry/ability_mapping.rb
 - lib/can_can_dry/ability_mapping/action_mapping_not_found.rb
@@ -80,7 +87,7 @@ files:
 - lib/can_can_dry/ability_mapping_sets/devise.rb
 - lib/can_can_dry/ability_mapping_sets/devise_invitable.rb
 - lib/can_can_dry/controller_authorization.rb
-- lib/can_can_dry/helpers/can_can_dry_helper.rb
+- lib/can_can_dry/engine.rb
 - lib/can_can_dry/no_controller_can_can_additions.rb
 - lib/can_can_dry/path_recognizer.rb
 - lib/can_can_dry/railtie.rb
@@ -108,8 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: DRY authorization with CanCanCan.

data/lib/can_can_dry/helpers/can_can_dry_helper.rb

@@ -1,63 +0,0 @@
-# frozen_string_literal: true
-
-module CanCanDry
-  module Helpers
-    module CanCanDryHelper
-      def ability_mapping
-        @ability_mapping ||= ::AbilityMapping.new
-      end
-
-      def can_by_path?(path, method = :get)
-        can_by_can_args(ability_mapping.can_args_by_path(main_app.root_path, path, method))
-      end
-
-      def can_by_path_hash?(path_hash)
-        can_by_can_args(ability_mapping.can_args_by_path_hash(path_hash))
-      end
-
-      def link_or_text(name = nil, options = nil, html_options = nil)
-        link_or_default(name, name, options, html_options)
-      end
-
-      def link_or_nil(name = nil, options = nil, html_options = nil)
-        link_or_default(name, nil, options, html_options)
-      end
-
-      private
-
-      def link_or_default(name, default, options, html_options)
-        if can_by_link_options?(options, html_options)
-          link_to(name, options, html_options)
-        else
-          default
-        end
-      end
-
-      def can_by_link_options?(options, html_options)
-        can_by_path?(url_for(options), link_method(options, html_options))
-      end
-
-      def link_method(*hashs)
-        hashs.each do |h|
-          return h[:method] if h.is_a?(Hash) && h[:method]
-        end
-        :get
-      end
-
-      def can_by_can_args(can_args_args)
-        assert_can_method
-        can_args_args.each do |c|
-          next if c.empty?
-          return true if can?(*c)
-        end
-        false
-      end
-
-      def assert_can_method
-        return if respond_to?('can?')
-
-        singleton_class.include(::CanCanDry::NoControllerCanCanAdditions)
-      end
-    end
-  end
-end