can_can_dry 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6d616a9b6ad397897fac85697703891c64d112c1f35d1a0dccd1440d1ef104a
-  data.tar.gz: f0ee05bb9187e61f33137e0b3ae8b86c5a9b262ed02cbf31afd02587814afaec
+  metadata.gz: 3bf8f9e250599a1c4ab7da0ca8f4bfc8ea294f8ff8d6399ba113e4b93400aa3c
+  data.tar.gz: 4ea554e0a534db616f0bfc1b544d5624ec7bbe163d2471f7d0217aefd136f211
 SHA512:
-  metadata.gz: '0170885cc2ebe41ba704a6a47a3b9f4dc4e7281f2591defe4460981169abe4176f1f244041c41df44ec054eebb9af4775885cc1fbf62b6f2bcb546b7ffab667d'
-  data.tar.gz: 4845274bc917347ce95087f940d8e154ec928f5062a7e2f488d254406d581c220b30a13bc218ad914e85ad7b3e75fad3384f40a1c06d8adba91f1389d9f16d4a
+  metadata.gz: 39f056216e6f56005d170b8d8fda89bc02bf4dc101527631f7969c178417d8da8f52583d97cffffe6cdd16ceb8e5538e53f16def4223b186c5a1c8e57bf01c39
+  data.tar.gz: 64f39a8c9c27ca887a0113418d9fcb71757b38fdc13cae2300ec75eefbea57efba4580ab6ee47b362487043407eff22ef7b5cedf6501a09be37bb3392aa28940

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

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

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.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-22 00:00:00.000000000 Z
+date: 2020-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cancancan
@@ -72,6 +72,7 @@ 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 +81,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

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