http_redirect_test 0.1.0 → 0.1.1

data/lib/http_redirect_test/http_redirect_test.rb

@@ -3,51 +3,68 @@ require File.join(File.dirname(__FILE__), "resource_path")
 require 'test/unit'
 
 class HTTPRedirectTest < Test::Unit::TestCase
+  # permanent can be overriden in 2 ways, with a call to self.permanent to set globally. Or via the options array for each redirect call
+  @permanent=nil
 
   def default_test; end # placeholder to stop Test::Unit from complaining
 
-  def self.domain=(domain)
-    RedirectCheck.domain = domain
-  end
+  class <<self
+    def domain=(domain)
+      @domain = domain
+    end
 
-  def self.should_not_redirect(path)
-    class_eval <<-CODE
-      def test_#{name_for(path)}_should_not_redirect
-      check = RedirectCheck.new('#{path}')
-      assert_equal false, check.redirected?, "#{path} is redirecting"
-      assert_equal true, check.success?, "#{path} is not a success response"
-      end
-    CODE
-  end
+    def domain
+      @domain
+    end
 
-  def self.name_for(path)
-    name = path.gsub(/\W+/, '_')
-    name.gsub!(/^_+/, '')
-    name.gsub!(/_+$/, '')
-  
-    name = 'root' if name == ''
-  
-    name
-  end
+    def permanent=(permanent)
+      @permanent=permanent
+    end
+
+    def permanent?
+      @permanent.nil? ? false : true
+    end
+
+    def should_not_redirect(path)
+      class_eval <<-CODE
+        def test_#{name_for(path)}_should_not_redirect
+          check = RedirectCheck.new(self.class.domain, '#{path}')
+          assert_equal false, check.redirected?, "#{path} is redirecting"
+          assert_equal true, check.success?, "#{path} is not a success response"
+        end
+      CODE
+    end
+
+    def name_for(path)
+      name = path.gsub(/\W+/, '_')
+      name.gsub!(/^_+/, '')
+      name.gsub!(/_+$/, '')
+
+      name = 'root' if name == ''
+
+      name
+    end
+
+    def should_redirect(source, options)
+      source_path = ResourcePath.new(source, :param => 'subdir').to_s
+      destination_path = ResourcePath.new(options[:to], :param => 'subdir').to_s
+
+      @permanent = options.fetch(:permanent, true) if @permanent.nil?
+
+      class_eval <<-CODE
+        def test_#{name_for(source_path)}_should_redirect_to_#{name_for(destination_path)}
+          redirection = RedirectCheck.new(self.class.domain, '#{source_path}', '#{destination_path}')
+          assert_equal true, redirection.redirected?, "'#{source_path}' is not redirecting"
+          assert_equal '#{destination_path}', redirection.redirected_path,
+          "'#{source_path}' is not redirecting to '#{destination_path}'"
 
-  def self.should_redirect(source, options)
-    source_path = ResourcePath.new(source, :param => 'subdir').to_s
-    destination_path = ResourcePath.new(options[:to], :param => 'subdir').to_s
-  
-    permanent = options.fetch(:permanent, true)
-  
-    class_eval <<-CODE
-      def test_#{name_for(source_path)}_should_redirect_to_#{name_for(destination_path)}
-      redirection = RedirectCheck.new('#{source_path}', '#{destination_path}')
-      assert_equal true, redirection.redirected?, "'#{source_path}' is not redirecting"
-      assert_equal '#{destination_path}', redirection.redirected_path,
-      "'#{source_path}' is not redirecting to '#{destination_path}'"
-      if #{permanent}
-      assert_equal true, redirection.permanent_redirect?,
-      "The redirection from '#{source_path}' to '#{destination_path}' doesn't appear to be a permanent redirect"
-      end
-      end
-    CODE
+          if #{@permanent}
+            assert_equal true, redirection.permanent_redirect?,
+            "The redirection from '#{source_path}' to '#{destination_path}' doesn't appear to be a permanent redirect"
+          end
+        end
+      CODE
+    end
   end
 
-end
+end

data/lib/http_redirect_test/redirect_check.rb

@@ -1,45 +1,37 @@
 require 'uri'
 require 'net/http'
- 
+
 class RedirectCheck
-  
-  def self.domain=(domain)
-    @domain = domain
-  end
-  
-  def self.domain
-    @domain
-  end
-  
   attr_reader :source_path, :destination_path
- 
-  def initialize(source_path, destination_path = nil)
+
+  def initialize(domain, source_path, destination_path = nil)
+    @domain = domain
     @source_path = source_path.to_s
     @destination_path = destination_path.to_s
   end
- 
+
   def uri
-    URI.parse("http://#{self.class.domain}#{source_path}")
+    URI.parse("http://#{@domain}#{source_path}")
   end
- 
+
   def response
-    @response ||= Net::HTTP.start(uri.host, uri.port) {|http| http.head(uri.path) }
+    @response ||= Net::HTTP.start(uri.host, uri.port) {|http| return http.head(uri.path) }
   end
-  
+
   def success?
     response.is_a?(Net::HTTPOK)
   end
- 
+
   def redirected?
     response.is_a?(Net::HTTPRedirection)
   end
-  
+
   def permanent_redirect?
     redirected? && response.is_a?(Net::HTTPMovedPermanently)
   end
-  
+
   def redirected_path
     response['location'].sub(/#{Regexp.escape("#{uri.scheme}://#{uri.host}")}/, '') if redirected?
   end
- 
-end
+
+end

data/lib/http_redirect_test/resource_path.rb

@@ -1,18 +1,18 @@
 class ResourcePath
-  
+
   attr_writer :param
-  
+
   def initialize(path, options = {})
     @path = path
     @param = options[:param]
   end
-  
+
   def param
     @param ||= (0...8).map{65.+(rand(25)).chr}.join
   end
-  
+
   def to_s
     @path.gsub('*', param)
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: http_redirect_test
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Matt House
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-08 00:00:00 +01:00
+date: 2009-12-04 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -26,8 +26,10 @@ files:
 - lib/http_redirect_test/redirect_check.rb
 - lib/http_redirect_test/resource_path.rb
 - lib/http_redirect_test.rb
-has_rdoc: false
-homepage: http://github.com/shadowaspect
+has_rdoc: true
+homepage: http://github.com/shadowaspect/http_redirect_test
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -48,9 +50,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A subclass of Test::Unit::TestCase to allow for http redirect testing, packaged from a gist by Patrick Reagan of Viget Labs
 test_files: []