code-ruby 3.0.13 → 3.1.2

data/lib/code/object/function.rb

@@ -33,6 +33,7 @@ class Code
           code_call(
             *code_arguments.raw,
             explicit_arguments: args.fetch(:explicit_arguments, true),
+            bound_self: args.fetch(:bound_self, nil),
             **globals
           )
         when "extend"
@@ -64,10 +65,11 @@ class Code
         code_arguments = arguments.to_code
         code_context = Context.new({}, definition_context || globals[:context])
         code_self = bound_self.to_code
-        code_self = captured_self if code_self.nothing? && captured_self
         code_self = Dictionary.new if code_self.nil? || code_self.nothing?
+        code_parent = captured_self.to_code
 
         code_context.code_set("self", code_self)
+        bind_parent(code_context, code_self, code_parent)
 
         if parent.is_a?(Function)
           code_context.code_set(
@@ -110,7 +112,18 @@ class Code
               code_arguments.raw[index].to_code
             end
 
-          code_argument = code_parameter.code_default if code_argument.nothing?
+          if code_argument.nothing?
+            code_default = code_parameter.code_default
+            code_argument =
+              if code_default.is_a?(Code)
+                code_default.code_evaluate(
+                  **globals,
+                  context: code_context
+                )
+              else
+                code_default
+              end
+          end
 
           code_context.code_set(code_parameter.code_name, code_argument)
         end
@@ -200,6 +213,18 @@ class Code
 
       private
 
+      def bind_parent(code_context, code_self, code_parent)
+        return if code_parent.nothing?
+
+        code_context.code_set("parent", code_parent)
+
+        return unless code_self.is_a?(Dictionary)
+        return if code_self == code_parent
+        return if code_self.code_has_key?("parent").truthy?
+
+        code_self.code_set("parent", code_parent)
+      end
+
       def captured_self
         self_from(definition_context)
       end
@@ -241,7 +266,7 @@ class Code
             if code_parameter.code_default.code_to_string.raw == "nothing"
               []
             else
-              Code.parse(code_parameter.code_default.to_s)
+              ::Code.parse(code_parameter.code_default.to_s)
             end
           )
         end

data/lib/code/object/html.rb

@@ -188,10 +188,14 @@ class Code
 
         if code_function.something?
           code_content =
-            code_function.call(
-              arguments: List.new([code_name, code_attributes]),
-              **globals
-            )
+            begin
+              code_function.call(
+                arguments: List.new([code_name, code_attributes]),
+                **globals
+              )
+            rescue Error::Next => e
+              e.code_value
+            end
 
           content =
             if code_content.is_an?(Html)
@@ -206,33 +210,52 @@ class Code
         fragment.add_child(node)
 
         Html.new(fragment)
+      rescue Error::Break => e
+        e.code_value
       end
 
       def self.code_escape(value_or_function = nil, **globals)
         code_value =
           if value_or_function.is_a?(Function)
-            value_or_function.to_code.call(**globals)
+            begin
+              value_or_function.to_code.call(**globals)
+            rescue Error::Next => e
+              e.code_value
+            end
           else
             value_or_function.to_code
           end
 
         String.new(CGI.escapeHTML(code_value.to_s))
+      rescue Error::Break => e
+        e.code_value
       end
 
       def self.code_unescape(value_or_function = nil, **globals)
         code_value =
           if value_or_function.is_a?(Function)
-            value_or_function.to_code.call(**globals)
+            begin
+              value_or_function.to_code.call(**globals)
+            rescue Error::Next => e
+              e.code_value
+            end
           else
             value_or_function.to_code
           end
 
         String.new(Nokogiri::HTML.fragment(code_value.to_s).text)
+      rescue Error::Break => e
+        e.code_value
       end
 
       def self.code_join(first = nil, second = nil, **globals)
         if second.is_a?(Function)
-          code_contents = second.to_code.call(**globals)
+          code_contents =
+            begin
+              second.to_code.call(**globals)
+            rescue Error::Next => e
+              e.code_value
+            end
           code_separator = first.to_code
         else
           code_contents = first.to_code
@@ -264,12 +287,18 @@ class Code
         end
 
         Html.new(fragment)
+      rescue Error::Break => e
+        e.code_value
       end
 
       def self.code_text(value_or_function = nil, **globals)
         code_value =
           if value_or_function.is_a?(Function)
-            value_or_function.to_code.call(**globals)
+            begin
+              value_or_function.to_code.call(**globals)
+            rescue Error::Next => e
+              e.code_value
+            end
           else
             value_or_function.to_code
           end
@@ -280,12 +309,18 @@ class Code
         )
 
         Html.new(fragment)
+      rescue Error::Break => e
+        e.code_value
       end
 
       def self.code_raw(value_or_function = nil, **globals)
         code_value =
           if value_or_function.is_a?(Function)
-            value_or_function.to_code.call(**globals)
+            begin
+              value_or_function.to_code.call(**globals)
+            rescue Error::Next => e
+              e.code_value
+            end
           else
             value_or_function.to_code
           end
@@ -295,6 +330,8 @@ class Code
         else
           Html.new(Nokogiri::HTML::DocumentFragment.parse(code_value.to_s))
         end
+      rescue Error::Break => e
+        e.code_value
       end
 
       def call(**args)
@@ -352,6 +389,8 @@ class Code
             e.code_value
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def to_s

data/lib/code/object/integer.rb

@@ -584,9 +584,13 @@ class Code
             arguments: List.new([Integer.new(element), self]),
             **globals
           )
+        rescue Error::Next => e
+          e.code_value
         end
 
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_truncate(n = nil)

data/lib/code/object/list.rb

@@ -870,6 +870,8 @@ class Code
             e.code_value.tap { index += 1 }
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_append(other)
@@ -909,6 +911,8 @@ class Code
         rescue Error::Next => e
           e.code_value
         end || Nothing.new
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_each(argument = nil, **globals)
@@ -928,6 +932,8 @@ class Code
         end
 
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_first(value = nil)
@@ -1424,6 +1430,8 @@ class Code
             e.code_value
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_map!(argument = nil, **globals)
@@ -1445,6 +1453,8 @@ class Code
         end
 
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_max(argument = nil, **globals)
@@ -1462,6 +1472,8 @@ class Code
         rescue Error::Next => e
           e.code_value
         end || Nothing.new
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_none?(argument = nil, **globals)
@@ -1488,6 +1500,8 @@ class Code
             e.code_value.truthy?.tap { index += 1 }
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_all?(argument = nil, **globals)
@@ -1514,6 +1528,8 @@ class Code
             e.code_value.truthy?.tap { index += 1 }
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_reduce(argument = nil, **globals)
@@ -1536,6 +1552,8 @@ class Code
         rescue Error::Next => e
           e.code_value.tap { index += 1 }
         end || Nothing.new
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_reverse
@@ -1545,53 +1563,51 @@ class Code
       def code_compact(argument = nil, **globals)
         code_argument = argument.to_code
 
-        index = 0
-
         List.new(
-          raw.select do |code_element|
-            if code_argument.is_a?(Function)
-              code_argument
-                .call(
-                  arguments: List.new([code_element, Integer.new(index), self]),
-                  **globals
-                )
-                .truthy?
-                .tap { index += 1 }
+          raw.reject.with_index do |code_element, index|
+            if code_argument.nothing?
+              code_element.nothing?
+            elsif code_argument.is_a?(Function)
+              code_argument.call(
+                arguments: List.new([code_element, Integer.new(index), self]),
+                **globals
+              ).truthy?
             elsif code_argument.is_a?(Class)
-              code_element.is_a?(code_argument.raw).tap { index += 1 }
+              code_element.is_a?(code_argument.raw)
             else
-              code_element.truthy?.tap { index += 1 }
+              false
             end
           rescue Error::Next => e
-            e.code_value.truhty?.tap { index += 1 }
+            e.code_value.truthy?
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_compact!(argument = nil, **globals)
         code_argument = argument.to_code
 
-        index = 0
-
-        raw.select! do |code_element|
-          if code_argument.is_a?(Function)
-            code_argument
-              .call(
-                arguments: List.new([code_element, Integer.new(index), self]),
-                **globals
-              )
-              .truthy?
-              .tap { index += 1 }
+        raw.reject!.with_index do |code_element, index|
+          if code_argument.nothing?
+            code_element.nothing?
+          elsif code_argument.is_a?(Function)
+            code_argument.call(
+              arguments: List.new([code_element, Integer.new(index), self]),
+              **globals
+            ).truthy?
           elsif code_argument.is_a?(Class)
-            code_element.is_a?(code_argument.raw).tap { index += 1 }
+            code_element.is_a?(code_argument.raw)
           else
-            code_element.truthy?.tap { index += 1 }
+            false
           end
         rescue Error::Next => e
-          e.code_value.truhty?.tap { index += 1 }
+          e.code_value.truthy?
         end
 
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_select(argument = nil, **globals)
@@ -1613,6 +1629,8 @@ class Code
             e.code_value.truthy?
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_select!(argument = nil, **globals)
@@ -1634,6 +1652,8 @@ class Code
         end
 
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_reject(argument = nil, **globals)
@@ -1655,6 +1675,8 @@ class Code
             e.code_value.truthy?
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_reject!(argument = nil, **globals)
@@ -1676,6 +1698,8 @@ class Code
         end
 
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_join(separator = nil)
@@ -1701,6 +1725,8 @@ class Code
             e.code_value
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_size
@@ -1736,6 +1762,8 @@ class Code
             e.code_value.tap { index += 1 }
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_sum

data/lib/code/object/range.rb

@@ -90,8 +90,12 @@ class Code
               )
               .truthy?
               .tap { index += 1 }
+          rescue Error::Next => e
+            e.code_value.truthy?.tap { index += 1 }
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_any?(argument, **globals)
@@ -108,8 +112,12 @@ class Code
               )
               .truthy?
               .tap { index += 1 }
+          rescue Error::Next => e
+            e.code_value.truthy?.tap { index += 1 }
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_each(argument, **globals)
@@ -120,9 +128,13 @@ class Code
             arguments: List.new([code_element, Integer.new(index), self]),
             **globals
           )
+        rescue Error::Next => e
+          e.code_value
         end
 
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_first
@@ -142,8 +154,12 @@ class Code
               arguments: List.new([code_element, Integer.new(index), self]),
               **globals
             )
+          rescue Error::Next => e
+            e.code_value
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_select(argument, **globals)
@@ -155,8 +171,12 @@ class Code
               arguments: List.new([code_element, Integer.new(index), self]),
               **globals
             ).truthy?
+          rescue Error::Next => e
+            e.code_value.truthy?
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def exclude_end?

data/lib/code/parser.rb

@@ -407,12 +407,26 @@ class Code
       skip_newlines
 
       statement = parse_expression unless operator == "loop"
-      body = parse_body(%w[end])
+
+      if operator == "loop" &&
+           (match?(:punctuation, "{") || match?(:keyword, "do"))
+        block = parse_block(current.value)
+        body = block[:body]
+        parameters = block[:parameters]
+      else
+        body = parse_body(%w[end])
+      end
+
       skip_newlines
       advance if match?(:keyword, "end")
 
       {
-        while: { operator: operator, statement: statement, body: body }.compact
+        while: {
+          operator: operator,
+          statement: statement,
+          parameters: parameters,
+          body: body
+        }.compact
       }
     end
 

data/spec/code/format_spec.rb

@@ -16,6 +16,9 @@ RSpec.describe Code::Format do
       ["true || false", "true or false"],
       ["true && false", "true and false"],
       ["{a:1}", "{ a: 1 }"],
+      ["{ :mobility: mobility }", "{ mobility: mobility }"],
+      ['{ "hello": "world" }', "{ hello: :world }"],
+      ['{ "hello" => "world" }', "{ hello: :world }"],
       ["[1,2,3]", "[1, 2, 3]"],
       ["[1, 2, 3].select { |n| n.even? }", "[1, 2, 3].select { |n| n.even? }"],
       [
@@ -54,6 +57,10 @@ 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}"
       ],
+      [
+        "query = { :mobility: mobility, :unit_organization_id: unit_organization_id, :limit: limit, :offset: offset }",
+        "query = {\n  mobility: mobility,\n  unit_organization_id: unit_organization_id,\n  limit: limit,\n  offset: offset\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 or inline_url) { :source }\n    } if (link or 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)"
@@ -140,7 +147,7 @@ RSpec.describe Code::Format do
 
       formatted = described_class.format(Code.parse(input))
 
-      expect(formatted.lines.map(&:chomp).map(&:length).max).to be <= 80
+      expect(formatted.lines.map { |line| line.chomp.length }.max).to be <= 80
     end
   end
 end

data/spec/code/object/dictionary_spec.rb

@@ -74,6 +74,8 @@ RSpec.describe Code::Object::Dictionary do
     ["{ a: 1, b: [2, 3] }.flatten(1)", "[:a, 1, :b, [2, 3]]"],
     ["{ a: 1, b: [2, 3] }.to_list", "[[:a, 1], [:b, [2, 3]]]"],
     ["{ a: nothing }.compact", "{}"],
+    ["{ a: nothing, b: 1, c: false, d: \"\" }.compact", '{ b: 1, c: false, d: "" }'],
+    ["{ a: nothing, b: 1, c: false, d: \"\" }.compact(&:blank?)", "{ b: 1 }"],
     ["{ age: 31 }.delete_unless { |key| key == :age }", "{ age: 31 }"],
     ["{ age: 31 }.delete_unless(Integer)", "{ age: 31 }"],
     ["{ age: 31 }.keep_unless { |key| key == :age }", "{}"],