rack-app 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85eef183f233ed422353b4658cc710fcddd6f3fa
-  data.tar.gz: c64e1dea7180304029ce7515fdf96fdfa2339d60
+  metadata.gz: c43fab6a1ba24663ef2b9295f9d34a093d65f919
+  data.tar.gz: d9c1de6b460aaf5f2d4fde0e87d1845a41095115
 SHA512:
-  metadata.gz: c63f77fa26cf15b1a5312afdb6b199fd51d3d5fc79cc5f3bdd85728ce45002a5c8eee7de6ebe110506cf3941c0f7c6573485ef22e10a3d8b550cd31a193391ae
-  data.tar.gz: 282c092d984e8202bf4ce0d3cc81202033fa732822032ff804d8ef6241bc01acbfba817ecdb4358ff4210fbc101a8a478b7838fe30eff9e39de00ace2f7340a6
+  metadata.gz: e96d27d2479d291d4d79dcd14e09d9b764bd2c942b9ba747ea0fe18677123243cc67de07fa39c8bbfdb7de27b45adbb05e86a7bbe98f1fed0f7143040f790fee
+  data.tar.gz: ed4bdf700375dd5dc3e4f915af56d0531ae20772a9110e61b80323f116191f2f2a03ffe1155957cfc9ed188b0e694042c44b5b1d1955fabb52ab7ece3ff29f9b

data/README.md

@@ -69,6 +69,7 @@ Yes, in fact it's already powering heroku hosted micro-services.
   * 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  
+* Streaming
 * Null time look up routing
   * allows as many endpoint registration to you as you want, without impact on route look up speed
 * only basic sets for instance method lvl for the must need tools, such as params, payload
@@ -164,6 +165,12 @@ class App < Rack::App
 
   root '/hello'
 
+  get '/stream' do
+    stream do |out|
+      out << 'data row'
+    end
+  end 
+
 end
 
 ```

data/VERSION

@@ -1 +1 @@
-5.0.0
+5.1.0

data/lib/rack/app/cli/fetcher/server.rb

@@ -1,5 +1,24 @@
 class Rack::App::CLI::Fetcher::Server < Rack::Server
 
+  def get_rack_app
+    app_class = self.app
+    last_app = nil
+    until app_class.is_a?(Class) && app_class <= Rack::App
+      raise if app_class.__id__ == last_app.__id__
+
+      app_class.instance_variables.each do |ivar|
+        value = app_class.instance_variable_get(ivar)
+        if value.respond_to?(:call) and not [Method, Proc, UnboundMethod].include?(value.class)
+          app_class = value
+        end
+      end
+
+      last_app = app_class
+    end
+    app_class
+  rescue
+  end
+
   Abort = Class.new(StandardError)
 
   def app

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

@@ -12,22 +12,21 @@ module Rack::App::CLI::Fetcher
   end
 
   def rack_app
+    @rack_app ||= (server_based_lookup || rack_app_with_most_endpoints)
+  end
 
-    server = Rack::App::CLI::Fetcher::Server.new(:config => 'config.ru')
-
-    app = server.app
+  protected
 
-    until app.is_a?(Class) && app <= Rack::App
-      app.instance_variables.each do |ivar|
-        value = app.instance_variable_get(ivar)
-        if value.respond_to?(:call) and not [Method, Proc, UnboundMethod].include?(value.class)
-          app = value
-        end
-      end
-    end
-
-    app
+  def server_based_lookup
+     Rack::App::CLI::Fetcher::Server.new(:config => 'config.ru').get_rack_app
+  end
 
+  def rack_app_with_most_endpoints
+    ObjectSpace.each_object(Class).select{|klass|
+      klass < Rack::App
+    }.uniq.sort_by{ |rack_app|
+      rack_app.router.endpoints.length
+    }.last
   end
 
 end

data/lib/rack/app/constants.rb

@@ -22,6 +22,7 @@ module Rack::App::Constants
 
   module ENV
     REQUEST_HANDLER = 'rack-app.handler'
+    SERIALIZER = 'rack-app.serializer'
     PARSED_PARAMS = 'rack-app.parsed_params'
     VALIDATED_PARAMS = 'rack-app.validated_params'
     ORIGINAL_PATH_INFO = 'rack-app.original_path_info'.freeze

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

@@ -1,7 +1,12 @@
 class Rack::App::Endpoint::Properties
 
   def to_hash
-    @raw
+    app_class
+    serializer
+    error_handler
+    middleware_builders_blocks
+    endpoint_method_name
+    return @raw
   end
 
   def app_class

data/lib/rack/app/endpoint.rb

@@ -29,7 +29,7 @@ class Rack::App::Endpoint
     builder_blocks.each do |builder_block|
       builder_block.call(builder)
     end
-    builder.use(Rack::App::Middlewares::Configuration, @properties.app_class)
+    builder.use(Rack::App::Middlewares::Configuration, @properties.to_hash)
     apply_hook_middlewares(builder)
   end
 

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

@@ -0,0 +1,16 @@
+module Rack::App::InstanceMethods::Streaming
+  #
+  # Copyright (c) 2007, 2008, 2009 Blake Mizerany
+  # Copyright (c) 2010, 2011, 2012, 2013, 2014, 2015, 2016 Konstantin Haase
+  #
+  # Allows to start sending data to the client even though later parts of
+  # the response body have not yet been generated.
+  #
+  # The close parameter specifies whether Stream#close should be called
+  # after the block has been executed. This is only relevant for evented
+  # servers like Thin or Rainbows.
+  def stream(keep_open = false, &back)
+    response.body = Rack::App::Streamer.new(request.env, :keep_open => keep_open, &back)
+    finish_response
+  end
+end

data/lib/rack/app/instance_methods.rb

@@ -4,10 +4,12 @@ module Rack::App::InstanceMethods
   require 'rack/app/instance_methods/http_control'
   require 'rack/app/instance_methods/payload'
   require 'rack/app/instance_methods/serve_file'
+  require 'rack/app/instance_methods/streaming'
 
   include Rack::App::InstanceMethods::Core
   include Rack::App::InstanceMethods::HttpControl
   include Rack::App::InstanceMethods::Payload
   include Rack::App::InstanceMethods::ServeFile
+  include Rack::App::InstanceMethods::Streaming
 
 end

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

@@ -2,12 +2,14 @@ require "rack/request"
 require "rack/response"
 class Rack::App::Middlewares::Configuration
 
-  def initialize(app, handler_class)
-    @handler_class = handler_class
+  def initialize(app, options={})
+    @handler_class = options[:app_class] || raise
+    @serializer = options[:serializer] || raise
     @app = app
   end
 
   def call(env)
+    env[Rack::App::Constants::ENV::SERIALIZER]= @serializer
     env[Rack::App::Constants::ENV::REQUEST_HANDLER]= handler(env)
     @app.call(env)
   end

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

@@ -6,19 +6,13 @@ class Rack::App::Middlewares::HeaderSetter
   end
 
   def call(env)
-    response = rack_response(@app.call(env))
+     status, headers, body = @app.call(env)
 
     @headers.each do |header, value|
-      response.headers[header] ||= value
+      headers[header] ||= value
     end
 
-    response.finish
+    [status, headers, body]
   end
 
-  protected
-
-  def rack_response(raw_response)
-    Rack::Response.new(raw_response[2], raw_response[0], raw_response[1])
-  end
-
-end
+end

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

@@ -30,22 +30,27 @@ class Rack::App::Router::Base
         }
     )
 
-    compile_registered_endpoints!
+    reset
     return endpoint
   end
 
   def reset
+    clean_routes!
     compile_registered_endpoints!
   end
 
   protected
 
+  def clean_routes!
+    raise(NotImplementedError)
+  end
+
   def compile_registered_endpoints!
-    raise('IMPLEMENTATION MISSING ERROR')
+    raise(NotImplementedError)
   end
 
   def fetch_context(request_method, request_path)
-    raise('IMPLEMENTATION MISSING ERROR')
+    raise(NotImplementedError)
   end
 
   def as_app(endpoint_or_app)

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

@@ -33,8 +33,11 @@ class Rack::App::Router::Dynamic < Rack::App::Router::Base
     path_part == Rack::App::Constants::RACK_BASED_APPLICATION
   end
 
-  def compile_registered_endpoints!
+  def clean_routes!
     @http_method_cluster.clear
+  end
+
+  def compile_registered_endpoints!
     endpoints.each do |endpoint_prop|
       compile_endpoint(endpoint_prop[:request_method], endpoint_prop[:request_path], endpoint_prop[:endpoint])
     end

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

@@ -11,11 +11,15 @@ class Rack::App::Router::Static < Rack::App::Router::Base
     @mapped_endpoint_routes ||= {}
   end
 
-  def compile_registered_endpoints!
+  def clean_routes!
     mapped_endpoint_routes.clear
+  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
     end
   end
+
 end

data/lib/rack/app/serializer.rb

@@ -11,7 +11,7 @@ class Rack::App::Serializer
   end
 
   def serialize(object)
-    @logic.call(object)
+    String(@logic.call(object))
   end
 
 end

data/lib/rack/app/streamer/scheduler/null.rb

@@ -0,0 +1,13 @@
+module Rack::App::Streamer::Scheduler::Null
+
+  extend(self)
+
+  def schedule(*)
+     yield
+   end
+
+  def defer(*)
+    yield
+  end
+
+end

data/lib/rack/app/streamer/scheduler.rb

@@ -0,0 +1,14 @@
+module Rack::App::Streamer::Scheduler
+  require "rack/app/streamer/scheduler/null"
+
+  extend(self)
+
+  def by_env(env)
+    if env['async.callback'] && defined?(::EventMachine)
+      ::EventMachine
+    else
+      ::Rack::App::Streamer::Scheduler::Null
+    end
+  end
+
+end

data/lib/rack/app/streamer.rb

@@ -0,0 +1,56 @@
+# Copyright (c) 2007, 2008, 2009 Blake Mizerany
+# Copyright (c) 2010, 2011, 2012, 2013, 2014, 2015, 2016 Konstantin Haase
+#
+# Class of the response body in case you use #stream.
+#
+# Three things really matter: The front and back block (back being the
+# block generating content, front the one sending it to the client) and
+# the scheduler, integrating with whatever concurrency feature the Rack
+# handler is using.
+#
+# Scheduler has to respond to defer and schedule.
+class Rack::App::Streamer
+  require "rack/app/streamer/scheduler"
+
+  def initialize(env, options={}, &back)
+    @serializer = env[Rack::App::Constants::ENV::SERIALIZER]
+    @scheduler = options[:scheduler] || Rack::App::Streamer::Scheduler.by_env(env)
+    @keep_open = options[:keep_open] || false
+    @back = back.to_proc
+    @callbacks, @closed = [], false
+  end
+
+  def close
+    return if closed?
+    @closed = true
+    @scheduler.schedule { @callbacks.each { |c| c.call }}
+  end
+
+  def each(&front)
+    @front = front
+    @scheduler.defer do
+      begin
+        @back.call(self)
+      rescue Exception => ex
+        @scheduler.schedule { raise(ex) }
+      end
+      close unless @keep_open
+    end
+  end
+
+  def <<(data)
+    @scheduler.schedule { @front.call(@serializer.serialize(data)) }
+    self
+  end
+
+  def callback(&block)
+    return yield if closed?
+    @callbacks << block
+  end
+
+  alias errback callback
+
+  def closed?
+    @closed
+  end
+end

data/lib/rack/app/test.rb

@@ -1,5 +1,6 @@
-require 'uri'
-require 'rack/app'
+require "uri"
+require "rack/app"
+require "rack/mock"
 module Rack::App::Test
 
   require 'rack/app/test/utils'
@@ -11,7 +12,8 @@ module Rack::App::Test
 
   attr_reader :last_response
 
-  [:get, :post, :put, :delete, :options, :patch, :head].each do |request_method|
+  Rack::App::Constants::HTTP::METHODS.each do |request_method_type|
+    request_method = request_method_type.to_s.downcase
     define_method(request_method) do |*args|
 
       properties = args.select { |e| e.is_a?(Hash) }.reduce({}, &:merge!)
@@ -25,7 +27,7 @@ module Rack::App::Test
 
   def rack_app(&block)
 
-    @app ||= lambda do
+    @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)
@@ -34,7 +36,7 @@ module Rack::App::Test
       Rack::App::Test::Utils.rack_app_by(app_class, constructors)
     end.call
 
-    block.is_a?(Proc) ? @app.instance_exec(&block) : @app
+    block.is_a?(Proc) ? @rack_app.instance_exec(&block) : @rack_app
 
   end
 

data/lib/rack/app.rb

@@ -13,6 +13,7 @@ class Rack::App
   require 'rack/app/params'
   require 'rack/app/router'
   require 'rack/app/endpoint'
+  require 'rack/app/streamer'
   require 'rack/app/extension'
   require 'rack/app/serializer'
   require 'rack/app/middlewares'

data/old_ruby.sh

@@ -0,0 +1 @@
+rbenv shell 1.8.7-p375

data/spec_files.txt

@@ -0,0 +1 @@
+./spec/benchmark_spec.rb ./spec/rack/app/alias_endpoint_spec.rb ./spec/rack/app/bundled_extensions/logger_spec.rb ./spec/rack/app/cli_spec.rb ./spec/rack/app/endpoint_spec.rb ./spec/rack/app/extension_spec.rb ./spec/rack/app/file_server_spec.rb ./spec/rack/app/hooks_spec.rb ./spec/rack/app/inheritance_spec.rb ./spec/rack/app/instance_methods_spec.rb ./spec/rack/app/middlewares/header_setter_spec.rb ./spec/rack/app/mounting_spec.rb ./spec/rack/app/not_found_spec.rb ./spec/rack/app/only_next_endpoint_middlewares_spec.rb ./spec/rack/app/params_validation_spec/with_real_class_spec.rb ./spec/rack/app/params_validation_spec.rb ./spec/rack/app/redirect_spec.rb ./spec/rack/app/request_configurator_spec.rb ./spec/rack/app/router/dynamic_spec.rb ./spec/rack/app/router/static_spec.rb ./spec/rack/app/router_spec.rb ./spec/rack/app/streaming_spec.rb ./spec/rack/app/test_spec.rb ./spec/rack/app/utils/deep_dup_spec.rb ./spec/rack/app/utils/parser_spec.rb ./spec/rack/app/utils_spec.rb ./spec/rack/app_spec.rb

data/spike/array_vs_proc.rb

@@ -0,0 +1,20 @@
+require 'benchmark'
+
+TEST_AMOUNT = 1_000_000
+Benchmark.bm(15) do |x|
+
+  x.report('empty_array') do
+    empty_array = []
+    TEST_AMOUNT.times do
+      empty_array.each{|e|}
+    end
+  end
+
+  x.report('proc call') do
+    block = proc {}
+    TEST_AMOUNT.times do
+      block.call
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -116,6 +116,7 @@ files:
 - lib/rack/app/instance_methods/http_control.rb
 - lib/rack/app/instance_methods/payload.rb
 - lib/rack/app/instance_methods/serve_file.rb
+- lib/rack/app/instance_methods/streaming.rb
 - lib/rack/app/middlewares.rb
 - lib/rack/app/middlewares/configuration.rb
 - lib/rack/app/middlewares/header_setter.rb
@@ -148,6 +149,9 @@ files:
 - lib/rack/app/singleton_methods/rack_interface.rb
 - lib/rack/app/singleton_methods/route_handling.rb
 - lib/rack/app/singleton_methods/settings.rb
+- lib/rack/app/streamer.rb
+- lib/rack/app/streamer/scheduler.rb
+- lib/rack/app/streamer/scheduler/null.rb
 - lib/rack/app/test.rb
 - lib/rack/app/test/singleton_methods.rb
 - lib/rack/app/test/utils.rb
@@ -164,7 +168,10 @@ files:
 - lib/rack/app/utils/parser/string.rb
 - lib/rack/app/utils/parser/time.rb
 - lib/rack/app/version.rb
+- old_ruby.sh
 - rack-app.gemspec
+- spec_files.txt
+- spike/array_vs_proc.rb
 - spike/method_vs_instance_exec.rb
 - spike/return_vs_throw.rb
 - src/Net__HTTP Cheat Sheet.pdf