rack-app 5.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c43fab6a1ba24663ef2b9295f9d34a093d65f919
-  data.tar.gz: d9c1de6b460aaf5f2d4fde0e87d1845a41095115
+  metadata.gz: 10f50fab86de1a0048be77118f717f557c3fcfc9
+  data.tar.gz: 84ec803fcb8677e60b56ef0b7c1362f792f62e2e
 SHA512:
-  metadata.gz: e96d27d2479d291d4d79dcd14e09d9b764bd2c942b9ba747ea0fe18677123243cc67de07fa39c8bbfdb7de27b45adbb05e86a7bbe98f1fed0f7143040f790fee
-  data.tar.gz: ed4bdf700375dd5dc3e4f915af56d0531ae20772a9110e61b80323f116191f2f2a03ffe1155957cfc9ed188b0e694042c44b5b1d1955fabb52ab7ece3ff29f9b
+  metadata.gz: 0ed0aeb5c5e1969ded36b657d28265f1b9d5cec2120d9277a5515ec0ab441154bbb1744d6f03de288ce853daa471fe5175bf9354a30f2daa1c4ae1f52c4cf8c5
+  data.tar.gz: 5548b69b220ba01de870451750cb624b0e94f4ce41fb5bdb92b8563ebde88095c7bb46a74d53f744491e1684a231e27233fb2d9e533c1ea906a3454e2b75522d

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
-script: rspec spec
+script: rspec spec -f d
 
 install:
   - gem update bundler
@@ -32,7 +32,7 @@ env:
     - VERBOSE=true
     - TIMEOUT=1
     - BENCHMARK_QUANTITY=100000
-    - STREAM_FILE_SIZE=1024
+    - STREAM_FILE_SIZE=68
 
 branches:
   only:

data/README.md

@@ -4,8 +4,6 @@
 [travis-link]: http://travis-ci.org/rack-app/rack-app
 [travis-home]: http://travis-ci.org/
 
-![Rack::App](http://rack-app-website.herokuapp.com/img/msruby_old.png)
-
 Your next favourite rack based micro framework that is totally addition free!
 Have a cup of awesomeness with your performance designed framework!
 
@@ -169,7 +167,7 @@ class App < Rack::App
     stream do |out|
       out << 'data row'
     end
-  end 
+  end
 
 end
 

data/VERSION

@@ -1 +1 @@
-5.1.0
+5.2.0

data/lib/rack/app/middlewares/configuration.rb

@@ -2,6 +2,9 @@ require "rack/request"
 require "rack/response"
 class Rack::App::Middlewares::Configuration
 
+  require "rack/app/middlewares/configuration/path_info_formatter"
+  require "rack/app/middlewares/configuration/path_params_matcher"
+
   def initialize(app, options={})
     @handler_class = options[:app_class] || raise
     @serializer = options[:serializer] || raise

data/lib/rack/app/middlewares/configuration/path_info_formatter.rb

@@ -0,0 +1,14 @@
+class Rack::App::Middlewares::Configuration::PathInfoFormatter
+
+  def initialize(app, cut_string_from_path)
+    @cut_string_from_path = cut_string_from_path
+    @app = app
+  end
+
+  def call(env)
+    env[::Rack::App::Constants::ENV::ORIGINAL_PATH_INFO]= env[::Rack::PATH_INFO].dup
+    env[::Rack::PATH_INFO].sub!(@cut_string_from_path, '')
+    @app.call(env)
+  end
+
+end

data/lib/rack/app/middlewares/configuration/path_params_matcher.rb

@@ -0,0 +1,14 @@
+class Rack::App::Middlewares::Configuration::PathParamsMatcher
+
+  def initialize(app, path_params)
+    @path_params = path_params
+    @app = app
+  end
+
+  def call(env)
+    env[::Rack::App::Constants::ENV::PATH_PARAMS_MATCHER]= @path_params.dup
+
+    @app.call(env)
+  end
+
+end

data/lib/rack/app/router/base.rb

@@ -8,29 +8,26 @@ class Rack::App::Router::Base
     context = fetch_context(request_method, path_info)
     return unless context.is_a?(Hash) and not context[:app].nil?
 
-    format_env(context, env)
     context[:app].call(env)
-
   end
 
-  def format_env(context, env)
-  end
 
   def endpoints
     @endpoints ||= []
   end
 
   def register_endpoint!(request_method, request_path, endpoint, properties={})
+    normalized_request_path = Rack::App::Utils.normalize_path(request_path)
     endpoints.push(
         {
             :request_method => request_method,
-            :request_path => Rack::App::Utils.normalize_path(request_path),
+            :request_path => normalized_request_path,
             :endpoint => endpoint,
             :properties => properties
         }
     )
 
-    reset
+    compile_endpoint!(request_method, normalized_request_path, endpoint)
     return endpoint
   end
 
@@ -41,6 +38,10 @@ class Rack::App::Router::Base
 
   protected
 
+  def compile_endpoint!(request_method, request_path, endpoint)
+    raise(NotImplementedError)
+  end
+
   def clean_routes!
     raise(NotImplementedError)
   end

data/lib/rack/app/router/dynamic.rb

@@ -39,18 +39,20 @@ class Rack::App::Router::Dynamic < Rack::App::Router::Base
 
   def compile_registered_endpoints!
     endpoints.each do |endpoint_prop|
-      compile_endpoint(endpoint_prop[:request_method], endpoint_prop[:request_path], endpoint_prop[:endpoint])
+      compile_endpoint!(endpoint_prop[:request_method], endpoint_prop[:request_path], endpoint_prop[:endpoint])
     end
   end
 
-  def compile_endpoint(request_method, request_path, endpoint)
+  def compile_endpoint!(request_method, request_path, endpoint)
     clusters_for(request_method) do |current_cluster|
 
       break_build = false
       path_params = {}
-      mount_path = ''
       options = {}
 
+      builder = Rack::Builder.new
+      builder.use(Rack::App::Middlewares::Configuration::PathParamsMatcher, path_params)
+
       request_path_parts = request_path.split('/')
       request_path_parts.each.with_index do |path_part, index|
 
@@ -64,7 +66,10 @@ class Rack::App::Router::Dynamic < Rack::App::Router::Base
 
                            elsif path_part_is_a_mounted_rack_based_application?(path_part)
                              break_build = true
-                             mount_path = calculate_mount_path(request_path_parts)
+                             builder.use(
+                              Rack::App::Middlewares::Configuration::PathInfoFormatter,
+                              calculate_mount_path(request_path_parts)
+                             )
                              MOUNTED_APPLICATION
 
                            else
@@ -76,16 +81,16 @@ class Rack::App::Router::Dynamic < Rack::App::Router::Base
 
       end
 
-      current_cluster[:app]= as_app(endpoint)
+
+      builder.run(as_app(endpoint))
+      current_cluster[:app]= builder.to_app
+
       current_cluster[:endpoint]= endpoint
       if current_cluster[:endpoint].respond_to?(:register_path_params_matcher)
         current_cluster[:endpoint].register_path_params_matcher(path_params)
       end
 
-      options[:mount_path]= mount_path
-      options[:path_params]= path_params
       current_cluster[:options]= options
-
     end
   end
 
@@ -146,10 +151,4 @@ class Rack::App::Router::Dynamic < Rack::App::Router::Base
 
   end
 
-  def format_env(context, env)
-    mount_path = context[:options][:mount_path] rescue ''
-    env[::Rack::App::Constants::ENV::PATH_PARAMS_MATCHER]= context[:options][:path_params].dup
-    env[::Rack::PATH_INFO].sub!(mount_path, '')
-  end
-
 end

data/lib/rack/app/router/static.rb

@@ -15,10 +15,13 @@ class Rack::App::Router::Static < Rack::App::Router::Base
     mapped_endpoint_routes.clear
   end
 
+  def compile_endpoint!(request_method, request_path, endpoint)
+    mapped_endpoint_routes[[request_method.to_s.upcase, request_path]]= as_app(endpoint)
+  end
+
   def compile_registered_endpoints!
     endpoints.each do |endpoint|
-      app = as_app(endpoint[:endpoint])
-      mapped_endpoint_routes[[endpoint[:request_method].to_s.upcase, endpoint[:request_path]]]= app
+      compile_endpoint!(endpoint[:request_method],endpoint[:request_path], endpoint[:endpoint])
     end
   end
 

data/lib/rack/app/test.rb

@@ -26,18 +26,16 @@ module Rack::App::Test
   end
 
   def rack_app(&block)
-
     @rack_app ||= lambda do
-      app_class = defined?(__rack_app_class__) ? __rack_app_class__ : nil
-      constructors = []
-      if defined?(__rack_app_constructor__) and __rack_app_constructor__.is_a?(Proc)
-        constructors << __rack_app_constructor__
+      if defined?(__rack_app_class__)
+        __rack_app_class__
+      elsif defined?(described_class) && described_class.respond_to?(:call)
+        described_class
+      else
+        raise('missing class definition')
       end
-      Rack::App::Test::Utils.rack_app_by(app_class, constructors)
-    end.call
-
+    end.call 
     block.is_a?(Proc) ? @rack_app.instance_exec(&block) : @rack_app
-
   end
 
 end

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

@@ -1,9 +1,14 @@
 module Rack::App::Test::SingletonMethods
 
   def rack_app(rack_app_class=nil, &constructor)
-    in_this_context(:__rack_app_class__) { rack_app_class }
-    in_this_context(:__rack_app_constructor__) { constructor }
-    nil
+    klass = if !rack_app_class.nil? && rack_app_class.respond_to?(:call)
+      rack_app_class
+    else
+      Class.new(Rack::App)
+    end
+
+    klass.class_eval(&constructor) unless constructor.nil?
+    return in_this_context(:__rack_app_class__){ klass }
   end
 
   def in_this_context(name, &block)
@@ -12,4 +17,4 @@ module Rack::App::Test::SingletonMethods
     define_method(name, &block)
   end
 
-end
+end

data/lib/rack/app/test/utils.rb

@@ -10,12 +10,6 @@ module Rack::App::Test::Utils
     properties
   end
 
-  def rack_app_by(subject_class, constructors)
-    app_class = subject_class.respond_to?(:call) ? subject_class : Class.new(Rack::App)
-    constructors.each { |constructor| app_class.class_eval(&constructor) }
-    return app_class
-  end
-
   def env_by(properties)
 
     properties = format_properties(properties)

data/spike/long_endpoint.rb

@@ -0,0 +1,29 @@
+rack_api_lib_folder = File.join(File.dirname(__FILE__), '..', 'lib')
+$LOAD_PATH.unshift(rack_api_lib_folder)
+
+require "rack/app"
+require "rack/mock"
+require "benchmark"
+
+class App < Rack::App
+
+  get "/a/b/c/:d/e/f/:g/h/i/j/k/l/m/n/o/p/q/:something" do
+    return 'Hello, World!'
+  end
+
+end
+
+
+request = Rack::MockRequest.new(App)
+
+Benchmark.bm do |x|
+  x.report do
+    request.get("/a/b/c/dog/e/f/goat/h/i/j/k/l/m/n/o/p/q/chicken" )
+  end
+end
+
+result = Benchmark.measure do
+
+end
+
+puts result

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-21 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -119,6 +119,8 @@ files:
 - lib/rack/app/instance_methods/streaming.rb
 - lib/rack/app/middlewares.rb
 - lib/rack/app/middlewares/configuration.rb
+- lib/rack/app/middlewares/configuration/path_info_formatter.rb
+- lib/rack/app/middlewares/configuration/path_params_matcher.rb
 - lib/rack/app/middlewares/header_setter.rb
 - lib/rack/app/middlewares/hooks.rb
 - lib/rack/app/middlewares/hooks/after.rb
@@ -172,6 +174,7 @@ files:
 - rack-app.gemspec
 - spec_files.txt
 - spike/array_vs_proc.rb
+- spike/long_endpoint.rb
 - spike/method_vs_instance_exec.rb
 - spike/return_vs_throw.rb
 - src/Net__HTTP Cheat Sheet.pdf