0
@@ -1,5 +1,7 @@
0
 * SVN *
0
 
0
+* NEW FEATURE: Redirections (see environment.rb)
0
+
0
 * Allow drag/drop reordering of sections in a site [Bill Katz]
0
 
0
 * Refine child_sections liquid filter, add descendant_sections filter [Cristi Balan]

0
@@ -12,6 +12,17 @@ class MephistoController < ApplicationController
0
   end
0
 
0
   protected
0
+    def dispatch_redirect
0
+      # @section is the http status
0
+      # @dispatch_path.first has the headers
0
+      if @dispatch_path.first.is_a?(Hash)
0
+        response.headers['Status'] = interpret_status @section
0
+        redirect_to @dispatch_path.first[:location]
0
+      else
0
+        head @section
0
+      end
0
+    end
0
+
0
     def dispatch_list
0
       @articles = @section.articles.find_by_date(:include => :user, :limit => @section.articles_per_page)
0
       self.cached_references << @section

0
@@ -52,3 +52,28 @@ require 'mephisto_init'
0
 # shouldn't need to set the host, it's set automatically
0
 UserMailer.default_url_options[:host] = 'localhost:3000'
0
 UserMailer.mail_from = 'webmaster@localhost'
0
+
0
+# OPTIONAL - Redirections
0
+# Deny a route by immediately returning a 404
0
+#
0
+#   Mephisto::Routing.deny 'articles/trackback/*' # return 404
0
+#
0
+# Specify multiple denied routes:
0
+# 
0
+#   Mephisto::Routing.deny 'articles/trackback/*', 'monkey/foo/*'
0
+#
0
+# Redirect elsewhere.  You can fill in variables marked by ? or * with variable names beginning with :
0
+#
0
+# Redirect /old/foo to /new/foo and /old/foo/bar to /new/foo/bar
0
+#
0
+#   Mephisto::Routing.redirect 'old/*' => 'new/$1'
0
+#
0
+# Redirect with a more specific set of variables
0
+#
0
+#   Mephisto::Routing.redirect 'article/?/?/?' => 'new/$2/$1/$3'
0
+#
0
+# Multiple redirections at a time
0
+#
0
+#   Mephisto::Routing.redirect \
0
+#     'old/*' => 'new/$1',
0
+#     'article/?/?/?' => 'new/$2/$1/$3'
0
\ No newline at end of file

0
@@ -6,6 +6,10 @@ module Mephisto
0
     def self.run(site, path)
0
       # check for any bad urls like /foo//bar
0
       return [:error, nil, *path] if path.any? &:blank?
0
+      
0
+      if args = Mephisto::Routing.handle_redirection(path * "/")
0
+        return [:redirect, *args]
0
+      end
0
 
0
       # check for permalink
0
       if options = recognize_permalink(site, path)

0
@@ -22,5 +22,57 @@ module Mephisto
0
       map.dispatch '*path', :controller => 'mephisto', :action => 'dispatch'
0
       map.home '', :controller => 'mephisto', :action => 'dispatch'
0
     end
0
+    
0
+    def self.redirections
0
+      @redirections ||= {}
0
+    end
0
+    
0
+    def self.deny(*paths)
0
+      paths.each do |path|
0
+        redirections[convert_redirection_to_regex(path)] = :deny
0
+      end
0
+    end
0
+    
0
+    def self.redirect(options)
0
+      options.each do |key, value|
0
+        redirections[convert_redirection_to_regex(key)] = sanitize_path(value)
0
+      end
0
+    end
0
+
0
+    def self.handle_redirection(path)
0
+      redirections.each do |pattern, action|
0
+        if match = pattern.match(path)
0
+          if action == :deny
0
+            return [:not_found]
0
+          else
0
+            return [:moved_permanently, {:location => build_destination(action.dup, match)}]
0
+          end
0
+        end
0
+      end
0
+      nil
0
+    end
0
+    
0
+    protected
0
+      def self.sanitize_path(path)
0
+        path =~ /^(\/)|(https?:\/\/)/ ? path : "/#{path.split("://").last}"
0
+      end
0
+      
0
+      def self.convert_redirection_to_regex(path)
0
+        path = path.split("://").last
0
+        path = path[1..-1] if path.starts_with('/')
0
+        path = Regexp.escape(path)
0
+        path.gsub! /\//, "\\/"
0
+        path.gsub! /(\\\*)|(\\\?$)/, "(.*)"
0
+        path.gsub! /\\\?/, "([^\\/]+)"
0
+        Regexp.new("^#{path}$")
0
+      end
0
+      
0
+      def self.build_destination(path, matches)
0
+        i = -1
0
+        path.gsub!(/\$\d+/) { |s| matches[s[1..-1].to_i] }
0
+        path.gsub!(/[^:]\/\//, &:first)
0
+        path.chomp!('/')
0
+        path
0
+      end
0
   end
0
 end
0
\ No newline at end of file

0
@@ -76,6 +76,17 @@ THEME_FILES = [
0
   'templates/single.liquid'
0
 ] unless Object.const_defined?(:THEME_FILES)
0
 
0
+Mephisto::Routing.redirections.clear
0
+Mephisto::Routing.deny 'limited_deny'
0
+Mephisto::Routing.deny 'deny/foo/*'
0
+Mephisto::Routing.deny 'deny/bar/?/?'
0
+Mephisto::Routing.redirect \
0
+  'redirect/from/*'           => 'to/here',
0
+  'redirect/match/wildcard/*' => 'this/$1',
0
+  'redirect/match/vars/?/?'   => 'this/$2/$1',
0
+  '/sanitize/path'            => 'foo://bar',
0
+  'redirect/external'         => 'http://external/$1/$2'
0
+
0
 class Test::Unit::TestCase
0
   self.use_transactional_fixtures = true
0
   self.use_instantiated_fixtures  = false

0
@@ -79,12 +79,48 @@ context "Dispatcher" do
0
     assert_dispatch :error, nil, '', 'foo', ['', 'foo']
0
   end
0
 
0
+  specify "should handle denied requests" do
0
+    %w(deny/foo/bar deny/foo/bar/baz limited_deny deny/bar/baz/blah).each { |path| assert_denied path }
0
+  end
0
+
0
+  specify "should redirect without variable matches" do
0
+    assert_redirected_to '/to/here', 'redirect/from/here'
0
+    assert_redirected_to '/bar',     'sanitize/path'
0
+  end
0
+  
0
+  specify "should redirect with unused variable matches" do
0
+    assert_redirected_to 'http://external', 'redirect/external'
0
+  end
0
+  
0
+  specify "should redirect with wildcard match" do
0
+    assert_redirected_to '/this/foo',     'redirect/match/wildcard/foo'
0
+    assert_redirected_to '/this/foo/bar', 'redirect/match/wildcard/foo/bar'
0
+  end
0
+
0
+  specify "should redirect and match multiple vars" do
0
+    assert_redirected_to '/this/bar/foo',     'redirect/match/vars/foo/bar'
0
+    assert_redirected_to '/this/bar/baz/foo', 'redirect/match/vars/foo/bar/baz'
0
+  end
0
+
0
   protected
0
     def assert_dispatch(dispatch_type, section, *args)
0
       path   = args.pop
0
       result = Mephisto::Dispatcher.run sites(:first), path
0
       assert_equal [dispatch_type, section, *args], result
0
     end
0
+
0
+    def assert_denied(path)
0
+      result = Mephisto::Dispatcher.run sites(:first), path.split('/')
0
+      assert_equal :redirect,  result.first
0
+      assert_equal :not_found, result.last
0
+    end
0
+
0
+    def assert_redirected_to(expected, path)
0
+      result = Mephisto::Dispatcher.run sites(:first), path.split('/')
0
+      assert_equal :redirect, result.shift
0
+      assert_equal :moved_permanently, result.first
0
+      assert_equal expected, result.last[:location]
0
+    end
0
 end
0
 
0
 context "Dispatcher Permalink Regular Expression" do