puma 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3aaeb164dd6e399e4155a81117c4ad6cde4a0420
-  data.tar.gz: d040b98c0015ce89e4d5c7d793a488eace1d6422
+  metadata.gz: 6e39b5bfaf5412e8f121f6b9328daf7fa584660b
+  data.tar.gz: e51cb8a8d699a649016b13be0244a6cd3156f85a
 SHA512:
-  metadata.gz: aa50dc14fdac0d976b3f0e480039f301aad9c09cd898eb0fc8c901f900b5f1167ff50818d10c68601c8a70122a7ae865b75f5702c83425cd6005ecca11862236
-  data.tar.gz: e2da1eb6e42bdad2925391be65b152af26ac784f70dcbc1c4074cd0a269eff58e6b2cc22572b60febc46777a488bfca402b71ed0f1dcbcbe6655b561d7460543
+  metadata.gz: bb73af5cfd7aa7e56c89356e1a0d1a2aba5fd8f479a92075d567d7edd46d73df1511802d6b5bec94e2086ad6391987bbc6ca84b2ba7187e19ba3e8acfc4de52e
+  data.tar.gz: 69a5de1661aad1e70548bf44043dbd2957cc8144f79b9b79cf50ba7ec24a072562301090cd2d2a7d6eeaf9e77994c16e80148f5c3ef832dd065058576bf4e48e

data/History.txt

@@ -1,3 +1,11 @@
+=== 3.0.1 / 2016-02-25
+
+* 1 bug fix:
+
+  * Removed the experimental support for async.callback as it broke
+    websockets entirely. Seems no server has both hijack and async.callback
+    and thus faye is totally confused what to do and doesn't work.
+
 === 3.0.0 / 2016-02-25
 
 * 2 major changes:

data/README.md

@@ -1,6 +1,6 @@
 # Puma: A Ruby Web Server Built For Concurrency
 
-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/puma/puma?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/puma/puma?utm\_source=badge&utm\_medium=badge&utm\_campaign=pr-badge)
 [![Build Status](https://secure.travis-ci.org/puma/puma.svg)](http://travis-ci.org/puma/puma)
 [![Dependency Status](https://gemnasium.com/puma/puma.svg)](https://gemnasium.com/puma/puma)
 [![Code Climate](https://codeclimate.com/github/puma/puma.svg)](https://codeclimate.com/github/puma/puma)
@@ -29,6 +29,36 @@ Now you should have the `puma` command available in your PATH, so just do the fo
 
     $ puma app.ru
 
+## Plugins
+
+Puma 3.0 added support for plugins that can augment configuration and service operations.
+
+2 canonical plugins to look to aid in development of further plugins:
+
+* [tmp\_restart](https://github.com/puma/puma/blob/master/lib/puma/plugin/tmp_restart.rb): Restarts the server if the file `tmp/restart.txt` is touched
+* [heroku](https://github.com/puma/puma-heroku/blob/master/lib/puma/plugin/heroku.rb): Packages up the default configuration used by puma on Heroku
+
+Plugins are activated in a puma configuration file (such as `config/puma.rb'`) by adding `plugin "name"`, such as `plugin "heroku"`.
+
+Plugins are activated based simply on path requirements so, activating the `heroku` plugin will simply be doing `require "puma/plugin/heroku"`. This allows gems to provide multiple plugins (as well as unrelated gems to provide puma plugins).
+
+The `tmp_restart` plugin is bundled with puma, so it can always be used.
+
+To use the `heroku` plugin, add `puma-heroku` to your Gemfile or install it.
+
+### API
+
+At present, there are 2 hooks that plugins can use: `start` and `config`.
+
+`start` runs when the server has started and allows the plugin to start other functionality to augment puma.
+
+`config` runs when the server is being configured and is passed a `Puma::DSL` object that can be used to add additional configuration.
+
+Any public methods in `Puma::Plugin` are the public API that any plugin may use.
+
+In the future, more hooks and APIs will be added.
+
+
 ## Advanced Setup
 
 ### Sinatra

data/lib/puma/const.rb

@@ -99,7 +99,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "3.0.0".freeze
+    PUMA_VERSION = VERSION = "3.0.1".freeze
     CODE_NAME = "Plethora of Penguin Pinatas".freeze
 
     FAST_TRACK_KA_TIMEOUT = 0.2

data/lib/puma/server.rb

@@ -520,20 +520,63 @@ module Puma
       env['HTTP_X_FORWARDED_PROTO'] == 'https' ? PORT_443 : PORT_80
     end
 
-    def handle_app_response(req, lines, env, status, headers, res_body)
+    # Given the request +env+ from +client+ and a partial request body
+    # in +body+, finish reading the body if there is one and invoke
+    # the rack app. Then construct the response and write it back to
+    # +client+
+    #
+    # +cl+ is the previously fetched Content-Length header if there
+    # was one. This is an optimization to keep from having to look
+    # it up again.
+    #
+    def handle_request(req, lines)
+      env = req.env
       client = req.io
 
+      normalize_env env, req
+
+      env[PUMA_SOCKET] = client
+
+      if env[HTTPS_KEY] && client.peercert
+        env[PUMA_PEERCERT] = client.peercert
+      end
+
+      env[HIJACK_P] = true
+      env[HIJACK] = req
+
       body = req.body
 
       head = env[REQUEST_METHOD] == HEAD
 
+      env[RACK_INPUT] = body
+      env[RACK_URL_SCHEME] =  env[HTTPS_KEY] ? HTTPS : HTTP
+
       # A rack extension. If the app writes #call'ables to this
       # array, we will invoke them when the request is done.
       #
-      # (This is already initialized in `handle_request`, just getting here)
-      after_reply = env[RACK_AFTER_REPLY]
+      after_reply = env[RACK_AFTER_REPLY] = []
 
       begin
+        begin
+          status, headers, res_body = @app.call(env)
+
+          return :async if req.hijacked
+
+          status = status.to_i
+
+          if status == -1
+            unless headers.empty? and res_body == []
+              raise "async response must have empty headers and body"
+            end
+
+            return :async
+          end
+        rescue StandardError => e
+          @events.unknown_error self, e, "Rack app"
+
+          status, headers, res_body = lowlevel_error(e, env)
+        end
+
         content_length = nil
         no_body = head
 
@@ -675,75 +718,6 @@ module Puma
       return keep_alive
     end
 
-    # Given the request +env+ from +client+ and a partial request body
-    # in +body+, finish reading the body if there is one and invoke
-    # the rack app. Then construct the response and write it back to
-    # +client+
-    #
-    # +cl+ is the previously fetched Content-Length header if there
-    # was one. This is an optimization to keep from having to look
-    # it up again.
-    #
-    def handle_request(req, lines)
-      env = req.env
-      client = req.io
-
-      normalize_env env, req
-
-      env[PUMA_SOCKET] = client
-
-      if env[HTTPS_KEY] && client.peercert
-        env[PUMA_PEERCERT] = client.peercert
-      end
-
-      env[HIJACK_P] = true
-      env[HIJACK] = req
-
-      env['async.callback'] = lambda { |__response|
-        _status, _headers, _res_body = __response
-        # Faye websocket gem also calls this (when available)
-        # with status=101, and res_body being a stream
-        # but calling here just finishes the response
-        # that's why we only response if the request is not
-        # hijacked. not sure if this is a correct solution
-        # but working. for now.
-        unless req.hijacked
-          handle_app_response(req, lines, env, _status, _headers, _res_body)
-        end
-      }
-
-      body = req.body
-
-      env[RACK_INPUT] = body
-      env[RACK_URL_SCHEME] =  env[HTTPS_KEY] ? HTTPS : HTTP
-
-      env[RACK_AFTER_REPLY] = []
-
-      begin
-        status, headers, res_body = @app.call(env)
-
-        return :async if req.hijacked
-
-        status = status.to_i
-
-        if status == -1
-          # unless headers.empty? and res_body == []
-          #   puts "HEADERS: ".white.on_green + headers.inspect
-          #   puts "BODY: ".white.on_green + res_body.inspect
-          #   raise "async response must have empty headers and body"
-          # end
-
-          return :async
-        end
-      rescue StandardError => e
-        @events.unknown_error self, e, "Rack app"
-
-        status, headers, res_body = lowlevel_error(e, env)
-      end
-
-      return handle_app_response(req, lines, env, status, headers, res_body)
-    end
-
     def fetch_status_code(status)
       HTTP_STATUS_CODES.fetch(status) { 'CUSTOM' }
     end

data/puma.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
   s.date = `git log --pretty="%ai" -n 1`.split(" ").first
-  s.description = "Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack applications. Puma is intended for use in both development and production environments. In order to get the best throughput, it is highly recommended that you use a Ruby implementation with real threads like Rubinius or JRuby."
+  s.description = "Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack applications. Puma is intended for use in both development and production environments. It's great for highly concurrent Ruby implementations such as Rubinius and JRuby as well as as providing process worker support to support CRuby well."
   s.email = ["evan@phx.io"]
   s.executables = ["puma", "pumactl"]
   s.extensions = ["ext/puma_http11/extconf.rb"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Evan Phoenix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc