internetdata 2.8.5 → 2.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0708d6fdf3bef022159596ad8724e5ff79095a7d38c61a0db537192bed295db
-  data.tar.gz: b517ad130576ab173e338c38af500a22f2f8ac35e464e91d66dbc43b6a85d4d3
+  metadata.gz: 60cb6997f887f4ac598e856721bfc16b49d84059390ce32d1c1a13721cf3079a
+  data.tar.gz: 129161d2e8eede6fc3aa00ee2daf764f3177dab897b7af0a79d7188241430cce
 SHA512:
-  metadata.gz: eacf0044ca61529afe45265106e756fe2b1c29a7a1d941f47b939b52442c7f905400f183dfb345ee0808c5bb8a2dad4e03b587de8ec00c5f6a0824411425cec0
-  data.tar.gz: d8a60d131b2511687df48c5f7586c8fec08ca79091401b004c73c6109b465492c8e4e990cf44c0630de411cb8aaafa65da942c05f56a9d6fa3637b317ebf7d8d
+  metadata.gz: 63b12de438f16533af87d36997d2a66a53b7e5b98330b6a4175c42c6ab481f27ed4bf742646674b51a5eae3567db6fcce25b267cf237bd019369577ebac9f476
+  data.tar.gz: c9c6f3cef56834177ea1f5806ebadb0c31aa7ce40817c7e19b3e579f309b64fb68ffaa474f64c503ce8a11c59792e0bb4acf6e678cd4d3fa5f23e044907957d9

data/lib/internetdata/client.rb

@@ -21,16 +21,20 @@ module InternetData
 
     # @param api_key [String, nil] a key carrying the `db.download` scope. Omit
     #   it and no credential is sent; every database published today answers 401.
-    # @param retries [Integer] extra attempts for a transient failure. Each waits
-    #   the server's `Retry-After` when it sent one of at most about 24.8 days,
-    #   and otherwise a backoff of 250 ms that doubles per retry.
+    #   The blanks around it are dropped, and blanks alone are no key.
+    # @param retries [Integer] extra attempts for a transient failure, from 0. Each
+    #   waits the server's `Retry-After` when it sent one of at most about 24.8
+    #   days, and otherwise a backoff of 250 ms that doubles per retry.
     # @param timeout [Numeric] seconds allowed for one API call, 0 for no bound. It
     #   also bounds the CONNECT phase of a transfer, which is otherwise unlimited.
     # @raise [ArgumentError] for a `timeout` that is negative, not a finite number,
-    #   or past 2147483.647 seconds (2**31 - 1 ms), the longest curl holds.
+    #   or past 2147483.647 seconds (2**31 - 1 ms), the longest curl holds; for a
+    #   `retries` that is not an Integer from 0; and for an `api_key` holding a
+    #   control character, without the key in the message.
     # @param transport [Transport, nil] override the HTTP layer, mostly for tests.
     def initialize(api_key: nil, base_url: DEFAULT_BASE_URL, retries: DEFAULT_RETRIES,
                    timeout: DEFAULT_TIMEOUT, transport: nil)
+      retries = Retries.checked_count(retries)
       @transport = transport || Transport.new(
         Transport::Config.new(api_key: api_key, base_url: base_url, timeout: timeout),
       )

data/lib/internetdata/retries.rb

@@ -15,6 +15,15 @@ module InternetData
 
     module_function
 
+    # `retries`, once it is a count. Refused where it is set: unchecked, -1 and
+    # NaN read as none, 1.5 as two, Infinity retried a failing call for good, and
+    # a String, nil or true raised a raw ArgumentError out of every failing call.
+    def checked_count(retries)
+      return retries if retries.is_a?(Integer) && retries >= 0
+
+      raise ArgumentError, "retries must be an Integer from 0, not #{retries.inspect}"
+    end
+
     # `retry_if`, when given, is asked after each retryable failure, and a false
     # answer ends the attempts there.
     def with_retries(retries, retry_if: nil)

data/lib/internetdata/transport.rb

@@ -24,6 +24,19 @@ module InternetData
             "timeout must be a number of seconds from 0 (no bound) to #{LONGEST_TIMEOUT}, not #{timeout.inspect}"
     end
 
+    # `api_key` without the blanks around it, nil for blanks alone. A control
+    # character is refused where it is set, and the key is left out of the
+    # message: a CR or LF failed every call with Ethon's raw InvalidValue, whose
+    # message quoted the key, and a tab, NUL or DEL went out inside it (2.8.5).
+    def self.checked_key(api_key)
+      return nil if api_key.nil?
+
+      key = api_key.to_s.strip
+      raise ArgumentError, 'api_key must not contain a control character' if key.match?(/[[:cntrl:]]/)
+
+      key.empty? ? nil : key
+    end
+
     # The generated Configuration applies a security scheme whatever it holds, so
     # a keyless client would send `Authorization: Bearer ` - an empty credential,
     # which the API answers 401 to rather than treating as no credential at all.
@@ -35,7 +48,7 @@ module InternetData
         self.scheme = uri.scheme
         self.host = uri.port == uri.default_port ? uri.host : "#{uri.host}:#{uri.port}"
         self.base_path = uri.path
-        self.access_token = api_key
+        self.access_token = Transport.checked_key(api_key)
         self.timeout = timeout.nil? ? nil : Transport.checked_timeout(timeout)
       end
 
@@ -240,7 +253,9 @@ module InternetData
         when 'Integer' then value.is_a?(Integer)
         when 'Float' then value.is_a?(Numeric)
         when 'Boolean' then [true, false].include?(value)
-        when 'Object' then true
+        # The spec's `type: object`, a sample row: through 2.8.5 a row of 1, "x"
+        # or [] came back as the answer.
+        when 'Object' then value.is_a?(Hash)
         when /\AArray<(?<inner>.+)>\z/
           inner = Regexp.last_match(:inner)
           value.is_a?(Array) && value.each_with_index.all? { |v, i| check_type!(v, inner, "#{where}[#{i}]") }

data/lib/internetdata/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module InternetData
-  VERSION = '2.8.5'
+  VERSION = '2.8.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: internetdata
 version: !ruby/object:Gem::Version
-  version: 2.8.5
+  version: 2.8.6
 platform: ruby
 authors:
 - Mslm Dev