puma 2.12.1 → 2.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c8b1f4fce0fcee4ebd03eaaf4d93ad9376c4183
-  data.tar.gz: bc8ce26bf9b9536d0cba6e7537ce3fce707b6d57
+  metadata.gz: acc6978f0afad6cb3d2f28d834f2c60c08f6f6a9
+  data.tar.gz: 24c4f715b9b474a438567ce91314ce24e17f1acb
 SHA512:
-  metadata.gz: 69fabcd7985017bd09cf783d576e38e02d565e0d02dce427d25c84d5477e3ea557de0a67dc66fd237f0ebff8f3e77990938fc8ba04bace87df497fbd1848489a
-  data.tar.gz: 66335f209d5d66ef6d29336b04b84c23d13409f3ff514005fa9704a02452a1875207cd3f1d0412155e8afb9f98ac2658f823ce73dda7f3bdf1e9c2ac8e2c1519
+  metadata.gz: 115b5753fb3487f7a6e3ae3e0009c75bea89d2cbe9b1b67bf1de52e6795f7788123034a54627b38be5585061ce34db46ba7108f8cff03abef478fc6081cf3854
+  data.tar.gz: 9b7198cca050cc284a335184a7ab3ec630ec5bfe081a44e0760abf1b748ae0388c4b0171b609574ba27748445be5ecf16a62b371aa0dfe58e9dbc05454018420

data/History.txt

@@ -1,3 +1,9 @@
+=== 2.12.2 / 2015-07-17
+
+* 2 bug fix:
+  * Pull over and use Rack::URLMap. Fixes #741
+  * Stub out peercert on JRuby for now. Fixes #739
+
 === 2.12.1 / 2015-07-16
 
 * 2 bug fixes:

data/Manifest.txt

@@ -53,6 +53,7 @@ lib/puma/rack/backports/uri/common_18.rb
 lib/puma/rack/backports/uri/common_192.rb
 lib/puma/rack/backports/uri/common_193.rb
 lib/puma/rack/builder.rb
+lib/puma/rack/urlmap.rb
 lib/puma/rack_default.rb
 lib/puma/reactor.rb
 lib/puma/runner.rb

data/ext/puma_http11/org/jruby/puma/MiniSSL.java

@@ -384,4 +384,9 @@ public class MiniSSL extends RubyObject {
       throw new RuntimeException(e);
     }
   }
+
+  @JRubyMethod
+  public IRubyObject peercert() {
+    return getRuntime().getNil();
+  }
 }

data/lib/puma/const.rb

@@ -99,7 +99,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.12.1".freeze
+    PUMA_VERSION = VERSION = "2.12.2".freeze
     CODE_NAME = "Plutonian Photo Shoot".freeze
 
     FAST_TRACK_KA_TIMEOUT = 0.2

data/lib/puma/rack/builder.rb

@@ -290,6 +290,8 @@ module Puma::Rack
     private
 
     def generate_map(default_app, mapping)
+      require 'puma/rack/urlmap'
+
       mapped = default_app ? {'/' => default_app} : {}
       mapping.each { |r,b| mapped[r] = self.class.new(default_app, &b).to_app }
       URLMap.new(mapped)

data/lib/puma/rack/urlmap.rb

@@ -0,0 +1,90 @@
+module Puma::Rack
+  # Rack::URLMap takes a hash mapping urls or paths to apps, and
+  # dispatches accordingly.  Support for HTTP/1.1 host names exists if
+  # the URLs start with <tt>http://</tt> or <tt>https://</tt>.
+  #
+  # URLMap modifies the SCRIPT_NAME and PATH_INFO such that the part
+  # relevant for dispatch is in the SCRIPT_NAME, and the rest in the
+  # PATH_INFO.  This should be taken care of when you need to
+  # reconstruct the URL in order to create links.
+  #
+  # URLMap dispatches in such a way that the longest paths are tried
+  # first, since they are most specific.
+
+  class URLMap
+    NEGATIVE_INFINITY = -1.0 / 0.0
+    INFINITY = 1.0 / 0.0
+
+    def initialize(map = {})
+      remap(map)
+    end
+
+    def remap(map)
+      @mapping = map.map { |location, app|
+        if location =~ %r{\Ahttps?://(.*?)(/.*)}
+          host, location = $1, $2
+        else
+          host = nil
+        end
+
+        unless location[0] == ?/
+          raise ArgumentError, "paths need to start with /"
+        end
+
+        location = location.chomp('/')
+        match = Regexp.new("^#{Regexp.quote(location).gsub('/', '/+')}(.*)", nil, 'n')
+
+        [host, location, match, app]
+      }.sort_by do |(host, location, _, _)|
+        [host ? -host.size : INFINITY, -location.size]
+      end
+    end
+
+    def call(env)
+      path = env['PATH_INFO']
+      script_name = env['SCRIPT_NAME']
+      hHost = env['HTTP_HOST']
+      sName = env['SERVER_NAME']
+      sPort = env['SERVER_PORT']
+
+      @mapping.each do |host, location, match, app|
+        unless casecmp?(hHost, host) \
+            || casecmp?(sName, host) \
+            || (!host && (casecmp?(hHost, sName) ||
+                          casecmp?(hHost, sName+':'+sPort)))
+          next
+        end
+
+        next unless m = match.match(path.to_s)
+
+        rest = m[1]
+        next unless !rest || rest.empty? || rest[0] == ?/
+
+        env['SCRIPT_NAME'] = (script_name + location)
+        env['PATH_INFO'] = rest
+
+        return app.call(env)
+      end
+
+      [404, {'Content-Type' => "text/plain", "X-Cascade" => "pass"}, ["Not Found: #{path}"]]
+
+    ensure
+      env['PATH_INFO'] = path
+      env['SCRIPT_NAME'] = script_name
+    end
+
+    private
+    def casecmp?(v1, v2)
+      # if both nil, or they're the same string
+      return true if v1 == v2
+
+      # if either are nil... (but they're not the same)
+      return false if v1.nil?
+      return false if v2.nil?
+
+      # otherwise check they're not case-insensitive the same
+      v1.casecmp(v2).zero?
+    end
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 2.12.1
+  version: 2.12.2
 platform: ruby
 authors:
 - Evan Phoenix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2015-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -150,6 +150,7 @@ files:
 - lib/puma/rack/backports/uri/common_192.rb
 - lib/puma/rack/backports/uri/common_193.rb
 - lib/puma/rack/builder.rb
+- lib/puma/rack/urlmap.rb
 - lib/puma/rack_default.rb
 - lib/puma/reactor.rb
 - lib/puma/runner.rb