passages 1.5.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3d3f4fa013d65c71495f42e6afe5dfdfe2af8434
-  data.tar.gz: b7c95addc7701918a5578f5f471702e08059c63a
+SHA256:
+  metadata.gz: b5cec78946494fdc9d3a624cb7dba705becb79f1251e0819543060b188677f71
+  data.tar.gz: 87c3abd13986edeea7221d8b99ac9a85b4a9f7f1b6e744c48cab92372781d468
 SHA512:
-  metadata.gz: d4c9b9decac15e237464c6eaea561e1ba45d3000c74a52e0d1d16e37b1f5825ed73287f54b1d4fb4ee16e86ec3a48cb43f3cd038c5d7719b5715c032a27dfa0a
-  data.tar.gz: 64d959ed0dec380d4c8e694b9f5d51f115ce02bfee4561018c87c88481d296c0837eb155b1f4a460337e5ec019042f74306824bc537952835bc52dd40a4821ad
+  metadata.gz: 69bce6148be98f32c1fcefacb52b78ffb3c6880c073d2304c9fa47b48083576a766ecd3040dfab73733ef5096b7b7431f86c490b3b3d70b76db155680214ece9
+  data.tar.gz: 21e56c99be87f0704c9f797bd582930d7bdf4cec529f7c3515f1a2d5472f74613fea588ab08022beb1cc966e560d8a3b643ec15ba90ac72e763bb3fe3dbcf5b1

data/.rubocop.yml

@@ -0,0 +1,6 @@
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/BlockLength:
+  Exclude:
+    - 'spec/**/*.rb'

data/.travis.yml

@@ -1,9 +1,8 @@
 language: ruby
 rvm:
-  - 2.0
-  - 2.2.1
   - 2.2.2
   - 2.3.0
+  - 2.4.0
 
 script:
   - bundle exec rspec spec

data/Gemfile.lock

@@ -1,128 +1,165 @@
 PATH
   remote: .
   specs:
-    passages (1.5.1)
-      rails (~> 4.0)
+    passages (2.2.0)
+      rails (~> 6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.4)
-      actionpack (= 4.2.4)
-      actionview (= 4.2.4)
-      activejob (= 4.2.4)
+    actioncable (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      activejob (= 6.0.3.4)
+      activerecord (= 6.0.3.4)
+      activestorage (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
+      mail (>= 2.7.1)
+    actionmailer (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      actionview (= 6.0.3.4)
+      activejob (= 6.0.3.4)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.4)
-      actionview (= 4.2.4)
-      activesupport (= 4.2.4)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.4)
-      activesupport (= 4.2.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.0.3.4)
+      actionview (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      activerecord (= 6.0.3.4)
+      activestorage (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.3.4)
+      activesupport (= 6.0.3.4)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.4)
-      activesupport (= 4.2.4)
-      globalid (>= 0.3.0)
-    activemodel (4.2.4)
-      activesupport (= 4.2.4)
-      builder (~> 3.1)
-    activerecord (4.2.4)
-      activemodel (= 4.2.4)
-      activesupport (= 4.2.4)
-      arel (~> 6.0)
-    activesupport (4.2.4)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.3.4)
+      activesupport (= 6.0.3.4)
+      globalid (>= 0.3.6)
+    activemodel (6.0.3.4)
+      activesupport (= 6.0.3.4)
+    activerecord (6.0.3.4)
+      activemodel (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
+    activestorage (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      activejob (= 6.0.3.4)
+      activerecord (= 6.0.3.4)
+      marcel (~> 0.3.1)
+    activesupport (6.0.3.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.3)
-    ast (2.2.0)
-    builder (3.2.2)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    globalid (0.3.6)
-      activesupport (>= 4.1.0)
-    i18n (0.7.0)
-    json (1.8.3)
-    loofah (2.0.3)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    ast (2.4.0)
+    builder (3.2.4)
+    concurrent-ruby (1.1.7)
+    crass (1.0.6)
+    diff-lcs (1.3)
+    erubi (1.9.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
+    loofah (2.7.0)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.6.2)
-    mini_portile (0.6.2)
-    minitest (5.8.3)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    parser (2.3.0.7)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    rack (1.6.4)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.4)
-      actionmailer (= 4.2.4)
-      actionpack (= 4.2.4)
-      actionview (= 4.2.4)
-      activejob (= 4.2.4)
-      activemodel (= 4.2.4)
-      activerecord (= 4.2.4)
-      activesupport (= 4.2.4)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.4)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
-      loofah (~> 2.0)
-    railties (4.2.4)
-      actionpack (= 4.2.4)
-      activesupport (= 4.2.4)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (1.0.0)
+    mimemagic (0.3.5)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.14.2)
+    nio4r (2.5.4)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    parallel (1.12.1)
+    parser (2.5.1.0)
+      ast (~> 2.4.0)
+    powerpack (0.1.2)
+    rack (2.2.3)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (6.0.3.4)
+      actioncable (= 6.0.3.4)
+      actionmailbox (= 6.0.3.4)
+      actionmailer (= 6.0.3.4)
+      actionpack (= 6.0.3.4)
+      actiontext (= 6.0.3.4)
+      actionview (= 6.0.3.4)
+      activejob (= 6.0.3.4)
+      activemodel (= 6.0.3.4)
+      activerecord (= 6.0.3.4)
+      activestorage (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
+      bundler (>= 1.3.0)
+      railties (= 6.0.3.4)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
+      method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rainbow (2.1.0)
-    rake (10.4.2)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+      thor (>= 0.20.3, < 2.0)
+    rainbow (2.2.2)
+      rake
+    rake (12.3.1)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    rubocop (0.39.0)
-      parser (>= 2.3.0.7, < 3.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    rubocop (0.49.0)
+      parallel (~> 1.10)
+      parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.7.5)
-    sprockets (3.3.5)
+    ruby-progressbar (1.9.0)
+    sprockets (4.0.2)
+      concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    sprockets-rails (3.2.2)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (1.0.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    unicode-display_width (1.0.2)
+    unicode-display_width (1.4.0)
+    websocket-driver (0.7.3)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby
@@ -130,7 +167,7 @@ PLATFORMS
 DEPENDENCIES
   passages!
   rspec (~> 3.2)
-  rubocop (= 0.39.0)
+  rubocop (= 0.49.0)
 
 BUNDLED WITH
-   1.11.2
+   1.17.3

data/README.md

@@ -47,6 +47,11 @@ end
 
 With the Engine mounted at `/passages`, the rendered page will display a search box and list of all known routes within the application.
 
+### Rails 5 and Above
+
+Rails 5 apps should use version 2.0 of this gem, everyone below should use
+1.5.2
+
 ## Authorization
 
 Since there are no environment dependent checks, the `/passages` page uses configurable http basic authentication.

data/app/controllers/passages/routes_controller.rb

@@ -12,8 +12,11 @@ module Passages
 
     def routes
       @routes = application_routes
-      @engine_routes = engine_routes
       @mount_routes = mount_routes
+      mounted_engines = @mount_routes.keys
+      @engine_routes = engine_routes.select do |r|
+        mounted_engines.include?(r[:engine])
+      end
     end
 
     private

data/app/views/passages/routes/_route.html.erb

@@ -1,6 +1,6 @@
 <tr>
   <% Passages::Route.attributes_for_display.each do |attribute| %>
-    <td data-search='<%= route.send(attribute).downcase %>' data-matching-attribute='<%=attribute%>'>
+    <td data-search='<%= route.send(attribute).try(:downcase) %>' data-matching-attribute='<%=attribute%>'>
       <%= route.send(attribute) %>
     </td>
   <% end %>

data/lib/passages/engine.rb

@@ -8,7 +8,7 @@ module Passages
     # Necessary for rake assets:precompile in a main application
     #  to compile this Engine's assets as well
     initializer 'passages.assets.precompile' do |app|
-      app.config.assets.precompile += %w(application.css application.js)
+      app.config.assets.precompile += %w[passages/application.css passages/application.js]
     end
 
     # Optionally mount the /passages route at an applications top
@@ -25,7 +25,8 @@ module Passages
       unless Passages.config.no_auth?
         Passages::RoutesController.http_basic_authenticate_with(
           name: Passages.username,
-          password: Passages.password)
+          password: Passages.password
+        )
       end
     end
   end

data/lib/passages/route.rb

@@ -6,13 +6,15 @@ module Passages
   # Main DelegateClass used for decoration and discerning if a route is
   #  a "regular" route or a mount route
   class Route < DelegateClass(ActionDispatch::Routing::RouteWrapper)
+    ATTRIBUTES_FOR_DISPLAY = %w[name verb controller action path].freeze
+
     def initialize(route)
       super(ActionDispatch::Routing::RouteWrapper.new(route))
     end
 
     class << self
       def attributes_for_display
-        %w(name verb controller action path)
+        ATTRIBUTES_FOR_DISPLAY
       end
 
       def from_raw_route(raw_route)

data/passages.gemspec

@@ -16,13 +16,13 @@ Gem::Specification.new do |s|
   s.homepage      = 'https://github.com/yez/passages'
   s.license       = 'MIT'
 
-  s.require_paths = %w(lib app)
+  s.require_paths = %w[lib app]
   s.files         = `git ls-files`.split("\n")
   s.test_files    = s.files.grep(%r{^spec/})
 
-  s.required_ruby_version = '>= 2.0.0'
-  s.add_dependency 'rails', '~> 4.0'
+  s.required_ruby_version = '>= 2.2.2'
+  s.add_dependency 'rails', '~> 6.0'
 
   s.add_development_dependency 'rspec', '~> 3.2'
-  s.add_development_dependency 'rubocop', '0.39.0'
+  s.add_development_dependency 'rubocop', '0.49.0'
 end

data/spec/controllers/passages/routes_controller_spec.rb

@@ -9,9 +9,9 @@ module Passages
   describe RoutesController do
     describe '#routes' do
       before do
-        allow(subject).to receive(:application_routes) { anything }
-        allow(subject).to receive(:engine_routes) { anything }
-        allow(subject).to receive(:mount_routes) { anything }
+        allow(subject).to receive(:application_routes) { [] }
+        allow(subject).to receive(:engine_routes) { [] }
+        allow(subject).to receive(:mount_routes) { {} }
         subject.routes
       end
 
@@ -23,6 +23,21 @@ module Passages
         expect(subject.instance_variable_get(:@engine_routes)).to_not be_nil
       end
 
+      it 'sets @engine_routes only if a corresponding mounte route exists' do
+        first_engine_route = { engine: :foo, routes: [anything] }
+        second_engine_route = { engine: :bar, routes: [anything] }
+        allow(subject).to receive(:engine_routes) do
+          [
+            first_engine_route,
+            second_engine_route
+          ]
+        end
+        allow(subject).to receive(:mount_routes) { { foo: anything } }
+        expected = [first_engine_route]
+        subject.routes
+        expect(subject.instance_variable_get(:@engine_routes)).to eq(expected)
+      end
+
       it 'sets @mount_routes' do
         expect(subject.instance_variable_get(:@mount_routes)).to_not be_nil
       end

data/spec/lib/passages/mount_route_spec.rb

@@ -18,7 +18,7 @@ module Passages
       end
     end
 
-    [:internal?, :path].each do |method|
+    %i[internal? path].each do |method|
       describe "##{method}" do
         it "responds to #{method}" do
           expect(subject).to respond_to(method)

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
-require 'action_dispatch/routing'
-require 'action_dispatch/routing/inspector'
 require 'active_support'
+require 'action_dispatch'
 require 'action_controller'
 require './lib/passages'

data/version.rb

@@ -1,6 +1,6 @@
 module Passages
-  MAJOR = 1
-  MINOR = 5
+  MAJOR = 3
+  MINOR = 0
   TINY = 0
 
   VERSION = [MAJOR, MINOR, TINY].join('.').freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passages
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Jake Yesbeck
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.39.0
+        version: 0.49.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.39.0
+        version: 0.49.0
 description: |-
   Rails Engine to make internal routes searchable and
                         discoverable for more than just the name of the route.
@@ -63,6 +63,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -109,7 +110,7 @@ homepage: https://github.com/yez/passages
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -118,16 +119,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.0.4
+signing_key:
 specification_version: 4
 summary: Display and search capabilities for Ruby on Rails routes
 test_files: