rails-route-checker 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03ed64e49d9050509ae5295e0316b36bd8adce8c
-  data.tar.gz: b80c5b8fb5b74f8e1bde7d1a01be06181adec0c2
+  metadata.gz: c2ee3366805e8dbc68755df5f5ce5e1342f5be11
+  data.tar.gz: 9ce06f8c42d7f2940ee45ab82ad491afce95f2fa
 SHA512:
-  metadata.gz: 56169fb79ebacfde4bb198192315fb66b291f3d06691f8c53160568b45abe9d417063954bc7746403268de5770fca148c696285353b2acdcf93bedc7e25a6d9b
-  data.tar.gz: c8a8c3f3427e635bc3bfa93a783cfd1de93bd773731e0f0b2f7b614cbb22e71325f7bb5d43f8d2b11f3d7b933e7d0c773191b37279bb9c75e931244959c505bb
+  metadata.gz: da784f02dd0cb29e448fb698e89196709a2b7be7b080b4d7e9c8770bf11bc66ec158907da3f51e9ff81fc3ebdf355dad4d047aebdb80675b4953038a0355ee3f
+  data.tar.gz: 87d43f4feca31e8f58820570439fddbe97be9499ea5828a8111b9439e9e75df068c2d0bf5ae085c91b43dc1d3a452e548b996daeefd7b314489e5710233b311d

data/lib/rails-route-checker/app_interface.rb

@@ -42,13 +42,14 @@ module RailsRouteChecker
     end
 
     def generate_undef_view_path_calls_erb
-      files = `find app -type f -iregex '.*\\.erb'`.split("\n")
+      files = Dir['app/**/*.erb']
       return [] if files.none?
 
       RailsRouteChecker::Parsers::Loader.load_parser(:erb)
 
       files.map do |filename|
         controller = controller_from_view_file(filename)
+        next unless controller # controller will be nil if it's an ignored controller
 
         filter = lambda do |path_or_url|
           return false if match_in_whitelist?(filename, path_or_url)
@@ -61,7 +62,7 @@ module RailsRouteChecker
     end
 
     def generate_undef_view_path_calls_haml
-      files = `find app -type f -iregex '.*\\.haml'`.split("\n")
+      files = Dir['app/**/*.haml']
       return [] if files.none?
 
       unless RailsRouteChecker::Parsers::Loader.haml_available?
@@ -74,6 +75,7 @@ module RailsRouteChecker
 
       files.map do |filename|
         controller = controller_from_view_file(filename)
+        next unless controller # controller will be nil if it's an ignored controller
 
         filter = lambda do |path_or_url|
           return false if match_in_whitelist?(filename, path_or_url)
@@ -86,7 +88,7 @@ module RailsRouteChecker
     end
 
     def generate_undef_controller_path_calls
-      files = `find app/controllers -type f -iregex '.*\\.rb'`.split("\n")
+      files = Dir['app/controllers/**/*.rb']
       return [] if files.none?
 
       RailsRouteChecker::Parsers::Loader.load_parser(:ruby)
@@ -127,20 +129,23 @@ module RailsRouteChecker
       split_path = filename.split('/')
       possible_controller_path = split_path[(split_path.index('app') + 2)..-2]
 
-      controller = nil
-      while controller.nil? && possible_controller_path.any?
-        if controller_information.include?(possible_controller_path.join('/'))
-          controller = controller_information[possible_controller_path.join('/')]
-        else
-          possible_controller_path = possible_controller_path[0..-2]
-        end
+      while possible_controller_path.any?
+        controller_name = possible_controller_path.join('/')
+        return controller_information[controller_name] if controller_exists?(controller_name)
+        possible_controller_path = possible_controller_path[0..-2]
       end
-      controller || controller_information['application']
+      controller_information['application']
     end
 
     def controller_from_ruby_file(filename)
-      controller_name = (filename.match(%r{app/controllers/(.*)_controller.rb}) || [])[1] || 'application'
-      controller_information[controller_name]
+      controller_name = (filename.match(%r{app/controllers/(.*)_controller.rb}) || [])[1]
+      return controller_information[controller_name] if controller_exists?(controller_name)
+      controller_information['application']
+    end
+
+    def controller_exists?(controller_name)
+      return false unless controller_name
+      File.exists?("app/controllers/#{controller_name}_controller.rb")
     end
   end
 end

data/lib/rails-route-checker/version.rb

@@ -1,3 +1,3 @@
 module RailsRouteChecker
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-route-checker
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Dave Allie