Merge pull request #263 from orien/ruby-3.1

Format cookie `Expires` timestamps as per RFC 2616

Author: 0x1eef

.github/workflows/test.yml

@@ -9,20 +9,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby_version: ["2.3.8", "2.4.5", "2.5.3", "2.6.3", "2.7.2"]
+        ruby_version: ["2.3", "2.4", "2.5", "2.6", "2.7", "3.0", "3.1"]
         experimental: [false]
         include:
-          - ruby_version: "3.0"
+          - ruby_version: "3.2"
             experimental: true
           - ruby_version: "ruby-head"
             experimental: true
-          - ruby_version: "jruby-head"
-            experimental: true
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby_version }}
-      - run: "bundle install"
+          bundler-cache: true
       - run: "bundle exec rspec spec/ -b"

lib/webmachine/cookie.rb

@@ -102,10 +102,12 @@ def to_s
 
     private
 
+    # Format timestamps for the 'Expires' portion of the cookie string, as per RFC 2822 and 2616.
+    #
+    # @see https://www.rfc-editor.org/rfc/rfc2616#section-3.3.1
+    # @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Expires
     def rfc2822(time)
-      wday = Time::RFC2822_DAY_NAME[time.wday]
-      mon = Time::RFC2822_MONTH_NAME[time.mon - 1]
-      time.strftime("#{wday}, %d-#{mon}-%Y %H:%M:%S GMT")
+      time.strftime('%a, %d %b %Y %T GMT')
     end
 
     if URI.respond_to?(:decode_www_form_component) and defined?(::Encoding)

spec/webmachine/cookie_spec.rb

@@ -60,7 +60,7 @@
         expect(str).to include "Path=/"
         expect(str).to include "Version=1"
         expect(str).to include "Max-Age=60"
-        expect(str).to include "Expires=Sun, 14-Mar-2010 03:14:00 GMT"
+        expect(str).to include "Expires=Sun, 14 Mar 2010 03:14:00 GMT"
       end
     end
   end