code-ruby 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a1d60879ca94a53452e814d8c8de4975be88088beb0ce216f3584a48b0dfcae
-  data.tar.gz: 0ad78db73acc96f99df57e3c945c5d97fb404ed692d5f9de7c7bc08c25562468
+  metadata.gz: 71c8d3a9deab8aee738543c6fb7a3b06732c5ecd0fbd042ec41c7e3d3a351bf1
+  data.tar.gz: e828824ea1a50b4fa0cdb071aeee9b0042933dfad6b80c90ee91df7010946fd1
 SHA512:
-  metadata.gz: 2eec31b74d22e1d123ea138cf41063792cbff5e2192e26a692c7dfaa52834db9112bacb9929d3a88d59a6fd4296cc23ff0501a41761f95fa963b027878eda54c
-  data.tar.gz: 3363b4f05ca9203842aa8c3a6eee0ccd2ac570609cd9bf3bfb77bda134b234c2ddd0e95a9265941ac8239659260823dfc8e36c8fb34643d835cc702dbc5e5ae4
+  metadata.gz: 75f6791a43a543361becdde69f55c47134dc2386ef6e018df1fed31b261f748afb1a16233cccc1d1512f95858866654954250b2d48570510e3910e71efdc38f7
+  data.tar.gz: '041049251701b05e2ea7f3c95ed48173b4cdc1fc76dfef311e5109f6c3c25de51fe9c0a604261915759617dc1684a59d01defffc5578e9eb57d65bb9c1658201'

data/Gemfile.lock

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

data/VERSION

@@ -1 +1 @@
-3.0.4
+3.0.5

data/lib/code/format.rb

@@ -413,10 +413,22 @@ class Code
           else
             candidate = "#{expression} #{operator} #{right}"
             if expression.include?("\n") || candidate.length > MAX_LINE_LENGTH
-              right_parts = right.split(" #{operator} ")
+              right_lines =
+                if right.include?("\n")
+                  right.lines(chomp: true).map(&:lstrip)
+                else
+                  right.split(" #{operator} ")
+                end
               continuation_lines =
-                right_parts.map do |part|
-                  "#{INDENT * (indent + 1)}#{operator} #{part}"
+                right_lines.each_with_index.map do |line, index|
+                  content = line.lstrip
+                  prefix =
+                    if content.start_with?("#{operator} ")
+                      ""
+                    else
+                      "#{operator} "
+                    end
+                  "#{INDENT * (indent + 1)}#{prefix}#{content}"
                 end
               "#{expression}\n#{continuation_lines.join("\n")}"
             else

data/lib/code/parser.rb

@@ -350,11 +350,10 @@ class Code
           skip_newlines
 
           if match?(:keyword, "if") || match?(:keyword, "unless")
-            else_operator = advance.value
-            skip_newlines
-            else_statement = parse_expression
-            else_body = parse_body(%w[elsif elsunless else end])
-            elses << { operator: else_operator, statement: else_statement, body: else_body }
+            elses << {
+              operator: "else",
+              body: [parse_if_expression(advance.value)]
+            }
           else
             elses << { operator: "else", body: parse_body(%w[end]) }
           end
@@ -365,6 +364,7 @@ class Code
         break
       end
 
+      skip_newlines
       advance if match?(:keyword, "end")
 
       {
@@ -382,6 +382,7 @@ class Code
 
       statement = parse_expression unless operator == "loop"
       body = parse_body(%w[end])
+      skip_newlines
       advance if match?(:keyword, "end")
 
       {
@@ -414,7 +415,10 @@ class Code
         parse_delimited_code("{", "}")
       elsif match?(:keyword, "do") || match?(:keyword, "begin")
         advance
-        parse_code(stop_keywords: ["end"]).tap { advance if match?(:keyword, "end") }
+        parse_code(stop_keywords: ["end"]).tap do
+          skip_newlines
+          advance if match?(:keyword, "end")
+        end
       else
         [parse_expression]
       end
@@ -548,6 +552,7 @@ class Code
         expect(:keyword, "do")
         parameters = parse_pipe_parameters
         body = parse_code(stop_keywords: ["end"])
+        skip_newlines
         expect(:keyword, "end")
       end
 

data/spec/code/format_spec.rb

@@ -23,6 +23,14 @@ RSpec.describe Code::Format do
         "if true 1 elsif false 2 else 3 end",
         "if true\n  1\nelsif false\n  2\nelse\n  3\nend"
       ],
+      [
+        "if false 1 else if true 2 else 3 end",
+        "if false\n  1\nelse\n  if true\n    2\n  else\n    3\n  end\nend"
+      ],
+      [
+        "event[:uid].present? and event[:summary].present? and event[:starts_at].present? and event[:ends_at].present?",
+        "event[:uid].present?\n  and event[:summary].present?\n  and event[:starts_at].present?\n  and event[:ends_at].present?"
+      ],
       [
         "sum = (a, b: 2) => { a + b } sum(1)",
         "sum = (a, b: 2) => {\n  a + b\n}\n\nsum(1)"

data/spec/code_spec.rb

@@ -366,7 +366,10 @@ RSpec.describe Code do
     ["if false 1 else 2", "2"],
     ["if false 1 else if false 2", "nothing"],
     ["if false 1 else if true 2", "2"],
+    ["if false 1 else if false 2 else 3 end", "3"],
+    ["if false 1 else if true 2 else 3 end", "2"],
     ["if false 1 else unless false 2", "2"],
+    ["if false 1 else unless true 2 else 3 end", "3"],
     ["if false 1 else unless true 2", "nothing"],
     ["if false 1 elsif false 2", "nothing"],
     ["if false 1 elsif true 2", "2"],

metadata

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