can_can_dry 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bf8f9e250599a1c4ab7da0ca8f4bfc8ea294f8ff8d6399ba113e4b93400aa3c
-  data.tar.gz: 4ea554e0a534db616f0bfc1b544d5624ec7bbe163d2471f7d0217aefd136f211
+  metadata.gz: d4815527015549ba0d6cf2f3679ad8d44ac7753b9d34831d9ea7552b900d73fe
+  data.tar.gz: e5dff2e70c55ed2e5eb3240a305861142626795c823bd7088f310f583cf0d1df
 SHA512:
-  metadata.gz: 39f056216e6f56005d170b8d8fda89bc02bf4dc101527631f7969c178417d8da8f52583d97cffffe6cdd16ceb8e5538e53f16def4223b186c5a1c8e57bf01c39
-  data.tar.gz: 64f39a8c9c27ca887a0113418d9fcb71757b38fdc13cae2300ec75eefbea57efba4580ab6ee47b362487043407eff22ef7b5cedf6501a09be37bb3392aa28940
+  metadata.gz: ced8842ccc57776aa32462fc71096e22c0456313cb3d27bd115fb765859ea870ca1766af955bdf885c332928ee91945174da58e7fc261b1906291812114036aa
+  data.tar.gz: ab0814157bf16844ee3ad07a95f694a0e8eea7c15771194fd914b575cbecc9f8fd1442e15fac2614995f41f09c01237c2a0ca4bb1c29bd34c8d041145db05ea4

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.5.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: can_can_dry
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-26 00:00:00.000000000 Z
+date: 2020-10-03 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.46'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.46'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -109,8 +109,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.0.8
 signing_key: 
 specification_version: 4
 summary: DRY authorization with CanCanCan.