rewritten 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a44ade38a5b5052b5d98a4424fc444e7b4208939
-  data.tar.gz: 6ddaf0da53b50cca46e91c6d4a77a90003abfeb4
+  metadata.gz: 4b8a500718f5764e1215c94dcefc425cfa4fb609
+  data.tar.gz: c36cd32276590c3ccda6b0ff56371dcd09e37f43
 SHA512:
-  metadata.gz: e2c287f97d495e2a7f566baba6ab2a9c266f05f984daa5eca6d76cd74a0961c5fc0e62d08517ddf616612468dc2c74f1253b50f2ceefde2f3eb61e3ff59f9986
-  data.tar.gz: 0ca027f2379473fbf9602fcaf04c33d62e00b3f56c3628d903e99b372e1b83102c78da4ee5aee4bac9644b69a005ee29ce469df5d4b8ec14061c2fc9139aa2b5
+  metadata.gz: 4597038ac4306fbc18f19474c744de3fa1077c817b85e5d98c360bac7900e9f5340d8a83c8243f1f25afe1c3d2fa7297c8b654e5d5210b5f196c7ed2ac50bdb4
+  data.tar.gz: be0923ab8fd3e7567ef325257ecfa1be9a4b0942e45665985d7aa15992a9c3928f591af3ff7c4d599dfb20cd70c1fee3d18193695b63dd4957b1deb0bb8852a3

data/HISTORY.rdoc

@@ -1,3 +1,11 @@
+== 0.11.0 
+
+  * Partial translations and canonical tags in Rack::Rewritten::Url
+
+== 0.10.0
+
+  * add Rails URL Helpers
+
 == 0.9.0
 
   * always chomp '/' from request_path
@@ -5,7 +13,7 @@
 
 == 0.8.0
 
-  * introduce the [H] flag to stop translating
+  * introduce the [L] flag to stop translating
 
 == 0.7.0
 

data/README.md

@@ -1,4 +1,4 @@
-Rewritten [![Build Status](https://travis-ci.org/learnjin/rewritten.png?branch=master)](https://travis-ci.org/learnjin/rewritten/) [![Code Climate](https://codeclimate.com/github/learnjin/rewritten.png)](https://codeclimate.com/github/learnjin/rewritten) [![Coverage Status](https://coveralls.io/repos/learnjin/rewritten/badge.png)](https://coveralls.io/r/learnjin/rewritten)
+Rewritten [![Build Status](https://travis-ci.org/learnjin/rewritten.png?branch=master)](https://travis-ci.org/learnjin/rewritten/) [![Csdfode Climate](https://codeclimate.com/github/learnjin/rewritten.png)](https://codeclimate.com/github/learnjin/rewritten) [![Coverage Status](https://coveralls.io/repos/learnjin/rewritten/badge.png)](https://coveralls.io/r/learnjin/rewritten)
 =========
 
 Rewritten is a lookup-based rewriting engine that rewrites requested URLs on

data/lib/rack/url.rb

@@ -10,11 +10,12 @@ module Rack
         @app = app
         @translate_backwards = false
         @downcase_before_lookup = false
+        @translate_partial = false
 
         instance_eval(&block) if block_given?
       end
 
-      def call(env)
+      def call(env, tail=nil)
         req = Rack::Request.new(env)
 
         subdomain = env["SUBDOMAIN"] ? "#{env["SUBDOMAIN"]}:" : ""
@@ -32,26 +33,53 @@ module Rack
           if current_path == req.path_info or ::Rewritten.has_flag?(path, 'L')
             # if this is the current path, rewrite path and parameters
             tpath, tparams = split_to_path_params(to)
-            req.path_info = tpath
+
             env['QUERY_STRING'] = Rack::Utils.build_query(tparams.merge(req.params))
-            @app.call(req.env) 
+            req.path_info = tpath + (tail ? "/"+tail : "")
+            #@app.call(req.env)
+            
+            # add the canonical tag to the body
+            status, headers, response = @app.call(req.env)
+
+            if status == 200 && headers["Content-Type"] =~ /text\/html|application\/xhtml\+xml/
+              body = ""
+              response.each { |part| body << part }
+              index = body.rindex("</head>")
+              if index
+                body.insert(index, %Q|<link rel="canonical" href="#{path}"/>| )
+                headers["Content-Length"] = body.length.to_s
+                response = [body]
+              end
+            end
+
+            [status, headers, response]
+
           else
             # if this is not the current path, redirect to current path
             # NOTE: assuming redirection is always to non-subdomain-path
-            
+
             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 << current_path + (tail ? "/"+tail : "")
             new_path << '?' << env["QUERY_STRING"] unless (env["QUERY_STRING"]||'').empty?
 
             r.redirect(new_path, 301)
             a = r.finish
           end
-       else
-          @app.call(req.env) 
+        else
+          # Translation of partials (e.g. /some/path/tail -> /translated/path/tail)
+          if(path).count('/') > 1 && translate_partial?
+            parts = path.split('/')
+            req.path_info = parts.slice(0, parts.size-1).join('/')
+            self.call(req.env, parts.last + tail.to_s)
+          else
+            req.path_info = (tail ? req.path_info+"/"+tail : req.path_info)
+            @app.call(req.env)
+
+          end
         end
       end
 
@@ -64,9 +92,9 @@ module Rack
       private
 
       def translate_backwards?
-        @translate_backwards  
+        @translate_backwards
       end
-      
+
       def translate_backwards=(yes_or_no)
         @translate_backwards = yes_or_no
       end
@@ -74,16 +102,18 @@ module Rack
       def downcase_before_lookup?
         @downcase_before_lookup
       end
-      
+
       def downcase_before_lookup=(yes_or_no)
         @downcase_before_lookup = yes_or_no
       end
 
-      
+      def translate_partial?
+        @translate_partial
+      end
+
+      def translate_partial=(yes_or_no)
+        @translate_partial = yes_or_no
+      end
     end
   end
-
 end
-
-
-

data/lib/rewritten/version.rb

@@ -1,4 +1,4 @@
 module Rewritten
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end
 

data/test/rack/rewritten_url_test.rb

@@ -60,8 +60,73 @@ describe Rack::Rewritten::Url do
       ret[0].must_equal 200
     end
 
+    describe "partial translation" do
+
+      before {
+        @request_str = '/foo/baz/with_tail'
+        @env = request_url(@request_str)
+        @html_body = <<-HTML
+        <html>
+          <head></head>
+          <body>Hello</body>
+        </html>
+        HTML
+        }
+
+      it "must not translate partials by default" do
+        @app.expect :call, [200, {'Content-Type' => 'text/plain'},[""]], [Hash]
+        ret = @rack.call @env
+        @app.verify
+        @env['PATH_INFO'].must_equal @request_str
+      end
+
+      it "must translate partials if enabled" do
+        @rack = Rack::Rewritten::Url.new(@app) do
+          self.translate_partial = true
+        end
+
+        @app.expect :call, [200, {'Content-Type' => 'text/html'},[]], [Hash]
+
+        ret = @rack.call @env
+        @app.verify
+        @env['PATH_INFO'].must_equal '/products/1/with_tail'
+      end
+
+      it "must add the canonical tag to pages with trail" do
+
+        @rack = Rack::Rewritten::Url.new(lambda{|env| [200, {'Content-Type' => 'text/html'}, [@html_body]]}) do
+          self.translate_partial = true
+        end
+
+        res,env,body = @rack.call(@env)
+        html = body.join("")
+        html.must_include  '<link rel="canonical" href="/foo/baz"/>'
+      end
+
+      it "won't translate segments not by separated by slashes" do
+        @rack = Rack::Rewritten::Url.new(@app) do
+          self.translate_partial = true
+        end
+        @app.expect :call, [200, {'Content-Type' => 'text/plain'},[""]], [Hash]
+        ret = @rack.call @env=request_url('/foo/bazzling')
+        @app.verify
+        @env['PATH_INFO'].must_equal '/foo/bazzling'
+      end
+
+      it "must carry on trail when redirecting" do
+        @rack = Rack::Rewritten::Url.new(@app) do
+          self.translate_partial = true
+        end
+        ret = @rack.call request_url('/foo/bar/with_tail', 'QUERY_STRING' => 'w=1')
+        @app.verify
+        ret[0].must_equal 301
+        ret[1]['Location'].must_equal "http://www.example.org/foo/baz/with_tail?w=1"
+      end
+
+    end
+
     describe "/ behavior" do
-      
+
       it "must 301 redirect paths with / in the end to their chomped version" do
         ret = @rack.call request_url('/foo/bar/')
         @app.verify
@@ -104,7 +169,7 @@ describe Rack::Rewritten::Url do
         ret[0].must_equal 200
       end
 
-      it "must redirect from resource url to nice url if enabled xxx" do
+      it "must redirect from resource url to nice url if enabled" do
         @rack = Rack::Rewritten::Url.new(@app) do
           self.translate_backwards = true
         end
@@ -148,7 +213,6 @@ describe Rack::Rewritten::Url do
 
     end
 
-
   end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rewritten
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Kai Rubarth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-namespace
@@ -153,6 +153,7 @@ files:
 - HISTORY.rdoc
 - README.md
 - Rakefile
+- afile
 - bin/rewritten-dump.rb
 - bin/rewritten-import.rb
 - bin/rewritten-web.rb
@@ -218,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rewritten
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A redis-based URL rewriting engine