redirect 0.3.2 → 0.4.0

data/.gitignore

@@ -0,0 +1,4 @@
+*.gem
+.bundle
+Gemfile.lock
+pkg/*

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in redirect.gemspec
+gemspec

data/README.md

@@ -0,0 +1,63 @@
+# Redirect
+
+http://github.com/p8/redirect/tree/master
+
+## Description
+Redirect is a simple Ruby redirect DSL built on Rack.
+It's like a simple Ruby mod_rewrite, so you can write and test your redirects in Ruby.
+
+## Getting started
+- Install the gem `gem install redirect`
+- Create a new redirect rack app: `redirect_app my_redirect_app`
+- This creates a directory called `my_redirect_app` with the required files and tests.
+- Open `my_redirect_app/my_redirect_app.rb` in your favorite editor and add some redirect rules.
+
+To run the app locally just run the main rb file: `ruby my_redirect_app.rb`.
+
+## Defining redirects
+Redirects are processed in the same order as they are defined:
+
+    redirect  ['/catch_url', '/redirect_url'], ['/catch_url2', '/redirect_url2']
+
+The first one is evaluated first, then the next one, etc..              
+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 also pass extra options as follows:
+
+    :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 by specifying:
+
+    Redirect.default_code = 307
+
+All redirects with a name will be specified in the generated /sitemap.xml.
+
+## License
+
+(The MIT License)
+
+Copyright (c) 2009 Petrik de Heus
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,18 +1 @@
-# -*- ruby -*-
-
-require 'rubygems'
-require 'lib/redirect.rb'
-
-require 'hoe' rescue nil
-if defined? Hoe
-  Hoe.new('redirect', Redirect::VERSION) do |p|
-    p.developer('Petrik de Heus', 'FIX@example.com')
-    p.remote_rdoc_dir = '' # Release to root  
-  end
-end
-
-# require 'metric_fu'
-# 
-# MetricFu::Configuration.run do |config|
-#   config.coverage = { :test_files => ['spec/**/*_spec.rb'] }
-# end
+require 'bundler/gem_tasks'

data/autotest/discover.rb

@@ -0,0 +1 @@
+Autotest.add_discovery { "rspec2" }

data/lib/redirect.rb

@@ -1,110 +1,8 @@
-require 'rubygems'
+require 'redirect/version'
 require 'rack'
 require 'rack/showexceptions'
 require 'rack/request'
 require 'rack/response'
+require 'redirect/redirect'
+require 'redirect/app'
 
-module Redirect
-  VERSION = '0.3.2'
-  
-  def self.default_code= default_code
-    @default_code = default_code
-  end
-  
-  def self.default_code
-    @default_code ||= 301
-  end
-
-  def self.autorun= autorun
-    @autorun = autorun
-  end
-  
-  def self.autorun
-    @autorun = true unless @autorun == false
-    @autorun
-  end
-
-  def self.app= app
-    @app = app
-  end
-  
-  def self.app
-    @app
-  end
-  
-  class Data
-    attr_reader :catch_url, :redirect_url, :code, :name
-    def initialize(catch_url, redirect_url, options = {})
-      @catch_url = catch_url
-      @redirect_url = redirect_url
-      @code = options[:code] || Redirect.default_code
-      @name = options[:name]
-    end
-  end
-    
-end
-
-def redirect(*redirects)
-
-  Redirect.app = Rack::Redirect.new(*redirects)
-  if Redirect.autorun
-    Rack::Handler::WEBrick.run \
-      Rack::ShowExceptions.new(Rack::Lint.new(Redirect.app)),
-      :Port => 3000
-    run Redirect.app
-  end
-end
-
-module Rack
-
-  class Redirect
-    attr_reader :redirects
-    def initialize(*redirects)
-      @redirects = redirects.collect do |r|
-        ::Redirect::Data.new(*r)
-      end
-    end
-    
-    def call(env)
-      req = Request.new(env)
-      if req.fullpath == '/sitemap.xml'
-        return [200, {"Content-Type" => "text/xml"}, sitemap(req.host)]
-      end
-      if req.fullpath == '/' && index
-        return [200, {"Content-Type" => "text/html"}, index]
-      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 #{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"]
-    end
-   
-    def sitemap(host)
-      %(<?xml version="1.0" encoding="UTF-8"?>\n) +
-      %(<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">\n) +
-      @redirects.select{|r| r.name }.collect { |r|
-        %(<url>\n) +
-          %(<loc>http://#{host}#{r.redirect_url}</loc>\n) +
-        %(</url>\n)}.join +
-      %(</urlset>\n)
-    end
-    
-    def index
-      @index
-    end
-    
-    def index= index
-      @index = index
-    end
-    
-  end
-  
-end

data/lib/redirect/app.rb

@@ -0,0 +1,123 @@
+module Redirect
+
+  class App
+
+    class StaticFile
+      def initialize(path)
+        @path = path
+      end
+
+      def available?
+        expanded_path && expanded_path == path and File.file?(expanded_path)
+      end
+
+      def path
+        @path
+      end
+
+      def expanded_path
+        @static_file_expanded_path ||= File.expand_path(path)
+      end
+
+    end
+
+    attr_reader :redirects
+    attr_accessor :public_dir
+
+    def initialize(*redirects)
+      @redirects = redirects.collect do |r|
+        Data.new(*r)
+      end
+    end
+
+    def call(env)
+      @env = env
+      @request = Rack::Request.new(env)
+      if static_file.available?
+        return static_response
+      end
+      if request.fullpath == '/sitemap.xml'
+        return sitemap_response
+      end
+      if request.fullpath == '/' && index_file.available?
+        return index_response
+      end
+      @redirects.each do |r|
+        if r.matches?(request.fullpath)
+          return redirects_response(r)
+        end
+      end
+      not_found_response
+    end
+
+    def public_dir
+      @public_dir ||= 'public'
+    end
+
+    private
+      def env
+        @env
+      end
+
+      def request
+        @request
+      end
+
+      def index_response
+        send_file(index_file.expanded_path)
+      end
+
+      def index_file
+        @index_file ||= StaticFile.new(File.join(public_dir_path, 'index.html'))
+      end
+
+      def public_dir_path
+        @public_dir_path ||= File.expand_path(public_dir)
+      end
+
+      def not_found_response
+        [404, {"Content-Type" => "text/html"}, ["not found"]]
+      end
+
+      def redirects_response(r)
+        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}"]]
+      end
+
+      def send_file(path, opts={})
+        # if opts[:type] or not response['Content-Type']
+          # content_type ::File.extname(path), :default => 'application/octet-stream'
+        # end
+        # last_modified opts[:last_modified] if opts[:last_modified]
+        file = Rack::File.new public_dir_path
+        file.path = path
+        file.serving env
+      rescue Errno::ENOENT
+        not_found_response
+      end
+
+      def sitemap_response
+        [200, {"Content-Type" => "text/xml"}, [sitemap(request.host)]]
+      end
+
+      def sitemap(host)
+        %(<?xml version="1.0" encoding="UTF-8"?>\n) +
+        %(<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">\n) +
+        @redirects.select{|r| r.name }.collect { |r|
+          %(<url>\n) +
+            %(<loc>http://#{host}#{r.redirect_url}</loc>\n) +
+          %(</url>\n)}.join +
+        %(</urlset>\n)
+      end
+
+      def static_file
+        @static_file ||= StaticFile.new(public_dir_path + URI.unescape(request.path_info))
+      end
+
+      def static_response
+        send_file static_file.expanded_path
+      end
+
+  end
+end

data/lib/redirect/redirect.rb

@@ -0,0 +1,63 @@
+module Redirect
+
+  def self.default_code= default_code
+    @default_code = default_code
+  end
+
+  def self.default_code
+    @default_code ||= 301
+  end
+
+  def self.autorun= autorun
+    @autorun = autorun
+  end
+
+  def self.autorun
+    @autorun = true unless @autorun == false
+    @autorun
+  end
+
+  def self.app= app
+    @app = app
+  end
+
+  def self.app
+    @app
+  end
+
+  class Data
+    attr_reader :catch_url, :code, :match, :name
+    def initialize(catch_url, redirect_url, options = {})
+      @catch_url = catch_url
+      @redirect_url = redirect_url
+      @code = options[:code] || Redirect.default_code
+      @name = options[:name]
+    end
+
+    def matches?(url)
+      matched = url.match(catch_url)
+      @match = $1
+      matched
+    end
+
+    def redirect_url
+      if @match
+        @redirect_url.gsub('$1', @match)
+      else
+        @redirect_url
+      end
+    end
+  end
+
+end
+
+def redirect(*redirects)
+
+  Redirect.app = Redirect::App.new(*redirects)
+  if Redirect.autorun
+    Rack::Handler::WEBrick.run \
+      Rack::ShowExceptions.new(Rack::Lint.new(Redirect.app)),
+      :Port => 3000
+    run Redirect.app
+  end
+end

data/lib/redirect/test.rb

@@ -5,7 +5,8 @@ class Test::Unit::TestCase
 
   def assert_redirects(from, to)
     res = Rack::MockRequest.new(APP[:redirect_app]).get(from)
-    assert_equal(res.headers, { 'Location' => to, 'Content-Type' => 'text/html' })
+    assert_equal to,          res.headers['Location'    ]
+    assert_equal 'text/html', res.headers['Content-Type']
   end
 
 end
@@ -14,4 +15,4 @@ APP = {}
 
 def redirect(*redirects)
   APP[:redirect_app] = Rack::Redirect.new(*redirects)
-end
+end

data/lib/redirect/version.rb

@@ -0,0 +1,3 @@
+module Redirect
+  VERSION = "0.4.0"
+end

data/redirect.gemspec

@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "redirect/version"
+
+Gem::Specification.new do |s|
+  s.authors     = ["Petrik de Heus"]
+  s.default_executable = %q{redirect_app}
+  s.name        = "redirect"
+  s.version     = Redirect::VERSION
+  s.email       = ["FIX@email.com"]
+  s.homepage    = "http://github.com/p8/redirect/tree/master"
+  s.summary     = %q{Redirect is a simple Ruby redirect DSL build on Rack}
+  s.description = %q{Redirect is a simple Ruby redirect DSL build on Rack. It's like a simple Ruby mod_rewrite, so you can write and test your redirects in Ruby.}
+
+  s.rubyforge_project = "redirect"
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_dependency 'rack', '~> 1.3', '>= 1.3.4'
+  s.add_development_dependency "rspec"
+end

data/spec/fixtures/private

@@ -0,0 +1 @@
+hidden

data/spec/fixtures/public/index.html

@@ -0,0 +1,5 @@
+<html>
+  <body>
+    Hello
+  </body
+</html>

data/spec/helper.rb

@@ -1,7 +1,7 @@
-require 'rubygems'
-require 'test/unit'
-require 'test/spec'
-require 'mocha'
+# require 'rubygems'
+# require 'test/unit'
+# require 'test/spec'
+# require 'mocha'
 
 $:.unshift File.dirname(File.dirname(__FILE__)) + "/lib"
-require 'redirect'
+require 'redirect'

data/spec/rack_spec.rb

@@ -1,110 +1,206 @@
 require File.dirname(__FILE__) + '/helper'
 
-describe "Rack::Redirect" do
-
-  it "should show 404 not found with if no redirect exists" do
-    @app = Rack::Redirect.new()
-    res = Rack::MockRequest.new(@app).get("/test")
-
-    res.not_found?.should be_true
-    res["Content-Type"].should == "text/html"
-    res.body.should == "not found"
-  end
-  
-  it "should show index if no redirect exists but index does" do
-    @app = Rack::Redirect.new()
-    @app.index = "index"
-    res = Rack::MockRequest.new(@app).get("/")
-    # res.not_found?.should be_true
-    res["Content-Type"].should == "text/html"
-    res.body.should == "index"
-  end  
-  
-  it "should redirect '/' if redirect exists" do
-    @app = Rack::Redirect.new(['/', '/test'])
-    res = Rack::MockRequest.new(@app).get('/')
-    res.headers.should == { 'Location' => '/test', 'Content-Type' => 'text/html' }
-    res.body.should == 'Redirecting to: /test'
-  end  
-  
-  it "should show sitemap.xml" do
-    @app = Rack::Redirect.new(['/', '/test', {:name => 'test'}])
-    res = Rack::MockRequest.new(@app).get('/sitemap.xml')
-    res.headers.should == {'Content-Type' => 'text/xml' }
-    res.body.should == %(<?xml version="1.0" encoding="UTF-8"?>\n) +
-    %(<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">\n) +
-    %(<url>\n) +
-      %(<loc>http://example.org/test</loc>\n) +
-      %(</url>\n) +
-    %(</urlset>\n)
-  end
-  
-  it "should show sitemap.xml only for named redirects" do
-    @app = Rack::Redirect.new(['/', '/test', {:name => 'test'}], ['/a', '/hidden'])
-    res = Rack::MockRequest.new(@app).get('/sitemap.xml')
-    res.body.should == %(<?xml version="1.0" encoding="UTF-8"?>\n) +
-    %(<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">\n) +
-    %(<url>\n) +
-      %(<loc>http://example.org/test</loc>\n) +
-      %(</url>\n) +
-    %(</urlset>\n)
-  end  
-  
-  it "should redirect if redirect exists" do
-    @app = Rack::Redirect.new(['/old/2008', '/2008-new'])
-    res = Rack::MockRequest.new(@app).get('/old/2008')
-    res.headers.should == { 'Location' => '/2008-new', 'Content-Type' => 'text/html' }
-    res.body.should == 'Redirecting to: /2008-new'
-  end
-
-  it "should redirect for a regular_expression" do
-    @app = Rack::Redirect.new(['^/old', '/new'])
-    res = Rack::MockRequest.new(@app).get('/old/2008')
-    res.headers.should == { 'Location' => '/new', 'Content-Type' => 'text/html' }
-    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')
-    res.headers.should == { 'Location' => '/new2', 'Content-Type' => 'text/html' }
-    res.body.should == 'Redirecting to: /new2'
-  end
-
-  it "should turn redirects array into Redirect Objects" do
-    @app = Rack::Redirect.new(['^/old3', '/new', {:code => 307}], ['^/old2', '/new2', {:name => 'test'}])
-    res = Rack::MockRequest.new(@app).get("/test")
-
-    res.not_found?.should be_true
-    res["Content-Type"].should == "text/html"
-    res.body.should == "not found"
+describe "Redirect::App" do
+
+  describe "/" do
+    context "no redirect matches" do
+      it "returns a 404 if no index exists" do
+        @app = Redirect::App.new
+        get '/'
+        status.should == 404
+        res["Content-Type"].should == "text/html"
+        body.should == "not found"
+      end
+
+      it "returns a index.html if it exists" do
+        @app = Redirect::App.new
+        @app.public_dir = 'spec/fixtures/public'
+        get '/'
+        status.should == 200
+        body.should == File.read('spec/fixtures/public/index.html')
+      end
+    end
+
+    context "a redirect matches" do
+      it "should redirect '/' if redirect exists" do
+        @app = Redirect::App.new(['/', '/test'])
+        get '/'
+        headers['Location'].should == '/test'
+        headers['Content-Type'].should == 'text/html'
+        body.should == 'Redirecting to: /test'
+      end
+    end
+  end
+
+  describe "/sitemap.xml" do
+    it "returns the sitemap xml" do
+      @app = Redirect::App.new(['/', '/test', {:name => 'test'}])
+      get '/sitemap.xml'
+      headers['Content-Type'].should == 'text/xml'
+      body.should == %(<?xml version="1.0" encoding="UTF-8"?>\n) +
+      %(<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">\n) +
+      %(<url>\n) +
+        %(<loc>http://example.org/test</loc>\n) +
+        %(</url>\n) +
+      %(</urlset>\n)
+    end
+
+    it "ignores unnamed redirects" do
+      @app = Redirect::App.new(['/a', '/hidden'])
+      get('/sitemap.xml')
+      body.should == %(<?xml version="1.0" encoding="UTF-8"?>\n) +
+      %(<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">\n) +
+      %(</urlset>\n)
+    end
+  end
+
+  describe "static files" do
+    before do
+      @app = Redirect::App.new
+      @app.public_dir = 'spec/fixtures/public'
+    end
+
+    it "serves GET requests for files in the public directory" do
+      get "/index.html"
+      status.should == 200
+      body.should == File.read('spec/fixtures/public/index.html')
+      headers['Content-Length'].should == '43'
+      headers.should include('Last-Modified')
+    end
+
+    it "ignores GET request up the public directory" do
+      get "/../private"
+      status.should == 404
+    end
+
+    it "ignores GET request with .." do
+      get "/../public/index.html"
+      status.should == 404
+    end
+
+    it "ignores GET requests for dirs in the public directory" do
+      get "/dir"
+      status.should == 404
+    end
+  end
+
+  describe "404" do
+    it "shows 404 not found if no redirect exists" do
+      @app = Redirect::App.new
+      get("/test")
+      res.not_found?.should be_true
+      headers["Content-Type"].should == "text/html"
+      body.should == "not found"
+    end
+  end
+
+  describe "redirect" do
+    context "basic redirect" do
+      let(:res) do
+        @app = Redirect::App.new(['/old/2008', '/index.html'])
+        get('/old/2008')
+      end
+
+      it "sets the content-type header to text/html" do
+        headers['Content-Type'].should == 'text/html'
+      end
+
+      it "sets the Location header to text/html" do
+        headers['Location'].should == '/index.html'
+      end
+
+      it "sets the body to redirecting text/html" do
+        body.should == 'Redirecting to: /index.html'
+      end
+    end
+
+    it "renders the redirect if available" do
+      @app = Redirect::App.new(['/old/2008', '/index.html'])
+      @app.public_dir = 'spec/fixtures/public'
+      get '/index.html'
+      # status.should == 200
+      body.should == File.read('spec/fixtures/public/index.html')
+    end
+
+    it "redirects a regular_expression" do
+      @app = Redirect::App.new(['^/old', '/new'])
+      @app.public_dir = 'spec/fixtures/public'
+      get '/old/2008'
+      headers['Location'].should == '/new'
+    end
+
+    it "redirects a regular_expression with arguments" do
+      @app = Redirect::App.new([/old\/(.*)/, '/new/$1'])
+      get '/old/2008/02/14'
+      headers['Location'].should == '/new/2008/02/14'
+    end
+
+    it "redirects to the first match" do
+      @app = Redirect::App.new(['^/old2', '/new'], ['^/old2', '/new2'])
+      get '/old2008'
+      headers['Location'].should == '/new'
+    end
+
+    it "should turn redirects array into Redirect Objects" do
+      @app = Redirect::App.new(['^/old3', '/new', {:code => 307}], ['^/old2', '/new2', {:name => 'test'}])
+      get "/test"
+      res.not_found?.should be_true
+      headers["Content-Type"].should == "text/html"
+      body.should == "not found"
+    end
   end
 
+  describe "#initialize" do
+    it "raises an error if a catch_url matches a redirect_url" #do
+      # Redirect::App.new(['^/old', 'new'], ['^/new', 'old'])
+    # end
+  end
+
+  describe "#public_dir" do
+    it "defaults to public" do
+      Redirect::App.new.public_dir.should == 'public'
+    end
+  end
+
+  def body
+    res.body
+  end
+
+  def get url
+    @res = Rack::MockRequest.new(@app).get(url)
+  end
+
+  def headers
+    res.headers
+  end
+
+  def res
+    @res
+  end
+
+  def status
+    res.status
+  end
 end
 
 describe "Redirect::Data" do
-  it "should turn an array into an Object" do
-    data = Redirect::Data.new('^/old3', '/new', {:code => 307, :name => 'test'})
-    data.catch_url.should == '^/old3'
-    data.redirect_url.should == '/new'
-    data.code.should == 307    
-    data.name.should == 'test'
-  end
-  
-  it "should turn an dafault array into an Object" do
-    data = Redirect::Data.new('^/old3', '/new')
-    data.catch_url.should == '^/old3'
-    data.redirect_url.should == '/new'
-    data.code.should == 301
-    data.name.should == nil
-  end  
+  describe "#initialize" do
+    it "turns an default array into a redirect object" do
+      data = Redirect::Data.new('^/old3', '/new')
+      data.catch_url.should == '^/old3'
+      data.redirect_url.should == '/new'
+      data.code.should == 301
+      data.name.should == nil
+    end
+
+    it "turns an array into a redirect object" do
+      data = Redirect::Data.new('^/old3', '/new', {:code => 307, :name => 'test'})
+      data.catch_url.should == '^/old3'
+      data.redirect_url.should == '/new'
+      data.code.should == 307
+      data.name.should == 'test'
+    end
+  end
 end
 
 describe "Redirect" do
@@ -113,25 +209,31 @@ describe "Redirect" do
     Redirect.app = nil
     Redirect.autorun = true
   end
-  
-  it "Should be able to configure the default http code" do
-    data = Redirect::Data.new('/a', '/b')
-    data.code.should == 301    
-    Redirect.default_code = 307
-    data = Redirect::Data.new('/a', '/b')
-    data.code.should == 307
-  end
-  
-  it "Should be able to set app" do
-    Redirect.app.should == nil
-    Redirect.app = 'a'
-    Redirect.app.should == 'a'
-  end  
-
-  it "Should be able to set autorun" do
-    Redirect.autorun.should == true
-    Redirect.autorun = false
-    Redirect.autorun.should == false
-  end  
-  
-end
+
+  describe ".default_code" do
+    it "overwrites default http redirect code" do
+      data = Redirect::Data.new('/a', '/b')
+      data.code.should == 301
+      Redirect.default_code = 307
+      data = Redirect::Data.new('/a', '/b')
+      data.code.should == 307
+    end
+  end
+
+  describe ".app" do
+    it "sets app" do
+      Redirect.app.should == nil
+      Redirect.app = 'a'
+      Redirect.app.should == 'a'
+    end
+  end
+
+  describe ".autorun" do
+    it "sets autorun" do
+      Redirect.autorun.should == true
+      Redirect.autorun = false
+      Redirect.autorun.should == false
+    end
+  end
+
+end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: redirect
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors: 
 - Petrik de Heus
@@ -9,68 +10,94 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-03 00:00:00 +01:00
-default_executable: 
+date: 2011-12-27 00:00:00 +01:00
+default_executable: redirect_app
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: rack
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.3"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.3.4
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.3
-    version: 
+        version: "0"
+  type: :development
+  version_requirements: *id002
 description: Redirect is a simple Ruby redirect DSL build on Rack. It's like a simple Ruby mod_rewrite, so you can write and test your redirects in Ruby.
 email: 
-- FIX@example.com
+- FIX@email.com
 executables: 
 - redirect_app
 extensions: []
 
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
+extra_rdoc_files: []
+
 files: 
+- .gitignore
+- Gemfile
 - History.txt
 - Manifest.txt
-- README.txt
+- README.md
 - Rakefile
+- autotest/discover.rb
 - bin/redirect_app
 - example.rb
 - example.ru
 - lib/redirect.rb
+- lib/redirect/app.rb
+- lib/redirect/redirect.rb
 - lib/redirect/test.rb
+- lib/redirect/version.rb
+- redirect.gemspec
+- spec/fixtures/private
+- spec/fixtures/public/index.html
 - spec/helper.rb
 - spec/rack_spec.rb
 has_rdoc: true
 homepage: http://github.com/p8/redirect/tree/master
+licenses: []
+
 post_install_message: 
-rdoc_options: 
-- --main
-- README.txt
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: redirect
-rubygems_version: 1.3.1
+rubygems_version: 1.5.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Redirect is a simple Ruby redirect DSL build on Rack
-test_files: []
-
+test_files: 
+- spec/fixtures/private
+- spec/fixtures/public/index.html
+- spec/helper.rb
+- spec/rack_spec.rb

data/README.txt

@@ -1,70 +0,0 @@
-= Redirect
-
-http://github.com/p8/redirect/tree/master
-
-== DESCRIPTION:
-
-Redirect is a simple Ruby redirect DSL build on Rack.
-It's like a simple Ruby mod_rewrite, so you can write and test your redirects in Ruby.
-
-== GETTING STARTED:
-
-From the commandline run:
-
-  redirect_app PROJECT_NAME
-
-This create a directory PROJECT_NAME with the required files and tests.
-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..
-
-  redirect  ['/catch_url', '/redirect_url'],
-            ['/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:
-  
-  Redirect.default_code = 307
-
-A sitemap.xml is generated for all redirects that have a name.
-
-== LICENSE:
-
-(The MIT License)
-
-Copyright (c) 2009 Petrik de Heus
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.