code-ruby 3.0.13 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6baa3c7c3ef6b602529e2af4a36200029291ed89c115f1c1f3d750a8e815cc03
-  data.tar.gz: aa9c876fb0aff915f895ec3d209d25ac06270e3809eadba8f5e71b37b9cb29db
+  metadata.gz: 4fb3de0080323ce38f0bc61db99084820616f9b437d94fbf973a4a0736da7a0b
+  data.tar.gz: 476a64d5bcd78add94f15f25c3d1d086c3263aa66dd4af73443e8ad5e126fc9e
 SHA512:
-  metadata.gz: 444adc5d9b9a5223b82a921a888558a2f23dc40344a12b383137581b910ba4e33ea13873a2e5ce6698dc130ae77775cf9aa5b3e0e23f70947418301831df96b9
-  data.tar.gz: bcf7ecebc28788a2cf7464e3a7b67f32b2bfb86ec3d6365ca58674914d852181d27f3a051b596665807acd67291c2026d227b98d33603260e3122417e04d6a76
+  metadata.gz: 9851fd43383c19e34984f2124980f788beb59b22e2fd6cd5871a4e3107f62b908770c0b1575b58e1f84cefef574740877f9de9d18bb41ac22eaac531a85136bb
+  data.tar.gz: b620dc0c1eb65e83fe5d8ade6047fc712a1149f258a1275fc46163f4852a7efd2e5107fc979396daaa95672bb2216c43b3796176abf27d6c0f7bd35c9fba1cf4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    code-ruby (3.0.13)
+    code-ruby (3.1.1)
       activesupport
       base64
       bigdecimal
@@ -20,7 +20,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.1.2)
+    activesupport (8.1.3)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -33,11 +33,11 @@ GEM
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
-    addressable (2.8.9)
+    addressable (2.9.0)
       public_suffix (>= 2.0.2, < 8.0)
     ast (2.4.3)
     base64 (0.3.0)
-    bigdecimal (4.0.1)
+    bigdecimal (4.1.2)
     bundler-audit (0.9.3)
       bundler (>= 1.2.0)
       thor (~> 1.0)
@@ -79,7 +79,7 @@ GEM
     dorian-to_struct (2.0.2)
     drb (2.2.3)
     geom2d (0.4.1)
-    git (4.3.1)
+    git (4.3.2)
       activesupport (>= 5.0)
       addressable (~> 2.8)
       process_executer (~> 4.0)
@@ -89,23 +89,20 @@ GEM
       thor
       tilt
     hashdiff (1.2.1)
-    hexapdf (1.6.0)
+    hexapdf (1.8.0)
       cmdparse (~> 3.0, >= 3.0.3)
       geom2d (~> 0.4, >= 0.4.1)
       openssl (>= 2.2.1)
       strscan (>= 3.1.2)
     i18n (1.14.8)
       concurrent-ruby (~> 1.0)
-    icalendar (2.12.2)
+    icalendar (2.12.3)
       base64
       ice_cube (~> 0.16)
       logger
       ostruct
     ice_cube (0.17.0)
-    json (2.18.1)
-    json-schema (6.1.0)
-      addressable (~> 2.8)
-      bigdecimal (>= 3.1, < 5)
+    json (2.19.5)
     language-ruby (1.2.0)
       dorian-arguments
       zeitwerk
@@ -121,19 +118,16 @@ GEM
       net-imap
       net-pop
       net-smtp
-    mcp (0.7.1)
-      json-schema (>= 4.1)
     mini_mime (1.1.5)
-    mini_racer (0.20.0)
+    mini_racer (0.21.0)
       libv8-node (~> 24.12.0.1)
-    minitest (6.0.2)
+    minitest (6.0.6)
       drb (~> 2.0)
       prism (~> 1.5)
-    mustermann (3.0.4)
-      ruby2_keywords (~> 0.0.1)
+    mustermann (3.1.1)
     net-http (0.9.1)
       uri (>= 0.11.1)
-    net-imap (0.6.3)
+    net-imap (0.6.4)
       date
       net-protocol
     net-pop (0.1.2)
@@ -142,34 +136,34 @@ GEM
       timeout
     net-smtp (0.5.1)
       net-protocol
-    nokogiri (1.19.1-arm64-darwin)
+    nokogiri (1.19.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.1-x86_64-linux-gnu)
+    nokogiri (1.19.3-x86_64-linux-gnu)
       racc (~> 1.4)
-    openssl (4.0.1)
+    openssl (4.0.2)
     ostruct (0.6.3)
-    parallel (1.27.0)
-    parser (3.3.10.2)
+    parallel (2.1.0)
+    parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
     prettier_print (1.2.1)
     prism (1.9.0)
-    process_executer (4.0.2)
+    process_executer (4.0.4)
       track_open_instances (~> 0.1)
-    public_suffix (7.0.2)
+    public_suffix (7.0.5)
     racc (1.8.1)
-    rack (3.2.5)
+    rack (3.2.6)
     rack-protection (4.2.1)
       base64 (>= 0.1.0)
       logger (>= 1.6.0)
       rack (>= 3.0.0, < 4)
-    rack-session (2.1.1)
+    rack-session (2.1.2)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
     rainbow (3.1.1)
-    rake (13.3.1)
+    rake (13.4.2)
     rchardet (1.10.0)
-    regexp_parser (2.11.3)
+    regexp_parser (2.12.0)
     rexml (3.4.4)
     rspec (3.13.2)
       rspec-core (~> 3.13.0)
@@ -184,24 +178,23 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.7)
-    rubocop (1.85.0)
+    rubocop (1.86.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
-      mcp (~> 0.6)
-      parallel (~> 1.10)
+      parallel (>= 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
       rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.49.0)
+    rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
-    rubocop-capybara (2.22.1)
+    rubocop-capybara (2.23.0)
       lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
+      rubocop (~> 1.81)
     rubocop-factory_bot (2.28.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
@@ -209,7 +202,7 @@ GEM
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.47.1, < 2.0)
-    rubocop-rails (2.34.3)
+    rubocop-rails (2.35.0)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
@@ -225,11 +218,10 @@ GEM
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
       rubocop-rspec (~> 3.5)
-    ruby-prof (2.0.3)
+    ruby-prof (2.0.4)
       base64
       ostruct
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
     securerandom (0.4.1)
     sinatra (4.2.1)
       logger (>= 1.6.0)
@@ -238,7 +230,7 @@ GEM
       rack-protection (= 4.2.1)
       rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
-    strscan (3.1.7)
+    strscan (3.1.8)
     syntax_tree (6.3.0)
       prettier_print (>= 1.2.0)
     syntax_tree-haml (4.0.3)
@@ -253,7 +245,7 @@ GEM
       unicode-display_width (>= 1.1.1, < 4)
     thor (1.5.0)
     tilt (2.7.0)
-    timeout (0.6.0)
+    timeout (0.6.1)
     track_open_instances (0.1.15)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -264,7 +256,7 @@ GEM
     w_syntax_tree-erb (0.12.0)
       prettier_print (~> 1.2, >= 1.2.0)
       syntax_tree (~> 6.1, >= 6.1.1)
-    webmock (3.26.1)
+    webmock (3.26.2)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

data/VERSION

@@ -1 +1 @@
-3.0.13
+3.1.1

data/lib/code/format.rb

@@ -11,6 +11,7 @@ class Code
     MAX_INLINE_CALL_ARGUMENTS_LENGTH = 80
     MAX_INLINE_BLOCK_BODY_LENGTH = 40
     CONTINUATION_PADDING = 4
+    BOOLEAN_WORD_OPERATORS = %w[and or].freeze
 
     class << self
       def format(parsed)
@@ -328,13 +329,30 @@ class Code
     end
 
     def format_dictionary_statement_code(statement_code)
-      key = format_nested_statement(statement_code[:statement], indent: 0)
+      key =
+        format_dictionary_statement_key(statement_code[:statement]) ||
+        format_nested_statement(statement_code[:statement], indent: 0)
       return key unless statement_code.key?(:code)
 
       value = format_code_inline(statement_code[:code], indent: 0)
       "#{key}: #{value}"
     end
 
+    def format_dictionary_statement_key(statement)
+      return unless statement.is_a?(Hash) && statement.key?(:string)
+
+      parts = Array(statement[:string])
+      return unless parts.one?
+
+      part = parts.first
+      return unless part.is_a?(Hash) && part.key?(:text)
+
+      text = part[:text].to_s
+      return unless text.match?(/\A[a-z_][a-z0-9_]*\z/)
+
+      text
+    end
+
     def format_call(call, indent:)
       name = call[:name]
       raw_arguments = call[:arguments].presence || []
@@ -444,8 +462,8 @@ class Code
             if right.include?("\n")
               first_line, *rest = right.lines(chomp: true)
               if multiline_operand_statement?(other[:statement]) ||
-                   !%w[and or].include?(operator)
-                [ "#{expression} #{operator} #{first_line.lstrip}", *rest ].join("\n")
+                   !BOOLEAN_WORD_OPERATORS.include?(operator)
+                ["#{expression} #{operator} #{first_line.lstrip}", *rest].join("\n")
               else
                 [
                   "#{expression}\n#{INDENT * (indent + 1)}#{operator} #{first_line.lstrip}",
@@ -456,7 +474,7 @@ class Code
               right_lines =
                 if right.include?("\n")
                   right.lines(chomp: true).map(&:lstrip)
-                elsif %w[and or].include?(operator)
+                elsif BOOLEAN_WORD_OPERATORS.include?(operator)
                   right.split(" #{operator} ")
                 else
                   [right]
@@ -492,7 +510,7 @@ class Code
         expression
           .lines(chomp: true)[1..]
           .to_a
-          .reject { |line| line.strip.empty? || line.strip.match?(/\A[\)\]\}]+\z/) }
+          .reject { |line| line.strip.empty? || line.strip.match?(/\A[\])}]+\z/) }
 
       return false if continuation_lines.empty?
 
@@ -502,7 +520,7 @@ class Code
       continuation_lines.any? do |line|
         next false unless line[/\A */].to_s.length == base_indent
 
-        line.lstrip.match?(/\A(\+|-|\*|\/|%|<<|>>|\||\^|&|and\b|or\b)/)
+        line.lstrip.match?(%r{\A(\+|-|\*|/|%|<<|>>|\||\^|&|and\b|or\b)})
       end
     end
 
@@ -713,6 +731,7 @@ class Code
 
       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])
@@ -791,6 +810,8 @@ class Code
       index, token = split
       left = line[0...index]
       right = line[(index + token.length)..]
+      return [line] if token == "." && left.strip.empty?
+
       continuation = "#{indent}#{INDENT}#{right.lstrip}"
 
       first_line =

data/lib/code/node/left_operation.rb

@@ -51,12 +51,20 @@ class Code
 
         @others.reduce(first) do |left, right|
           if right.call?
-            right.statement.evaluate(**args, object: left)
+            right.statement.evaluate(
+              **args,
+              object: left,
+              previous_object: args.fetch(:object)
+            )
           elsif right.safe_call?
             if left.is_an?(Object::Nothing)
               Object::Nothing.new
             else
-              right.statement.evaluate(**args, object: left)
+              right.statement.evaluate(
+                **args,
+                object: left,
+                previous_object: args.fetch(:object)
+              )
             end
           elsif (right.or? && left.truthy?) || (right.and? && left.falsy?)
             left
@@ -76,9 +84,18 @@ class Code
         list = Object::IdentifierList.new([first])
 
         (@others || []).each do |other|
-          list.code_append(
-            other.statement.resolve(**args, object: list.code_last)
-          )
+          resolved =
+            other.statement.resolve(
+              **args,
+              object: list.code_last,
+              previous_object: args.fetch(:object)
+            )
+
+          if resolved.is_a?(Object::IdentifierList)
+            resolved.raw.each { |identifier| list.code_append(identifier) }
+          else
+            list.code_append(resolved)
+          end
         end
 
         list

data/lib/code/node/square_bracket.rb

@@ -13,9 +13,10 @@ class Code
 
       def evaluate(**args)
         left = @left&.evaluate(**args) || Object::Nothing.new
+        index_args = args.merge(object: args.fetch(:previous_object, args.fetch(:object)))
 
         (@statements || []).reduce(left) do |object, statement|
-          object.code_fetch(statement.evaluate(**args))
+          object.code_fetch(statement.evaluate(**index_args))
         end
       end
 
@@ -29,8 +30,10 @@ class Code
             Object::IdentifierList.new([left])
           end
 
+        index_args = args.merge(object: args.fetch(:previous_object, args.fetch(:object)))
+
         (@statements || []).each do |statement|
-          list.code_append(statement.evaluate(**args))
+          list.code_append(statement.evaluate(**index_args))
         end
 
         list

data/lib/code/object/dictionary.rb

@@ -134,6 +134,11 @@ class Code
         code_arguments = args.fetch(:arguments, List.new).to_code
         globals = multi_fetch(args, *GLOBALS)
         code_value = code_arguments.code_first
+        stored_value = code_fetch(code_operator)
+
+        if stored_value.is_a?(Function)
+          return stored_value.call(**args, operator: nil, bound_self: self)
+        end
 
         case code_operator.to_s
         when "[]", "at", "get"
@@ -146,11 +151,11 @@ class Code
           sig(args)
           code_clear
         when "compact!"
-          sig(args)
-          code_compact!
+          sig(args) { (Function | Class).maybe }
+          code_compact!(code_value, **globals)
         when "compact"
-          sig(args)
-          code_compact
+          sig(args) { (Function | Class).maybe }
+          code_compact(code_value, **globals)
         when "delete"
           sig(args) { Object.repeat(1) }
           code_delete(*code_arguments.raw, **globals)
@@ -581,12 +586,45 @@ class Code
         self
       end
 
-      def code_compact
-        Dictionary.new(raw.dup.delete_if { |_, value| value.falsy? })
+      def code_compact(argument = nil, **globals)
+        code_argument = argument.to_code
+
+        Dictionary.new(
+          raw.reject.with_index do |(key, value), index|
+            if code_argument.nothing?
+              value.nothing?
+            elsif code_argument.is_a?(Class)
+              value.is_a?(code_argument.raw)
+            else
+              code_argument.call(
+                arguments: List.new([value, key, Integer.new(index), self]),
+                **globals
+              ).truthy?
+            end
+          rescue Error::Next => e
+            e.code_value.truthy?
+          end
+        )
       end
 
-      def code_compact!
-        raw.delete_if { |_, value| value.falsy? }
+      def code_compact!(argument = nil, **globals)
+        code_argument = argument.to_code
+
+        raw.reject!.with_index do |(key, value), index|
+          if code_argument.nothing?
+            value.nothing?
+          elsif code_argument.is_a?(Class)
+            value.is_a?(code_argument.raw)
+          else
+            code_argument.call(
+              arguments: List.new([value, key, Integer.new(index), self]),
+              **globals
+            ).truthy?
+          end
+        rescue Error::Next => e
+          e.code_value.truthy?
+        end
+
         self
       end
 

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/list.rb

@@ -1545,25 +1545,22 @@ 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
         )
       end
@@ -1571,24 +1568,21 @@ class Code
       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

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 }", "{}"],

data/spec/code/object/function_spec.rb

@@ -3,22 +3,22 @@
 require "spec_helper"
 
 RSpec.describe Code::Object::Function do
-  #   [
-  #     ["even? = (i) => { i.even? } even?(2)", "true"],
-  #     ["even? = (i:) => { i.even? } even?(i: 2)", "true"],
-  #     ["add = (a, b) => { a + b } add(1, 2)", "3"],
-  #     ["minus = (a:, b:) => { a - b } minus(b: 1, a: 2)", "1"]
-  #   ].each do |input, expected|
-  #     it "#{input} == #{expected}" do
-  #       expect(Code.evaluate(input)).to eq(Code.evaluate(expected))
-  #     end
-  #   end
+  [
+    ["even? = (i) => { i.even? } even?(2)", "true"],
+    ["even? = (i:) => { i.even? } even?(i: 2)", "true"],
+    ["add = (a, b) => { a + b } add(1, 2)", "3"],
+    ["minus = (a:, b:) => { a - b } minus(b: 1, a: 2)", "1"]
+  ].each do |input, expected|
+    it "#{input} == #{expected}" do
+      expect(Code.evaluate(input)).to eq(Code.evaluate(expected))
+    end
+  end
 
   context "valid" do
     [
       "f = () => {} f",
-      "f = (x) => {} f(1)"
-      #      "f = (x:) => {} f(x: 1)"
+      "f = (x) => {} f(1)",
+      "f = (x:) => {} f(x: 1)"
     ].each do |input|
       it "#{input} is valid" do
         Code.evaluate(input)
@@ -38,6 +38,46 @@ RSpec.describe Code::Object::Function do
     end
   end
 
+  it "evaluates omitted keyword argument defaults" do
+    result = Code.evaluate(<<~CODE)
+      f = (number: 1, text: "fallback", missing: nothing, headers: {}) => {
+        [
+          number,
+          text,
+          missing.nothing?,
+          headers.merge({ authorization: "Bearer x" })
+        ]
+      }
+
+      f()
+    CODE
+
+    expect(result).to eq(
+      Code.evaluate('[1, "fallback", true, { authorization: "Bearer x" }]')
+    )
+  end
+
+  it "evaluates keyword defaults in the call context" do
+    expect(Code.evaluate("f = (a:, b: a + 1) => { b } f(a: 2)")).to eq(
+      Code.evaluate("3")
+    )
+  end
+
+  it "binds self when calling a function stored on a dictionary" do
+    result = Code.evaluate(<<~CODE)
+      object = {}
+      object.value = 1
+      object.fetch = () => {
+        self.value
+      }
+      object.fetch()
+    CODE
+
+    expect(result).to eq(
+      Code.evaluate("1")
+    )
+  end
+
   it "captures self for constructor-like functions that return self" do
     result = Code.evaluate(<<~CODE)
         User = (given_name:, family_name:, birth_date:) => {
@@ -72,6 +112,73 @@ RSpec.describe Code::Object::Function do
     )
   end
 
+  it "binds parent to the enclosing self for nested constructor functions" do
+    result = Code.evaluate(<<~CODE)
+        Account = (name:) => {
+          self.name = name
+
+          self.Project = (name:) => {
+            self.name = name
+
+            self.Task = (name:) => {
+              self.name = name
+
+              [
+                self.name,
+                parent.name,
+                parent.parent.name
+              ]
+            }
+
+            return(self)
+          }
+
+          return(self)
+        }
+
+        account = Account(name: "Acme")
+        Project = account.get(:Project)
+        project = Project(name: "Migration")
+        Task = project.get(:Task)
+        Task(name: "Import")
+      CODE
+
+    expect(result).to eq(
+      Code.evaluate('["Import", "Migration", "Acme"]')
+    )
+  end
+
+  it "allows parent chains deeper than two levels" do
+    result = Code.evaluate(<<~CODE)
+        A = (name:) => {
+          self.name = name
+          self.B = (name:) => {
+            self.name = name
+            self.C = (name:) => {
+              self.name = name
+              self.D = (name:) => {
+                self.name = name
+                parent.parent.parent.name
+              }
+              return(self)
+            }
+            return(self)
+          }
+          return(self)
+        }
+
+        a = A(name: "a")
+        B = a.get(:B)
+        b = B(name: "b")
+        C = b.get(:C)
+        c = C(name: "c")
+        D = c.get(:D)
+        D(name: "d")
+      CODE
+
+    expect(result).to eq(Code::Object::String.new("a"))
+  end
+
   it "supports constructor methods on functions" do
     result = Code.evaluate(<<~CODE)
         User = (given_name:, family_name:) => {

data/spec/code/object/list_spec.rb

@@ -5,6 +5,8 @@ require "spec_helper"
 RSpec.describe Code::Object::List do
   [
     ["[] == []", "true"],
+    ["[nothing, 1, false, \"\"].compact", '[1, false, ""]'],
+    ["[nothing, 1, false, \"\"].compact(&:blank?)", "[1]"],
     ["[1, 2, 3].sum", "6"],
     ["[1, 2] + [3, 4]", "[1, 2, 3, 4]"],
     ["[] + []", "[]"],

data/spec/code_spec.rb

@@ -328,6 +328,18 @@ RSpec.describe Code do
       ["[1, 2, 3]", "[1, 2, 3]"],
       ["[1, 2, 3].include?(2)", "true"],
       ["[1, 2, 3].include?(4)", "false"],
+      [
+        "summary = { by_status: { draft: 1 } } k = \"draft\" summary.by_status[k]",
+        "1"
+      ],
+      [
+        "summary = { by_status: {} } k = \"draft\" summary.by_status[k] = 1 summary",
+        '{"by_status" => {"draft" => 1}}'
+      ],
+      [
+        "summary = { by_status: {} } [{status: \"draft\"}].each { |track| summary.by_status[track[:status]] = 1 } summary",
+        '{"by_status" => {"draft" => 1}}'
+      ],
       ["[1, 2, 3].map { |i| continue(0) if i.even? i ** 2}", "[1, 0, 9]"],
       ["[1, 2, 3].map { |i| next if i == 2 i ** 2}", "[1, nothing, 9]"],
       ["[1, 2, 3].map { |i| next(0) if i.even? i ** 2}", "[1, 0, 9]"],

metadata

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