passages 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9222ad73782391482c0c599d4cc2fab3a731b1d
-  data.tar.gz: 3e813114c9aa59ae36a1e4a37350ac48b4f9309b
+  metadata.gz: 1545e7207653537cd21e3fc22e717fb51c15154f
+  data.tar.gz: fde415b8f6d56d9bc882c13f56c0bb00e2bce321
 SHA512:
-  metadata.gz: 64674b61c287c6b0b81f41ea705112a49f74b38bd299fa5aea5df1c22ec4eaaceff806ff18a32f2e37e22d4552c482c9d4d4aae71009d0d28fd443534ebd11a2
-  data.tar.gz: 63801b31a44fe49e6f024a795cfe452be60454b0bac40fe93a75de9eda81dcf2a9842e75531c040645eed216be2b2f22ac0718c59edfd6937c2c806b02413d4f
+  metadata.gz: 736a61de7b2f02de0b15333e6214df8bd1526114b045118eeb82928dfa0c32f5aed9ea7254f4e9910b8cc26c7cfe9b27c5fb54b1b762463e083a0ce55b7ff4b9
+  data.tar.gz: 5194dd0128d2e860c38ec48ec81c56e661e65b87b206a06e1301aa631279fb7a966a06c4c08a74ec698595142ebb3e1b3611c18216b15bed2d992efa417e8e83

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

@@ -7,131 +7,143 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.1.1)
-      actionpack (= 5.1.1)
+    actioncable (5.2.0)
+      actionpack (= 5.2.0)
       nio4r (~> 2.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.1.1)
-      actionpack (= 5.1.1)
-      actionview (= 5.1.1)
-      activejob (= 5.1.1)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.1)
-      actionview (= 5.1.1)
-      activesupport (= 5.1.1)
+    actionpack (5.2.0)
+      actionview (= 5.2.0)
+      activesupport (= 5.2.0)
       rack (~> 2.0)
-      rack-test (~> 0.6.3)
+      rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.1)
-      activesupport (= 5.1.1)
+    actionview (5.2.0)
+      activesupport (= 5.2.0)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.1)
-      activesupport (= 5.1.1)
+    activejob (5.2.0)
+      activesupport (= 5.2.0)
       globalid (>= 0.3.6)
-    activemodel (5.1.1)
-      activesupport (= 5.1.1)
-    activerecord (5.1.1)
-      activemodel (= 5.1.1)
-      activesupport (= 5.1.1)
-      arel (~> 8.0)
-    activesupport (5.1.1)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
+    activestorage (5.2.0)
+      actionpack (= 5.2.0)
+      activerecord (= 5.2.0)
+      marcel (~> 0.3.1)
+    activesupport (5.2.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (8.0.0)
-    ast (2.2.0)
+    arel (9.0.0)
+    ast (2.4.0)
     builder (3.2.3)
     concurrent-ruby (1.0.5)
-    diff-lcs (1.2.5)
-    erubi (1.6.0)
-    globalid (0.4.0)
+    crass (1.0.4)
+    diff-lcs (1.3)
+    erubi (1.7.1)
+    globalid (0.4.1)
       activesupport (>= 4.2.0)
-    i18n (0.8.1)
-    loofah (2.0.3)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
+    loofah (2.2.2)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.5)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.10.2)
-    nio4r (2.0.0)
-    nokogiri (1.7.2)
-      mini_portile2 (~> 2.1.0)
-    parser (2.3.0.7)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    rack (2.0.3)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (5.1.1)
-      actioncable (= 5.1.1)
-      actionmailer (= 5.1.1)
-      actionpack (= 5.1.1)
-      actionview (= 5.1.1)
-      activejob (= 5.1.1)
-      activemodel (= 5.1.1)
-      activerecord (= 5.1.1)
-      activesupport (= 5.1.1)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 5.1.1)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.2)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.0)
+    mimemagic (0.3.2)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    nio4r (2.3.1)
+    nokogiri (1.8.3)
+      mini_portile2 (~> 2.3.0)
+    parallel (1.12.1)
+    parser (2.5.1.0)
+      ast (~> 2.4.0)
+    powerpack (0.1.2)
+    rack (2.0.5)
+    rack-test (1.0.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.0)
+      actioncable (= 5.2.0)
+      actionmailer (= 5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
+      activemodel (= 5.2.0)
+      activerecord (= 5.2.0)
+      activestorage (= 5.2.0)
+      activesupport (= 5.2.0)
+      bundler (>= 1.3.0)
+      railties (= 5.2.0)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.1.1)
-      actionpack (= 5.1.1)
-      activesupport (= 5.1.1)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.0)
+      actionpack (= 5.2.0)
+      activesupport (= 5.2.0)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.1.0)
-    rake (12.0.0)
-    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)
+    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.7.1)
+    ruby-progressbar (1.9.0)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (0.19.4)
+    thor (0.20.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.0.2)
-    websocket-driver (0.6.5)
+    unicode-display_width (1.4.0)
+    websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
+    websocket-extensions (0.1.3)
 
 PLATFORMS
   ruby
@@ -139,7 +151,7 @@ PLATFORMS
 DEPENDENCIES
   passages!
   rspec (~> 3.2)
-  rubocop (= 0.39.0)
+  rubocop (= 0.49.0)
 
 BUNDLED WITH
-   1.11.2
+   1.16.0

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/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[application.css 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,7 +6,7 @@ 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
+    ATTRIBUTES_FOR_DISPLAY = %w[name verb controller action path].freeze
 
     def initialize(route)
       super(ActionDispatch::Routing::RouteWrapper.new(route))

data/passages.gemspec

@@ -16,7 +16,7 @@ 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/})
 
@@ -24,5 +24,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'rails', '~> 5.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 = 2
-  MINOR = 0
+  MINOR = 1
   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: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Jake Yesbeck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2018-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -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
@@ -126,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Display and search capabilities for Ruby on Rails routes