Merge pull request #266 from castle/bumps/09-07-2024

bumps 09-07-2024
castle · Jul 10, 2024 · 74df9a4 · 74df9a4
2 parents 089fcb1 + 9e36ba8
commit 74df9a4
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 41 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2.1
 aliases:
   - &coditsu
     docker:
-      - image: cimg/ruby:3.2
+      - image: cimg/ruby:3.3
     steps:
       - setup_remote_docker
       - checkout
@@ -33,6 +33,9 @@ aliases:
   - &ruby-3_2
     docker:
       - image: cimg/ruby:3.2
+  - &ruby-3_3
+    docker:
+      - image: cimg/ruby:3.3
   - &job-defaults
     steps:
       - checkout
@@ -64,6 +67,10 @@ jobs:
     <<: *ruby-3_2
     <<: *rails-7
     <<: *job-defaults
+  ruby-3_3-rails-7:
+    <<: *ruby-3_3
+    <<: *rails-7
+    <<: *job-defaults
 workflows:
   main:
     jobs:
@@ -75,3 +82,4 @@ workflows:
       - ruby-3_0-rails-7
       - ruby-3_1-rails-7
       - ruby-3_2-rails-7
+      - ruby-3_3-rails-7
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.7.7
+3.3.4
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -6,54 +6,69 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.1)
-      public_suffix (>= 2.0.2, < 6.0)
-    appraisal (2.4.1)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    appraisal (2.5.0)
       bundler
       rake
       thor (>= 0.14.0)
+    bigdecimal (3.1.8)
     byebug (11.1.3)
-    coveralls_reborn (0.25.0)
-      simplecov (>= 0.18.1, < 0.22.0)
-      term-ansicolor (~> 1.6)
-      thor (>= 0.20.3, < 2.0)
-      tins (~> 1.16)
-    crack (0.4.5)
+    coveralls_reborn (0.28.0)
+      simplecov (~> 0.22.0)
+      term-ansicolor (~> 1.7)
+      thor (~> 1.2)
+      tins (~> 1.32)
+    crack (1.0.0)
+      bigdecimal
       rexml
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     docile (1.4.0)
-    hashdiff (1.0.1)
-    public_suffix (5.0.1)
+    hashdiff (1.1.0)
+    mize (0.4.1)
+      protocol (~> 2.0)
+    protocol (2.0.0)
+      ruby_parser (~> 3.0)
+    public_suffix (6.0.0)
+    racc (1.8.0)
     rack (3.0.11)
-    rake (13.0.6)
-    rexml (3.2.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.1)
+    rake (13.2.1)
+    rexml (3.3.1)
+      strscan
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.1)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    simplecov (0.21.2)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    ruby_parser (3.21.1)
+      racc (~> 1.5)
+      sexp_processor (~> 4.16)
+    sexp_processor (4.17.2)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
+    strscan (3.1.0)
     sync (0.5.0)
-    term-ansicolor (1.7.1)
+    term-ansicolor (1.10.2)
+      mize
       tins (~> 1.0)
-    thor (1.2.1)
-    timecop (0.9.6)
-    tins (1.32.1)
+    thor (1.3.1)
+    timecop (0.9.10)
+    tins (1.33.0)
+      bigdecimal
       sync
-    webmock (3.18.1)
+    webmock (3.23.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -74,4 +89,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.3.26
+   2.5.11
diff --git a/spec/integration/rails/rails_spec.rb b/spec/integration/rails/rails_spec.rb
@@ -24,8 +24,8 @@
             'Accept' =>
               'text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5',
             'Authorization' => true,
-            'Content-Length' => '0',
             'Cookie' => true,
+            'Content-Length' => '0',
             'Host' => 'www.example.com',
             'X-Forwarded-For' => '5.5.5.5, 1.2.3.4',
             'Remote-Addr' => '127.0.0.1',
@@ -40,7 +40,7 @@
       }
     end
     let(:now) { Time.now }
-    let(:headers) { { 'HTTP_AUTHORIZATION' => 'Basic 123', 'HTTP_X_FORWARDED_FOR' => '5.5.5.5, 1.2.3.4' } }
+    let(:headers) { { 'HTTP_AUTHORIZATION' => 'Basic 123', 'HTTP_X_FORWARDED_FOR' => '5.5.5.5, 1.2.3.4', 'HTTP_VERSION' => 'HTTP/1.0', 'HTTP_CONTENT_LENGTH' => '0' } }
 
     before do
       Timecop.freeze(now)

diff --git a/spec/lib/castle/client_spec.rb b/spec/lib/castle/client_spec.rb
@@ -9,7 +9,8 @@
       '/',
       'HTTP_USER_AGENT' => ua,
       'HTTP_X_FORWARDED_FOR' => ip,
-      'HTTP_COOKIE' => "__cid=#{cookie_id};other=efgh"
+      'HTTP_COOKIE' => "__cid=#{cookie_id};other=efgh",
+      'HTTP_CONTENT_LENGTH' => '0'
     )
   end
   let(:request) { Rack::Request.new(env) }

diff --git a/spec/lib/castle/context/get_default_spec.rb b/spec/lib/castle/context/get_default_spec.rb
@@ -12,7 +12,8 @@
       'HTTP_X_FORWARDED_FOR' => ip,
       'HTTP_ACCEPT_LANGUAGE' => 'en',
       'HTTP_USER_AGENT' => 'test',
-      'HTTP_COOKIE' => "__cid=#{client_id};other=efgh"
+      'HTTP_COOKIE' => "__cid=#{client_id};other=efgh",
+      'HTTP_CONTENT_LENGTH' => '0'
     )
   end
   let(:request) { Rack::Request.new(env) }

diff --git a/spec/lib/castle/context/prepare_spec.rb b/spec/lib/castle/context/prepare_spec.rb
@@ -9,7 +9,8 @@
       '/',
       'HTTP_USER_AGENT' => ua,
       'HTTP_X_FORWARDED_FOR' => ip,
-      'HTTP_COOKIE' => "__cid=#{cookie_id};other=efgh"
+      'HTTP_COOKIE' => "__cid=#{cookie_id};other=efgh",
+      'HTTP_CONTENT_LENGTH' => '0'
     )
   end
   let(:request) { Rack::Request.new(env) }

diff --git a/spec/lib/castle/headers/filter_spec.rb b/spec/lib/castle/headers/filter_spec.rb
@@ -14,7 +14,8 @@
         'HTTP_X_FORWARDED_FOR' => '1.2.3.4',
         'HTTP_USER_AGENT' => 'Mozilla 1234',
         'TEST' => '1',
-        'REMOTE_ADDR' => '1.2.3.4'
+        'REMOTE_ADDR' => '1.2.3.4',
+        'HTTP_CONTENT_LENGTH' => '0'
       )
     result[:HTTP_OK] = 'OK'
     result

diff --git a/spec/lib/castle/payload/prepare_spec.rb b/spec/lib/castle/payload/prepare_spec.rb
@@ -9,7 +9,8 @@
       '/',
       'HTTP_USER_AGENT' => ua,
       'HTTP_X_FORWARDED_FOR' => ip,
-      'HTTP_COOKIE' => "__cid=#{cookie_id};other=efgh"
+      'HTTP_COOKIE' => "__cid=#{cookie_id};other=efgh",
+      'HTTP_CONTENT_LENGTH' => '0'
     )
   end
   let(:request) { Rack::Request.new(env) }