reel-rack 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63b096952fd168d6a393e3e72a1e042cbd46d48e
-  data.tar.gz: e6fb8172123d070e07cb0da3c1e48be553b9fb89
+  metadata.gz: fc523b3bd8451f12b547c078df59cafa431f9fa2
+  data.tar.gz: 2cc6c4f427f567c7b0c3c1c55e1eabfc71487d35
 SHA512:
-  metadata.gz: 1d123755ec3fa199eafc3740be39dae4f28f16d9e9e8bf9b3b1127e4292faeef4df8b1dbe6a8bb6d807637c526169c223285d436a3ab942a24b3f2100e5aa127
-  data.tar.gz: 86aaab1608695ce38ab53950cf46f8a312bcc301556f65b34c680e3071c5a9edfd7169274c5bae26d6a646ed500ed5bd579bd33057d7dfdd8447b0a59e157fe4
+  metadata.gz: c646547d89ee18f33fa25e53eacde194173aeefc6299b0cb74530f1dba89d92de3d852f83cbe199f40dc977d04ab8e9b0cff265a4de82de577a258f6755911b5
+  data.tar.gz: f044747dd5ec6c251d8290750cecc144af666ac0ff2a8000cbbeab714e31c947b0d69176a004f60ea704ee0b429ea2153ff0f83c2282f28f97027ff0e6a156b8

data/CHANGES.md

@@ -1,3 +1,7 @@
+0.2.2 (2015-03-27)
+------------------
+* Add SERVER_NAME and SERVER_PORT key to rack env
+
 0.2.1 (2014-12-17)
 ------------------
 * Bugfixes for responding with chunked encoding

data/lib/reel/rack/server.rb

@@ -40,7 +40,9 @@ module Reel
           :input        => request.body.to_s,
           "REMOTE_ADDR" => request.remote_addr
         }.merge(convert_headers(request.headers))
-   
+
+        normalize_env(options)
+
         status, headers, body = app.call ::Rack::MockRequest.env_for(request.url, options)
 
         if body.respond_to? :each
@@ -78,6 +80,26 @@ module Reel
         }]
       end
 
+      # Copied from lib/puma/server.rb
+      def normalize_env(env)
+        if host = env["HTTP_HOST"]
+          if colon = host.index(":")
+            env["SERVER_NAME"] = host[0, colon]
+            env["SERVER_PORT"] = host[colon+1, host.bytesize]
+          else
+            env["SERVER_NAME"] = host
+            env["SERVER_PORT"] = default_server_port(env)
+          end
+        else
+          env["SERVER_NAME"] = "localhost"
+          env["SERVER_PORT"] = default_server_port(env)
+        end
+      end
+
+      def default_server_port(env)
+        env['HTTP_X_FORWARDED_PROTO'] == 'https' ? 443 : 80
+      end
+
       def status_symbol(status)
         if status.is_a?(Fixnum)
           Http::Response::STATUS_CODES[status].downcase.gsub(/\s|-/, '_').to_sym

data/lib/reel/rack/version.rb

@@ -1,5 +1,5 @@
 module Reel
   module Rack
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

data/spec/reel/rack/server_spec.rb

@@ -10,10 +10,10 @@ describe Reel::Rack::Server do
   let(:body) { "hello world" }
   let(:uri) { URI("http://#{host}:#{port}/") }
   let(:http) { Net::HTTP.new(uri.host, uri.port) }
+  let(:rack_app) { proc { [200, headers, [body]] } }
 
   subject do
-    app = proc { [200, headers, [body]] }
-    described_class.new(Rack::Lint.new(Rack::Head.new(app)), :Host => host, :Port => port)
+    described_class.new(Rack::Lint.new(Rack::Head.new(rack_app)), :Host => host, :Port => port)
   end
 
   before do
@@ -53,4 +53,20 @@ describe Reel::Rack::Server do
       expect(http.send_request('GET', uri.path, 'test')['transfer-encoding']).to eq 'chunked'
     end
   end
+
+  context "works with Rack::Builder" do
+    let(:rack_app) {
+      headers = {"Content-Type" => "text/plain"}
+      Rack::Builder.app {
+        map("/path1") { run proc { [200, headers.merge("Content-Length"=>"5"), ["path1"]] } }
+        run proc { [200, headers.merge("Content-Length"=>"3"), ["any"]] }
+      }
+    }
+
+    it "routes the requests both exact path and any path" do
+      expect(http.send_request('GET', "/path1", 'test').body).to eq "path1"
+      expect(http.send_request('GET', "/", 'test').body).to eq "any"
+      expect(http.send_request('GET', "/path2", 'test').body).to eq "any"
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reel-rack
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Tony Arcieri
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2015-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reel
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Rack adapter for Reel, a Celluloid::IO web server