rack_slashless 0.0.6 → 0.0.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack_slashless (0.0.6)
+    rack_slashless (0.0.7)
 
 GEM
   remote: http://rubygems.org/

data/lib/rack_slashless.rb

@@ -7,13 +7,8 @@ module Rack
 
     def call(env)
       request = Rack::Request.new(env)
-      if request.get? && request.path_info.match(/\w+\/$/)
-        destination = [
-          "#{request.scheme}://",
-          request.env['SERVER_NAME'],
-          request.path_info[0..-2],
-          (request.query_string.empty? ? '' : "?#{request.query_string}")
-        ].join
+      if request.get? && request.path_info.match(/.+\/$/)
+        destination = request.url.gsub(/\/(\?.*)?$/,'\1')
         [301, {'Location' => destination}, ["Redirecting to #{destination}"]]
       else
         @app.call(env)

data/rack_slashless.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- spec/*`.split("\n")
   gem.name          = "rack_slashless"
   gem.require_paths = ["lib"]
-  gem.version       = "0.0.6"
+  gem.version       = "0.0.7"
   gem.license       = "MIT"
 
   gem.add_development_dependency 'rspec', '>= 2'

data/spec/rack_slashless_spec.rb

@@ -8,45 +8,59 @@ describe Rack::Slashless do
     end
   end
 
-  describe "/" do
-    it "should not redirect" do
-      get '/', {}, {'SERVER_NAME' => 'www.example.org'}
-      
-      last_response.status.should == 200
+  context 'GET requests' do
+
+    context 'without a path' do
+      it 'should not redirect' do
+        get '/', {}, 'HTTP_HOST' => 'example.org'
+        last_response.status.should == 200
+      end
     end
 
-    context "without a subdomain" do
-      it "should redirect to server name" do
-        get '/', {}, {'SERVER_NAME' => 'example.org'}
-      
+    context 'with a path that does not include a trailing slash' do
+      it 'should not redirect' do
+        get '/blog', {}, 'HTTP_HOST' => 'example.org'
         last_response.status.should == 200
       end
     end
-  end
 
-  describe "/blog/" do
-    it "should redirect to /blog" do
-      get '/blog/', {}, {'SERVER_NAME' => 'www.example.org'}
+    context 'with a path that includes a trailing slash' do
+      it 'should redirect to a url without a trailing slash' do
+        get '/blog/', {}, 'HTTP_HOST' => 'example.org'
+        last_response.status.should == 301
+        last_response['Location'].should eql('http://example.org/blog')
+      end
+    end
 
-      last_response.status.should == 301
-      last_response['Location'].should eql('http://www.example.org/blog')
+    context 'with a query string' do
+      it 'should retain the query string when redirecting' do
+        get '/blog/?article=1', {}, 'HTTP_HOST' => 'example.org'
+        last_response.status.should == 301
+        last_response['Location'].should eql('http://example.org/blog?article=1')
+      end
     end
 
-    context "with a query_string" do
-      it "should redirect" do
-        get '/blog/?article=1', {}, {'SERVER_NAME' => 'example.org'}
+    context 'with a port' do
+      it 'should retain the port when redirecting' do
+        get '/blog/', {}, 'HTTP_HOST' => 'example.org', 'SERVER_PORT' => '3000'
+        last_response.status.should == 301
+        last_response['Location'].should eql('http://example.org:3000/blog')
+      end
+    end
 
+    context 'with a subdomain' do
+      it 'should retain the subdomain when redirecting' do
+        get '/blog/', {}, 'HTTP_HOST' => 'www.example.org'
         last_response.status.should == 301
-        last_response['Location'].should eql('http://example.org/blog?article=1')
+        last_response['Location'].should eql('http://www.example.org/blog')
       end
     end
 
   end
 
-  describe "POST /blog" do
-    it "should not redirect" do
-      post '/blog/', {}, {'SERVER_NAME' => 'www.example.org'}
-
+  context 'POST requests' do
+    it 'should not redirect' do
+      post '/blog/', {}, 'HTTP_HOST' => 'example.org'
       last_response.status.should == 200
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack_slashless
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-15 00:00:00.000000000 Z
+date: 2012-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec