rack_slashless 0.0.4 → 0.0.5

data/lib/rack_slashless.rb

@@ -6,15 +6,15 @@ module Rack
     end
 
     def call(env)
-      if env['REQUEST_METHOD'] == "GET" && env['QUERY_STRING'].empty? && env['PATH_INFO'].match(/\w+\/$/)
-        parts = env['SERVER_NAME'].split('.')
-        suffix, chunk, prefix = parts.pop, parts.pop, parts.pop
+      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
 
-        destination = "#{env['rack.url_scheme']}://"
-        destination << "#{prefix}." if prefix
-        destination << "#{chunk}.#{suffix}"
-        destination << "#{env['PATH_INFO']}"[0..-2]
-        
         [301, {'Location' => destination}, ['Redirecting to the same url but with the ending /']]
       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.4"
+  gem.version       = "0.0.5"
   gem.license       = "MIT"
 
   gem.add_development_dependency 'rspec'

data/spec/rack_slashless_spec.rb

@@ -9,7 +9,7 @@ describe Rack::Slashless do
   end
 
   describe "/" do
-    it "should success to server name" do
+    it "should not redirect" do
       get '/', {}, {'SERVER_NAME' => 'www.example.org'}
       
       last_response.status.should == 200
@@ -22,7 +22,6 @@ describe Rack::Slashless do
         last_response.status.should == 200
       end
     end
-
   end
 
   describe "/blog/" do
@@ -32,14 +31,16 @@ describe Rack::Slashless do
       last_response.status.should == 301
       last_response['Location'].should eql('http://www.example.org/blog')
     end
-  end
 
-  describe "/blog?article=1" do
-    it "should not redirect" do
-      get '/blog?article=1', {}, {'SERVER_NAME' => 'www.example.org'}
+    context "with a query_string" do
+      it "should redirect" do
+        get '/blog/?article=1', {}, {'SERVER_NAME' => 'example.org'}
 
-      last_response.status.should == 200
+        last_response.status.should == 301
+        last_response['Location'].should eql('http://example.org/blog?article=1')
+      end
     end
+
   end
 
   describe "POST /blog" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack_slashless
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors: