rewritten 0.14.2 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 388f8074c4d815dbb2df6d3e5c50ddbe77821187
-  data.tar.gz: 9dd7175a1d4d3d3c503a300c118a1f95841c2d41
+  metadata.gz: 452e88a0bbdf356f472e86034e0df828f4708899
+  data.tar.gz: bb3f1342257f6aa9414aada49a6ad2af7daf4af8
 SHA512:
-  metadata.gz: b3afe4b2a95bb922788496eaacdb0bd86a299074fdb0beae96ad0db54b0a737612d110de02ed64f2dc99f49cfe72905e68e84f77952e42a5c8a61ea0adc5749b
-  data.tar.gz: 60ece3b7d4b7e1ca470bc4996e4506c605fe9c17ba85f3ff80d9f796df751d1585e17252fbe8085cdee11f044ea0c4777483457335054917c431e659165be71a
+  metadata.gz: a5f725ac82a9353f1eaff6dfdb01655dde86ef5e1e3b17df701dad7215aa4d417d26ce5633195d5ed2cd0a35648655b0daba426fd84d7c89bea91f5ccd94fcbb
+  data.tar.gz: c4fe89affbe1216585006c25dc3cede93be62ffb4ab839f8bd053185e2c2f14a4200b77e873a0f26413257f6989ee3e928e2e379244bd6f24a885eb3024312f6

data/HISTORY.rdoc

@@ -1,3 +1,7 @@
+== 0.15.0
+
+  * Support external targets in redirects
+
 == 0.14.0
   * Extract canonical to own rack app
 

data/lib/rack/url.rb

@@ -6,14 +6,25 @@ module Rack
 
     class Url
 
+      attr_accessor :base_url
+
       def initialize(app, &block)
         @app = app
         @translate_backwards = false
         @downcase_before_lookup = false
         @translate_partial = false
+        @base_url = ''
         instance_eval(&block) if block_given?
       end
 
+      def is_internal_target?(url)
+        url.nil? or url.start_with?('/') or url.start_with?(@base_url)
+      end
+
+      def is_external_target?(url)
+        !is_internal_target?(url)
+      end
+
       def call(env)
         req = Rack::Request.new(env)
 
@@ -22,7 +33,13 @@ module Rack
         path = "#{subdomain}#{req.path_info}"
         path.downcase! if downcase_before_lookup?
 
-        if ::Rewritten.includes?(path.chomp("/")) or backwards=( translate_backwards? && ::Rewritten.exist_translation_for?(path) )
+        target_url = ::Rewritten.translate(path)
+
+        if is_external_target?(target_url)
+          r = Rack::Response.new
+          r.redirect(target_url, 301)
+          r.finish
+        elsif ::Rewritten.includes?(path.chomp("/")) or backwards=( translate_backwards? && ::Rewritten.exist_translation_for?(path) )
 
           to = ::Rewritten.includes?(path.chomp("/")) || path
 

data/lib/rewritten/version.rb

@@ -1,4 +1,4 @@
 module Rewritten
-  VERSION = "0.14.2"
+  VERSION = "0.15.0"
 end
 

data/test/rack/rewritten_url_test.rb

@@ -61,6 +61,26 @@ describe Rack::Rewritten::Url do
       ret[0].must_equal 200
     end
 
+    describe 'external redirection' do
+
+      before {
+        @app = MiniTest::Mock.new
+        @rack = Rack::Rewritten::Url.new(@app) do |config|
+          config.base_url = 'http://www.example.org'
+        end
+
+        Rewritten.add_translation '/external/target', 'http://www.external.com'
+      }
+
+      it "must redirect to external target" do
+        ret = @rack.call request_url('/external/target')
+        @app.verify
+        ret[0].must_equal 301
+        ret[1]['Location'].must_equal "http://www.external.com"
+      end
+
+    end
+
     describe "partial translation" do
 
       before do 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rewritten
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.15.0
 platform: ruby
 authors:
 - Kai Rubarth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-namespace