can_can_dry 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f376cdbeb98a1137714aa74e1e0f9b84de1ecaf6b1d85f8bbcaa1902d6bc610
-  data.tar.gz: 4e0272959e2e2ba9aebe2d1544884f293222aadb7385f4a3531522845633fb8b
+  metadata.gz: 818f91d0d410669d0dfa281a2f00a16483f0dc7105cb064adb22cd363a5b14a2
+  data.tar.gz: 88e252fb9f6b1ff964178cb7a6753cbac2d26a391b469687ac509be66bb20c91
 SHA512:
-  metadata.gz: 525ecb1249278e808dab39fa4634a83f3ac78d9ed9aaf9537a1666627ba05f3a84c88af784093a6d0012da43e90adf8e28daf12738b486b5f1365b0a0bc9bc60
-  data.tar.gz: 55d148c30ab64a8465967f01e2e5d35d50cbc600348b62d5721cc63436631a16966b243ce6a6ca6a49e407e53cf263910ede7494ff973b620975eec9d5746e3a
+  metadata.gz: 217d443821182f6e14a33c0eed5a3f2abc0c3389bfd1e386dac8efa97d88086ceca83027f1393c6f796fb6de4846a02a953818b99b44c59f5d4f94ef2b6c6962
+  data.tar.gz: '0529f2c5de053a4e73eaa8d4833f32c203179d4a14d63fab9de2c33efbe02f0fd5948adfd7796c0ced2f9973837dd2da2cd86a645a1968e7e1c3b0d7ef83c6d6'

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require 'bundler/setup'
 rescue LoadError

data/lib/can_can_dry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/dependencies'
 require 'cancancan'
 
@@ -15,5 +17,5 @@ module CanCanDry
   require_dependency 'can_can_dry/path_recognizer'
 
   require_dependency 'action_view'
-  ActionView::Base.send :include, CanCanDry::Helpers::CanCanDryHelper
+  ActionView::Base.include CanCanDry::Helpers::CanCanDryHelper
 end

data/lib/can_can_dry/ability_mapping.rb

@@ -1,11 +1,15 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
 module CanCanDry
   module AbilityMapping
     RESOURCES_ACTION_MAPPING = {
-      read: %w(index show),
-      create: %w(new create),
-      update: %w(update edit),
-      destroy: %w(destroy)
-    }
+      read: %w[index show],
+      create: %w[new create],
+      update: %w[update edit],
+      destroy: %w[destroy]
+    }.freeze
     ALL_ACTION = 'ALL'
 
     def mapping
@@ -38,6 +42,7 @@ module CanCanDry
       if can_args.count == 1
         raise "\"can_args\" deve ter 0 ou 2 ou mais elementos (can_args.count=#{can_args.count})"
       end
+
       mapping[controller] ||= {}
       mapping[controller][action] ||= []
       mapping[controller][action] << can_args
@@ -45,8 +50,8 @@ module CanCanDry
 
     def can_args_by_path(root_path, path, method)
       can_args_by_path_hash(recognize_path(root_path, path, method))
-    rescue ActionMappingNotFound => ex
-      raise PathMappingNotFound.new(path, method, ex)
+    rescue ActionMappingNotFound => e
+      raise PathMappingNotFound.new(path, method, e)
     end
 
     def can_args_by_path_hash(path_hash)
@@ -59,7 +64,7 @@ module CanCanDry
     def replace_model_by_record(can_args_args, id)
       can_args_args.map do |can_args|
         ca = can_args.dup
-        ca[1] = ca[1].find_by_id(id) if id && ca[1].respond_to?(:find_by_id)
+        ca[1] = ca[1].find_by(id: id) if id && ca[1].respond_to?(:find_by_id)
         ca
       end
     end
@@ -70,15 +75,47 @@ module CanCanDry
     end
 
     def find_can_args_list(controller, action)
-      controller = ActiveSupport::Inflector.camelize(controller)
-      raise ActionMappingNotFound.new(controller, action) unless mapping[controller]
-      return mapping[controller][action] if mapping[controller][action]
-      return mapping[controller][ALL_ACTION] if mapping[controller][ALL_ACTION]
-      raise ActionMappingNotFound.new(controller, action)
+      FindCanArgsList.new(mapping, controller, action).find
     end
 
     def recognize_path(root_path, path, method)
       ::CanCanDry::PathRecognizer.recognize(root_path, path, method: method)
     end
+
+    class FindCanArgsList
+      ALL_ACTION = ::CanCanDry::AbilityMapping::ALL_ACTION
+      common_constructor :mapping, :controller, :action
+
+      set_callback :initialize, :after do
+        @controller = ::ActiveSupport::Inflector.camelize(controller)
+      end
+
+      def find
+        validate
+        find_by_action || find_by_all_action || raise_mapping_not_found
+      end
+
+      private
+
+      def find_by_action
+        return mapping[controller][action] if mapping[controller][action]
+      end
+
+      def find_by_all_action
+        return mapping[controller][ALL_ACTION] if mapping[controller][ALL_ACTION]
+      end
+
+      def mapping_has_controller?
+        mapping[controller]
+      end
+
+      def raise_mapping_not_found
+        raise(ActionMappingNotFound.new(controller, action))
+      end
+
+      def validate
+        raise ActionMappingNotFound.new(controller, action) unless mapping_has_controller?
+      end
+    end
   end
 end

data/lib/can_can_dry/ability_mapping/action_mapping_not_found.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module CanCanDry
   module AbilityMapping
-    class ActionMappingNotFound < Exception
+    class ActionMappingNotFound < RuntimeError
       def initialize(controller, action)
         super('Nenhum mapeamento de controle de acesso encontrado ' \
             "para a action \"#{controller}##{action}\"")

data/lib/can_can_dry/ability_mapping/path_mapping_not_found.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module CanCanDry
   module AbilityMapping
-    class PathMappingNotFound < Exception
-      def initialize(path, method, ex)
-        super("Falha ao tentar recuperar mapeamento \"#{path}\", método=#{method}: #{ex}")
+    class PathMappingNotFound < RuntimeError
+      def initialize(path, method, error)
+        super("Falha ao tentar recuperar mapeamento \"#{path}\", método=#{method}: #{error}")
       end
     end
   end

data/lib/can_can_dry/ability_mapping_sets/active_scaffold.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
+
 module CanCanDry
   module AbilityMappingSets
     module ActiveScaffold
       ACTIVE_SCAFFOLD_MAPPING = {
-        read: [:browse, :index, :mark, :render_field, :show, :show_search],
-        create: [:create, :new],
-        update: [:add_existing, :edit, :edit_associated, :new_existing, :update, :update_column],
-        destroy: [:destroy, :destroy_existing]
+        read: %i[browse index mark render_field show show_search],
+        create: %i[create new],
+        update: %i[add_existing edit edit_associated new_existing update update_column],
+        destroy: %i[destroy destroy_existing]
       }.freeze
 
       def map_active_scaffold(controller, entity)

data/lib/can_can_dry/ability_mapping_sets/devise.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CanCanDry
   module AbilityMappingSets
     module Devise

data/lib/can_can_dry/ability_mapping_sets/devise_invitable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CanCanDry
   module AbilityMappingSets
     module DeviseInvitable

data/lib/can_can_dry/controller_authorization.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency 'can_can_dry/helpers/can_can_dry_helper'
 
 module CanCanDry
@@ -5,14 +7,14 @@ module CanCanDry
     include CanCanDry::Helpers::CanCanDryHelper
 
     def authorize_by_ability_mapping
-      fail CanCan::AccessDenied, "Falhou ao tentar acessar #{path_hash}" unless
+      raise CanCan::AccessDenied, "Falhou ao tentar acessar #{path_hash}" unless
         can_by_path_hash?(path_hash)
     end
 
     private
 
     def path_hash
-      params.select { |k, _v| %w(controller action id).include?(k) }
+      params.select { |k, _v| %w[controller action id].include?(k) }
     end
 
     def ability_mapping

data/lib/can_can_dry/helpers/can_can_dry_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CanCanDry
   module Helpers
     module CanCanDryHelper
@@ -53,6 +55,7 @@ module CanCanDry
 
       def assert_can_method
         return if respond_to?('can?')
+
         singleton_class.include(::CanCanDry::NoControllerCanCanAdditions)
       end
     end

data/lib/can_can_dry/no_controller_can_can_additions.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module CanCanDry
   # A substitute for CanCan::ControllerAdditions when no controller is present.
   module NoControllerCanCanAdditions

data/lib/can_can_dry/path_recognizer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CanCanDry
   # Copiado de https://github.com/appirits/awesome_admin_layout
   # /lib/awesome_admin_layout/recognize_path.rb
@@ -5,7 +7,7 @@ module CanCanDry
     class << self
       def recognize(root_path, path, options = {})
         path = remove_root_path(root_path, path)
-        return Rails.application.routes.recognize_path(path, options)
+        Rails.application.routes.recognize_path(path, options)
       rescue ActionController::RoutingError
         Rails::Engine.subclasses.each do |engine|
           recognized_path = engine_recognize(engine, path, options)
@@ -24,6 +26,7 @@ module CanCanDry
       def engine_recognize(engine, path, options)
         engine_path = path_for_engine(engine.instance.class, path)
         return unless engine_path
+
         begin
           return engine.instance.routes.recognize_path(engine_path, options)
         rescue ActionController::RoutingError => e
@@ -35,6 +38,7 @@ module CanCanDry
       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
+
         path.gsub(/^#{engine_route.path.spec}/, '')
       end
 

data/lib/can_can_dry/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CanCanDry
   require 'rails'
 

data/lib/can_can_dry/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CanCanDry
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

data/lib/tasks/can_can_dry.rake

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 namespace :can_can_dry do
   desc 'Mostra o mapeamento de CanCanDry'
   task ability_mapping: :environment do

data/test/can_can_dry_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 class CanCanDryTest < ActiveSupport::TestCase

data/test/lib/can_can_dry/path_recognizer_test.rb

@@ -1,14 +1,15 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module CanCanDry
   class PathRecognizerTest < ActiveSupport::TestCase
     test 'remove_root_path' do
-      [%w(/path/to/action /prefix/ /prefix/path/to/action),
-       %w(/path/to/action /prefix /prefix/path/to/action),
-       %w(/path / /path),
+      [%w[/path/to/action /prefix/ /prefix/path/to/action],
+       %w[/path/to/action /prefix /prefix/path/to/action],
+       %w[/path / /path],
        ['/path', '', '/path'],
-       %w(/unknown/path /abc /unknown/path)].each do |s|
+       %w[/unknown/path /abc /unknown/path]].each do |s|
         assert_equal s[0], ::CanCanDry::PathRecognizer.send(:remove_root_path, s[1], s[2]), s
       end
     end

data/test/test_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ENV['RAILS_ENV'] = 'test'
 require 'minitest/autorun'
 require 'can_can_dry'

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: can_can_dry
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-18 00:00:00.000000000 Z
+date: 2020-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: cancancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
-  name: cancancan
+  name: eac_ruby_utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
+- !ruby/object:Gem::Dependency
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement