code-ruby 3.0.3 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4adfeb34ead1c64815b7c1441fe958bdb800124060f85fe34e3e069d84471bf9
-  data.tar.gz: 47d16a2b78dfa78f09c3a85ceb96bec36462e5370c46c6da5bfa6cbeccb16704
+  metadata.gz: 71c8d3a9deab8aee738543c6fb7a3b06732c5ecd0fbd042ec41c7e3d3a351bf1
+  data.tar.gz: e828824ea1a50b4fa0cdb071aeee9b0042933dfad6b80c90ee91df7010946fd1
 SHA512:
-  metadata.gz: f3282f6775597df25231b0aef32f5d0a8a11d7cee0f33abdb0989c843fff87a16f908a01998c1269d81bebe507c5023cf56095a8037624be68066a6e82c15443
-  data.tar.gz: 49e847ebb8e89dad0b072b25e3116718d3cbb3de2c4b0252cb8e2d7ae0462e93992554dadbf1665f91cb821fd9fe05f0a1769b3a06ab8d1632d4d1a268b828bb
+  metadata.gz: 75f6791a43a543361becdde69f55c47134dc2386ef6e018df1fed31b261f748afb1a16233cccc1d1512f95858866654954250b2d48570510e3910e71efdc38f7
+  data.tar.gz: '041049251701b05e2ea7f3c95ed48173b4cdc1fc76dfef311e5109f6c3c25de51fe9c0a604261915759617dc1684a59d01defffc5578e9eb57d65bb9c1658201'

data/Gemfile.lock

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

data/VERSION

@@ -1 +1 @@
-3.0.3
+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/object/ics.rb

@@ -46,7 +46,14 @@ class Code
           next unless event.respond_to?(attribute)
 
           serialized = serialize_value(event.public_send(attribute))
-          serialized = serialized.flatten(1) if attribute == :categories && serialized.is_a?(::Array)
+          serialized =
+            if attribute == :categories && serialized.is_a?(::Array)
+              serialized.flatten(1)
+            elsif scalar_event_attribute?(attribute) && serialized.is_a?(::Array)
+              serialized.join(",")
+            else
+              serialized
+            end
           result[attribute] = serialized unless serialized.nil?
         end.merge(
           timestamp: serialize_value(event.dtstamp),
@@ -60,7 +67,9 @@ class Code
         case value
         when nil
           nil
-        when ::String, ::Symbol, ::Integer, ::Float, ::BigDecimal, true, false
+        when ::String
+          normalize_string(value)
+        when ::Symbol, ::Integer, ::Float, ::BigDecimal, true, false
           value
         when ::Array
           value.map { |item| serialize_value(item) }
@@ -73,13 +82,24 @@ class Code
           if value.respond_to?(:value)
             serialize_value(value.value)
           elsif value.respond_to?(:to_ical)
-            value.to_ical
+            normalize_string(value.to_ical)
           else
-            value.to_s
+            normalize_string(value.to_s)
           end
         end
       end
 
+      def self.scalar_event_attribute?(attribute)
+        !%i[categories attendees geo].include?(attribute)
+      end
+
+      def self.normalize_string(value)
+        value
+          .dup
+          .force_encoding(::Encoding::UTF_8)
+          .encode(::Encoding::UTF_8, invalid: :replace, undef: :replace)
+      end
+
       def self.serialize_date_like(value)
         case value
         when ::Time, ::Date, ::ActiveSupport::TimeWithZone

data/lib/code/object/string.rb

@@ -74,7 +74,7 @@ class Code
           sig(args)
           code_strip
         when "split"
-          sig(args) { String }
+          sig(args) { String.maybe }
           code_split(code_value)
         else
           super
@@ -162,7 +162,11 @@ class Code
       def code_split(value)
         code_value = value.to_code
 
-        List.new(raw.split(code_value.to_s))
+        if code_value.nothing?
+          List.new(raw.split)
+        else
+          List.new(raw.split(code_value.to_s))
+        end
       end
 
       def present?

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/object/ics_spec.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe Code::Object::Ics do
+  it "normalizes binary event strings before json serialization" do
+    source =
+      <<~ICS
+        BEGIN:VCALENDAR
+        VERSION:2.0
+        PRODID:-//code-ruby//EN
+        BEGIN:VEVENT
+        UID:event-1
+        DTSTART:20260327T120000Z
+        DTEND:20260327T133000Z
+        SUMMARY:Joséphine
+        DESCRIPTION:https://luma.com/opv3owre
+        END:VEVENT
+        END:VCALENDAR
+      ICS
+
+    events = described_class.code_parse(Code::Object::String.new(source.b))
+
+    expect { expect(events.to_json).to include("Joséphine") }.not_to output.to_stderr
+  end
+
+  it "serializes comma-separated descriptions as strings" do
+    source =
+      <<~ICS
+        BEGIN:VCALENDAR
+        VERSION:2.0
+        PRODID:-//code-ruby//EN
+        BEGIN:VEVENT
+        UID:event-2
+        DTSTART:20260401T170000Z
+        DTEND:20260401T190000Z
+        SUMMARY:Le Cirque du Donut
+        DESCRIPTION:Bonjour Paris !\\nLe 1er avril, Kate Raworth vous donne rendez-vous, pour une soirée inédite.
+        END:VEVENT
+        END:VCALENDAR
+      ICS
+
+    events = described_class.code_parse(Code::Object::String.new(source))
+    description = events.raw.first.code_get("description").raw
+
+    expect(description).to be_a(String)
+    expect(description).to include("Le 1er avril, Kate Raworth")
+    expect(description).to include("rendez-vous, pour")
+  end
+end

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.3
+  version: 3.0.5
 platform: ruby
 authors:
 - Dorian Marié
@@ -321,6 +321,7 @@ files:
 - spec/code/object/decimal_spec.rb
 - spec/code/object/dictionary_spec.rb
 - spec/code/object/function_spec.rb
+- spec/code/object/ics_spec.rb
 - spec/code/object/integer_spec.rb
 - spec/code/object/list_spec.rb
 - spec/code/object/nothing_spec.rb