joshbuddy-rack-rewrite 0.0.3 → 0.0.4

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 3
+:patch: 4

data/lib/rack_rewrite/actions.rb

@@ -1,5 +1,4 @@
 require 'rack'
-require 'cgi'
 
 module Rack
   class Rewrite
@@ -17,7 +16,7 @@ module Rack
         env = @request.env
         env['QUERY_STRING'] = case params
         when Hash
-          params.inject([]) { |qs, (k, v)| qs << "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}"} * '&'
+          Rack::Utils.build_query(params)
         else
           params
         end

data/lib/rack_rewrite/condition_set.rb

@@ -13,7 +13,7 @@ module Rack
       def satisfied?(env)
         if conditions
       
-          uri_ok = conditions.key?(:uri) ? conditions[:uri] === env['PATH_INFO'] : true
+          uri_ok = conditions.key?(:path_info) ? conditions[:path_info] === env['PATH_INFO'] : true
           method_ok = conditions.key?(:method) ? conditions[:method] === env['REQUEST_METHOD'].downcase : true
           host_ok = conditions.key?(:host) ? conditions[:host] === env['HTTP_HOST'] : true
           port_ok = conditions.key?(:port) ? conditions[:port] === env['SERVER_PORT'].to_i : true

data/spec/conditions_spec.rb

@@ -8,7 +8,7 @@ describe "Rack::Rewrite Conditions" do
       env = Rack::MockRequest.env_for('/test', :method => method)
       app = mock('app')
       app.should_receive(:call).with(env).and_return([200, {}, ["body"]])
-      Rack::Rewrite.new(app) { on(:method => method) { pass } }.call(env)
+      Rack::Rewrite.new(app) { on(:method => method) { pass }; fail }.call(env)
     end
   end
   
@@ -16,7 +16,14 @@ describe "Rack::Rewrite Conditions" do
     env = Rack::MockRequest.env_for('/test', :method => 'get')
     app = mock('app')
     app.should_receive(:call).with(env).and_return([200, {}, ["body"]])
-    Rack::Rewrite.new(app) { on(:path_info => '/test') { pass } }.call(env)
+    Rack::Rewrite.new(app) { on(:path_info => '/test') { pass }; fail }.call(env)
+    proc { Rack::Rewrite.new(app) { on(:path_info => %r{^/test}) { pass }; fail }.call(Rack::MockRequest.env_for('/badtest', :method => 'get')) }.should raise_error
+  end
+
+  it "should fail on a simple path_info" do
+    env = Rack::MockRequest.env_for('/test', :method => 'get')
+    app = mock('app')
+    proc { Rack::Rewrite.new(app) { on(:path_info => %r{^/test}) { pass }; fail }.call(Rack::MockRequest.env_for('/badtest', :method => 'get')) }.should raise_error
   end
 
   it "should detect a param in the query string" do
@@ -24,7 +31,7 @@ describe "Rack::Rewrite Conditions" do
     app = mock('app')
     app.should_receive(:call).with(env).and_return([200, {}, ["body"]])
     Rack::Rewrite.new(app) { on(:params => {:test => 'helpme'}) { pass } }.call(env)
-    proc { Rack::Rewrite.new(app) { on(:params => {:test => 'helpme2'}) { pass } }.call(env) }.should raise_error
+    proc { Rack::Rewrite.new(app) { on(:params => {:test => 'helpme2'}) { pass }; fail }.call(env) }.should raise_error
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: joshbuddy-rack-rewrite
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Joshua Hull
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-04 00:00:00 -07:00
+date: 2009-05-18 00:00:00 -07:00
 default_executable: 
 dependencies: []