scorched 0.17 → 0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ad267343b4c7040dda32f6c394418bf9494dbcf
-  data.tar.gz: e8161cbafa5becf64f73ee970ac247a2ed43ef5f
+  metadata.gz: cc448b9aca2411bb1687c2981fb9ba8d9f75429c
+  data.tar.gz: 66c20180446fd507f019c645d87cad07b2098f1c
 SHA512:
-  metadata.gz: d8184c8ba998ffc82d2292b089fccbb0ce60e9e6c89e35679b0e8a14121ff3da46ad338cb33296b0139a98ba4fe226228d83387f34f1f424567f8620c26a1278
-  data.tar.gz: 723fd6f62103871197a99b39912677ebff7c4bc77d1e3cf707efc842e948da8c79aa4c8806cefe0cdc88d843c6aa9df89ea4e804bb54cf5e54f0c786606db194
+  metadata.gz: 2f48eea992d507bd058115c412b37c3c7e86697fad098d9be60872d983307e868cf0fd55d0f74b0d564c6c7c6fa22f745fa715e1382cbd966b5a208fa1ce6421
+  data.tar.gz: 3cb2c849244e1a3316689d62575e524d5a2aa77aa77a7109bad7f836777187dfd544d30f475e562fb5bfc5018543dc2b1b1280ca3b06833d17e51dd668e8751c

data/CHANGES.md

@@ -1,6 +1,9 @@
 Changelog
 =========
 
+### v0.18
+* Redirects now use a 303 or 302 HTTP status code by default, depending on HTTP version (similar logic to Sinatra). Trailing slash redirects (triggered by :strip_trailing_slash) still uses a 307 status.
+
 ### v0.17
 * Fixes an issue introduced in v0.16 where joining `SCRIPT_NAME` and `PATH_INFO` would sometimes produce a path with two forward slashes, and a related issue where `PATH_INFO` would sometimes be missing a leading forward slash when it should have had one.
 * Mappings are now sorted by the best matching `media type` in addition to the existing logic that included definition order and priority. This required that mappings be sorted at request-time rather than at the time they're mapped. Note, because of limitations of `rack-accept`, this doesn't completely respect the HTTP spec when it comes to prioritising which media type to serve for a given request. Full support for the HTTP spec is intended for a future release.

data/docs/02_fundamentals/04_requests_and_responses.md

@@ -34,4 +34,4 @@ If a target passes a request, the request is still considered _unmatched_ or _un
 
 Redirections
 ------------
-A common requirement of many applications is to redirect requests to another URL based on some kind of condition. Scorched offers the very simple `redirect` method which takes one required argument - the URL to redirect to - and an optional response status, which defaults to 307 (temporary redirect). `redirect` is mostly a convenience method. It sets the _Location_ header of the response before halting the request.
+A common requirement of many applications is to redirect requests to another URL based on some kind of condition. Scorched offers the very simple `redirect` method which takes one required argument - the absolute or relative URL to redirect to - and an optional response status, which defaults to either 303 or 302 depending on the HTTP protocol version used for the request.

data/lib/scorched/controller.rb

@@ -257,7 +257,7 @@ module Scorched
       begin
         catch(:halt) do
           if config[:strip_trailing_slash] == :redirect && request.path =~ %r{./$}
-            redirect(request.path.chomp('/'))
+            redirect(request.path.chomp('/'), 307)
           end
           eligable_matches = matches.reject { |m| m.failed_condition }
           pass if config[:auto_pass] && eligable_matches.empty?
@@ -344,7 +344,7 @@ module Scorched
       invert ? !retval : !!retval
     end
     
-    def redirect(url, status = 307)
+    def redirect(url, status = (env['HTTP_VERSION'] == 'HTTP/1.1') ? 303 : 302)
       response['Location'] = url
       halt(status)
     end

data/lib/scorched/version.rb

@@ -1,3 +1,3 @@
 module Scorched
-  VERSION = '0.17'
+  VERSION = '0.18'
 end

data/spec/controller_spec.rb

@@ -631,6 +631,33 @@ module Scorched
       end
     end
     
+    describe 'redirecting' do
+      it "redirects using 303 or 302 by default, depending on HTTP version" do
+        app.get('/cat') { redirect '/dog' }
+        response = rt.get('/cat', {}, 'HTTP_VERSION' => 'HTTP/1.1')
+        response.status.should == 303
+        response.location.should == '/dog'
+        response = rt.get('/cat', {}, 'HTTP_VERSION' => 'HTTP/1.0')
+        response.status.should == 302
+        response.location.should == '/dog'
+      end
+      
+      it "allows the HTTP status to be overridden" do
+        app.get('/') { redirect '/somewhere', 308 }
+        rt.get('/').status.should == 308
+      end
+      
+      it "halts the request after redirect" do
+        var = false
+        app.get('/') do
+          redirect '/somewhere'
+          var = true
+        end
+        rt.get('/')
+        var.should == false
+      end
+    end
+    
     describe "passing" do
       it "invokes the next match" do
         app.get('/') { response.body << 'hello'; pass }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scorched
 version: !ruby/object:Gem::Version
-  version: '0.17'
+  version: '0.18'
 platform: ruby
 authors:
 - Tom Wardrop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-12 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack