rack-app 5.7.0 → 5.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7171c075e5153081bdf87f6f73cb693e3f79258d
-  data.tar.gz: 127afc8743a292af00e7d7a3ce21dedaf8bc78b3
+  metadata.gz: f508a985161b52acd4c9670809dd2e67e58e0651
+  data.tar.gz: 996142d38f74b27f7ae120711f7e46006801828f
 SHA512:
-  metadata.gz: 0354dbeda51211982538fca1c621332c3b96519c6f64428ce00addbbae3f1cb89e14d36ad2c4303fafd9b162a0ee9574a45839a3e5cbf8d5a40682f9ba326a8f
-  data.tar.gz: 0ce8d133bb66095d89728247937258b7ffe6fe5ebe605799fa9e016600fad65bf1e883ba01dac5476255f97a1f5fbfb8e106bdc06d7c2fb0ba2451327f943c6d
+  metadata.gz: 4ece40a6832073132ddcbb0d103615f189247899cd361761da3955af816ed61017bd9aca772d853e0fe0f76609b0ef77bdd86e3883c78747c5687e34bfcc5084
+  data.tar.gz: d1ba5d8943f0404cb48ed44cc2c58e06a740e79bc353d9d90b06de5609e4b4f8a6617d3e220879904be83932dd4ac5dc73dfaa8c77a72163a273c4f252a07053

data/README.md

@@ -199,14 +199,14 @@ describe App do
 
     it { expect(subject.status).to eq 200 }
 
-    it { expect(subject.body.join).to eq "Hello World!" }
+    it { expect(subject.body).to eq "Hello World!" }
   end
 
   describe '/users/:user_id' do
     # restful endpoint example
     subject{ get(url: '/users/1234') }
 
-    it { expect(subject.body.join).to eq 'hello 1234!'}
+    it { expect(subject.body).to eq 'hello 1234!'}
 
     it { expect(subject.status).to eq 201 }
 
@@ -216,7 +216,7 @@ describe App do
     # error handled example
     subject{ get(url: '/make_error') }
 
-    it { expect(subject.body.join).to eq '{:error=>"error block rescued"}' }
+    it { expect(subject.body).to eq '{:error=>"error block rescued"}' }
   end
 
 end

data/VERSION

@@ -1 +1 @@
-5.7.0
+5.8.0

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/logger'
   require 'rack/app/params'
   require 'rack/app/payload'
   require 'rack/app/router'

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

@@ -3,51 +3,10 @@ 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)
+    @logger ||= Rack::App::Logger.new(STDOUT).tap do |this|
+      this.id = request.env['HTTP_X_REQUEST_ID']
+    end
   end
 
 end

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

@@ -7,7 +7,6 @@ class Rack::App::Endpoint::Builder
 
   def build
     builder = Rack::Builder.new
-    apply_core_middlewares(builder)
     apply_middleware_build_blocks(builder)
     builder.run(Rack::App::Endpoint::Executor.new(@config))
     builder.to_app
@@ -15,10 +14,6 @@ class Rack::App::Endpoint::Builder
 
   protected
 
-  def apply_core_middlewares(builder)
-    builder.use(Rack::App::Middlewares::Configuration::PayloadParserSetter)
-  end
-
   def apply_middleware_build_blocks(builder)
     builder_blocks.each do |builder_block|
       builder_block.call(builder)
@@ -37,7 +32,7 @@ class Rack::App::Endpoint::Builder
   end
 
   def builder_blocks
-    @config.app_class.middlewares + @config.middleware_builders_blocks
+    [@config.app_class.middlewares, @config.middleware_builders_blocks].flatten
   end
 
 end

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

@@ -8,6 +8,10 @@ class Rack::App::Endpoint::Config
     return @raw
   end
 
+  def payload_builder
+    @raw[:payload].parser_builder
+  end
+
   def application
     @raw[:application]
   end

data/lib/rack/app/logger.rb

@@ -0,0 +1,24 @@
+require 'logger'
+class Rack::App::Logger < ::Logger
+  attr_writer :id
+
+  def initialize(*args)
+    super
+    configure!
+  end
+
+  protected
+
+  def id
+    @id ||= SecureRandom.hex
+  end
+
+  def configure!
+    original_formatter = Logger::Formatter.new
+    self.formatter = proc do |severity, datetime, progname, msg|
+      fmsg = msg.is_a?(::Hash) ? (defined?(::JSON) ? JSON.dump(msg) : msg) : msg
+      fprname = progname || id
+      original_formatter.call(severity, datetime, fprname, fmsg)
+    end
+  end
+end

data/lib/rack/app/middlewares.rb

@@ -1,5 +1,4 @@
 module Rack::App::Middlewares
-  require 'rack/app/middlewares/payload_parser_setter'
   require 'rack/app/middlewares/path_info_cutter'
   require 'rack/app/middlewares/configuration'
   require 'rack/app/middlewares/header_setter'

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

@@ -3,33 +3,37 @@ require "rack/request"
 require "rack/response"
 class Rack::App::Middlewares::Configuration
 
-  require "rack/app/middlewares/configuration/handler_setter"
-  require "rack/app/middlewares/configuration/serializer_setter"
-  require "rack/app/middlewares/configuration/payload_parser_setter"
-
   require "rack/app/middlewares/configuration/path_params_matcher"
 
   def initialize(app, config)
-    @stack = build_stack(app) do |builder|
-      builder.use Rack::App::Middlewares::Configuration::SerializerSetter,
-                  config.serializer
-
-      builder.use Rack::App::Middlewares::Configuration::HandlerSetter,
-                  config.app_class
-
-    end
+    @app = app || raise
+    @serializer = config.serializer || raise
+    @handler_class = config.app_class || raise
+    @payload_parser = config.payload_builder.to_parser || raise
   end
 
   def call(env)
-    @stack.call(env)
+    env[Rack::App::Constants::ENV::REQUEST_HANDLER]= handler(env)
+    env[::Rack::App::Constants::ENV::SERIALIZER]= @serializer
+    env[::Rack::App::Constants::ENV::PAYLOAD_PARSER]= @payload_parser
+    env[::Rack::App::Constants::ENV::PAYLOAD_GETTER]= lambda do
+       env[::Rack::App::Constants::ENV::PARSED_PAYLOAD] ||= env[::Rack::App::Constants::ENV::PAYLOAD_PARSER].parse_env(env)
+     end
+    @app.call(env)
   end
 
   protected
 
-  def build_stack(app)
-    builder = Rack::Builder.new
-    yield(builder)
-    builder.run(app)
-    return builder.to_app
+  def handler(env)
+    new_handler = @handler_class.new
+    new_handler.request = ::Rack::Request.new(env)
+    new_handler.response = ::Rack::Response.new
+    new_handler
   end
+
+  def extname(env)
+    path_info = env[::Rack::App::Constants::ENV::PATH_INFO]
+    File.extname(path_info.split("/").last.to_s)
+  end
+
 end

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

@@ -1,9 +1,12 @@
 class Rack::App::Payload::Builder
-  
-  def parser(&block)
+
+  def parser_builder(&block)
     @parser_builder ||= Rack::App::Payload::Parser::Builder.new
     @parser_builder.instance_exec(&block) if block
     @parser_builder
   end
 
+  alias parser parser_builder
+  alias configure_parser parser_builder
+
 end

data/lib/rack/app/payload/parser.rb

@@ -7,12 +7,11 @@ class Rack::App::Payload::Parser
 
   def initialize(content_type__parsers = {})
     raise unless content_type__parsers.is_a?(Hash)
-    @content_type__parsers = Hash.new(DEFAULT_PARSER)
-    @content_type__parsers.merge!(content_type__parsers)
+    @content_type__parsers = content_type__parsers
   end
 
   def parse_io(content_type, io)
-    @content_type__parsers[content_type.to_s].call(io)
+    parser_for(content_type.to_s).call(io)
   end
 
   def parse_env(env)
@@ -23,4 +22,11 @@ class Rack::App::Payload::Parser
   def parse_string(content_type, str)
     parse_io(content_type, StringIO.new(str))
   end
+
+  protected
+
+  def parser_for(content_type)
+    @content_type__parsers[content_type] || DEFAULT_PARSER
+  end
+
 end

data/lib/rack/app/payload/parser/builder.rb

@@ -3,15 +3,15 @@ class Rack::App::Payload::Parser::Builder
   require "rack/app/payload/parser/builder/formats"
 
   def initialize
-    @parsers = {}
+    @content_type__parsers = Hash.new(Rack::App::Payload::Parser::DEFAULT_PARSER)
   end
 
   def to_parser
-    Rack::App::Payload::Parser.new(@parsers)
+    Rack::App::Payload::Parser.new(@content_type__parsers.dup)
   end
 
   def on(content_type, &parser)
-    @parsers[content_type]= parser
+    @content_type__parsers[content_type]= parser
     self
   end
 
@@ -19,20 +19,24 @@ class Rack::App::Payload::Parser::Builder
     Rack::App::Payload::Parser::Builder::Formats.accept(self, *formats)
   end
 
-  # def reject_unsupported_media_types
-  #   reject = proc do
-  #     rr = Rack::Response.new
-  #     rr.status = 415
-  #     rr.write("Unsupported Media Type")
-  #     throw(:rack_response, rr)
-  #   end
-  #   @parsers = Hash.new(reject).merge(@parsers)
-  #   nil
-  # end
+  def reject_unsupported_media_types
+    reject = proc do |io|
+      rr = Rack::Response.new
+      rr.status = 415
+      rr.write("Unsupported Media Type")
+      rr.write("Accepted content-types:")
+      @content_type__parsers.each do |content_type, _|
+        rr.write(content_type.to_s)
+      end
+      throw(:rack_response, rr)
+    end
+    @content_type__parsers = Hash.new(reject).merge(@content_type__parsers)
+    nil
+  end
 
   def merge!(parser_builder)
     raise unless parser_builder.is_a?(self.class)
-    @parsers.merge!(parser_builder.instance_variable_get(:@parsers))
+    @content_type__parsers.merge!(parser_builder.instance_variable_get(:@content_type__parsers))
     self
   end
 

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

@@ -1,12 +1,9 @@
 module Rack::App::SingletonMethods::Payload
 
   def payload(&block)
-    unless @payload_builder
-      @payload_builder = Rack::App::Payload::Builder.new
-      use(Rack::App::Middlewares::Payload::ParserSetter, @payload_builder)
-    end
+    @payload_builder ||= Rack::App::Payload::Builder.new
     @payload_builder.instance_exec(&block) if block
-    nil 
+    @payload_builder
   end
 
 end

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

@@ -25,6 +25,7 @@ module Rack::App::SingletonMethods::RouteHandling
     router.register_endpoint!(
       Rack::App::Endpoint.new({
         :app_class => self,
+        :payload => payload,
         :error_handler => error,
         :user_defined_logic => block,
         :request_method => request_method,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 5.7.0
+  version: 5.8.0
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-11 00:00:00.000000000 Z
+date: 2016-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -121,12 +121,10 @@ files:
 - lib/rack/app/instance_methods/redirect_to.rb
 - lib/rack/app/instance_methods/serve_file.rb
 - lib/rack/app/instance_methods/streaming.rb
+- lib/rack/app/logger.rb
 - lib/rack/app/middlewares.rb
 - lib/rack/app/middlewares/configuration.rb
-- lib/rack/app/middlewares/configuration/handler_setter.rb
 - lib/rack/app/middlewares/configuration/path_params_matcher.rb
-- lib/rack/app/middlewares/configuration/payload_parser_setter.rb
-- lib/rack/app/middlewares/configuration/serializer_setter.rb
 - lib/rack/app/middlewares/header_setter.rb
 - lib/rack/app/middlewares/hooks.rb
 - lib/rack/app/middlewares/hooks/after.rb
@@ -141,7 +139,6 @@ files:
 - lib/rack/app/middlewares/path_info_cutter.rb
 - lib/rack/app/middlewares/payload.rb
 - lib/rack/app/middlewares/payload/parser_setter.rb
-- lib/rack/app/middlewares/payload_parser_setter.rb
 - lib/rack/app/params.rb
 - lib/rack/app/payload.rb
 - lib/rack/app/payload/builder.rb

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

@@ -1,22 +0,0 @@
-class Rack::App::Middlewares::Configuration::HandlerSetter
-
-  def initialize(app, handler_class)
-    @app = app
-    @handler_class = handler_class || raise
-  end
-
-  def call(env)
-    env[Rack::App::Constants::ENV::REQUEST_HANDLER]= handler(env)
-    @app.call(env)
-  end
-
-  protected
-
-  def handler(env)
-    new_handler = @handler_class.new
-    new_handler.request = ::Rack::Request.new(env)
-    new_handler.response = ::Rack::Response.new
-    new_handler
-  end
-
-end

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

@@ -1,18 +0,0 @@
-class Rack::App::Middlewares::Configuration::PayloadParserSetter
-
-  PARSER = ::Rack::App::Constants::ENV::PAYLOAD_PARSER
-  PARSED = ::Rack::App::Constants::ENV::PARSED_PAYLOAD
-  GETTER = ::Rack::App::Constants::ENV::PAYLOAD_GETTER
-
-  def initialize(app)
-    @app = app
-    @parser = Rack::App::Payload::Parser.new 
-  end
-
-  def call(env)
-    env[PARSER]= @parser
-    env[GETTER]= lambda { env[PARSED] ||= env[PARSER].parse_env(env) }
-    @app.call(env)
-  end
-
-end

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

@@ -1,21 +0,0 @@
-class Rack::App::Middlewares::Configuration::SerializerSetter
-
-  def initialize(app, serializer)
-    @app = app
-    @serializer = serializer || raise
-  end
-
-  def call(env)
-    # env[::Rack::App::Constants::ENV::EXTNAME] ||= extname(env)
-    env[::Rack::App::Constants::ENV::SERIALIZER]= @serializer
-    @app.call(env)
-  end
-
-  protected
-
-  def extname(env)
-    path_info = env[::Rack::App::Constants::ENV::PATH_INFO]
-    File.extname(path_info.split("/").last.to_s)
-  end
-
-end

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

@@ -1,18 +0,0 @@
-class Rack::App::Middlewares::PayloadParserSetter
-
-  PARSER = ::Rack::App::Constants::ENV::PAYLOAD_PARSER
-  PARSED = ::Rack::App::Constants::ENV::PARSED_PAYLOAD
-  GETTER = ::Rack::App::Constants::ENV::PAYLOAD_GETTER
-
-  def initialize(app, payload_parser)
-    @payload_parser = payload_parser
-    @app = app
-  end
-
-  def call(env)
-    env[PARSER]= @payload_parser
-    env[GETTER]= lambda { env[PARSED] ||= env[PARSER].parse_env(env) }
-    @app.call(env)
-  end
-
-end