http_redirect_test 0.1.3 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 64f09a427c707013226be65e99ca2046031f4193
+  data.tar.gz: 92ecc2d00aab3052558edd3793ae522e1b947943
+SHA512:
+  metadata.gz: b6fde8b137000b1e2636c3cd3f6d9266413fe75831c60052409b00b980c2e44f770f7bfc1f2b413f01f91b19f3ed7f7cab436df52e72fec695e044f316014bb7
+  data.tar.gz: 8d56d9b74eb42a453218b1ba164009db22ae5ac95501e5df9e85192c9d770df7a5528ba7c738929f9f22a15cc4e70c9bcf28b2e6ecaf606cf17f291b62efe622

data/lib/http_redirect_test/http_redirect_test.rb

@@ -1,85 +1,72 @@
-require File.join(File.dirname(__FILE__), "redirect_check")
-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
+class HTTPRedirectTest < MiniTest::Test
   @permanent=nil
 
-  def default_test; end # placeholder to stop Test::Unit from complaining
-
-  class <<self
-    attr_accessor :domain
-    attr_writer :permanent
+  class << self
+    attr_reader :domain, :permanent
 
-    def permanent?
-      @permanent.nil? ? false : true
+    def set_domain(domain)
+      @domain = domain
     end
 
-    def name_for(path)
-      name = path.strip.gsub(/\W+/, '_')
-      name = 'root' if name == ''
-      name
+    def treat_all_redirects_as_permanent
+      @permanent = 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
+    def permanent?
+      !!@permanent
     end
+  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}'"
-
-          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
+  def should_not_redirect(path)
+    assert_equal false, check_for(path).redirected?, "#{path} is redirecting"
+    assert_equal true, check_for(path).success?, "#{path} is not a success response"
+  end
 
-    def should_be_gone(path)
-      class_eval <<-CODE
-        def test_#{name_for(path)}_should_be_gone
-          check = RedirectCheck.new(self.class.domain, '#{path}')
-          assert check.gone?
-        end
-      CODE
-    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
 
-    def should_not_be_found(path)
-      class_eval <<-CODE
-        def test_#{name_for(path)}_should_be_gone
-          check = RedirectCheck.new(self.class.domain, '#{path}')
-          assert check.not_found?
-        end
-      CODE
-    end
+    redirection = check_for(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 should_have_header(path, header, options)
-      value = options[:with_value]
-      class_eval <<-CODE
-        def test_should_return_value_for_#{name_for(header)}_header
-          check = RedirectCheck.new(self.class.domain, '#{path}')
-          assert_equal '#{value}', check.header('#{header}')
-        end
-      CODE
+    return if options[:permanent] == false
+
+    if permanent? || options[:permanent] == true
+      assert_equal true, redirection.permanent_redirect?,
+                   "The redirection from '#{source_path}' to '#{destination_path}' doesn't appear to be a permanent redirect"
     end
   end
 
+  def should_be_gone(path)
+    assert check_for(path).gone?
+  end
+
+  def should_not_be_found(path)
+    assert check_for(path).not_found?
+  end
+
+  def should_have_header(path, header, options)
+    value = options[:with_value]
+    assert_equal value, check_for(path).header(header)
+  end
+
+  private
+
+  def check_for(path, destination=nil)
+    RedirectCheck.new(self.class.domain, path, destination)
+  end
+
+  def permanent?
+    !!self.class.permanent
+  end
+
+  def name_for(path)
+    if path.empty?
+      'root'
+    else
+      path.strip.gsub(/\W+/, '_')
+    end
+  end
 end

data/lib/http_redirect_test/redirect_check.rb

@@ -11,7 +11,7 @@ class RedirectCheck
   end
 
   def uri
-    URI.parse("http://#{@domain}#{source_path}")
+    URI.parse("#{scheme}://#{raw_domain}#{source_path}")
   end
 
   def source_uri
@@ -19,7 +19,9 @@ class RedirectCheck
   end
 
   def response
-    @response ||= Net::HTTP.start(uri.host, uri.port) {|http| return http.head(source_uri) }
+    @response ||= Net::HTTP.start(uri.host, uri.port, use_ssl: ssl?) do |http|
+      return http.head(source_uri)
+    end
   end
 
   def success?
@@ -43,11 +45,32 @@ class RedirectCheck
   end
 
   def redirected_path
-    response['location'].sub(/#{Regexp.escape("#{uri.scheme}://#{uri.host}")}/, '') if redirected?
+    response['location'].sub(/#{Regexp.escape("#{uri.scheme}://#{uri.host}")}:#{uri.port}/, '') if redirected?
   end
 
   def header(name)
-    response.key?(name) && response.fetch(name)
+    response[name]
   end
 
+  private
+
+  def scheme
+    if domain_components.length == 2
+      scheme = domain_components.first
+    end
+
+    scheme || 'http'
+  end
+
+  def raw_domain
+    domain_components.last
+  end
+
+  def ssl?
+    scheme == 'https'
+  end
+
+  def domain_components
+    @domain_components ||= @domain.split('://')
+  end
 end

data/lib/http_redirect_test/resource_path.rb

@@ -1,5 +1,4 @@
 class ResourcePath
-
   attr_writer :param
 
   def initialize(path, options = {})
@@ -14,5 +13,4 @@ class ResourcePath
   def to_s
     @path.gsub('*', param)
   end
-
-end
+end

data/lib/http_redirect_test.rb

@@ -1 +1,7 @@
-require File.join(File.dirname(__FILE__), "http_redirect_test", "http_redirect_test")
+require 'minitest'
+require 'uri'
+require 'net/http'
+
+require 'http_redirect_test/redirect_check'
+require 'http_redirect_test/resource_path'
+require 'http_redirect_test/http_redirect_test'

data/test/integration_test.rb

@@ -0,0 +1,69 @@
+require 'http_redirect_test'
+
+class IntegrationTest < HTTPRedirectTest
+  set_domain "localhost:4567"
+
+  def test_not_redirect
+    should_not_redirect '/ok'
+  end
+
+  def test_should_redirect_non_permanantly
+    should_redirect '/redirect', to: '/ok'
+  end
+
+  def should_redirect_permanently
+    should_redirect '/redirect_permanant', to: '/ok', permanent: true
+  end
+
+  def test_should_not_be_found
+    should_not_be_found '/not_found'
+  end
+
+  def test_should_be_gone
+    should_be_gone '/gone'
+  end
+
+  def test_custom_header
+    should_have_header('/custom_header', 'X-One-Million-Years', with_value: 'Dungeon')
+  end
+end
+
+class AllRedirectsArePermanent < HTTPRedirectTest
+  set_domain "localhost:4567"
+  treat_all_redirects_as_permanent
+
+  def test_should_redirect
+    should_redirect '/redirect_permanant', to: '/ok'
+  end
+
+  def test_non_permanent_redirect_should_fail
+    assertion_failed = begin
+      should_redirect '/redirect', to: '/ok'
+      false
+        rescue MiniTest::Assertion
+      true
+    end
+
+    assert assertion_failed
+  end
+
+  def test_explicit_non_permanent_check_should_override
+    should_redirect '/redirect', to: '/ok', permanent: false
+  end
+end
+
+class DomainsWithExplicitSSLSchemes < HTTPRedirectTest
+  set_domain "https://uk.yahoo.com"
+
+  def test_should_not_redirect
+    should_not_redirect '/'
+  end
+end
+
+class DomainsWithExplicitNonSSLSchemes < HTTPRedirectTest
+  set_domain "http://www.example.com"
+
+  def test_should_not_redirect
+    should_not_redirect '/'
+  end
+end

data/test/test_app/test_redirect_server.rb

@@ -0,0 +1,28 @@
+require 'sinatra'
+
+get '/ok' do
+  status 200
+end
+
+get '/redirect' do
+  redirect '/ok'
+end
+
+get '/redirect_permanant' do
+  redirect '/ok', 301
+end
+
+get '/not_found' do
+  status 404
+end
+
+get '/gone' do
+  status 410
+end
+
+get '/custom_header' do
+  headers['X-One-Million-Years'] = 'Dungeon'
+  status 200
+end
+
+

data/test/test_helper.rb

@@ -1,5 +1,5 @@
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
+require 'minitest/autorun'
+
+require 'http_redirect_test'
+require 'mocha/mini_test'
 
-require 'rubygems'
-require 'test/unit'
-require 'mocha'

data/test/unit/http_redirect_test_test.rb

@@ -1,18 +1,19 @@
-require File.join(File.dirname(__FILE__), "..", "test_helper")
-require 'http_redirect_test'
+require 'test_helper'
 
-class HttpRedirectTestTests < Test::Unit::TestCase
+class HttpRedirectTestTests < MiniTest::Test
   def test_that_permanent_flag_is_being_set_correctly
     assert_equal false,  HTTPRedirectTest.permanent?
-    HTTPRedirectTest.permanent=true
+
+    HTTPRedirectTest.treat_all_redirects_as_permanent
+
     assert_equal true,  HTTPRedirectTest.permanent?
   end
 
   def test_each_class_should_have_its_own_domain
     a = Class.new(HTTPRedirectTest)
-    a.__send__(:domain=, "a.example.com")
+    a.set_domain "a.example.com"
     b = Class.new(HTTPRedirectTest)
-    b.__send__(:domain=, "b.example.com")
+    b.set_domain "b.example.com"
     assert_equal "a.example.com", a.__send__(:domain)
     assert_equal "b.example.com", b.__send__(:domain)
   end

data/test/unit/redirect_check_test.rb

@@ -1,10 +1,11 @@
-require File.join(File.dirname(__FILE__), "..", "test_helper")
-require 'http_redirect_test'
+require 'test_helper'
+require 'net/http'
 
+class RedirectCheckTest < MiniTest::Test
 
-class RedirectCheckTest < Test::Unit::TestCase
-
-  require 'net/http'
+  def test_redirect_check_supports_https
+    assert_equal 'https', RedirectCheck.new('https://www.example.com', '/dontcare').uri.scheme
+  end
 
   def test_that_redirect_checker_returns_legitimate_response
     stub_http_head_request(Net::HTTPOK)
@@ -66,15 +67,16 @@ private
     @http_head = response_type.new(stub, stub, stub)
     @http_session = stub(:session)
     @http_session.stubs(:head).with("/index.html").returns(@http_head)
-    Net::HTTP.stubs(:start).with("example.com", 80).yields(@http_session)
+    Net::HTTP.stubs(:start).with("example.com", 80, use_ssl: false).yields(@http_session)
   end
 
   def stub_http_header(header_name, value)
-    @http_head = Net::HTTPOK.new(stub, stub, stub)
-    @http_head.stubs(:key?).with(header_name).returns(true)
-    @http_head.stubs(:fetch).with(header_name).returns(value)
-    @http_session = stub(:session)
-    @http_session.stubs(:head).with("/index.html").returns(@http_head)
-    Net::HTTP.stubs(:start).with("example.com", 80).yields(@http_session)
+    http_head = Net::HTTPOK.new(stub, stub, stub)
+    http_head.initialize_http_header({ header_name => value })
+
+    http_session = stub(:session)
+    http_session.stubs(:head).with("/index.html").returns(http_head)
+
+    Net::HTTP.stubs(:start).with("example.com", 80, use_ssl: false).yields(http_session)
   end
 end

data/test/unit/resource_path_test.rb

@@ -1,11 +1,9 @@
-require File.join(File.dirname(__FILE__), "..", "test_helper")
-require 'http_redirect_test'
+require 'test_helper'
 
-class ResourcePathTest < Test::Unit::TestCase
+class ResourcePathTest < MiniTest::Test
 
   def test_that_resource_path_is_created_successfully
     rp = ResourcePath.new("")
     assert rp.instance_of? ResourcePath
   end
-
-end
+end

metadata

@@ -1,89 +1,109 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: http_redirect_test
-version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
+version: !ruby/object:Gem::Version
+  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - Matt House
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-21 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2010-10-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.3.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.3.5
+- !ruby/object:Gem::Dependency
   name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.3.0
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 9
-        - 5
-        version: 0.9.5
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.3.0
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.5
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.5
 description: 
 email: matt@eightbitraptor.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- lib/http_redirect_test.rb
 - lib/http_redirect_test/http_redirect_test.rb
 - lib/http_redirect_test/redirect_check.rb
 - lib/http_redirect_test/resource_path.rb
-- lib/http_redirect_test.rb
+- test/integration_test.rb
+- test/test_app/test_redirect_server.rb
 - test/test_helper.rb
 - test/unit/http_redirect_test_test.rb
 - test/unit/redirect_check_test.rb
 - test/unit/resource_path_test.rb
-has_rdoc: true
 homepage: http://github.com/eightbitraptor/http_redirect_test
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: Test Apache behavior using Test::Unit, based on a gist by Patrick Reagan of Viget Labs
+specification_version: 4
+summary: Test Apache behavior using Test::Unit, based on a gist by Patrick Reagan
+  of Viget Labs
 test_files: []
-