Merge 9.2.0 release into master

Author: bartes

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 9.2.0
+
+**Changes:**
+
+- Slim down the default request context to `headers`, `ip` and `library`; the remaining data is already available via `headers`.
+- Remove the internal `Castle::ClientId::Extract` service and the now-unused `cookies` plumbing in `Castle::Context::GetDefault`.
+- No longer read the API secret from the `CASTLE_API_SECRET` environment variable automatically; set `Castle.api_secret` explicitly (for example `Castle.api_secret = ENV.fetch('CASTLE_API_SECRET')`).
+
 ## 9.1.0
 
 **Enhancements:**

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    castle-rb (9.1.0)
+    castle-rb (9.2.0)
       base64 (~> 0.2)
 
 GEM

lib/castle.rb

@@ -78,7 +78,6 @@
   castle/headers/format
   castle/headers/extract
   castle/secure_mode
-  castle/client_id/extract
   castle/ips/extract
   castle/core/get_connection
   castle/core/process_response

lib/castle/client_id/extract.rb

@@ -69,7 +69,7 @@ def reset
       self.base_url = BASE_URL
       self.allowlisted = [].freeze
       self.denylisted = [].freeze
-      self.api_secret = ENV.fetch('CASTLE_API_SECRET', '')
+      self.api_secret = ''
       self.ip_headers = [].freeze
       self.trusted_proxies = [].freeze
       self.trust_proxy_chain = false

lib/castle/configuration.rb

@@ -3,50 +3,21 @@
 module Castle
   module Context
     class GetDefault
-      def initialize(request, cookies = nil)
+      def initialize(request)
         @pre_headers = Castle::Headers::Filter.new(request).call
-        @cookies = cookies || request.cookies
-        @request = request
       end
 
       def call
-        {
-          client_id: client_id,
-          active: true,
-          headers: headers,
-          ip: ip,
-          library: {
-            name: 'castle-rb',
-            version: Castle::VERSION
-          }
-        }.tap do |result|
-          result[:locale] = locale if locale
-          result[:user_agent] = user_agent if user_agent
-        end
+        { headers: headers, ip: ip, library: { name: 'castle-rb', version: Castle::VERSION } }
       end
 
       private
 
-      # @return [String]
-      def locale
-        @pre_headers['Accept-Language']
-      end
-
-      # @return [String]
-      def user_agent
-        @pre_headers['User-Agent']
-      end
-
       # @return [String]
       def ip
         Castle::IPs::Extract.new(@pre_headers).call
       end
 
-      # @return [String]
-      def client_id
-        Castle::ClientId::Extract.new(@pre_headers, @cookies).call
-      end
-
       # formatted and filtered headers
       # @return [Hash]
       def headers

lib/castle/context/get_default.rb

@@ -9,7 +9,7 @@ class << self
         # @param options [Hash]
         # @return [Hash]
         def call(request, options = {})
-          default_context = Castle::Context::GetDefault.new(request, options[:cookies]).call
+          default_context = Castle::Context::GetDefault.new(request).call
           Castle::Context::Merge.call(default_context, options[:context])
         end
       end

lib/castle/context/prepare.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Castle
-  VERSION = '9.1.0'
+  VERSION = '9.2.0'
 end

lib/castle/version.rb

@@ -20,19 +20,7 @@
   let(:client_with_no_timestamp) { described_class.new(context: request_to_context) }
 
   let(:headers) { { 'Content-Length': '0', 'User-Agent': ua, 'X-Forwarded-For': ip.to_s, Cookie: true } }
-  let(:context) do
-    {
-      client_id: 'abcd',
-      active: true,
-      user_agent: ua,
-      headers: headers,
-      ip: ip,
-      library: {
-        name: 'castle-rb',
-        version: '2.2.0'
-      }
-    }
-  end
+  let(:context) { { headers: headers, ip: ip, library: { name: 'castle-rb', version: '2.2.0' } } }
 
   let(:time_now) { Time.now }
   let(:time_auto) { time_now.utc.iso8601(3) }