p8-redirect 0.1.0 → 0.3.0

data/History.txt

@@ -1,3 +1,16 @@
+=== 0.3.0 / 2009-02-24
+
+* 1 major enhancement
+
+  * Added reuse of match patterns
+    [/old\/(.*)/, '/new/$1']  # /old/2008/02/01 will be redirected to /new/2008/02/01
+
+=== 0.2.0 / 2009-02-22
+
+* 1 major enhancement
+
+  * Added a generator method
+  
 === 0.1.0 / 2009-02-22
 
 * 1 major enhancement

data/Manifest.txt

@@ -2,6 +2,7 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
+bin/redirect_app
 example.rb
 example.ru
 lib/redirect.rb

data/README.txt

@@ -6,17 +6,36 @@ http://github.com/p8/redirect/tree/master
 
 Redirect is a simple Ruby redirect DSL build on Rack
 
-== EXAMPLE
+== GETTING STARTED
 
-Create a file and pass an array to the redirect method:
+From the commandline run:
+
+  redirect_app PROJECT_NAME
+
+This create a directory PROJECT_NAME with the required files.
+PROJECT_NAME.rb contains the main logic.
+
+To locally run the app you can do:  
+
+  ruby PROJECT_NAME.rb
+
+== REDIRECTS
+
+The first one is evaluated first, then the next one, etc..
 
-  require 'redirect'
   redirect  ['/catch_url', '/redirect_url'],
-            ['/catch_url2', '/redirect_url2', {:code => 307, :name => 'redirect link'}],  
-            ['^/some_regexp', '/all']
-            
-The catch_url can be a regular expression.
-You can overwrite the http code (defaults is 301) in the options and pass a name for the sitemap.
+            ['/catch_url2', '/redirect_url2']
+              
+The catch_url can be a regular expression:
+
+  ['^/some_regexp', '/all']
+  [/old\/(.*)/, '/new/$1']  # /old/2008/02/01 will be redirected to /new/2008/02/01
+
+You can pass extra options.
+ :code # Overwrite the http code (defaults is 301) in the options
+ :name # named redirects are public so they'll appear in you sitemap
+
+  ['/catch_url', '/redirect_url', {:code => 307, :name => 'redirect link'}]
 
 The default redirect code can be changed:
   

data/bin/redirect_app

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+require 'fileutils'
+project = ARGV.first
+FileUtils.mkdir_p(project, :verbose => false) unless File.directory?(project)
+
+# create application
+open("#{project}/#{project}.rb", "w") do |f|
+  f.puts %(require 'rubygems'\n) +
+    %(require 'redirect'\n\n) +
+    %(redirect  ['/old_url', '/new_url', {:code => 307, :name => 'test'}],\n) +
+    %(      ['^/some_regexp', '/all'])
+end
+
+# create config
+open("#{project}/config.ru", "w") do |f|
+  f.puts %(require 'rubygems'\n) +
+    %(require 'redirect'\n\n) +
+    %(Redirect.autorun = false\n\n) +
+    %(require '#{project}.rb'\n\n) +
+    %(run Redirect.app)
+end

data/example.rb

@@ -1,4 +1,5 @@
 require 'lib/redirect'
 
 redirect  ['/old_url', '/new_url', {:code => 307, :name => 'test'}],
-          ['^/some_regexp', '/all']
+          [/old\/(.*)/, '/new/$1'],
+          ['^/some_regexp', '/all'],

data/lib/redirect.rb

@@ -5,7 +5,7 @@ require 'rack/request'
 require 'rack/response'
 
 module Redirect
-  VERSION = '0.1.0'
+  VERSION = '0.3.0'
   
   def self.default_code= default_code
     @default_code = default_code
@@ -75,9 +75,13 @@ module Rack
       end      
       @redirects.each do |r|
         if req.fullpath.match(r.catch_url)
+          redirect_url = r.redirect_url
+          if $1
+            redirect_url.gsub!('$1', $1)
+          end
           puts "Match found for #{r.catch_url}."
-          puts "Redirecting to #{r.redirect_url}"
-          return [r.code, {"Location" => r.redirect_url, "Content-Type" => "text/html"}, "Redirecting to: #{r.redirect_url}"]
+          puts "Redirecting to #{redirect_url}"
+          return [r.code, {"Location" => redirect_url, "Content-Type" => "text/html"}, "Redirecting to: #{redirect_url}"]
         end
       end
       [404, {"Content-Type" => "text/html"}, "not found"]

data/spec/rack_spec.rb

@@ -64,6 +64,13 @@ describe "Rack::Redirect" do
     res.body.should == 'Redirecting to: /new'
   end
 
+  it "should redirect for a regular_expression with rewrite" do
+    @app = Rack::Redirect.new([/old\/(.*)/, '/new/$1'])
+    res = Rack::MockRequest.new(@app).get('/old/2008/02/14')
+    res.headers.should == { 'Location' => '/new/2008/02/14', 'Content-Type' => 'text/html' }
+    res.body.should == 'Redirecting to: /new/2008/02/14'
+  end
+
   it "should allow multiple redirects" do
     @app = Rack::Redirect.new(['^/old3', '/new'], ['^/old2', '/new2'])
     res = Rack::MockRequest.new(@app).get('/old2008')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: p8-redirect
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Petrik de Heus
@@ -9,15 +9,15 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-22 00:00:00 -08:00
-default_executable: 
+date: 2009-02-24 00:00:00 -08:00
+default_executable: redirect_app
 dependencies: []
 
 description: Redirect is a simple Ruby redirect DSL build on Rack
 email: 
 - FIX@example.com
-executables: []
-
+executables: 
+- redirect_app
 extensions: []
 
 extra_rdoc_files: 
@@ -29,6 +29,7 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
+- bin/redirect_app
 - example.rb
 - example.ru
 - lib/redirect.rb