code-ruby 1.9.6 → 1.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a95a925416d72995a702f1ee826b2acaed3783f8b5fb969ded2acce57a3b463c
-  data.tar.gz: 83dc27edc922a93efee66d355b670ce6689e99573c6c7b26c3e2ffd84c3cbb6a
+  metadata.gz: 56fcf3ffc17f9740302bc6bd52c6aeb204eb3799883920fa35d7140829070464
+  data.tar.gz: 6e8b2521a80535fbf094771f4c105c56f6ccaef4d492dfbec9b0d51d099ab875
 SHA512:
-  metadata.gz: 4085a7a81985da654973b626b01e03bc54f8348004652afb17eab037556c608fd3591b98fcbd0a944a1e1ec9206795b62f2c297f62e989eb19744f8d16fe5540
-  data.tar.gz: 67c3d94c118ecc9f3d3f5fcce44c6295214c3b0af2309ccb933093f2002bd0a59fd9c9a6cb2fdfd4b4ffa3364c91dd862498d5411ebabe6d8cd4898e1e7e9b62
+  metadata.gz: fccf82958c319089713c3e00ec779f06adb23f315bff2fd4e2af5bac36b74cf91dbff74c7a5cd7d807cb4353e043e689b372fc4f3302d7e806e48a7c6d021c0b
+  data.tar.gz: 8424f8d97d597e00c3390ace61a8038fc151415f7a87573912be0cd43f342686a2d6dac70a775a86a7033f8cd40197376e1e1a6d7eb654f1c842180f2804904e

data/Gemfile.lock

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

data/VERSION

@@ -1 +1 @@
-1.9.6
+1.9.8

data/lib/code/format.rb

@@ -220,30 +220,35 @@ class Code
         components.flat_map do |component|
           value = component[:value].to_s
           if component[:type] == :code
-            [value]
+            [{ value: value, splittable: false }]
           else
-            value.split(/(\s+)/)
+            value
+              .split(/(\s+)/)
+              .reject(&:empty?)
+              .map { |unit| { value: unit, splittable: true } }
           end
-        end.reject(&:empty?)
+        end
 
       chunks = [""]
       units.each do |unit|
-        if unit.length > limit
+        value = unit[:value]
+
+        if unit[:splittable] && value.length > limit
           if chunks.last.empty?
-            segments = unit.scan(/.{1,#{limit}}/m)
+            segments = value.scan(/.{1,#{limit}}/m)
             chunks[-1] = segments.shift.to_s
             segments.each { |segment| chunks << segment }
           else
-            chunks << unit
+            chunks << value
           end
           next
         end
 
         current = chunks.last
-        candidate = "#{current}#{unit}"
+        candidate = "#{current}#{value}"
         if !current.empty? && candidate.length > limit
           chunks[-1] = current
-          chunks << unit
+          chunks << value
         else
           chunks[-1] = candidate
         end

data/lib/code/object/date.rb

@@ -7,6 +7,7 @@ class Code
 
       class << self
         delegate(
+          :code_zone,
           :code_format,
           :code_past?,
           :code_future?,
@@ -84,6 +85,13 @@ class Code
         code_second = code_arguments.code_second
 
         case code_operator.to_s
+        when "zone="
+          sig(args) { String }
+          ::Time.zone = code_value.raw
+          code_value
+        when "zone"
+          sig(args)
+          code_zone
         when "after?"
           sig(args) { (Date | Time).maybe }
           code_after?(code_value)
@@ -334,6 +342,9 @@ class Code
         code_second = code_arguments.code_second
 
         case code_operator.to_s
+        when "zone"
+          sig(args)
+          code_zone
         when "after?"
           sig(args) { (Date | Time).maybe }
           code_after?(code_value)
@@ -858,6 +869,10 @@ class Code
 
         Date.new(dup)
       end
+
+      def code_zone
+        String.new(::Time.zone.name)
+      end
     end
   end
 end

data/lib/code/object/identifier_list.rb

@@ -12,32 +12,99 @@ class Code
         case code_operator.to_s
         when /=$/
           sig(args) { Object }
+          assignment_operator = code_operator.to_s
+          context = find_context_with_identifier(code_context, raw.first)
 
-          code_context = code_context.code_lookup!(raw.first)
-
-          code_context =
-            raw[..-2].reduce(code_context) do |code_context, code_identifier|
-              code_context.code_fetch(code_identifier)
-            end
-
-          code_context.code_set(
-            raw.last,
-            if code_operator.to_s == "="
-              code_value
-            else
-              code_context.code_fetch(raw.last).call(
-                **args,
-                operator: code_operator.to_s.chop,
-                arguments: [code_value]
-              )
-            end
-          )
-
-          code_context.code_fetch(raw.last)
+          if context
+            assign_in_context(
+              context: context,
+              assignment_operator: assignment_operator,
+              code_value: code_value,
+              **args
+            )
+          else
+            assign_with_setter(
+              assignment_operator: assignment_operator,
+              code_value: code_value,
+              **args
+            )
+          end
         else
           super
         end
       end
+
+      private
+
+      def find_context_with_identifier(context, identifier)
+        current = context
+
+        while current
+          return current if current.code_has_key?(identifier).truthy?
+
+          current = current.parent
+        end
+
+        nil
+      end
+
+      def assign_in_context(context:, assignment_operator:, code_value:, **args)
+        receiver =
+          raw[..-2].reduce(context) do |value, code_identifier|
+            value.code_fetch(code_identifier)
+          end
+
+        receiver.code_set(
+          raw.last,
+          if assignment_operator == "="
+            code_value
+          else
+            receiver.code_fetch(raw.last).call(
+              **args.merge(context: args.fetch(:context, context)),
+              operator: assignment_operator.chop,
+              arguments: [code_value]
+            )
+          end
+        )
+
+        receiver.code_fetch(raw.last)
+      end
+
+      def assign_with_setter(assignment_operator:, code_value:, **args)
+        code_object = args.fetch(:object)
+        receiver =
+          raw[...-1].reduce(code_object) do |value, code_identifier|
+            value.call(
+              **args,
+              operator: code_identifier,
+              arguments: Object::List.new
+            )
+          end
+
+        if assignment_operator == "="
+          receiver.call(
+            **args,
+            operator: "#{raw.last}=",
+            arguments: Object::List.new([code_value])
+          )
+        else
+          next_value = receiver.call(
+            **args,
+            operator: raw.last,
+            arguments: Object::List.new
+          ).call(
+            **args,
+            operator: assignment_operator.chop,
+            arguments: Object::List.new([code_value])
+          )
+
+          receiver.call(
+            **args,
+            operator: "#{raw.last}=",
+            arguments: Object::List.new([next_value])
+          )
+        end
+      end
     end
   end
 end

data/lib/code/object/time.rb

@@ -97,6 +97,14 @@ class Code
         code_second = code_arguments.code_second
 
         case code_operator.to_s
+        when "zone="
+          sig(args) { String }
+          ::Time.zone = code_value.raw
+          code_value
+        when "zone"
+          sig(args)
+          ::Time.zone ||= DEFAULT_ZONE
+          code_zone
         when "after?"
           sig(args) { (Date | Time).maybe }
           code_after?(code_value)
@@ -370,6 +378,10 @@ class Code
         end
       end
 
+      def self.code_zone
+        String.new(::Time.zone.name)
+      end
+
       def call(**args)
         code_operator = args.fetch(:operator, nil).to_code
         code_arguments = args.fetch(:arguments, []).to_code
@@ -377,6 +389,9 @@ class Code
         code_second = code_arguments.code_second
 
         case code_operator.to_s
+        when "zone"
+          sig(args)
+          code_zone
         when "after?"
           sig(args) { (Date | Time).maybe }
           code_after?(code_value)
@@ -997,6 +1012,10 @@ class Code
 
         Time.new(dup)
       end
+
+      def code_zone
+        String.new(raw.zone)
+      end
     end
   end
 end

data/spec/code/format_spec.rb

@@ -30,6 +30,10 @@ RSpec.describe Code::Format do
       [
         "Http.post(\"https://api.openai.com/v1/chat/completions\", headers: { authorization: \"Bearer {open_ai_api_key}\", \"content-type\": \"application/json\" }, body: { model: model, messages: [{ role: \"system\", content: \"hello\" }, { role: \"user\", content: \"world\" }] }.to_json)",
         "Http.post(\n  \"https://api.openai.com/v1/chat/completions\",\n  headers: {\n    authorization: \"Bearer {open_ai_api_key}\",\n    \"content-type\": \"application/json\"\n  },\n  body: {\n    model: model,\n    messages: [\n      { role: :system, content: :hello },\n      { role: :user, content: :world }\n    ]\n  }.to_json\n)"
+      ],
+      [
+        "proxy_url = (url) => { \"{proxy_base_url}?{{ url: url, disposition: proxy_inline_disposition }.to_query}\" }",
+        "proxy_url = (url) => {\n  \"{proxy_base_url}?\"\n    + \"{{\n    url: url,\n    disposition: proxy_inline_disposition\n  }.to_query}\"\n}"
       ]
     ].each do |input, expected|
       it "formats #{input.inspect}" do

data/spec/code/object/identifier_list_spec.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe Code::Object::IdentifierList do
+  it "keeps context for ||= assignments in nested context receivers" do
+    code_context = Code::Object::Context.new
+    code_identifier = Code::Object::String.new("value")
+    code_key = Code::Object::String.new("key")
+
+    code_context.code_set(
+      code_identifier,
+      Code::Object::Dictionary.new(code_key => Code::Object::Dictionary.new(a: 1))
+    )
+
+    identifier_list = described_class.new([code_identifier, code_key])
+
+    expect do
+      identifier_list.send(
+        :assign_in_context,
+        context: code_context,
+        assignment_operator: "||=",
+        code_value: Code::Object::Dictionary.new(b: 2),
+        arguments: Code::Object::List.new([Code::Object::Dictionary.new(b: 2)]),
+        operator: "||=",
+        error: StringIO.new,
+        input: StringIO.new,
+        object: Code::Object::Global.new,
+        output: StringIO.new,
+        source: ""
+      )
+    end.not_to raise_error
+  end
+end

data/spec/code_spec.rb

@@ -464,6 +464,7 @@ RSpec.describe Code do
     ["subject = 1 { subject }", "{ subject: 1 }"],
     ["subject = 1 { subject: }", "{ subject: 1 }"],
     ["'{1} {2}'", "'1 2'"],
+    ['Time.zone = "Etc/UTC"', '"Etc/UTC"'],
     %w[Json.parse("1") 1],
     %w[{a:1}.to_query "a=1"],
     ["", ""]
@@ -532,4 +533,10 @@ RSpec.describe Code do
     described_class.evaluate(input)
     described_class.evaluate(format_input(input))
   end
+
+  it "raises for undefined constant receiver assignment" do
+    expect do
+      described_class.evaluate("UnknownConstant.zone = 1")
+    end.to raise_error(Code::Error, /UnknownConstant is not defined/)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby
 version: !ruby/object:Gem::Version
-  version: 1.9.6
+  version: 1.9.8
 platform: ruby
 authors:
 - Dorian Marié
@@ -346,6 +346,7 @@ files:
 - spec/code/object/dictionary_spec.rb
 - spec/code/object/function_spec.rb
 - spec/code/object/http_spec.rb
+- spec/code/object/identifier_list_spec.rb
 - spec/code/object/integer_spec.rb
 - spec/code/object/list_spec.rb
 - spec/code/object/nothing_spec.rb