rack-app 7.2.2 → 7.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5614e4c29acc3d192bebfc6d67a67c5b2ad862e3
-  data.tar.gz: 3a78843a4bdcbccdd5adb9229f12a91251d7152a
+  metadata.gz: 470832cf00bcd28e1aba12840dea366381926732
+  data.tar.gz: 88c19a8414ba4a2ea6d1c45a420f0143869706b8
 SHA512:
-  metadata.gz: 8176fac52e18bef41214a80e4bfd81a73d1c02f8c463a2f464ac9ffce842486d9bbe136148cdb48cb6de4caf51c081afa1caed5b71ed0c22fd0d5ad453df093c
-  data.tar.gz: 80b38b35ed528638d952bd22b7aca152b1b85d4dbe53f7f5b536d939b3ae1388387db2ecb7716868d325b3c18772c51d1daffa9d212e893d8022b120c7450daf
+  metadata.gz: 9232cc283980236bce4ea88899ae68b442f8c75be15cc4d2318c2828646c1c19efee5c83a66ebb8a7d7424ea2f879cf5517501c6f27ac7b49c9c9cdd53983727
+  data.tar.gz: 126ab463a8bb939e0d5ad90514baaeec2bc3086f1d9164527bacece533f2b87c9665d4a46533a3b74c1818c39483d4808dc6aa65ee68daedf3f6c7a0b5a55999

data/.travis.yml

@@ -6,18 +6,13 @@ install:
   - bundle install
 
 rvm:
-
-  - 1.8
   - 1.9
   - 2.0.0
   - 2.1.1
   - 2.1.2
   - 2.2.2
   - 2.3.1
-
-  - jruby-18mode
   - jruby-19mode
-  - ree
 
   - ruby-head
   - jruby-head

data/VERSION

@@ -1 +1 @@
-7.2.2
+7.3.0

data/lib/rack/app/cli/command.rb

@@ -5,7 +5,7 @@ class Rack::App::CLI::Command
 
   class << self
 
-    def option_definitions
+    def __option_definitions__
       @options_parser_options ||= []
     end
 
@@ -17,7 +17,7 @@ class Rack::App::CLI::Command
     alias desc description
 
     def option(*args, &block)
-      option_definitions << {:args => args, :block => block}
+      __option_definitions__ << {:args => args, :block => block}
     end
 
     alias on option
@@ -28,11 +28,8 @@ class Rack::App::CLI::Command
 
   end
 
-  def options
-    @options ||= {}
-  end
-
   def action(*argv)
+    raise NotImplementedError
   end
 
   def start(argv)

data/lib/rack/app/cli/command/configurator.rb

@@ -3,10 +3,8 @@ module Rack::App::CLI::Command::Configurator
   extend self
 
   def configure(command, name, options_parser)
-
-    attach_definitions(command, options_parser, command.class.option_definitions)
+    attach_definitions(command, options_parser, command.class.__option_definitions__)
     update_banner(command, name, options_parser.banner)
-
   end
 
   protected

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

@@ -1,11 +1,11 @@
 module Rack::App::CLI::DefaultCommands::ListCommands
   extend self
 
-  PRESERVED_KEYWORDS = %w[commands help routes irb].freeze
+  PRESERVED_KEYWORDS = %w[help routes irb].freeze
 
   DEFAULT_COMMANDS = {
-    'commands' => 'list all available command',
     'routes' => Rack::App::CLI::DefaultCommands::ShowRoutes.description,
+    'help' => 'list all available command or describe a specific command',
     'irb' => Rack::App::CLI::DefaultCommands::IRB.description
   }.freeze
 

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

@@ -1,13 +1,106 @@
 class Rack::App::CLI::DefaultCommands::ShowRoutes < Rack::App::CLI::Command
-
   description 'list the routes for the application'
 
+  on '-v', '--verbose', 'print out everything' do
+    @verbose = true
+  end
+
+  on '-d', '--desc', '--description', 'include endpoint descriptions too' do
+    @description = true
+  end
+
+  on '-l', '--location', '--source-location', 'show endpoint definition locations' do
+    @source_location = true
+  end
+
+  on '-m', '--middlewares', 'show endpoint definition middleware stack' do
+    @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(app.router.show_endpoints)
+    STDOUT.puts(format(sort(Rack::App::CLI.rack_app.router.endpoints)))
+  end
+
+  private
+
+
+  def get_fields
+    if @verbose
+      return FIELD_FETCHERS.keys
+    end
+
+    fields = [:request_method, :request_path]
+    fields << :description if @description
+    fields << :source_location if @source_location
+    fields
   end
 
-  def app
-    Rack::App::CLI.rack_app
+  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
+    end
+  end
+
+
+  def sort(endpoints)
+    endpoints.sort_by { |endpoint| SORT_FIELDS.map { |sf| FIELD_FETCHERS[sf].call(endpoint) } }
+  end
+
+  def format(endpoints)
+    fields = get_fields
+    widths = width_by(endpoints, fields)
+
+    endpoints.map do |endpoint|
+      outputs = []
+
+      outputs << fields.map do |field|
+        FIELD_FETCHERS[field].call(endpoint).to_s.ljust(widths[field])
+      end.join('   ')
+
+      if @middlewares
+        outputs << pretty_print_middlewares(endpoint)
+      end
+
+      outputs.join("\n")
+    end.join("\n")
+  end
+
+  class FakeBuilder
+    attr_reader :middlewares
+
+    def initialize
+      @middlewares = []
+    end
+
+    def use(middleware, *args)
+      @middlewares << middleware
+    end
+  end
+
+  def pretty_print_middlewares(endpoint)
+    builder = FakeBuilder.new
+
+    endpoint.config.middlewares.each do |builder_block|
+      builder.instance_exec(builder, &builder_block)
+    end
+
+    builder.middlewares.map do |middleware|
+      ["\t", '* ', middleware].join
+    end.join("\n")
   end
 
-end
+end

data/lib/rack/app/cli/runner.rb

@@ -27,14 +27,12 @@ class Rack::App::CLI::Runner
   def start_command_for(command_name, argv)
     case command_name.to_s
 
-      when 'commands'
-        show_commands
-
       when 'help'
         show_help_message(argv)
 
       when 'routes'
-        Rack::App::CLI::DefaultCommands::ShowRoutes.new.start(argv)
+        command = Rack::App::CLI::DefaultCommands::ShowRoutes.new
+        run_command(argv, command, "routes")
 
       when 'irb'
         Rack::App::CLI::DefaultCommands::IRB.new.start(argv)

data/lib/rack/app/endpoint.rb

@@ -28,7 +28,7 @@ class Rack::App::Endpoint
   end
 
   def to_app
-    self.class::Builder.new(@config).build
+    self.class::Builder.new(@config).to_app
   end
 
   def rack_app?

data/lib/rack/app/endpoint/builder.rb

@@ -5,15 +5,19 @@ class Rack::App::Endpoint::Builder
     @config = config
   end
 
+  def to_app
+    build.to_app
+  end
+
+  protected
+
   def build
     builder = Rack::Builder.new
     apply_middleware_build_blocks(builder)
     builder.run(app)
-    builder.to_app
+    builder
   end
 
-  protected
-
   def app
     case @config.type
     when :endpoint
@@ -25,7 +29,7 @@ class Rack::App::Endpoint::Builder
 
   def apply_middleware_build_blocks(builder)
     @config.middlewares.each do |builder_block|
-      builder_block.call(builder)
+      builder.instance_exec(builder, &builder_block)
     end
     builder.use(Rack::App::Middlewares::Configuration, @config)
 

data/lib/rack/app/instance_methods/params.rb

@@ -6,12 +6,6 @@ module Rack::App::InstanceMethods::Params
     request.env[E::PARAMS].to_hash
   end
 
-  def validated_params
-    request.env[E::PARAMS].validated_params
-  end
-
-  Rack::App::Utils.deprecate(self, :validated_params, :params, 2017, 07)
-
   def path_segments_params
     request.env[E::PARAMS].path_segments_params
   end

metadata

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