code-ruby 1.9.5 → 1.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df0804f190945d8f07a6f5cae42a219bc576f28f02031dfd3996c6cb9d2ba65c
-  data.tar.gz: 6256656f387e5d7314989d6ec36565a6513b2a79a9b90cc56de37c5fc36dda94
+  metadata.gz: 6333e864ab7337464252aefef70ff9d3bd5adbfa56a6824f26800a19e5edc776
+  data.tar.gz: 6556133a0bf11f1651f693d9af6edce9781f2c5b90a842fb46dbd0a45061034d
 SHA512:
-  metadata.gz: 3c5ef827b4df8b02930ea953d32deb87416417e390ba82c28b8106fb6450d7187a9e65341c3e843416ca5cffe58d2639ae7db078a47c474350b070d912f4c40f
-  data.tar.gz: fb25671a2ba8c4643325dbafc837b6a7819402ceda55ff1f6870d6cedcf81a3ff1166d370896528a03e6ed8fc7587a95b84e468f12c15b8c3b1629941ed8140b
+  metadata.gz: a4e8152a05e0f67801282b08d1ebc4a2ed8ebbb346d15cdb976f4e201a0358658922d7f457faf6b7bfe5d9e65f7d135a3b97741dcdc8ce10706c302e0e19fa8d
+  data.tar.gz: f24a4f62f8eac88f50c6627f07969deeb92a3a0e95d5f4b77769aa78b28f27136c13b573db5fb46a1737064af2be2eeedc62f3a0a16ebcf28ec24bce3674dcff

data/Gemfile.lock

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

data/VERSION

@@ -1 +1 @@
-1.9.5
+1.9.7

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)
@@ -706,7 +717,6 @@ class Code
 
         requested_locale = code_locale.raw&.to_s
         locale = requested_locale&.presence_in(LOCALES)&.to_sym
-        locale ||= ::Current.locale if defined?(::Current)
         locale ||= ::I18n.locale
         locale = ::I18n.locale unless ::I18n.available_locales.include?(locale.to_sym)
 
@@ -859,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,
+              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)
@@ -815,7 +830,6 @@ class Code
 
         requested_locale = code_locale.raw&.to_s
         locale = requested_locale&.presence_in(LOCALES)&.to_sym
-        locale ||= ::Current.locale if defined?(::Current)
         locale ||= ::I18n.locale
         locale = ::I18n.locale unless ::I18n.available_locales.include?(locale.to_sym)
 
@@ -998,6 +1012,10 @@ class Code
 
         Time.new(dup)
       end
+
+      def code_zone
+        String.new(raw.zone)
+      end
     end
   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.5
+  version: 1.9.7
 platform: ruby
 authors:
 - Dorian Marié