puma 2.12.1-java → 2.12.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dc44ef6aaeda70b87da03a15bd5b9bd3abd35d6
-  data.tar.gz: 64d3be4eb9cbffa1e417c29d561553e2198dcb17
+  metadata.gz: 768be597d1e25adc921a6b075d6659aedcbf62ca
+  data.tar.gz: 6c7ee73f2b7d12e8243e366d81cbcdc804b562bf
 SHA512:
-  metadata.gz: 0d3e867cae3b8c665ae63153d5a47b77f9457f81461976abe27bd9cb82902ba1e68203f8ac4f3dcc3ac7002583f9dc2609b5fce32751f3a85e73f7dd8459591c
-  data.tar.gz: 2d131676d9f81752d5e47af4d643b5e2a5e7ff4c38db02a1e5fa2f9edb27e36c2c725ae38571316bd6ebeae319960846b295a9cd230caff6521f51b80372e112
+  metadata.gz: 13cd7a49bcdd098e9998b1d9e67155edfd21ff5f711c88aa26f1b3ee750b46922331ba1d0ae8704b6835a8b25df1a336ff970d7c953a2938ac7857ac3268bffe
+  data.tar.gz: 04b52e6c876d8762f1d899405438a2d3e8886a434343c0eb954ffc6b9a2a65b7ca5231663ed8d09b0d7c1b41382cb9ba2d0180ad1c9b09ddf67dbb20d39748d2

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: java
 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
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +146,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