code-ruby 5.2.1 → 5.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 978d1a5cd5c7828f25ac0d619f50d68dcee1596a9fd3d92ac4e1ba684bfe2481
-  data.tar.gz: 06c6cb5d2bf9e3b596d1524ea710dd3ec7f6c8abcd871f07c62f1eb291967c94
+  metadata.gz: 52e251b96064139d4e72a393de2b727b5d792ff0026d3d5f4830e582b54a7573
+  data.tar.gz: 456d6ddc2f99e1d662273af433beaf0461e960be102d829c26a9637af0c29bae
 SHA512:
-  metadata.gz: 9c314514dc4d2ca20ebd674fe158b90b1f2200008e9e56389fab38513d8b81a1f21f7bd2dbd85f3bf16fe0d376c6879737524bb7597070a413b767d0b43df5a4
-  data.tar.gz: 6ad13fe0f05f93e56fece2befeaf33fb08a10c5f3d2a8186021d57a2e7d6bd7c246615690e78bf950ab25f5453ce9af3b4d43399f6b7e3ea543d7fef83daecf1
+  metadata.gz: bd013119d2df47feb3c438cee2dccb21e13a01ca319085f7a4dc012966efc02a21578b07ccd104e851f5a0d3c633ac45e07ffea4e7dc4ba34e4fd012fb9bbca8
+  data.tar.gz: 057ad7fc9b03bbe40e4c921833e0da2926c0dfb9688b5c63a389cb4e66a687354bebc9591fb95eb8f56f41785fac888d976964c950c88c5532646c164e35c9ed

data/VERSION

@@ -1 +1 @@
-5.2.1
+5.2.2

data/lib/code/format.rb

@@ -459,11 +459,12 @@ class Code
         extract_string_concatenation_parts(left_operation: operation)
       return format_string(merged_string, indent: indent) if merged_string
 
-      expression = format_nested_statement(operation[:first], indent: indent)
+      first_operator = format_operator(Array(operation[:others]).first&.fetch(:operator, ""))
+      expression = format_boolean_operand(operation[:first], first_operator, indent: indent)
 
       Array(operation[:others]).each do |other|
-        right = format_nested_statement(other[:statement], indent: indent)
         operator = format_operator(other[:operator])
+        right = format_boolean_operand(other[:statement], operator, indent: indent)
 
         expression =
           if compact_operator?(operator)
@@ -510,6 +511,21 @@ class Code
       expression
     end
 
+    def format_boolean_operand(statement, operator, indent:)
+      if BOOLEAN_WORD_OPERATORS.include?(operator) && statement.is_a?(Hash) &&
+           statement[:left_operation]
+        nested = Array(statement[:left_operation][:others])
+        if nested.any? do |other|
+             nested_operator = format_operator(other[:operator])
+             BOOLEAN_WORD_OPERATORS.include?(nested_operator) && nested_operator != operator
+           end
+          return format_group([statement], indent: indent)
+        end
+      end
+
+      format_nested_statement(statement, indent: indent)
+    end
+
     def format_compact_receiver(expression, indent:)
       return expression unless compact_receiver_needs_parentheses?(expression)
 

data/lib/code/object/http.rb

@@ -197,7 +197,8 @@ class Code
         not_extended: 510,
         network_authentication_required: 511
       }.freeze
-      DEFAULT_TIMEOUT = 1.hour.to_f
+      DEFAULT_TIMEOUT = 30
+      DEFAULT_OPEN_TIMEOUT = 10
       MAX_HEADER_BYTES = 32.kilobytes
       HEADER_NAME = /\A[A-Za-z0-9!#$%&'*+\-.^_`|~]+\z/
       RESTRICTED_HEADERS = %w[
@@ -348,7 +349,7 @@ class Code
           redirects =
             (
               if options.code_get("redirects").nothing?
-                10
+                0
               else
                 options.code_get("redirects").raw
               end
@@ -410,7 +411,11 @@ class Code
         http.use_ssl = true if uri.scheme == "https"
         http.max_retries = max_retries
         default_timeout = http_timeout(timeout, DEFAULT_TIMEOUT)
-        open_timeout_value = http_timeout(open_timeout, default_timeout)
+        open_timeout_value =
+          http_timeout(
+            open_timeout,
+            timeout.nothing? ? DEFAULT_OPEN_TIMEOUT : default_timeout
+          )
         read_timeout_value = http_timeout(read_timeout, default_timeout)
         write_timeout_value = http_timeout(write_timeout, default_timeout)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby
 version: !ruby/object:Gem::Version
-  version: 5.2.1
+  version: 5.2.2
 platform: ruby
 authors:
 - Dorian Marié