rewritten 0.16.3 → 0.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4c5d5f3b82a279cbf7537015998ea7bb2d953d1
-  data.tar.gz: c9d424c04a59af197e4809be37512e9b8099dc76
+  metadata.gz: a254642e07ed0bb8b46f4c9ebe95a152ac94481e
+  data.tar.gz: 52fe0a75b830039b7d2a0b78a05e13c4e902df53
 SHA512:
-  metadata.gz: ef7b3bb9e140229bc5d7bebe36624f80d9b65a98eb100b9044120f16989a0571af71478610263a29da7d04ccdf1a4659a5b4bd7f7ebec33ee6ef5a9ea81971df
-  data.tar.gz: de967382e05689032659860628760ff75debcd1d9fbee7bc9da42b6c95119ff0681c8d09c97a31fe7b0c58edbd8d083718a3c508a107b1d93114c8b58c384882
+  metadata.gz: b7835a4629b4980b5276a0a55a3da1d8017ca7cb117b5619b0c52167413ad14a485e10bab38f737fdc4a6e6b2b5b042959f7ca3a21cfdf8d93b2ce59e0e90e53
+  data.tar.gz: a40d86b684035a29ea2be929d94d071a522ac352a4d0a9dc148c6434d6b55dd75f9df87ebf2f3dfb13b190c52747e3ac5840d60349a3eff670a5eb0bd5542f28

data/HISTORY.rdoc

@@ -1,3 +1,7 @@
+== 0.16.4
+
+  * Fix trailing slash redirect
+
 == 0.16.3
 
   * Fix malformed path_info that contained query_string

data/lib/rack/url.rb

@@ -47,6 +47,20 @@ module Rack
           current_path_with_query = current_path
           current_path = current_path.split('?')[0]
 
+          if current_path.size + 1 == req.path_info.size and current_path == req.path_info.chomp('/')
+            r = Rack::Response.new
+
+            new_path = env['rack.url_scheme'].dup
+            new_path << '://'
+            new_path << env['HTTP_HOST'].dup.sub(/^#{subdomain.chomp(':')}\./, '')
+            new_path << current_path
+            new_path << ::Rewritten.appendix(path) unless backwards
+            new_path << '?' << env['QUERY_STRING'] unless (env['QUERY_STRING'] || '').empty?
+
+            r.redirect(new_path, 301)
+            return r.finish
+          end
+
           if (req.fullpath == current_path_with_query || current_path == req.path_info) || (::Rewritten.base_from(req.path_info) == current_path) || ::Rewritten.flag?(path, 'L')
             # if this is the current path, rewrite path and parameters
             tpath, tparams = split_to_path_params(to)

data/lib/rewritten/version.rb

@@ -1,3 +1,3 @@
 module Rewritten
-  VERSION = '0.16.3'
+  VERSION = '0.16.4'
 end

data/test/rack/rewritten_url_test.rb

@@ -134,7 +134,20 @@ describe Rack::Rewritten::Url do
     end
 
     describe '/ behavior' do
-      it 'must 301 redirect paths with / in the end to their chomped version' do
+      it 'must 301 redirect current paths with / in the end to their chomped version' do
+        ret = @rack.call request_url('/foo/baz/')
+        @app.verify
+        ret[0].must_equal 301
+        ret[1]['Location'].must_equal 'http://www.example.org/foo/baz'
+      end
+
+      it 'wont 301 redirect /' do
+        @app.expect :call, [200, { 'Content-Type' => 'text/plain' }, ['']], [Hash]
+        ret = @rack.call request_url('/')
+        @app.verify
+      end
+
+      it 'must 301 redirect paths with / in the end to their current chomped version' do
         ret = @rack.call request_url('/foo/bar/')
         @app.verify
         ret[0].must_equal 301

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rewritten
 version: !ruby/object:Gem::Version
-  version: 0.16.3
+  version: 0.16.4
 platform: ruby
 authors:
 - Kai Rubarth