redirect 0.0.4 → 0.1.0

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.1.0 / 2009-02-22
+
+* 1 major enhancement
+
+  * Works properly with rackup now
+  
 === 0.0.4 / 2009-02-21
 
 * 1 minor bug fix

data/Manifest.txt

@@ -3,6 +3,7 @@ Manifest.txt
 README.txt
 Rakefile
 example.rb
+example.ru
 lib/redirect.rb
 spec/helper.rb
 spec/rack_spec.rb

data/README.txt

@@ -16,7 +16,7 @@ Create a file and pass an array to the redirect method:
             ['^/some_regexp', '/all']
             
 The catch_url can be a regular expression.
-You can overwrite the default 301 http code in the options.
+You can overwrite the http code (defaults is 301) in the options and pass a name for the sitemap.
 
 The default redirect code can be changed:
   

data/Rakefile

@@ -10,9 +10,9 @@ if defined? Hoe
     p.remote_rdoc_dir = '' # Release to root  
   end
 end
-# 
+
 # require 'metric_fu'
 # 
 # MetricFu::Configuration.run do |config|
-#   config.coverage = { :test_files => ['test/**/test_*.rb'] }
+#   config.coverage = { :test_files => ['spec/**/*_spec.rb'] }
 # end

data/example.ru

@@ -0,0 +1,7 @@
+require 'lib/redirect'
+
+Redirect.autorun = false
+
+require 'example.rb'
+
+run Redirect.app

data/lib/redirect.rb

@@ -5,7 +5,32 @@ require 'rack/request'
 require 'rack/response'
 
 module Redirect
-  VERSION = '0.0.4'
+  VERSION = '0.1.0'
+  
+  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
@@ -16,24 +41,18 @@ module Redirect
       @name = options[:name]
     end
   end
-  
-  def self.default_code= default_code
-    @default_code = default_code
-  end
-  
-  def self.default_code
-    @default_code ||= 301
-  end
     
 end
 
 def redirect(*redirects)
 
-  app = Rack::Redirect.new(*redirects)
-  Rack::Handler::WEBrick.run \
-    Rack::ShowExceptions.new(Rack::Lint.new(app)),
-    :Port => 3000
-  run app
+  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

data/spec/rack_spec.rb

@@ -103,6 +103,8 @@ end
 describe "Redirect" do
   after do
     Redirect.default_code = 301
+    Redirect.app = nil
+    Redirect.autorun = true
   end
   
   it "Should be able to configure the default http code" do
@@ -113,4 +115,16 @@ describe "Redirect" do
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: redirect
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors: 
 - Petrik de Heus
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-21 00:00:00 +01:00
+date: 2009-02-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,6 +39,7 @@ files:
 - README.txt
 - Rakefile
 - example.rb
+- example.ru
 - lib/redirect.rb
 - spec/helper.rb
 - spec/rack_spec.rb