traceroute 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90fc80962b328c76194cf2766d02a2c2ad0bd462cb96e26686aeb15779c51085
-  data.tar.gz: 4e3ebbe7177df01147fbc9ce985ed2d94b3ac68c5be95dbf31c6c94955acb42d
+  metadata.gz: 0640e66c5ac5198335793c160a5af9a255b974018176dd7155f43d54cc17723b
+  data.tar.gz: cf4a741da1ccbad8fbe0319a6501ac91415c1f9c625fe161c9b9fb619a3391d2
 SHA512:
-  metadata.gz: 2feb27fe20d57f5683e396d86393b303fffc7627a5489224c6ca089fa957cb002811f87e5469e2565bea2883b1bf0d025c243429b0a9277733dfa4a20783cad9
-  data.tar.gz: acd2e0940b33e1f0e5c55a9de35251240026bbffbb4fff139690b3ebbd8161d0120562d636500d55d3ddc69e11d9783ef845eb88229dfa271b9177b1972fa59b
+  metadata.gz: d8e2e79af23d008f8fab956dd2b42589002606a25fd972076c5b010afc2ed5505226296f7fed567302eb5e8dd240ce0b549cc17523ee5dadfbe0b846ae6a5396
+  data.tar.gz: b640ac967c3d7ad64d7e894fe803d7bf0fa0b4696f26ee367a69f3656898c63b193c24d8a580741f896cfcb9f544170acd15254b36e15502ef1f593f93b18cbd

data/lib/tasks/traceroute.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 desc 'Prints out unused routes and unreachable action methods'
 task :traceroute => :environment do
   traceroute = Traceroute.new Rails.application

data/lib/traceroute.rb

@@ -1,5 +1,10 @@
+# frozen_string_literal: true
+
 class Traceroute
   VERSION = Gem.loaded_specs['traceroute'].version.to_s
+
+  WILDCARD_ROUTES = %r[^/?:controller\(?/:action].freeze
+
   class Railtie < ::Rails::Railtie
     rake_tasks do
       load File.join(File.dirname(__FILE__), 'tasks/traceroute.rake')
@@ -31,12 +36,16 @@ class Traceroute
 
   def routed_actions
     routes.map do |r|
-      if r.requirements[:controller].blank? && r.requirements[:action].blank? && (r.path == '/:controller(/:action(/:id(.:format)))')
-        %Q["#{r.path}"  This is a legacy wild controller route that's not recommended for RESTful applications.]
-      else
+      if r.requirements[:controller].present? && r.requirements[:action].present?
         "#{r.requirements[:controller]}##{r.requirements[:action]}"
+      elsif (String === r.path) && (WILDCARD_ROUTES =~ r.path)
+        %Q["#{r.path}"  ⚠️  This is a legacy wild controller route that's not recommended for RESTful applications.]
+      elsif WILDCARD_ROUTES =~ r.path.spec.to_s
+        %Q["#{r.path.spec}"  ⚠️  This is a legacy wild controller route that's not recommended for RESTful applications.]
+      else
+        ((String === r.path) && r.path.to_s) || r.path.spec.to_s  # unknown routes
       end
-    end.flatten.reject {|r| @ignored_unused_routes.any? { |m| r.match(m) } }
+    end.compact.flatten.reject {|r| @ignored_unused_routes.any? { |m| r.match(m) } }
   end
 
   private
@@ -60,7 +69,9 @@ class Traceroute
 
   def load_ignored_regex!
     @ignored_unreachable_actions = [/^rails\//]
-    @ignored_unused_routes = [/^rails\//]
+    @ignored_unused_routes = [/^rails\//, /^\/cable$/]
+
+    @ignored_unused_routes << %r{^#{@app.config.assets.prefix}} if @app.config.respond_to? :assets
 
     return unless at_least_one_file_exists?
 
@@ -87,7 +98,7 @@ class Traceroute
 
   def collect_routes(routes)
     routes = routes.each_with_object([]) do |r, tmp_routes|
-      next if r.name.nil? && r.requirements.blank?
+      next if (ActionDispatch::Routing::Mapper::Constraints === r.app) && (ActionDispatch::Routing::PathRedirect === r.app.app)
 
       if r.app.is_a?(ActionDispatch::Routing::Mapper::Constraints) && r.app.app.respond_to?(:routes)
         engine_routes = r.app.app.routes
@@ -101,14 +112,6 @@ class Traceroute
 
     routes.reject! {|r| r.app.is_a?(ActionDispatch::Routing::Redirect)}
 
-    if @app.config.respond_to?(:assets)
-      exclusion_regexp = %r{^#{@app.config.assets.prefix}}
-
-      routes.reject! do |route|
-        path = (defined?(ActionDispatch::Journey::Route) || defined?(Journey::Route)) ? route.path.spec.to_s : route.path
-        path =~ exclusion_regexp
-      end
-    end
     routes
   end
 end

data/test/app.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails'
 require 'action_controller/railtie'
 

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/setup'
 require 'minitest/autorun'
 require 'rails'

data/test/traceroute_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'test_helper'
 
 module TracerouteTest
@@ -51,21 +53,15 @@ module TracerouteTest
     end
 
     def test_dont_fail_when_envvar_is_anything_but_1
-      traceroute = Traceroute.new Rails.application
-
       ENV['FAIL_ON_ERROR'] = "DERP"
       Rake::Task[:traceroute].execute
     end
 
     def test_rake_task_fails_when_unreachable_action_method_detected
-      traceroute = Traceroute.new Rails.application
-
-      begin
-        ENV['FAIL_ON_ERROR']="1"
-        Rake::Task[:traceroute].execute
-      rescue => e
-        assert_includes e.message, "Unused routes or unreachable action methods detected."
-      end
+      ENV['FAIL_ON_ERROR']="1"
+      Rake::Task[:traceroute].execute
+    rescue => e
+      assert_includes e.message, "Unused routes or unreachable action methods detected."
     end
 
     def test_rake_task_fails_when_unused_route_detected
@@ -89,8 +85,6 @@ module TracerouteTest
         end
       end
 
-      traceroute = Traceroute.new Rails.application
-
       begin
         ENV['FAIL_ON_ERROR'] = "1"
         Rake::Task[:traceroute].execute

data/test/traceroute_with_engine_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'test_helper'
 
 module TestEngine

data/test/yaml_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'test_helper'
 
 module JasmineRails

data/traceroute.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "traceroute"
-  s.version     = '0.6.0'
+  s.version     = '0.6.1'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Akira Matsuda']
   s.email       = ['ronnie@dio.jp']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: traceroute
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-12 00:00:00.000000000 Z
+date: 2018-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails