rack-rewrite 1.2.0 → 1.2.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-rewrite (1.1.0)
+    rack-rewrite (1.2.1)
 
 GEM
   remote: http://rubygems.org/

data/History.rdoc

@@ -1,4 +1,8 @@
-=== 1.2.0 / 2011-09--20
+=== 1.2.1 / 2011-09-20
+* Maintenance
+  * Use Rack::Request to match the host
+
+=== 1.2.0 / 2011-09-20
 * API
   * :headers option to send additional headers with the response
 

data/README.rdoc

@@ -13,7 +13,7 @@ can get away with rack-rewrite instead of writing Apache mod_rewrite rules.
 
 === Sample rackup file
   
-  gem 'rack-rewrite', '~> 1.2.0'
+  gem 'rack-rewrite', '~> 1.2.1'
   require 'rack/rewrite'
   use Rack::Rewrite do
     rewrite '/wiki/John_Trupiano', '/john'
@@ -23,8 +23,7 @@ can get away with rack-rewrite instead of writing Apache mod_rewrite rules.
   end
 
 === Sample usage in a rails app
-  config.gem 'rack-rewrite', '~> 1.2.0'
-  require 'rack/rewrite'
+
   config.middleware.insert_before(Rack::Lock, Rack::Rewrite) do
     rewrite '/wiki/John_Trupiano', '/john'
     r301 '/wiki/Yair_Flicker', '/yair'

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/lib/rack/rewrite/rule.rb

@@ -128,13 +128,14 @@ module Rack
         
         def match_options?(env, path = build_path_from_env(env))
           matches = []
-          
+          request = Rack::Request.new(env)
+
           # negative matches
           matches << !string_matches?(path, options[:not]) if options[:not]
           
           # possitive matches
           matches << string_matches?(env['REQUEST_METHOD'], options[:method]) if options[:method]
-          matches << string_matches?(env['SERVER_NAME'], options[:host]) if options[:host]
+          matches << string_matches?(request.host, options[:host]) if options[:host]
           
           matches.all?
         end

data/test/rule_test.rb

@@ -180,11 +180,19 @@ class RuleTest < Test::Unit::TestCase
       end
       
       should 'match PATH_INFO of /features and HOST of testapp.com' do
-        assert @rule.matches?(rack_env_for("/features", 'SERVER_NAME' => 'testapp.com'))
+        assert @rule.matches?(rack_env_for("/features", 'SERVER_NAME' => 'testapp.com', "SERVER_PORT" => "8080"))
       end
       
       should 'not match PATH_INFO of /features and HOST of nottestapp.com' do
-        assert ! @rule.matches?(rack_env_for("/features", 'SERVER_NAME' => 'nottestapp.com'))
+        assert ! @rule.matches?(rack_env_for("/features", 'SERVER_NAME' => 'nottestapp.com', "SERVER_PORT" => "8080"))
+      end
+
+      should 'match PATH_INFO of /features AND HTTP_X_FORWARDED_HOST of testapp.com and SERVER_NAME of 127.0.0.1' do
+        assert @rule.matches?(rack_env_for("/features", "SERVER_NAME" => "127.0.0.1", "SERVER_PORT" => "8080", "HTTP_X_FORWARDED_HOST" => "testapp.com"))
+      end
+
+      should 'not match PATH_INFO of /features AND HTTP_X_FORWARDED_HOST of nottestapp.com and SERVER_NAME of 127.0.0.1' do
+        assert !@rule.matches?(rack_env_for("/features", "SERVER_NAME" => "127.0.0.1", "SERVER_PORT" => "8080", "HTTP_X_FORWARDED_HOST" => "nottestapp.com"))
       end
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-rewrite
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156177220 !ruby/object:Gem::Requirement
+  requirement: &2153125460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.10
   type: :development
   prerelease: false
-  version_requirements: *2156177220
+  version_requirements: *2153125460
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2156176760 !ruby/object:Gem::Requirement
+  requirement: &2153125000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 2.10.2
   type: :development
   prerelease: false
-  version_requirements: *2156176760
+  version_requirements: *2153125000
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2156200620 !ruby/object:Gem::Requirement
+  requirement: &2153148840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 0.9.7
   type: :development
   prerelease: false
-  version_requirements: *2156200620
+  version_requirements: *2153148840
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2156200240 !ruby/object:Gem::Requirement
+  requirement: &2153148460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156200240
+  version_requirements: *2153148460
 description: A rack middleware for enforcing rewrite rules. In many cases you can
   get away with rack-rewrite instead of writing Apache mod_rewrite rules.
 email: jtrupiano@gmail.com