Cleanup

Author: Ron Dahlgren

lib/serpapi/client.rb

@@ -259,10 +259,8 @@ def process_html_response(response, endpoint, params)
     end
 
     def validate_json_content!(data, response, endpoint, params)
-      # Check for API-level error inside the JSON
       if data.is_a?(Hash) && data.key?(:error)
         raise_http_error(response, data, endpoint, params, explicit_error: data[:error])
-        # Check for HTTP-level error
       elsif response.status != 200
         raise_http_error(response, data, endpoint, params)
       end
@@ -275,10 +273,10 @@ def raise_http_error(response, data, endpoint, params, explicit_error: nil, deco
 
       raise SerpApiError.new(
         "#{msg} from url: https://#{BACKEND}#{endpoint}",
-        serpapi_error: explicit_error || (data ? data[:error] : nil),
+        serpapi_error: explicit_error || (data.is_a?(Hash) ? data[:error] : nil),
         search_params: params,
         response_status: response.status,
-        search_id: data&.dig(:search_metadata, :id),
+        search_id: data.is_a?(Hash) ? data&.dig(:search_metadata, :id) : nil,
         decoder: decoder
       )
     end

lib/serpapi/error.rb

@@ -21,7 +21,7 @@ class SerpApiError < StandardError
     # @param search_params [Hash, nil] optional hash of the search parameters used
     # @param response_status [Integer, nil] optional HTTP or response status code
     # @param search_id [String, nil] optional id returned by the service for the search
-    # @param decoder [String, nil] optional decoder/format used (e.g. "json")
+    # @param decoder [Symbol, nil] optional decoder/format used (e.g. :json)
     def initialize(message = nil,
                    serpapi_error: nil,
                    search_params: nil,
@@ -76,7 +76,7 @@ def validate_optional_symbol(value, name = nil)
       return nil if value.nil?
       raise TypeError, "expected #{name || 'value'} to be a Symbol, got #{value.class}" unless value.is_a?(Symbol)
 
-      value.freeze
+      value
     end
 
     def freeze_hash(value)

spec/serpapi/client/client_spec.rb

@@ -71,8 +71,8 @@
   end
 
   it 'get endpoint error' do
-    expect { 
-      client.send(:get, '/search', :json, {}) 
+    expect {
+      client.send(:get, '/search', :json, {})
     }.to raise_error(SerpApi::SerpApiError).with_message(/HTTP request failed with status: 400.* error: Missing query `q` parameter./)
   end
 
@@ -133,9 +133,6 @@
     allow(client).to receive(:search).and_raise(SerpApi::SerpApiError)
     expect { client.search(q: 'Invalid Query') }.to raise_error(SerpApi::SerpApiError)
   end
-
-
-
 end
 
 describe 'SerpApi client with persitency disabled' do