rack-app 5.5.1 → 5.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4b3d25d410555551a8d81c6be4c797cb28d9a2b
-  data.tar.gz: 6b4c65de92a11cfcf01d7a613674797e855a0ffa
+  metadata.gz: d01a4b973a8a3b61c3fac65895cea447902368e0
+  data.tar.gz: 1661ab7a248eeb8d7df8cc65f23348ea9cf7c666
 SHA512:
-  metadata.gz: d84f255799c2c240f6245732a2ae00701c25584bb9eb37797206bbc88a2b69f3584d5ca441638699d7e5c33e090f24f2d3b84ebc564a170e85f420fd917a8386
-  data.tar.gz: 1a0db3ae2452a57f87c11f02613f8491b3659131d2af2d61ac41f1ec7ab0d0eb0599ffdb510fac27188c91f5b220f214dab0754386a72690d5591b338eac1363
+  metadata.gz: 0044dac4f6b279fd9f3d00d43bbba4ee86791fe40e7028999d8dbe1faf1164fa3c5918491e6ad2c3a7d76ed44c69e70033b7de8f41b73eae3067ff8e98fecc1f
+  data.tar.gz: f452f8899a4067484d63574ca9655b172813af4b7787865a846db8e5b37d0988a5f2487393fa3bdff209a6017b57e8b1a91e281eeae79b8770b1bbeb34ce2cec

data/VERSION

@@ -1 +1 @@
-5.5.1
+5.6.0

data/lib/rack/app/constants.rb

@@ -1,5 +1,7 @@
 module Rack::App::Constants
 
+  require "rack/app/constants/http_status_codes"
+  
   def self.rack_constant(constant_name, fallback_value)
     ::Rack.const_get(constant_name)
   rescue NameError

data/lib/rack/app/constants/http_status_codes.rb

@@ -0,0 +1,65 @@
+module Rack::App::Constants
+  HTTP_STATUS_CODES = {
+    100 => "Continue",
+    101 => "Switching Protocols",
+    102 => "Processing (WebDAV; RFC 2518)",
+    200 => "OK",
+    201 => "Created",
+    202 => "Accepted",
+    203 => "Non-Authoritative Information (since HTTP/1.1)",
+    204 => "", # No Content
+    205 => "", # Reset Content
+    206 => "Partial Content (RFC 7233)",
+    207 => "Multi-Status (WebDAV; RFC 4918)",
+    208 => "Already Reported (WebDAV; RFC 5842)",
+    226 => "IM Used (RFC 3229)",
+    300 => "Multiple Choices",
+    301 => "Moved Permanently",
+    302 => "Found",
+    303 => "See Other (since HTTP/1.1)",
+    304 => "", # Not Modified (RFC 7232)
+    305 => "Use Proxy (since HTTP/1.1)",
+    306 => "Switch Proxy",
+    307 => "Temporary Redirect (since HTTP/1.1)",
+    308 => "Permanent Redirect (RFC 7538)",
+    400 => "Bad Request",
+    401 => "Unauthorized (RFC 7235)",
+    402 => "Payment Required",
+    403 => "Forbidden",
+    404 => "Not Found",
+    405 => "Method Not Allowed",
+    406 => "Not Acceptable",
+    407 => "Proxy Authentication Required (RFC 7235)",
+    408 => "Request Timeout",
+    409 => "Conflict",
+    410 => "Gone",
+    411 => "Length Required",
+    412 => "Precondition Failed (RFC 7232)",
+    413 => "Payload Too Large (RFC 7231)",
+    414 => "URI Too Long (RFC 7231)",
+    415 => "Unsupported Media Type",
+    416 => "Range Not Satisfiable (RFC 7233)",
+    417 => "Expectation Failed",
+    418 => "I'm a teapot (RFC 2324)",
+    421 => "Misdirected Request (RFC 7540)",
+    422 => "Unprocessable Entity (WebDAV; RFC 4918)",
+    423 => "Locked (WebDAV; RFC 4918)",
+    424 => "Failed Dependency (WebDAV; RFC 4918)",
+    426 => "Upgrade Required",
+    428 => "Precondition Required (RFC 6585)",
+    429 => "Too Many Requests (RFC 6585)",
+    431 => "Request Header Fields Too Large (RFC 6585)",
+    451 => "Unavailable For Legal Reasons",
+    500 => "Internal Server Error",
+    501 => "Not Implemented",
+    502 => "Bad Gateway",
+    503 => "Service Unavailable",
+    504 => "Gateway Timeout",
+    505 => "HTTP Version Not Supported",
+    506 => "Variant Also Negotiates (RFC 2295)",
+    507 => "Insufficient Storage (WebDAV; RFC 4918)",
+    508 => "Loop Detected (WebDAV; RFC 5842)",
+    510 => "Not Extended (RFC 2774)",
+    511 => "Network Authentication Required (RFC 6585)",
+  }.freeze
+end

data/lib/rack/app/instance_methods.rb

@@ -1,13 +1,15 @@
 module Rack::App::InstanceMethods
 
   require 'rack/app/instance_methods/core'
-  require 'rack/app/instance_methods/http_control'
+  require 'rack/app/instance_methods/http_status'
+  require 'rack/app/instance_methods/redirect_to'
   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::HTTPStatus
+  include Rack::App::InstanceMethods::RedirectTo
   include Rack::App::InstanceMethods::Payload
   include Rack::App::InstanceMethods::ServeFile
   include Rack::App::InstanceMethods::Streaming

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

@@ -18,8 +18,11 @@ module Rack::App::InstanceMethods::Core
     @response || raise("response object is not set for #{self.class}")
   end
 
-  def finish_response
-    throw(:rack_response, response)
+  def finish!(rack_response=response)
+    throw(:rack_response, rack_response)
   end
 
+  alias finish_response finish!
+  Rack::App::Utils.deprecate(self, :finish_response, :finish!, 2016,9)
+
 end

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

@@ -0,0 +1,10 @@
+module Rack::App::InstanceMethods::HTTPStatus
+
+  def http_status!(code, desc=nil)
+    raise unless code.is_a?(Integer)
+    response.status = code
+    response.write(desc || Rack::App::Constants::HTTP_STATUS_CODES[code] || raise)
+    finish!
+  end
+
+end

data/lib/rack/app/instance_methods/{http_control.rb → redirect_to.rb}

@@ -1,4 +1,4 @@
-module Rack::App::InstanceMethods::HttpControl
+module Rack::App::InstanceMethods::RedirectTo 
 
   def redirect_to(url, params={})
 
@@ -12,8 +12,8 @@ module Rack::App::InstanceMethods::HttpControl
     response.status = 301
     response.headers.merge!({'Location' => url})
 
-    finish_response
-    
+    finish!
+
   end
 
 end

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

@@ -5,7 +5,7 @@ module Rack::App::InstanceMethods::ServeFile
     response.status = raw_rack_resp[0]
     response.headers.merge!(raw_rack_resp[1])
     response.body = raw_rack_resp[2]
-    finish_response
+    finish!
   end
 
 end

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

@@ -11,6 +11,6 @@ module Rack::App::InstanceMethods::Streaming
   # 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
+    finish!
   end
 end

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

@@ -1,4 +1,5 @@
 module Rack::App::Middlewares::Hooks
+  require "rack/app/middlewares/hooks/base"
   require "rack/app/middlewares/hooks/before"
   require "rack/app/middlewares/hooks/after"
 end

data/lib/rack/app/middlewares/hooks/after.rb

@@ -1,14 +1,7 @@
-class Rack::App::Middlewares::Hooks::After
-
-  def initialize(app, hook_block)
-    @app = app
-    @hook_block = hook_block
-  end
-
+class Rack::App::Middlewares::Hooks::After < Rack::App::Middlewares::Hooks::Base
   def call(env)
     response = @app.call(env)
-    env[Rack::App::Constants::ENV::REQUEST_HANDLER].instance_exec(&@hook_block)
-    return response
+    
+    return execute_hook(env) || response
   end
-
 end

data/lib/rack/app/middlewares/hooks/base.rb

@@ -0,0 +1,21 @@
+class Rack::App::Middlewares::Hooks::Base
+
+  def initialize(app, hook_block)
+    @app = app
+    @hook_block = hook_block
+  end
+
+  def call(env)
+    raise(NotImplementedError)
+  end
+
+  protected
+
+  def execute_hook(env)
+    catch :rack_response do
+      env[Rack::App::Constants::ENV::REQUEST_HANDLER].instance_exec(&@hook_block)
+      nil
+    end
+  end
+
+end

data/lib/rack/app/middlewares/hooks/before.rb

@@ -1,13 +1,5 @@
-class Rack::App::Middlewares::Hooks::Before
-
-  def initialize(app, hook_block)
-    @app = app
-    @hook_block = hook_block
-  end
-
+class Rack::App::Middlewares::Hooks::Before < Rack::App::Middlewares::Hooks::Base
   def call(env)
-    env[Rack::App::Constants::ENV::REQUEST_HANDLER].instance_exec(&@hook_block)
-    @app.call(env)
+    execute_hook(env) || @app.call(env)
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 5.5.1
+  version: 5.6.0
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2016-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,6 +105,7 @@ files:
 - lib/rack/app/cli/fetcher/server.rb
 - lib/rack/app/cli/runner.rb
 - lib/rack/app/constants.rb
+- lib/rack/app/constants/http_status_codes.rb
 - lib/rack/app/endpoint.rb
 - lib/rack/app/endpoint/builder.rb
 - lib/rack/app/endpoint/config.rb
@@ -114,8 +115,9 @@ files:
 - lib/rack/app/file_server.rb
 - lib/rack/app/instance_methods.rb
 - lib/rack/app/instance_methods/core.rb
-- lib/rack/app/instance_methods/http_control.rb
+- lib/rack/app/instance_methods/http_status.rb
 - lib/rack/app/instance_methods/payload.rb
+- 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/middlewares.rb
@@ -126,6 +128,7 @@ files:
 - lib/rack/app/middlewares/header_setter.rb
 - lib/rack/app/middlewares/hooks.rb
 - lib/rack/app/middlewares/hooks/after.rb
+- lib/rack/app/middlewares/hooks/base.rb
 - lib/rack/app/middlewares/hooks/before.rb
 - lib/rack/app/middlewares/params.rb
 - lib/rack/app/middlewares/params/definition.rb