rack-app 4.0.1 → 5.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cf38306bf272547c7a780a6a6e92f7138d8ebe5
-  data.tar.gz: 05929c52596d77e1caca9c46895ade3aa6a5b36d
+  metadata.gz: 401d8f6ab979fa3f44891018a61dcf640d45b488
+  data.tar.gz: 5d02724b737e668072d4ca5972d76d043cf854a5
 SHA512:
-  metadata.gz: acfe46345c8ac900aee026f9249f053e17252224354afc803732b0f3b878761c305a6dbc0e2c29054052e45ae004662d9380b82851559446dd7bbf74991752e5
-  data.tar.gz: b4f5c6d7ce3e35cc34b16626641ae10dabd369adca3606f48098f6aaaf9f1ed50f687ed75c2a3cb35e56346d43607d859a020d0fd8294fc950617ff053438f7a
+  metadata.gz: 010fcc827baf6f48e2ed0882a8d0b17052afc2dd11ae20659b722b91720f06a9bf161e4560d804b9f83b3e7c58c803cab8e1765719b6a312e45fd6479f7efcba
+  data.tar.gz: ab3f8dec6d35b7c3ec9570d9af48a10d2ab9ff2e027755bd9dedded3648017ec5d5dd359d7becf3f4cd70688744b3164496328b190749fdfca91cd710956e13c

data/VERSION

@@ -1 +1 @@
-4.0.1
+5.0.0.rc1

data/dev/console

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift(File.join(File.dirname(File.dirname(__FILE__)),'lib'))
+require 'rack/app'
+
+require "irb"
+IRB.start

data/lib/rack/app.rb

@@ -18,6 +18,7 @@ class Rack::App
   require 'rack/app/middlewares'
   require 'rack/app/file_server'
   require 'rack/app/error_handler'
+  require 'rack/app/bundled_extensions'
   require 'rack/app/endpoint/not_found'
   require 'rack/app/request_configurator'
 
@@ -27,4 +28,4 @@ class Rack::App
   require 'rack/app/instance_methods'
   include Rack::App::InstanceMethods
 
-end
+end

data/lib/rack/app/bundled_extensions.rb

@@ -0,0 +1,3 @@
+module Rack::App::BundledExtensions
+  require "rack/app/bundled_extensions/logger"
+end

data/lib/rack/app/bundled_extensions/logger.rb

@@ -0,0 +1,53 @@
+Rack::App::Extension.register(:logger) do
+
+  require "logger"
+  require "securerandom"
+
+  logger_class = Class.new
+  logger_class.class_eval do
+
+    def initialize(request_id)
+      @request_id = request_id
+      @logger = ::Logger.new(STDOUT)
+    end
+
+    [:info, :warn, :error, :fatal, :unknown].each do |log_level|
+      define_method(log_level) do |msg|
+        if msg.is_a?(Hash)
+          @logger.__send__(log_level, @request_id){format_hash(msg)}
+        else
+          @logger.__send__(log_level, @request_id){String(msg)}
+        end
+      end
+    end
+
+    protected
+
+    begin
+      require "json"
+    rescue LoadError
+    end
+
+    def format_hash(hash)
+      if defined?(::JSON)
+        JSON.dump(hash)
+      else
+        hash.inspect
+      end
+    end
+
+    def method_missing(name,*args)
+      if @logger.respond_to?(:binding)
+        @logger.__send__(name,*args)
+      else
+        super
+      end
+    end
+
+  end
+
+  define_method(:logger) do
+    @logger ||= logger_class.new(request.env['HTTP_X_REQUEST_ID'] || SecureRandom.hex)
+  end
+
+end

data/lib/rack/app/endpoint.rb

@@ -11,49 +11,54 @@ class Rack::App::Endpoint
     @error_handler = properties[:error_handler] || Rack::App::ErrorHandler.new
     @serializer = properties[:serializer] || Rack::App::Serializer.new
 
-    @middleware = (properties[:middleware] || Rack::Builder.new).dup
-    @middleware.run(lambda { |env| self.execute(env) })
+    middleware = (properties[:middleware] || Rack::Builder.new).dup
+    middleware.run(lambda { |env| self.call_without_middlewares(env) })
     @endpoint_method_name = register_method_to_app_class(properties[:user_defined_logic])
 
-    @app = @middleware.to_app
+    @app = middleware.to_app
   end
 
   def call(env)
     @app.call(env)
   end
 
-  def execute(request_env)
-
-    request = Rack::Request.new(request_env)
+  def call_without_middlewares(env)
+    request = Rack::Request.new(env)
     response = Rack::Response.new
-
-    set_response_body(response, get_response_body(request, response))
-    return response.finish
-
+    return catch(:rack_response){ execute(request, response) }.finish
   end
 
-  def get_response_body(rack_request, rack_response)
+  protected
 
+  def execute(request,response)
     request_handler = @app_class.new
-    request_handler.request = rack_request
-    request_handler.response = rack_response
-
-    return @error_handler.execute_with_error_handling_for(request_handler, @endpoint_method_name)
-
+    request_handler.request = request
+    request_handler.response = response
+    set_response_body(response, get_response_body(request_handler))
+    return response
   end
 
-  protected
+  def get_response_body(request_handler)
+    catch :response_body do
+      evaluated_value = evaluate_value(request_handler)
+      
+      evaluated_value
+    end
+  end
 
-  def set_response_body(response, result)
-    return nil unless response.body.is_a?(Array)
+  def set_response_body(response, response_body)
+    response.write(String(@serializer.serialize(response_body)))
+  end
 
-    response.write(String(@serializer.serialize(result)))
+  def evaluate_value(request_handler)
+    @error_handler.execute_with_error_handling_for(request_handler) do
+      request_handler.__send__(@endpoint_method_name)
+    end
   end
 
   def register_method_to_app_class(proc)
-    method_name = ::Rack::App::Utils.uuid
+    method_name = '__' + ::Rack::App::Utils.uuid
     @app_class.__send__(:define_method, method_name, &proc)
     return method_name
   end
-
 end

data/lib/rack/app/error_handler.rb

@@ -13,8 +13,8 @@ class Rack::App::ErrorHandler
     nil
   end
 
-  def execute_with_error_handling_for(instance, endpoint_method_name)
-    instance.__send__(endpoint_method_name)
+  def execute_with_error_handling_for(instance, &block)
+    block.call 
   rescue *[Exception, @handlers.keys].flatten => ex
     instance.instance_exec(ex, &get_handler(ex))
   end
@@ -34,4 +34,4 @@ class Rack::App::ErrorHandler
     return handler.nil? ? nil : handler.last
   end
 
-end
+end

data/lib/rack/app/instance_methods.rb

@@ -3,11 +3,11 @@ module Rack::App::InstanceMethods
   require 'rack/app/instance_methods/core'
   require 'rack/app/instance_methods/http_control'
   require 'rack/app/instance_methods/payload'
-  require 'rack/app/instance_methods/upload'
+  require 'rack/app/instance_methods/serve_file'
 
   include Rack::App::InstanceMethods::Core
   include Rack::App::InstanceMethods::HttpControl
   include Rack::App::InstanceMethods::Payload
-  include Rack::App::InstanceMethods::Upload
+  include Rack::App::InstanceMethods::ServeFile
 
 end

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

@@ -18,4 +18,8 @@ module Rack::App::InstanceMethods::Core
     @response || raise("response object is not set for #{self.class}")
   end
 
+  def finish_response
+    throw(:rack_response, response)
+  end
+
 end

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

@@ -1,11 +1,19 @@
 module Rack::App::InstanceMethods::HttpControl
 
-  def redirect_to(url)
-    url = "#{url}?#{request.env['QUERY_STRING']}" unless request.env['QUERY_STRING'].empty?
+  def redirect_to(url, params={})
+
+    if params.empty?
+      url = [url, request.env['QUERY_STRING']].join('?') unless request.env['QUERY_STRING'].empty?
+    else
+      query_string = Rack::App::Utils.encode_www_form(params.to_a)
+      url = [url, query_string].join('?')
+    end
+
     response.status = 301
     response.headers.merge!({'Location' => url})
-    'See Ya!'
+
+    finish_response
+    
   end
 
 end
-

data/lib/rack/app/instance_methods/{upload.rb → serve_file.rb}

@@ -1,12 +1,11 @@
-module Rack::App::InstanceMethods::Upload
+module Rack::App::InstanceMethods::ServeFile
 
   def serve_file(file_path)
     raw_rack_resp = Rack::App::FileServer.serve_file(request.env, file_path)
     response.status = raw_rack_resp[0]
     response.headers.merge!(raw_rack_resp[1])
     response.body = raw_rack_resp[2]
-    return nil
+    finish_response
   end
 
 end
-

data/lib/rack/app/singleton_methods.rb

@@ -2,6 +2,7 @@ module Rack::App::SingletonMethods
 
   require 'rack/app/singleton_methods/http_methods'
   require 'rack/app/singleton_methods/inheritance'
+  require 'rack/app/singleton_methods/middleware'
   require 'rack/app/singleton_methods/mounting'
   require 'rack/app/singleton_methods/params_validator'
   require 'rack/app/singleton_methods/rack_interface'
@@ -11,6 +12,7 @@ module Rack::App::SingletonMethods
 
   include Rack::App::SingletonMethods::HttpMethods
   include Rack::App::SingletonMethods::Inheritance
+  include Rack::App::SingletonMethods::Middleware
   include Rack::App::SingletonMethods::Mounting
   include Rack::App::SingletonMethods::ParamsValidator
   include Rack::App::SingletonMethods::RackInterface

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

@@ -10,9 +10,11 @@ module Rack::App::SingletonMethods::Extensions
     Rack::App::Extension.apply_extensions(self,applied_extensions,extension_names)
   end
 
+  alias apply_extension apply_extensions
+
   def extensions(*extensions_names)
     apply_extensions(*extensions_names)
     applied_extensions
   end
 
-end
+end

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

@@ -0,0 +1,23 @@
+module Rack::App::SingletonMethods::Middleware
+
+  protected
+  
+  def middlewares(&block)
+    @middlewares ||= []
+    @middlewares << block unless block.nil?
+    @middlewares
+  end
+
+  alias middleware middlewares
+
+  def use(*args)
+    middlewares{ |b| b.use(*args) }
+  end
+
+  def only_next_endpoint_middlewares(&block)
+    @only_next_endpoint_middlewares ||= []
+    @only_next_endpoint_middlewares << block unless block.nil?
+    @only_next_endpoint_middlewares
+  end
+
+end

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

@@ -35,18 +35,4 @@ module Rack::App::SingletonMethods::Settings
     return @error_handler
   end
 
-  def middlewares(&block)
-    @middlewares ||= []
-    @middlewares << block unless block.nil?
-    @middlewares
-  end
-
-  alias middleware middlewares
-
-  def only_next_endpoint_middlewares(&block)
-    @only_next_endpoint_middlewares ||= []
-    @only_next_endpoint_middlewares << block unless block.nil?
-    @only_next_endpoint_middlewares
-  end
-
 end

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

@@ -1,4 +1,3 @@
-require "cgi"
 module Rack::App::Test::Utils
 
   extend self
@@ -23,7 +22,7 @@ module Rack::App::Test::Utils
     env = properties[:headers].reduce({}) { |m, (k, v)| m.merge("HTTP_#{k.to_s.gsub('-', '_').upcase}" => v.to_s) }
     payload = properties.delete(:payload)
     env["rack.input"]= ::Rack::Lint::InputWrapper.new(string_io_for(payload))
-    env[::Rack::QUERY_STRING]= encode_www_form(properties[:params].to_a)
+    env[::Rack::QUERY_STRING]= Rack::App::Utils.encode_www_form(properties[:params].to_a)
     env.merge!(properties[:env] || {})
 
     env
@@ -44,28 +43,4 @@ module Rack::App::Test::Utils
     end
   end
 
-  def encode_www_form(enum)
-    enum.map do |k, v|
-      if v.nil?
-        encode_www_form_component(k)
-      elsif v.respond_to?(:to_ary)
-        v.to_ary.map do |w|
-          str = encode_www_form_component(k)
-          unless w.nil?
-            str << '='
-            str << encode_www_form_component(w)
-          end
-        end.join('&')
-      else
-        str = encode_www_form_component(k)
-        str << '='
-        str << encode_www_form_component(v)
-      end
-    end.join('&')
-  end
-
-  def encode_www_form_component(str)
-    CGI.escape(str.to_s)
-  end
-
 end

data/lib/rack/app/utils.rb

@@ -1,4 +1,5 @@
-require 'securerandom'
+require "cgi"
+require "securerandom"
 module Rack::App::Utils
   extend self
 
@@ -104,4 +105,28 @@ module Rack::App::Utils
     RUBY_PLATFORM =~ /mswin|mingw/ ? 'NUL:' : '/dev/null'
   end
 
+  def encode_www_form(enum)
+    enum.map do |k, v|
+      if v.nil?
+        encode_www_form_component(k)
+      elsif v.respond_to?(:to_ary)
+        v.to_ary.map do |w|
+          str = encode_www_form_component(k)
+          unless w.nil?
+            str << '='
+            str << encode_www_form_component(w)
+          end
+        end.join('&')
+      else
+        str = encode_www_form_component(k)
+        str << '='
+        str << encode_www_form_component(v)
+      end
+    end.join('&')
+  end
+
+  def encode_www_form_component(str)
+    CGI.escape(str.to_s)
+  end
+
 end

data/spike/method_vs_instance_exec.rb

@@ -0,0 +1,33 @@
+require 'benchmark'
+
+class TestSubject
+  def test
+    'OK'
+  end
+end
+
+block = proc do
+  test
+end
+
+TestSubject.__send__(:define_method, :defined_method,&block)
+
+TEST_AMOUNT = 1_000_000
+
+Benchmark.bm(15) do |x|
+
+  x.report('method call') do
+    TEST_AMOUNT.times do
+      test_subject = TestSubject.new
+      test_subject.__send__(:defined_method)
+    end
+  end
+
+  x.report('instance_exec') do
+    TEST_AMOUNT.times do
+      test_subject = TestSubject.new
+      test_subject.instance_exec(&block)
+    end
+  end
+
+end

data/spike/return_vs_throw.rb

@@ -0,0 +1,45 @@
+require 'benchmark'
+
+class TestSubject
+
+  def tvalue
+    catch :value do
+      tget
+    end
+  end
+
+  def rvalue
+    catch :value do
+      rget
+    end
+  end
+
+  def tget
+    throw :value, 'hello'
+  end
+
+  def rget
+    return 'hello'
+  end
+
+end
+
+TEST_AMOUNT = 1_000_000
+
+Benchmark.bm(15) do |x|
+
+  x.report('throw') do
+    test_subject = TestSubject.new
+    TEST_AMOUNT.times do
+      test_subject.tvalue
+    end
+  end
+
+  x.report('return') do
+    test_subject = TestSubject.new
+    TEST_AMOUNT.times do
+      test_subject.rvalue 
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 5.0.0.rc1
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-31 00:00:00.000000000 Z
+date: 2016-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,8 +89,11 @@ files:
 - VERSION
 - Vagrantfile
 - bin/rack-app
-- exec/rack-app
+- dev/console
+- dev/rack-app
 - lib/rack/app.rb
+- lib/rack/app/bundled_extensions.rb
+- lib/rack/app/bundled_extensions/logger.rb
 - lib/rack/app/cli.rb
 - lib/rack/app/cli/command.rb
 - lib/rack/app/cli/command/configurator.rb
@@ -110,7 +113,7 @@ files:
 - lib/rack/app/instance_methods/core.rb
 - lib/rack/app/instance_methods/http_control.rb
 - lib/rack/app/instance_methods/payload.rb
-- lib/rack/app/instance_methods/upload.rb
+- lib/rack/app/instance_methods/serve_file.rb
 - lib/rack/app/middlewares.rb
 - lib/rack/app/middlewares/header_setter.rb
 - lib/rack/app/middlewares/params.rb
@@ -132,6 +135,7 @@ files:
 - lib/rack/app/singleton_methods/extensions.rb
 - lib/rack/app/singleton_methods/http_methods.rb
 - lib/rack/app/singleton_methods/inheritance.rb
+- lib/rack/app/singleton_methods/middleware.rb
 - lib/rack/app/singleton_methods/mounting.rb
 - lib/rack/app/singleton_methods/params_validator.rb
 - lib/rack/app/singleton_methods/rack_interface.rb
@@ -154,6 +158,8 @@ files:
 - lib/rack/app/utils/parser/time.rb
 - lib/rack/app/version.rb
 - rack-app.gemspec
+- spike/method_vs_instance_exec.rb
+- spike/return_vs_throw.rb
 - src/Net__HTTP Cheat Sheet.pdf
 homepage: http://www.rack-app.com/
 licenses:
@@ -170,12 +176,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Your next favourite, performance designed micro framework!