rewritten 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c46c2783b6c6c0b7513137ee064d35204d248a8
-  data.tar.gz: e30fe5d81af0086b38aca82dbd03e0a38b9833ef
+  metadata.gz: bc8f7c951c788595d33a51ef61a2c0816bce4434
+  data.tar.gz: 6c9b8f754364a3085b625de88771d773e858de76
 SHA512:
-  metadata.gz: d04627b4246a02ffb960087a07e54ac2a9d5f33196ef32d78b65e3b2ccaabe3515384a88f7536ed8305c9f5ceeb800bcf4c1fac8e9a1f109203839466727d113
-  data.tar.gz: 92736611e92c52327f5faa2754668c9cc97578f806c5aa145b2a7963c3616c0c137fb5c0333679b5312c1e61ecf2f30289494554b014b9599afa7cb92f878eb2
+  metadata.gz: e16d7961db76c0ba4e6f39d6304339fe3acce5e3ef430a2a0f01b2c60099da0f820ea1a55be72d6c816074e618ba77a3901de1fb4d9b2d44357b55ee45a95463
+  data.tar.gz: 89162c04f68b099dda7b8d5499160e06dc693029fff79d7e48d71f387ea97dd09e817c72fb4553aa9ec0ac873cdc6a080b523460c3c044a054da1265e5a20e9c

data/HISTORY.rdoc

@@ -1,3 +1,7 @@
+== 0.16.1
+
+  * include exception list for reverse translations
+
 == 0.16.0
   
   * Makes rewritten work with fullpath. Example: Matching on '/some/url?q=1' will work now

data/lib/rack/url.rb

@@ -8,6 +8,7 @@ module Rack
       def initialize(app, &block)
         @app = app
         @translate_backwards = false
+        @translate_backwards_exceptions = []
         @downcase_before_lookup = false
         @translate_partial = false
         @base_url = ''
@@ -36,7 +37,7 @@ module Rack
           r = Rack::Response.new
           r.redirect(target_url, 301)
           r.finish
-        elsif ::Rewritten.includes?(req.fullpath) || ::Rewritten.includes?(path.chomp('/')) || backwards = (translate_backwards? && ::Rewritten.exist_translation_for?(path))
+        elsif ::Rewritten.includes?(req.fullpath) || ::Rewritten.includes?(path.chomp('/')) || backwards = (translate_backwards?(path) && ::Rewritten.exist_translation_for?(path))
 
           to = ::Rewritten.includes?(req.fullpath)
           to ||= ::Rewritten.includes?(path.chomp('/')) || path
@@ -80,11 +81,18 @@ module Rack
 
       private
 
-      def translate_backwards?
-        @translate_backwards
+      def translate_backwards?(path)
+        return false unless @translate_backwards
+
+        @translate_backwards_exceptions.each do |exception|
+          return false if path.index(exception) == 0
+        end
+
+        true
       end
 
       attr_writer :translate_backwards
+      attr_accessor :translate_backwards_exceptions
 
       def downcase_before_lookup?
         @downcase_before_lookup

data/lib/rewritten/version.rb

@@ -1,3 +1,3 @@
 module Rewritten
-  VERSION = '0.16.0'
+  VERSION = '0.16.1'
 end

data/test/rack/rewritten_url_test.rb

@@ -181,6 +181,19 @@ describe Rack::Rewritten::Url do
         ret[0].must_equal 301
         ret[1]['Location'].must_equal 'http://www.example.org/foo/baz'
       end
+
+      it 'must not redirect from resource url to nice url if enabled but in exceptions' do
+        @rack = Rack::Rewritten::Url.new(@app) do
+          self.translate_backwards = true
+          self.translate_backwards_exceptions = ['/products']
+        end
+
+        @app.expect :call, [200, { 'Content-Type' => 'text/plain' }, ['']], [Hash]
+        ret = @rack.call request_url('/products/1')
+        @app.verify
+        ret[0].must_equal 200
+      end
+
     end
 
     describe 'flag behavior' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rewritten
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Kai Rubarth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-31 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-namespace