rack-app 7.3.0 → 7.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 470832cf00bcd28e1aba12840dea366381926732
-  data.tar.gz: 88c19a8414ba4a2ea6d1c45a420f0143869706b8
+  metadata.gz: 79271c60c490af09f3db3df4e6907210529bf0d0
+  data.tar.gz: b14fc9c9169e980aee20a59c1384dadc27166df6
 SHA512:
-  metadata.gz: 9232cc283980236bce4ea88899ae68b442f8c75be15cc4d2318c2828646c1c19efee5c83a66ebb8a7d7424ea2f879cf5517501c6f27ac7b49c9c9cdd53983727
-  data.tar.gz: 126ab463a8bb939e0d5ad90514baaeec2bc3086f1d9164527bacece533f2b87c9665d4a46533a3b74c1818c39483d4808dc6aa65ee68daedf3f6c7a0b5a55999
+  metadata.gz: e02bcb5f6aba359290b0231bd22a0b4cdab6def0b885f7ee05383024027d5044308453d9c1a8df35b654f08b96283546330fd7032603ee8a35ed339f87a83f7c
+  data.tar.gz: 135399af68864242bb24bd985a07e8b83b8767c8e484715d99a2f3c21acfb0d0448ade94f5a5072f5ef6612a2fc4ee6ac10d88bddce108f45e0f11c827e47173

data/VERSION

@@ -1 +1 @@
-7.3.0
+7.3.1

data/lib/rack/app/cli/default_commands/show_routes.rb

@@ -17,26 +17,12 @@ class Rack::App::CLI::DefaultCommands::ShowRoutes < Rack::App::CLI::Command
     @middlewares = true
   end
 
-  FIELD_FETCHERS = {
-    :request_method =>  proc { |endpoint| endpoint.request_method },
-    :request_path =>  proc { |endpoint| endpoint.request_path },
-    :description => proc { |endpoint| endpoint.description },
-    :source_location => proc do |endpoint|
-      callable = endpoint.properties[:callable]
-      callable = callable.method(:call) unless callable.is_a?(::Proc)
-      callable.source_location.join(':')
-    end
-  }.freeze
-
-  SORT_FIELDS = [:request_method, :request_path].freeze
-
   action do
     STDOUT.puts(format(sort(Rack::App::CLI.rack_app.router.endpoints)))
   end
 
   private
 
-
   def get_fields
     if @verbose
       return FIELD_FETCHERS.keys
@@ -50,14 +36,32 @@ class Rack::App::CLI::DefaultCommands::ShowRoutes < Rack::App::CLI::Command
 
   def width_by(endpoints, fields)
     fields.reduce({}) do |widths, property|
-      widths[property] = endpoints.map { |endpoint| FIELD_FETCHERS[property].call(endpoint).to_s.length }.max
+      widths[property] = endpoints.map { |endpoint| fetch_field(endpoint, property).to_s.length }.max
       widths
     end
   end
 
+  SORT_FIELDS = [:request_method, :request_path].freeze
 
   def sort(endpoints)
-    endpoints.sort_by { |endpoint| SORT_FIELDS.map { |sf| FIELD_FETCHERS[sf].call(endpoint) } }
+    endpoints.sort_by { |endpoint| SORT_FIELDS.map { |sf| fetch_field(endpoint, sf) } }
+  end
+
+  FIELD_FETCHERS = {
+    :request_method =>  proc { |endpoint| endpoint.request_method },
+    :request_path =>  proc { |endpoint| endpoint.request_path },
+    :description => proc { |endpoint| endpoint.description },
+    :source_location => proc do |endpoint|
+      callable = endpoint.properties[:callable]
+      callable = callable.method(:call) unless callable.is_a?(::Proc)
+      path = callable.source_location.join(':')
+      relative_path_rgx = Regexp.new(sprintf('^%s', Regexp.escape(Rack::App::Utils.pwd('/'))))
+      path.sub(relative_path_rgx, '')
+    end
+  }.freeze
+
+  def fetch_field(endpoint, field)
+    instance_exec(endpoint, &FIELD_FETCHERS[field])
   end
 
   def format(endpoints)
@@ -68,7 +72,7 @@ class Rack::App::CLI::DefaultCommands::ShowRoutes < Rack::App::CLI::Command
       outputs = []
 
       outputs << fields.map do |field|
-        FIELD_FETCHERS[field].call(endpoint).to_s.ljust(widths[field])
+        fetch_field(endpoint, field).to_s.ljust(widths[field])
       end.join('   ')
 
       if @middlewares

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 7.3.0
+  version: 7.3.1
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-05 00:00:00.000000000 Z
+date: 2017-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler