rewritten 0.16.4 → 0.16.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a254642e07ed0bb8b46f4c9ebe95a152ac94481e
-  data.tar.gz: 52fe0a75b830039b7d2a0b78a05e13c4e902df53
+  metadata.gz: c1341c9fb6a042d2864f1cc01c903650661a55de
+  data.tar.gz: 24354a7bdc753c6038edd3871579d5e5c49b209f
 SHA512:
-  metadata.gz: b7835a4629b4980b5276a0a55a3da1d8017ca7cb117b5619b0c52167413ad14a485e10bab38f737fdc4a6e6b2b5b042959f7ca3a21cfdf8d93b2ce59e0e90e53
-  data.tar.gz: a40d86b684035a29ea2be929d94d071a522ac352a4d0a9dc148c6434d6b55dd75f9df87ebf2f3dfb13b190c52747e3ac5840d60349a3eff670a5eb0bd5542f28
+  metadata.gz: 2a2ae4fb9c6a89d26da98461eba2a7580506cc9180764754cc497b7138f4d4906f66c4f94df787bdbf1e9ad4aa21b4bd76f7da180b47009cdd46808169203228
+  data.tar.gz: 1699d501b7b6df4037f5576fd8794670ba3a73de135b6a787f48f9567fc71cba482a95f7d5ae1f9c215b90146a16c0c4d8bebf025e10bdec1917750a4b354ef7

data/HISTORY.rdoc

@@ -1,3 +1,7 @@
+== 0.16.4
+
+  * Fix trailing slash with query string redirect
+
 == 0.16.4
 
   * Fix trailing slash redirect

data/lib/rack/url.rb

@@ -29,17 +29,19 @@ module Rack
         subdomain = env['SUBDOMAIN'] ? "#{env['SUBDOMAIN']}:" : ''
 
         path = "#{subdomain}#{req.path_info}"
-        path.downcase! if downcase_before_lookup?
+        path.downcase! if downcase_before_lookup
 
         target_url = ::Rewritten.translate(path)
 
+        chomped_fullpath = req.fullpath.split('?').map { |s| s.chomp('/') }.join('?')
+
         if external_target?(target_url)
           r = Rack::Response.new
           r.redirect(target_url, 301)
           r.finish
-        elsif ::Rewritten.includes?(req.fullpath) || ::Rewritten.includes?(path.chomp('/')) || backwards = (translate_backwards?(path) && ::Rewritten.exist_translation_for?(path))
+        elsif ::Rewritten.includes?(chomped_fullpath) || ::Rewritten.includes?(path.chomp('/')) || backwards = (translate_backwards?(path) && ::Rewritten.exist_translation_for?(path))
 
-          to = ::Rewritten.includes?(req.fullpath)
+          to = ::Rewritten.includes?(chomped_fullpath)
           to ||= ::Rewritten.includes?(path.chomp('/')) || path
 
           current_path = ::Rewritten.get_current_translation(to)
@@ -54,18 +56,18 @@ module Rack
             new_path << '://'
             new_path << env['HTTP_HOST'].dup.sub(/^#{subdomain.chomp(':')}\./, '')
             new_path << current_path
-            new_path << ::Rewritten.appendix(path) unless backwards
+            new_path << ::Rewritten.appendix(chomped_fullpath) 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 (chomped_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)
             env['QUERY_STRING'] = Rack::Utils.build_nested_query(tparams.merge(req.params))
-            req.path_info = tpath + ::Rewritten.appendix(req.fullpath)
+            req.path_info = tpath + ::Rewritten.appendix(chomped_fullpath)
             @app.call(req.env)
           else
             # if this is not the current path, redirect to current path
@@ -107,16 +109,7 @@ module Rack
 
       attr_writer :translate_backwards
       attr_accessor :translate_backwards_exceptions
-
-      def downcase_before_lookup?
-        @downcase_before_lookup
-      end
-
-      attr_writer :downcase_before_lookup
-
-      def translate_partial?
-        @translate_partial
-      end
+      attr_accessor :downcase_before_lookup
 
       def translate_partial=(yes_or_no)
         $stderr.puts 'DEPRECATED. Please use Rewritten.translate_partial'

data/lib/rewritten.rb

@@ -41,11 +41,7 @@ module Rewritten
     end
   end
 
-  attr_writer :translate_partial
-
-  def translate_partial?
-    @translate_partial
-  end
+  attr_accessor :translate_partial
 
   # Returns the current Redis connection. If none has been created, will
   # create a new one.
@@ -194,7 +190,7 @@ module Rewritten
     translation = Rewritten.z_range("to:#{uri.path}", -1) unless translation
 
     if translation.nil?
-      if translate_partial? && path.count('/') > 1
+      if translate_partial && path.count('/') > 1
         parts = path.split('/')
         shorter_path = parts.slice(0, parts.size - 1).join('/')
         appendix = parts.last + (tail ? '/' + tail : '')
@@ -221,7 +217,7 @@ module Rewritten
     to = translate(conjugated)
     to = translate(conjugated.split('?')[0]) unless to
 
-    if to.nil? && translate_partial? && conjugated.count('/') > 1
+    if to.nil? && translate_partial && conjugated.count('/') > 1
       parts = conjugated.split('/')
       shorter_path = parts.slice(0, parts.size - 1).join('/')
       infinitive(shorter_path)
@@ -238,7 +234,7 @@ module Rewritten
       some_from
     elsif translate(base_from)
       base_from
-    elsif translate_partial? && base_from.count('/') > 1
+    elsif translate_partial && base_from.count('/') > 1
       parts = base_from.split('/')
       base_from(parts.slice(0, parts.size - 1).join('/'))
         end
@@ -287,7 +283,7 @@ module Rewritten
     result = Rewritten.redis.hget("from:#{path.chomp('/')}", :to)
     result = Rewritten.redis.hget("from:#{path.split('?')[0]}", :to) unless result
 
-    if result.nil? && translate_partial? && path.count('/') > 1
+    if result.nil? && translate_partial && path.count('/') > 1
       parts = path.split('/')
       includes?(parts.slice(0, parts.size - 1).join('/'))
     else

data/lib/rewritten/version.rb

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

data/test/rack/rewritten_url_test.rb

@@ -141,13 +141,21 @@ describe Rack::Rewritten::Url do
         ret[1]['Location'].must_equal 'http://www.example.org/foo/baz'
       end
 
+      it 'must 301 redirect current paths with / before the query string to their chomped version' do
+        Rewritten.add_translation '/path/with/params?w=1', '/embed/2'
+        ret = @rack.call request_url('/path/with/params/', 'QUERY_STRING' => 'w=1')
+        @app.verify
+        ret[0].must_equal 301
+        ret[1]['Location'].must_equal 'http://www.example.org/path/with/params?w=1'
+      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
+      it 'must 301 redirect non-current 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rewritten
 version: !ruby/object:Gem::Version
-  version: 0.16.4
+  version: 0.16.5
 platform: ruby
 authors:
 - Kai Rubarth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-namespace