rack-app 5.12.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad41bbced4baeeea08b32f690ed2268453b9491b
-  data.tar.gz: 5b02692483edeeffb9aaf5e8f5d15ba763f426e6
+  metadata.gz: 115ef984aee400271ed64f69eee96b2bc3896cb9
+  data.tar.gz: dcb1b5ee1fd8af7b107b6dc50d9089fd9410657e
 SHA512:
-  metadata.gz: 522f2d363ead4984e3afb39c81f801e8aec3f73cdfb6f897729756af7635a8ae40d0290f5257b99124f7bf3d9de9b3f14f1741d5868762d3dd5cdc0d2ff63619
-  data.tar.gz: 714c400a866ed8f47c386ea7dafdee6562ab97f590338b8f45d3bdd5b5fec04981afbd47dd8c9df951a6d33c0c3c9bbb48101432caef42de202859b1734cda63
+  metadata.gz: a921f4cc74415fd8aef272fd97bdd3fd53e2066e42266ddddc98a9271cee6df6612d695fa6129055d7d216df533f596099cea13fa59a8c311380f3e31dfa68de
+  data.tar.gz: fe97b75e3b27041a03b34daa0650c40fc4719161d3d1d91e355000f6454762d50b431f1384eddad588f387c6991f69e59f4d49203df0a9428b048381ec0abe97

data/README.md

@@ -68,7 +68,7 @@ Yes, in fact it's already powering heroku hosted micro-services.
   * syntax sugar for default header definitions
   * namespaces for endpoint request path declarations so it can be dry and unified
 * no Class method bloat, so you can enjoy pure ruby without any surprises
-* App mounting so you can crete separated controllers for different task
+* App mounting so you can create separated controllers for different task
 * Streaming
 * O(log(n)) lookup routing
   * allows as many endpoint registration to you as you want, without impact on route lookup speed
@@ -76,7 +76,7 @@ Yes, in fact it's already powering heroku hosted micro-services.
 * simple to use class level response serializer
   * so you can choose what type of serialization you want without any enforced convention
 * static file serving so you can mount even filesystem based endpoints too
-* built in testing module so your app can easily written with BDD approach
+* built in testing module so your app can be easily written with BDD approach
 * made with performance in mind so your app don't lose time by your framework
 * per endpoint middleware definitions
   * you can define middleware stack before endpoints and it will only applied to them, similar like protected method workflow
@@ -266,7 +266,6 @@ the benchmarking was taken on the following hardware specification:
 
 ### Endpoint to be call type: static
 
-
 #### number of declared endpoints: 100
 
 | name                   | version                | current / fastest      | real                   |
@@ -274,21 +273,28 @@ the benchmarking was taken on the following hardware specification:
 | rack-app               | 4.0.0                  | 1.0                    | 2.2053215187043942e-05 |
 | rack-app               | 5.2.0                  | 1.185                  | 2.6140331494390213e-05 |
 | rack-app               | 5.0.0.rc3              | 1.387                  | 3.0592694940592784e-05 |
-| ramaze                 | 2012.12.08             | 1.468                  | 3.236885466806858e-05  |
-| hobbit                 | 0.6.1                  | 2.996                  | 6.607205038890137e-05  |
-| brooklyn               | 0.0.1                  | 5.243                  | 0.00011562206838279088 |
-| nyny                   | 3.4.3                  | 5.272                  | 0.00011626420279498706 |
+| rack-app               | 5.10.0                 | 1.687                  | 3.719768107671963e-05  |
+| rack-app               | 5.12.0                 | 1.747                  | 3.852106360719058e-05  |
+| rack-app               | 5.7.0                  | 1.784                  | 3.934149001724991e-05  |
+| ramaze                 | 2012.12.08             | 2.237                  | 4.932373271523216e-05  |
+| hobbit                 | 0.6.1                  | 3.111                  | 6.860981349018188e-05  |
+| brooklyn               | 0.0.1                  | 5.245                  | 0.00011567194234917104 |
 | plezi                  | 0.14.1                 | 5.334                  | 0.00011763589749898317 |
-| nancy                  | 0.3.0                  | 5.649                  | 0.00012458588462322884 |
+| plezi                  | 0.14.2                 | 5.588                  | 0.00012324020796222724 |
+| nancy                  | 0.3.0                  | 5.725                  | 0.00012626088352407584 |
+| nyny                   | 3.4.3                  | 5.744                  | 0.00012667404900032145 |
+| roda                   | 2.20.0                 | 9.662                  | 0.00021307581296423227 |
 | roda                   | 2.17.0                 | 10.646                 | 0.00023477471132838754 |
 | scorched               | 0.25                   | 12.728                 | 0.0002807019599946191  |
-| sinatra                | 1.4.7                  | 21.169                 | 0.0004668393424013356  |
+| scorched               | 0.27                   | 16.074                 | 0.0003544879730325173  |
+| sinatra                | 1.4.7                  | 19.857                 | 0.00043791615583657487 |
 | grape                  | 0.17.0                 | 25.941                 | 0.0005720832234016178  |
 | rails                  | 5.0.0                  | 33.234                 | 0.0007329187002032537  |
-| camping                | 2.1.532                | 39.699                 | 0.0008754866444039887  |
-| cuba                   | 3.8.0                  | 54.196                 | 0.001195195165998367   |
-| almost-sinatra         | unknown                | 58.613                 | 0.0012926107780076503  |
-
+| camping                | 2.1.532                | 39.818                 | 0.0008781073650072727  |
+| grape                  | 0.18.0                 | 41.857                 | 0.000923075147962645   |
+| rails                  | 5.0.0.1                | 47.286                 | 0.0010428086559986802  |
+| cuba                   | 3.8.0                  | 55.397                 | 0.0012216723478342246  |
+| almost-sinatra         | unknown                | 58.728                 | 0.0012951477793394547  |
 
 For more reports check the Benchmark repo out :)
 

data/VERSION

@@ -1 +1 @@
-5.12.0
+6.0.0

data/lib/rack/app/block.rb

@@ -0,0 +1,2 @@
+class Rack::App::Block < Proc
+end

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

@@ -1,6 +1,6 @@
-require "rack/builder"
+# frozen_string_literal: true
+require 'rack/builder'
 class Rack::App::Endpoint::Builder
-
   def initialize(config)
     @config = config
   end
@@ -8,12 +8,21 @@ class Rack::App::Endpoint::Builder
   def build
     builder = Rack::Builder.new
     apply_middleware_build_blocks(builder)
-    builder.run(Rack::App::Endpoint::Executor.new(@config))
+    builder.run(app)
     builder.to_app
   end
 
   protected
 
+  def app
+    case @config.type
+    when :endpoint
+      Rack::App::Endpoint::Executor.new(@config)
+    else
+      @config.callable
+    end
+  end
+
   def apply_middleware_build_blocks(builder)
     builder_blocks.each do |builder_block|
       builder_block.call(builder)
@@ -32,7 +41,6 @@ class Rack::App::Endpoint::Builder
   end
 
   def builder_blocks
-    [@config.app_class.middlewares, @config.middleware_builders_blocks].flatten
+    [@config.app_class.middlewares, @config.endpoint_specific_middlewares].flatten
   end
-
 end

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

@@ -1,20 +1,30 @@
 # frozen_string_literal: true
 class Rack::App::Endpoint::Config
+
   def to_hash
     error_handler
-    middleware_builders_blocks
+    endpoint_specific_middlewares
     request_path
     request_methods
     defined_request_path
     @raw
   end
 
-  def payload_builder
-    @raw[:payload].parser_builder
+  def callable
+    @raw[:callable]
+  end
+
+  def type
+    case callable
+    when ::Rack::App::Block
+      :endpoint
+    else
+      :application
+    end
   end
 
-  def application
-    @raw[:application]
+  def payload_builder
+    @raw[:payload].parser_builder
   end
 
   def app_class
@@ -41,13 +51,10 @@ class Rack::App::Endpoint::Config
     @raw[:error_handler] ||= Rack::App::ErrorHandler.new
   end
 
-  def middleware_builders_blocks
-    @raw[:middleware_builders_blocks] ||= []
+  def endpoint_specific_middlewares
+    @raw[:endpoint_specific_middlewares] ||= []
   end
 
-  def endpoint_method_name
-    @raw[:method_name] ||= register_method_to_app_class
-  end
 
   def request_methods
     case @raw[:request_methods] || raise('missing config: request_methods')

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

@@ -2,7 +2,6 @@ class Rack::App::Endpoint::Executor
 
   def initialize(endpoint_properties)
     @endpoint_properties = endpoint_properties
-    @endpoint_properties.endpoint_method_name
   end
 
   def call(env)
@@ -35,7 +34,7 @@ class Rack::App::Endpoint::Executor
 
   def evaluate_value(request_handler)
     @endpoint_properties.error_handler.execute_with_error_handling_for(request_handler) do
-      request_handler.__send__(@endpoint_properties.endpoint_method_name)
+      request_handler.instance_exec(&@endpoint_properties.callable)
     end
   end
 

data/lib/rack/app/endpoint.rb

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

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

@@ -25,4 +25,8 @@ module Rack::App::InstanceMethods::Core
   alias finish_response finish!
   Rack::App::Utils.deprecate(self, :finish_response, :finish!, 2016,9)
 
+  def respond_with(respond_body)
+    throw(:response_body, respond_body)
+  end
+
 end

data/lib/rack/app/singleton_methods/http_methods.rb

@@ -3,43 +3,43 @@ module Rack::App::SingletonMethods::HttpMethods
   protected
 
   def get(path = '/', &block)
-    add_route(::Rack::App::Constants::HTTP::METHOD::GET, path, &block)
+    add_route(::Rack::App::Constants::HTTP::METHOD::GET, path, Rack::App::Block.new(&block))
   end
 
   def post(path = '/', &block)
-    add_route(::Rack::App::Constants::HTTP::METHOD::POST, path, &block)
+    add_route(::Rack::App::Constants::HTTP::METHOD::POST, path, Rack::App::Block.new(&block))
   end
 
   def put(path = '/', &block)
-    add_route(::Rack::App::Constants::HTTP::METHOD::PUT, path, &block)
+    add_route(::Rack::App::Constants::HTTP::METHOD::PUT, path, Rack::App::Block.new(&block))
   end
 
   def delete(path = '/', &block)
-    add_route(::Rack::App::Constants::HTTP::METHOD::DELETE, path, &block)
+    add_route(::Rack::App::Constants::HTTP::METHOD::DELETE, path, Rack::App::Block.new(&block))
   end
 
   def head(path = '/', &block)
-    add_route(::Rack::App::Constants::HTTP::METHOD::HEAD, path, &block)
+    add_route(::Rack::App::Constants::HTTP::METHOD::HEAD, path, Rack::App::Block.new(&block))
   end
 
   def options(path = '/', &block)
-    add_route(::Rack::App::Constants::HTTP::METHOD::OPTIONS, path, &block)
+    add_route(::Rack::App::Constants::HTTP::METHOD::OPTIONS, path, Rack::App::Block.new(&block))
   end
 
   def patch(path = '/', &block)
-    add_route(::Rack::App::Constants::HTTP::METHOD::PATCH, path, &block)
+    add_route(::Rack::App::Constants::HTTP::METHOD::PATCH, path, Rack::App::Block.new(&block))
   end
 
   def link(path = '/', &block)
-    add_route(::Rack::App::Constants::HTTP::METHOD::LINK, path, &block)
+    add_route(::Rack::App::Constants::HTTP::METHOD::LINK, path, Rack::App::Block.new(&block))
   end
 
   def unlink(path = '/', &block)
-    add_route(::Rack::App::Constants::HTTP::METHOD::UNLINK, path, &block)
+    add_route(::Rack::App::Constants::HTTP::METHOD::UNLINK, path, Rack::App::Block.new(&block))
   end
 
   def trace(path = '/', &block)
-    add_route(::Rack::App::Constants::HTTP::METHOD::TRACE, path, &block)
+    add_route(::Rack::App::Constants::HTTP::METHOD::TRACE, path, Rack::App::Block.new(&block))
   end
 
   def alias_endpoint(new_request_path, original_request_path)

data/lib/rack/app/singleton_methods/mounting.rb

@@ -41,41 +41,16 @@ module Rack::App::SingletonMethods::Mounting
     nil
   end
 
-  alias create_endpoints_for_files_in mount_directory
-  Rack::App::Utils.deprecate(self,:create_endpoints_for_files_in, :mount_directory, 2016,9)
-
   def serve_files_from(file_path, options={})
     file_server = Rack::App::FileServer.new(Rack::App::Utils.expand_path(file_path))
-    request_path = Rack::App::Utils.join(@namespaces, options[:to], Rack::App::Constants::PATH::MOUNT_POINT)
-
-    endpoint = Rack::App::Endpoint.new(
-      route_registration_properties.merge(
-        :request_methods => [
-          Rack::App::Constants::HTTP::METHOD::GET,
-          Rack::App::Constants::HTTP::METHOD::OPTIONS
-        ],
-        :request_path => request_path,
-        :application => file_server
-      )
-    )
-
-    router.register_endpoint!(endpoint)
-    route_registration_properties.clear
+    request_path = Rack::App::Utils.join(options[:to], Rack::App::Constants::PATH::MOUNT_POINT)
+    add_route(::Rack::App::Constants::HTTP::METHOD::ANY, request_path, file_server)
     nil
   end
 
   def mount_rack_interface_compatible_application(rack_based_app, options={})
-    properties = route_registration_properties.merge(
-          :request_methods => ::Rack::App::Constants::HTTP::METHOD::ANY,
-          :request_path => Rack::App::Utils.join(
-            @namespaces,
-            options[:to],
-            Rack::App::Constants::PATH::APPLICATION
-          ),
-          :application => rack_based_app
-    )
-
-    router.register_endpoint!(Rack::App::Endpoint.new(properties))
+    request_path = Rack::App::Utils.join(options[:to],Rack::App::Constants::PATH::APPLICATION)
+    add_route(::Rack::App::Constants::HTTP::METHOD::ANY, request_path, rack_based_app)
   end
 
 end

data/lib/rack/app/singleton_methods/route_handling.rb

@@ -20,17 +20,17 @@ module Rack::App::SingletonMethods::RouteHandling
 
   alias desc description
 
-  def add_route(request_method, request_path, &block)
+  def add_route(request_method, request_path, callable)
 
     router.register_endpoint!(
       Rack::App::Endpoint.new({
         :app_class => self,
+        :callable => callable,
         :payload => payload,
         :error_handler => error,
-        :user_defined_logic => block,
         :request_methods => [request_method],
         :route => route_registration_properties.dup,
-        :middleware_builders_blocks => next_endpoint_middlewares.dup,
+        :endpoint_specific_middlewares => next_endpoint_middlewares.dup,
         :request_path => ::Rack::App::Utils.join(@namespaces, request_path)
       })
     )
@@ -41,6 +41,9 @@ module Rack::App::SingletonMethods::RouteHandling
 
   end
 
+  def add_app_to_route(app, request_path)
+  end
+
   def namespace(request_path_namespace)
     return unless block_given?
     @namespaces ||= []

data/lib/rack/app.rb

@@ -10,6 +10,7 @@ class Rack::App
   require 'rack/app/cli'
   require 'rack/app/test'
   require 'rack/app/utils'
+  require 'rack/app/block'
   require 'rack/app/logger'
   require 'rack/app/params'
   require 'rack/app/payload'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 5.12.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-20 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -93,6 +93,7 @@ files:
 - dev/console
 - dev/rack-app
 - lib/rack/app.rb
+- lib/rack/app/block.rb
 - lib/rack/app/bundled_extensions.rb
 - lib/rack/app/bundled_extensions/logger.rb
 - lib/rack/app/bundled_extensions/payload.rb
@@ -200,7 +201,6 @@ files:
 - spike/method_vs_instance_exec.rb
 - spike/return_vs_throw.rb
 - spike/slice_vs_sub.rb
-- spike/tree.rb
 - spike/validator_with_minitest.rb
 - spike/xml.rb
 - src/Net__HTTP Cheat Sheet.pdf

data/spike/tree.rb

@@ -1,76 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-rack_api_lib_folder = File.join(File.dirname(__FILE__), '..', 'lib')
-$LOAD_PATH.unshift(rack_api_lib_folder)
-require 'rack/app'
-require 'pp'
-
-tree = Rack::App::Router::Tree.new
-
-APP = Class.new(Rack::App)
-
-payload = Rack::App::Payload::Builder.new
-
-payload.parser_builder do
-  accept :json
-end
-
-serializer = Rack::App::Serializer::FormatsBuilder.new
-serializer.instance_exec do
-    on '.json', 'application/json' do |obj|
-        JSON.dump(obj)
-    end
-end
-
-endpoint = Rack::App::Endpoint.new(
-  :route => {},
-  :app_class => APP,
-  :request_methods => ["GET"],
-  :request_path => '/hello/world/:id',
-  :middleware_builders_blocks => [],
-  :user_defined_logic => proc{ "hy" },
-  :serializer_builder => serializer,
-  :payload => payload,
-  :error_handler => Rack::App::ErrorHandler.new,
-)
-
-
-properties = {
-    :request_methods => ::Rack::App::Constants::HTTP::METHODS,
-    :request_path => Rack::App::Utils.join("hello", ::Rack::App::Constants::RACK_BASED_APPLICATION),
-    :application => proc{|env| Rack::Response.new.finish }
-}
-
-tree.add(Rack::App::Endpoint.new(properties))
-
-endpoint = Rack::App::Endpoint.new(
-  :route => {},
-  :app_class => APP,
-  :request_methods => ["GET"],
-  :request_path => '/hello/world/:id',
-  :middleware_builders_blocks => [],
-  :user_defined_logic => proc{ "hy" },
-  :serializer_builder => serializer,
-  :payload => payload,
-  :error_handler => Rack::App::ErrorHandler.new,
-)
-
-tree.add(endpoint)
-pp tree
-
-require 'rack'
-puts
-
-[
-    "/hello/world/123.json",
-    "/hello/world/123",
-    "/hello/world",
-].each do |path_info|
-    env = Rack::MockRequest.env_for(path_info, :method => 'GET')
-    resp = tree.call(env)
-
-    puts(path_info)
-    p resp.is_a?(Array) && resp.length == 3
-    puts
-end