roda 3.19.0 → 3.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 930b16a28e9acd91a802b03248b36f940ee50f22b387e2e6839b34513b181c19
-  data.tar.gz: ff504ecc1d793e7af9180742204e219e26838f2187c0538241e2c240d57d4ad9
+  metadata.gz: bce3cf55fdec3d303d3d78b6e190046b38619e9ab296b63575962864535339e5
+  data.tar.gz: 874904308a03694809bd777c406ed94e1cefcc11bb9d7e748dd860a22c853d18
 SHA512:
-  metadata.gz: 472f855ac1ea091a973d5396dd5950147cdee2f72fa4692233e0acca033ed989ad3d7c7aa338c053058b070efaa151de4b40ad475a9a14e70a32a21e81fe0f3c
-  data.tar.gz: bc8c7417ec1922531a2a535b57ca3528fe0de9731df0aaed520d9e3df22263fa96f23eadf2313284a8f03af3e77addafaf45c1fc0061e3795e01b3dd18024922
+  metadata.gz: 0c08ac192ce7a3609b968404e4a3bf232ad7d12d1e70ed3e0c3306fea13ddf91bbf746bff47ec746acfc3481c5bfbaed3d7916dbf44c88c9b7f4d8855be64358
+  data.tar.gz: c3e6e9d50efc13dcd202379a76fef8ad6305c29f38954c8ed340ce7bd274b0ffe792cecb69a8ec0ea37aebc0d9fe1aeda16ea87d50f0f8892c1d805121f635ee

data/CHANGELOG

@@ -1,3 +1,7 @@
+= 3.20.0 (2019-05-16)
+
+* Set Content-Length header to 0 for empty 205 responses (jeremyevans)
+
 = 3.19.0 (2019-04-12)
 
 * Allow assets plugin :timestamp_paths option to be a string to specify a custom separator (jeremyevans)

data/doc/release_notes/3.20.0.txt

@@ -0,0 +1,7 @@
+= Improvements
+
+* For empty responses with status code 205, a Content-Length header
+  is now added with a value of 0, for better conformance to RFC 7232.
+
+  Similarly, when using the drop_body plugin, responses with status
+  code 205 now have a Content-Length header added with a value of 0.

data/lib/roda.rb

@@ -1312,8 +1312,11 @@ WARNING
 
           if b.empty?
             s = @status || 404
-            if (s == 304 || s == 204 || s == 205 || (s >= 100 && s <= 199))
+            if (s == 304 || s == 204 || (s >= 100 && s <= 199))
               h.delete("Content-Type")
+            elsif s == 205
+              h.delete("Content-Type")
+              h["Content-Length"] = '0'
             else
               h["Content-Length"] ||= '0'
             end

data/lib/roda/plugins/drop_body.rb

@@ -6,22 +6,31 @@ class Roda
     # The drop_body plugin automatically drops the body and
     # Content-Type/Content-Length headers from the response if
     # the response status indicates that the response should
-    # not include a body (response statuses 100, 101, 102, 204, 205,
-    # and 304).
+    # not include a body (response statuses 100, 101, 102, 204,
+    # and 304).  For response status 205, the body and Content-Type
+    # headers are dropped, but the Content-length header is set to
+    # '0' instead of being dropped.
     module DropBody
       module ResponseMethods
         DROP_BODY_STATUSES = [100, 101, 102, 204, 205, 304].freeze
+        RodaPlugins.deprecate_constant(self, :DROP_BODY_STATUSES)
 
         # If the response status indicates a body should not be
         # returned, use an empty body and remove the Content-Length
         # and Content-Type headers.
         def finish
           r = super
-          if DROP_BODY_STATUSES.include?(r[0])
+          case r[0]
+          when 100, 101, 102, 204, 304
             r[2] = EMPTY_ARRAY
             h = r[1]
             h.delete("Content-Length")
             h.delete("Content-Type")
+          when 205
+            r[2] = EMPTY_ARRAY
+            h = r[1]
+            h["Content-Length"] = '0'
+            h.delete("Content-Type")
           end
           r
         end

data/lib/roda/version.rb

@@ -4,7 +4,7 @@ class Roda
   RodaMajorVersion = 3
 
   # The minor version of Roda, updated for new feature releases of Roda.
-  RodaMinorVersion = 19
+  RodaMinorVersion = 20
 
   # The patch version of Roda, updated only for bug fixes from the last
   # feature release.

data/spec/plugin/drop_body_spec.rb

@@ -7,12 +7,16 @@ describe "drop_body plugin" do
       response.write('a')
     end
 
-    [101, 102, 204, 205, 304].each do  |i|
+    [101, 102, 204, 304].each do  |i|
       body(i.to_s).must_equal ''
       header('Content-Type', i.to_s).must_be_nil
       header('Content-Length', i.to_s).must_be_nil
     end
 
+    body('205').must_equal ''
+    header('Content-Type', '205').must_be_nil
+    header('Content-Length', '205').must_equal '0'
+
     body('200').must_equal 'a'
     header('Content-Type', '200').must_equal 'text/html'
     header('Content-Length', '200').must_equal '1'

data/spec/plugin/sinatra_helpers_spec.rb

@@ -8,7 +8,6 @@ describe "sinatra_helpers plugin" do
   end
 
   def status_app(code, &block)
-    #code += 2 if [204, 205, 304].include? code
     block ||= proc{}
     sin_app do |r|
       status code

data/spec/response_spec.rb

@@ -65,14 +65,26 @@ describe "response #finish" do
     header('Content-Length').must_equal '1'
   end
 
-  it "should not set Content-Type header on a 204 response" do
+  [204, 304, 100].each do |status|
+    it "should not set Content-Type or Content-Length header on a #{status} response" do
+      app do |r|
+        response.status = status
+        throw :halt, response.finish
+      end
+
+      header('Content-Type').must_be_nil
+      header('Content-Length').must_be_nil
+    end
+  end
+
+  it "should not set Content-Type header on a 205 response, but should set a Content-Length header" do
     app do |r|
-      response.status = 204
+      response.status = 205
       throw :halt, response.finish
     end
 
     header('Content-Type').must_be_nil
-    header('Content-Length').must_be_nil
+    header('Content-Length').must_equal '0'
   end
 
   it "should not overwrite existing status" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda
 version: !ruby/object:Gem::Version
-  version: 3.19.0
+  version: 3.20.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-12 00:00:00.000000000 Z
+date: 2019-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -216,6 +216,7 @@ extra_rdoc_files:
 - doc/release_notes/3.17.0.txt
 - doc/release_notes/3.18.0.txt
 - doc/release_notes/3.19.0.txt
+- doc/release_notes/3.20.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -271,6 +272,7 @@ files:
 - doc/release_notes/3.18.0.txt
 - doc/release_notes/3.19.0.txt
 - doc/release_notes/3.2.0.txt
+- doc/release_notes/3.20.0.txt
 - doc/release_notes/3.3.0.txt
 - doc/release_notes/3.4.0.txt
 - doc/release_notes/3.5.0.txt