rewritten 0.3.3 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0c3f8baf622f9b4ce4351475c13fc1dc0eb73d86
+  data.tar.gz: 0afcf0f5c164bbae531c82692702305818cee956
+SHA512:
+  metadata.gz: efb7ccf5dfa9d2b060c97960a677da421651dcc7ed6ba91f12d8373754d7bd6e4c682e8234106ea3ac4fd91af0dbab92bc950e7d44de08b8067d4afb2440d2a6
+  data.tar.gz: 0380009037fce092fabab01e3fbf902521513fe52470f8f0158313ba4c4c118c57eb88735db61d6b35c5e3fbe7d6b46ec5fc203bbc383be3ffaf0c50e44a0202

data/lib/rack/url.rb

@@ -6,8 +6,10 @@ module Rack
 
     class Url
 
-      def initialize(app, options = {})
+      def initialize(app, &block)
         @app = app
+
+        self.instance_eval(&block) if block_given?
       end
 
       def call(env)
@@ -15,9 +17,10 @@ module Rack
 
         subdomain = env["SUBDOMAIN"] ? "#{env["SUBDOMAIN"]}:" : ""
 
-        if to = ::Rewritten.redis.get("from:#{subdomain}#{req.path_info}")
-          current_path = ::Rewritten.list_range("to:#{to}", -1, 1)  
+        if to = ::Rewritten.includes?("#{subdomain}#{req.path_info}")
+          current_path = ::Rewritten.get_current_translation(to)
           current_path = current_path.split(":").last
+
           if current_path == req.path_info
             # if this is the current path, rewrite path and parameters
             tpath, tparams = split_to_path_params(to)
@@ -26,13 +29,15 @@ module Rack
             @app.call(req.env) 
           else
             # if this is not the current path, redirect to current path
-            r = Rack::Response.new
             # 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 << '?' << env["QUERY_STRING"] unless (env["QUERY_STRING"]||'').empty?
 
             r.redirect(new_path, 301)
             a = r.finish
@@ -47,6 +52,16 @@ module Rack
         [path, Rack::Utils.parse_query(query_string)] 
       end
 
+
+      private
+      
+      def add_translation(from,to)
+        ::Rewritten.redis = :test unless ::Rewritten.redis == :test
+        ::Rewritten.add_translation(from, to)
+      end
+
+
+      
     end
   end
 

data/lib/rewritten/version.rb

@@ -1,4 +1,4 @@
 module Rewritten
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end
 

data/lib/rewritten.rb

@@ -34,6 +34,9 @@ module Rewritten
       @redis = Redis::Namespace.new(namespace, :redis => redis)
     when Redis::Namespace
       @redis = server
+    when :test
+      @redis = :test
+      @static_translations = {}
     else
       @redis = Redis::Namespace.new(:rewritten, :redis => server)
     end
@@ -126,10 +129,14 @@ module Rewritten
   #
 
   def add_translation(from, to)
-    redis.set("from:#{from}", to)
-    redis.lpush(:froms, from) 
-    redis.lpush(:tos, to) 
-    redis.rpush("to:#{to}", from) 
+    if @redis == :test
+      @static_translations[from] = to
+    else
+      redis.set("from:#{from}", to)
+      redis.lpush(:froms, from) 
+      redis.lpush(:tos, to) 
+      redis.rpush("to:#{to}", from) 
+    end
   end
 
   def add_translations(to, froms)
@@ -158,9 +165,21 @@ module Rewritten
   end
 
   def get_current_translation(path)
-    translation = Rewritten.list_range("to:#{path}", -1)  
-    return translation if translation
-    return path
+    if @redis == :test
+
+      translations = @static_translations.select{|k,v| v == path}
+
+      if translations.size > 0
+        return translations.keys.last
+      else
+        return path
+      end
+
+    else
+      translation = Rewritten.list_range("to:#{path}", -1)  
+      return translation if translation
+      return path
+    end
   end
 
 
@@ -174,8 +193,12 @@ module Rewritten
     Rewritten.redis.smembers("hits").map{|e| decode(e)}
   end
 
-  def include?(path)
-    Rewritten.redis.get("from:#{path}")
+  def includes?(path)
+    if @redis == :test
+      @static_translations[path]        
+    else
+      Rewritten.redis.get("from:#{path}")
+    end
   end
 
   #

data/rewritten.gemspec

@@ -22,6 +22,10 @@ Gem::Specification.new do |s|
   s.add_dependency "sinatra",         ">= 0.9.2"
   s.add_dependency "multi_json",      "~> 1.0"
 
+  s.add_development_dependency "rake"
+  s.add_development_dependency "minitest"
+  s.add_development_dependency "pry"
+
   s.description = <<description
     Rewritten is a lookup-based rewriting engine that rewrites requested
     URLs on the fly. The URL manipulations depend on translations found in

data/test/rewritten_url_test.rb

@@ -0,0 +1,89 @@
+require 'rewritten'
+require 'rack/mock'
+require 'minitest/autorun'
+require 'pry'
+
+describe Rack::Rewritten::Url do
+
+  def call_args(overrides={})
+    {'HTTP_HOST' => 'www.example.org',
+      'REQUEST_URI' => '/foo/with/params',
+      'SCRIPT_INFO'=> '',
+      'PATH_INFO' => '/foo/with/params',
+      'QUERY_STRING' => '',
+      'rack.input' => '',
+      'rack.url_scheme' => 'http'}.merge(overrides)
+  end
+
+  describe "redirection behavior" do
+
+    before {
+      @app = MiniTest::Mock.new
+
+      @rack = Rack::Rewritten::Url.new(@app) do
+        add_translation '/foo/bar', '/products/1'
+        add_translation '/foo/baz', '/products/1'
+        add_translation '/foo/with/params', '/products/2?w=1'
+      end
+    }
+
+    it "must not redirect if there are no entries" do
+      @app.expect :call, [200, {'Content-Type' => 'text/plain'},[""]], [Hash]
+      @rack.call(call_args)
+      @app.verify
+    end
+
+    it "must 301 redirect to latest translation" do
+      ret = @rack.call( call_args.merge('REQUEST_URI' => '/foo/bar', 'PATH_INFO' => '/foo/bar' ))
+      @app.verify
+      ret[0].must_equal 301
+      ret[1]['Location'].must_equal "http://www.example.org/foo/baz"
+    end
+
+    it "must keep the query parameters in the 301 redirect" do
+      ret = @rack.call( call_args.merge('REQUEST_URI' => '/foo/bar', 'PATH_INFO' => '/foo/bar', 'QUERY_STRING' => 'w=1' ))
+      @app.verify
+      ret[0].must_equal 301
+      ret[1]['Location'].must_equal "http://www.example.org/foo/baz?w=1"
+    end
+
+
+    it "must stay on latest translation" do
+      @app.expect :call, [200, {'Content-Type' => 'text/plain'},[""]], [Hash]
+      ret = @rack.call( call_args.merge('REQUEST_URI' => '/foo/baz', 'PATH_INFO' => '/foo/baz' ))
+      @app.verify
+      ret[0].must_equal 200
+    end
+
+  end
+
+
+  describe "the env" do
+
+    before {
+      @initial_args = call_args.dup
+      @rack = Rack::Rewritten::Url.new(lambda{|env| [200, {}, [""]]})
+    }
+
+    it "must set PATH_INFO to /products/2" do
+      @rack.call(@initial_args)
+      @initial_args['PATH_INFO'].must_equal "/products/2" 
+    end
+
+    it "must set QUERY_STRING to w=1" do
+      @rack.call(@initial_args)
+      @initial_args['QUERY_STRING'].must_equal 'w=1'
+    end
+
+    it "must merge QUERY parameters" do
+      @initial_args.merge!('QUERY_STRING' => 's=1')
+      @rack.call(@initial_args)
+      @initial_args['QUERY_STRING'].split('&').sort.must_equal ['s=1', 'w=1']
+    end
+
+  end
+
+
+
+end
+

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: rewritten
 version: !ruby/object:Gem::Version
-  version: 0.3.3
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Kai Rubarth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-03 00:00:00.000000000 Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vegas
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,23 +41,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,22 +62,69 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-description: ! "    Rewritten is a lookup-based rewriting engine that rewrites requested\n
-  \   URLs on the fly. The URL manipulations depend on translations found in\n    a
-  redis database.\n\n    If a matching translation is found, the result of a request
-  is either a\n    redirection or a modification of path and request parameters. For
-  URLs\n    without translation entries the request is left unmodified.\n\n    Rewritten
-  takes larges parts from the Resque codebase (which rocks). The\n    gem is compromised
-  of four parts:\n\n    1. A Ruby library for creating, modifying and querying translations\n
-  \   2. A Sinatra app for displaying and managing translations\n    3. A Rack app
-  for rewriting and redirecting request (Rack::Rewritten::Url)\n    4. A Rack app
-  for substituting URLs in HTML pages with their current translation (Rack::Rewritten::Html)\n
-  \   5. A Rack app for recording successful request (Rack::Rewritten::Record)\n"
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: |2
+      Rewritten is a lookup-based rewriting engine that rewrites requested
+      URLs on the fly. The URL manipulations depend on translations found in
+      a redis database.
+
+      If a matching translation is found, the result of a request is either a
+      redirection or a modification of path and request parameters. For URLs
+      without translation entries the request is left unmodified.
+
+      Rewritten takes larges parts from the Resque codebase (which rocks). The
+      gem is compromised of four parts:
+
+      1. A Ruby library for creating, modifying and querying translations
+      2. A Sinatra app for displaying and managing translations
+      3. A Rack app for rewriting and redirecting request (Rack::Rewritten::Url)
+      4. A Rack app for substituting URLs in HTML pages with their current translation (Rack::Rewritten::Html)
+      5. A Rack app for recording successful request (Rack::Rewritten::Record)
 email:
 - kai@doxter.de
 executables:
@@ -137,29 +176,29 @@ files:
 - lib/rewritten/version.rb
 - lib/test.ru
 - rewritten.gemspec
+- test/rewritten_url_test.rb
 - test/test_rewritten.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rewritten
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A redis-based URL rewriting engine
 test_files: []