code-ruby 0.14.0 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c99f4f0ee7e0d6ac477e266434a927ae59acc6cbf0ae50237397801acbd790a9
-  data.tar.gz: a6b1fb15a82837f17482a64d0e03f371b88d9f6fc1a7cd0ce10f37473ed71174
+  metadata.gz: 7027d0ca2225f4adf54f980dd7d08b7fa07c10c40c7e04b8e67e651a300f77b7
+  data.tar.gz: f652f053f3bb7710629deea3ad6cb0684c6117f1475cace386c4ea5005649eca
 SHA512:
-  metadata.gz: ac6a450e1cdc87c22ce13b834158c50ff3688152f524560c5fa35a3c86fa11f607859208e1fb1cad5333147bbbb5674e862e92c393e70382c4a42dc5e86bd153
-  data.tar.gz: 5cdaa736e54913b5de049fb580ddbef07e5240d9f5de7cb7aa183b5c7abd70601839a74378b779bdcb313de1cf2398d651a34f596afbcb4f3299c885e7ba28ff
+  metadata.gz: 5ecea3358e470e50cb5571c0c5094837a1eb7fd68043e803d18dc3b691686e246cc0cb93a1a89fd4fbe1448b0dc45841883e4938b8510f9df6d45d7091d57447
+  data.tar.gz: 3c0d475b0420dd3a937dd0f2dcff648bc2d1924b0639415c3096e79429dda1e787579a684aa3ce8b236739b590f72ebfb2049c901224288fadfca4ce25c5c183

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    code-ruby (0.13.1)
+    code-ruby (0.14.1)
       activesupport (~> 7)
       bigdecimal (~> 3)
       json (~> 2)

data/lib/code/object/dictionary.rb

@@ -107,6 +107,9 @@ class Code
         when "merge"
           sig(args) { [Dictionary.repeat, Function.maybe] }
           code_merge(*arguments.raw, **globals)
+        when "merge!"
+          sig(args) { [Dictionary.repeat, Function.maybe] }
+          code_merge!(*arguments.raw, **globals)
         when "nine?"
           sig(args)
           code_nine?
@@ -470,6 +473,40 @@ class Code
         )
       end
 
+      def code_merge!(*arguments, **globals)
+        conflict =
+          (
+            if arguments.last.is_a?(Function) && arguments.size > 1
+              arguments.last
+            end
+          )
+
+        arguments = arguments[..-2] if conflict
+
+        index = 0
+
+        raw.merge!(*arguments.map(&:raw)) do |key, old_value, new_value|
+          if conflict
+            conflict
+              .call(
+                arguments:
+                  List.new(
+                    [key, old_value, new_value, Integer.new(index), self]
+                  ),
+                **globals
+              )
+              .tap { index += 1 }
+          else
+            new_value.tap { index += 1 }
+          end
+        rescue Error::Next => e
+          index += 1
+          e.value || Nothing.new
+        end
+
+        self
+      end
+
       def code_nine?
         code_size.code_nine?
       end

data/lib/code/object/time.rb

@@ -7,9 +7,10 @@ class Code
 
       def initialize(*args, **_kargs, &_block)
         ::Time.zone ||= DEFAULT_ZONE
-        raw = args.first.presence || ::Time.zone.now
+        raw = args.first
         raw = raw.raw if raw.is_an?(Object)
-        @raw = ::Time.zone.parse(raw.to_s)
+        raw = raw.presence || ::Time.zone.now
+        @raw = ::Time.zone.parse(raw.to_s).presence || ::Time.zone.now
       end
 
       def self.call(**args)

data/lib/code/version.rb

@@ -2,4 +2,4 @@
 
 require_relative "../code"
 
-Code::Version = Gem::Version.new("0.14.0")
+Code::Version = Gem::Version.new("0.14.2")

data/spec/code_spec.rb

@@ -62,6 +62,7 @@ RSpec.describe Code do
     Parameter.new
     IdentifierList.new
     IdentifierList.new([])
+    Time.new(nothing).before?
   ].each { |input| it(input) { Code.evaluate(input) } }
 
   [
@@ -270,6 +271,8 @@ RSpec.describe Code do
     %w[1.to_json "1"],
     %w[1.0.to_json '"1.0"'],
     %w[1.1.to_json '"1.1"'],
+    ["a = {} a.merge!(a: 1) a", "{a: 1}"],
+    ["a = {} a.merge(a: 1) a", "{}"],
     ["", ""]
   ].each do |input, expected|
     it "#{input} == #{expected}" do

metadata

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