code-ruby 3.0.10 → 3.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e59505a1d473ed64e03853dd3465ce958bb81ee2dfcd2ec38b0280a5ee3dd98a
-  data.tar.gz: e13a2d15ba45209e81213bd7b5a3f1ea58a26cdcb9446f29f9f6b5906aa7e9fe
+  metadata.gz: fb5a51861ed784ebc8e0fbd2e6e6232ee05a3f3bafbc4f150e5cc92236590254
+  data.tar.gz: b2a82b40b6740387fde8490e5054cc1a0ab5d39c34e2ce7a694421cf5e0852ed
 SHA512:
-  metadata.gz: 82cf388eb36848ff8f01f122177e436205ccebfd6f4e19488e65e1adecdff267246292da159a99b42cca23f5adefb505483ebe1357b928922ee824ac4c832086
-  data.tar.gz: 3069cb6a421189bad2b0aba4eed4a3d50d5e24128f1fcd6fa6ee12db5110b5a53babf2b310175ba4701b59a5bb3447bb4fd1505282c5f3de44c5e2c3a530fc6d
+  metadata.gz: ca94cf8211ff117ca68db85a48d876a28f857398996b327a88a6488931d29bbdda34bc6d1b893af9196ecc25735a83875533f099cecbc15b5c9ffd248e34d0df
+  data.tar.gz: 9ecf7d03fffb87b1d7ade9242bc0cc4e75a8ff04b31c57b3c05cb2caba5811c1cb567de362e0c95c5852b2bebc3794df6291adb773b8b4a13da0c7320df03b3f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    code-ruby (3.0.10)
+    code-ruby (3.0.11)
       activesupport
       base64
       bigdecimal

data/VERSION

@@ -1 +1 @@
-3.0.10
+3.0.11

data/lib/code/format.rb

@@ -434,10 +434,17 @@ class Code
             "#{expression}#{operator}#{right}"
           else
             candidate = "#{expression} #{operator} #{right}"
-            if multiline_collection_statement?(other[:statement]) &&
-                 right.include?("\n")
+            if right.include?("\n")
               first_line, *rest = right.lines(chomp: true)
-              [ "#{expression} #{operator} #{first_line}", *rest ].join("\n")
+              if multiline_operand_statement?(other[:statement]) ||
+                   !%w[and or].include?(operator)
+                [ "#{expression} #{operator} #{first_line.lstrip}", *rest ].join("\n")
+              else
+                [
+                  "#{expression}\n#{INDENT * (indent + 1)}#{operator} #{first_line.lstrip}",
+                  *rest
+                ].join("\n")
+              end
             elsif expression.include?("\n") || candidate.length > MAX_LINE_LENGTH
               right_lines =
                 if right.include?("\n")
@@ -491,6 +498,17 @@ class Code
       operator = operation[:operator].to_s
       left = format_nested_statement(operation[:left], indent: indent)
       right = format_nested_statement(operation[:right], indent: indent)
+      if right.include?("\n")
+        first_line, *rest = right.lines(chomp: true)
+        first_line = first_line.lstrip
+        return "#{left} #{operator} #{first_line}" if rest.empty?
+
+        return [
+          "#{left} #{operator} #{first_line}",
+          *rest
+        ].join("\n")
+      end
+
       "#{left} #{operator} #{right}"
     end
 
@@ -598,9 +616,22 @@ class Code
       values.join(", ").length > MAX_INLINE_COLLECTION_LENGTH
     end
 
-    def multiline_collection_statement?(statement)
-      statement.is_a?(Hash) &&
-        (statement.key?(:dictionnary) || statement.key?(:list))
+    def multiline_operand_statement?(statement)
+      return false unless statement.is_a?(Hash)
+
+      return true if statement.key?(:dictionnary) || statement.key?(:list)
+      return true if statement.key?(:call)
+      if statement.key?(:left_operation)
+        operation = statement[:left_operation]
+        others = Array(operation[:others])
+
+        return false if others.empty?
+        return false unless others.all? { |other| compact_operator?(other[:operator]) }
+
+        return multiline_operand_statement?(operation[:first])
+      end
+
+      false
     end
 
     def multiline_call_arguments?(raw_arguments, arguments)
@@ -692,7 +723,7 @@ class Code
       search_limit = [MAX_LINE_LENGTH, line.length - token.length].min
       index = line.rindex(token, search_limit)
       while index
-        break if index.positive? && outside_string?(line, index)
+        break if index.positive? && outside_string_and_grouping?(line, index)
 
         index = line.rindex(token, index - 1)
       end
@@ -701,9 +732,10 @@ class Code
       [index, token]
     end
 
-    def outside_string?(line, index)
+    def outside_string_and_grouping?(line, index)
       quote_count = 0
       escaped = false
+      grouping_depth = 0
       line[0...index].each_char do |char|
         if escaped
           escaped = false
@@ -714,10 +746,17 @@ class Code
           escaped = true
         elsif char == '"'
           quote_count += 1
+        elsif quote_count.even?
+          case char
+          when "(", "[", "{"
+            grouping_depth += 1
+          when ")", "]", "}"
+            grouping_depth -= 1 if grouping_depth.positive?
+          end
         end
       end
 
-      quote_count.even?
+      quote_count.even? && grouping_depth.zero?
     end
   end
 end

data/spec/code/format_spec.rb

@@ -51,6 +51,18 @@ RSpec.describe Code::Format do
       [
         "blocks << { title: \"hello world\", description: \"lorem ipsum dolor es sit\", position: 1 }",
         "blocks << {\n  title: \"hello world\",\n  description: \"lorem ipsum dolor es sit\",\n  position: 1\n}"
+      ],
+      [
+        "sections << Html.join([Html.p { Html.b { \"{index + 1}. {title}\" } }, Html.p { query } if query.presence, Html.p { Html.a(href: link || inline_url) { :source } } if (link || inline_url), Html.p { Html.a(href: inline_url) { Html.img(src: inline_url, alt: title) } }, Html.p { Html.a(href: attachment_url) { \"télécharger\" } }].compact)",
+        "sections << Html.join(\n  [\n    Html.p { Html.b { \"{index + 1}. {title}\" } },\n    Html.p { query } if query.presence,\n    Html.p {\n      Html.a(href: link || inline_url) { :source }\n    } if (link || inline_url),\n    Html.p {\n      Html.a(href: inline_url) { Html.img(src: inline_url, alt: title) }\n    },\n    Html.p {\n      Html.a(href: attachment_url) { \"télécharger\" }\n    }\n  ].compact\n)"
+      ],
+      [
+        "safe = post.present? and !post[:over_18] and post[:post_hint] == :image and post[:url].to_string.strip.presence and (post[:url].to_string.strip.ends_with?(\".jpg\") or post[:url].to_string.strip.ends_with?(\".jpeg\") or post[:url].to_string.strip.ends_with?(\".png\") or post[:url].to_string.strip.include?(\"i.redd.it\"))",
+        "safe = post.present?\n  and !post[:over_18]\n  and post[:post_hint] == :image\n  and post[:url].to_string.strip.presence\n  and (post[:url].to_string.strip.ends_with?(\".jpg\")\n  or post[:url].to_string.strip.ends_with?(\".jpeg\")\n  or post[:url].to_string.strip.ends_with?(\".png\")\n  or post[:url].to_string.strip.include?(\"i.redd.it\"))"
+      ],
+      [
+        "items.each { |item, index| proxied_image_url = if image_url proxy_url(image_url) else nothing end }",
+        "items.each { |item, index|\n  proxied_image_url = if image_url\n    proxy_url(image_url)\n  else\n    nothing\n  end\n}"
       ]
     ].each do |input, expected|
       it "formats #{input.inspect}" do

metadata

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