code-ruby 1.8.3 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90ea1b00e6d1977fe3d8dfa40d26a7354556380bcd64c0c6cbe448a4ff3b28cd
-  data.tar.gz: df66b284a124cf8ec9eedb572567920093c36227d5d0c9cc7c5b95ea59e487ea
+  metadata.gz: 2fece707e7c4b6ac1d7b25424dde96b9095c088b4f22a28e64af1b093b1a9a94
+  data.tar.gz: 960c8660fd9f5039ea34dec5b34d618da17b861e29a7b317ba4f701f5e6f2c26
 SHA512:
-  metadata.gz: d1649988e887c986755e1ec2e9dbda9a5d410b290b0c29f3e025c33e6d229b79eb5905b390790a0fc287bb528a0a3a22c67e1650ad0982605594e10441404c7e
-  data.tar.gz: d29cfd0814037087f57aaeb4bd1ef56e8f2755cf4f6eba38a6ab0f65c66ff8d780d87315490171fabb01354029acd5d0b962b546f2c66d7bdd30914b03f2ea2b
+  metadata.gz: 8324362cd96bf8134b82cf175afd91a4ff3f44c21c2dcaa9ae47778e175d491bfa923859e9fd74f7fd2eeb316ab0685e6b06a167c6d9f6e9f30d344fd5d5860a
+  data.tar.gz: edb4cc8af5291c3778ea5eca8d95b420b4555a29298a5b1132b2a2adfd2d599c06e142f2b76607d54ca058ed35d9640744343416d4ef386944814681d29e47e4

data/Gemfile.lock

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

data/VERSION

@@ -1 +1 @@
-1.8.3
+1.8.5

data/lib/code/object/list.rb

@@ -142,6 +142,9 @@ class Code
         when "<<", "append"
           sig(args) { Object }
           code_append(code_value)
+        when "+", "plus"
+          sig(args) { List.maybe }
+          code_arguments.any? ? code_plus(code_value) : code_self
         when "-", "minus"
           sig(args) { List }
           code_minus(code_value)
@@ -227,8 +230,8 @@ class Code
           sig(args)
           code_sum
         when "uniq"
-          sig(args)
-          code_uniq
+          sig(args) { (Function | Class).maybe }
+          code_uniq(code_value, **globals)
         when "many?"
           sig(args)
           code_many?
@@ -580,6 +583,12 @@ class Code
         self
       end
 
+      def code_plus(other)
+        code_other = other.to_code
+
+        List.new(raw + code_other.raw)
+      end
+
       def code_minus(other)
         code_other = other.to_code
 
@@ -1001,8 +1010,39 @@ class Code
         Integer.new(raw.size)
       end
 
-      def code_uniq
-        List.new(raw.uniq)
+      def code_uniq(argument = nil, **globals)
+        code_argument = argument.to_code
+
+        unless code_argument.is_a?(Function) || code_argument.is_a?(Class)
+          return List.new(raw.uniq)
+        end
+
+        if code_argument.is_a?(Class)
+          return List.new(
+            raw
+              .select { |code_element| code_element.is_a?(code_argument.raw) }
+              .uniq
+          )
+        end
+
+        index = 0
+
+        List.new(
+          raw.uniq do |code_element|
+            if code_argument.is_a?(Function)
+              code_argument
+                .call(
+                  arguments: List.new([code_element, Integer.new(index), self]),
+                  **globals
+                )
+                .tap { index += 1 }
+            else
+              code_element.tap { index += 1 }
+            end
+          rescue Error::Next => e
+            e.code_value.tap { index += 1 }
+          end
+        )
       end
 
       def code_sum

data/lib/code/object/time.rb

@@ -74,6 +74,17 @@ class Code
           self.raw = args.first.to_time.in_time_zone(::Time.zone)
         elsif args.first.is_a?(::ActiveSupport::TimeWithZone)
           self.raw = args.first.dup
+        elsif args.first.is_a?(Integer) || args.first.is_a?(Decimal) ||
+            args.first.is_a?(::Integer) || args.first.is_a?(::Float) ||
+            args.first.is_a?(::BigDecimal)
+          code_value = args.first.to_code
+          timestamp =
+            if code_value.is_a?(Decimal)
+              code_value.raw.to_r
+            else
+              code_value.raw
+            end
+          self.raw = ::Time.zone.at(timestamp)
         else
           self.raw = ::Time.zone.now
         end

data/spec/code/object/list_spec.rb

@@ -3,7 +3,14 @@
 require "spec_helper"
 
 RSpec.describe Code::Object::List do
-  [["[] == []", "true"], ["[1, 2, 3].sum", "6"]].each do |input, expected|
+  [
+    ["[] == []", "true"],
+    ["[1, 2, 3].sum", "6"],
+    ["[1, 2] + [3, 4]", "[1, 2, 3, 4]"],
+    ["[] + []", "[]"],
+    ["[1].any", "true"],
+    ["[].any", "false"]
+  ].each do |input, expected|
     it "#{input} == #{expected}" do
       expect(Code.evaluate(input)).to eq(Code.evaluate(expected))
     end

data/spec/code/object/time_spec.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe Code::Object::Time do
+  [
+    ['Time.new(1).format("%s")', ":1"],
+    ['Time.new(1100042342).format("%s")', ":1100042342"],
+    ['Time.new(1.2).format("%s.%L")', '"1.200"'],
+    ['Time.new(11212.1212).format("%s.%L")', '"11212.121"']
+  ].each do |input, expected|
+    it "#{input} == #{expected}" do
+      expect(Code.evaluate(input)).to eq(Code.evaluate(expected))
+    end
+  end
+end

data/spec/code_spec.rb

@@ -284,6 +284,9 @@ RSpec.describe Code do
     ["[1, 2, 3].map { |i| next(0) if i.even? i ** 2}", "[1, 0, 9]"],
     ["[1, 2, 3].select { |n| n.even? }", "[2]"],
     ["[1, 2, 3].select { |n| n.even? }.select { |n| n.odd? }", "[]"],
+    ["[1, 2, 3, 4].uniq { |n| n % 2 }", "[1, 2]"],
+    ['[1, "1", 2, "2"].uniq(String)', '["1", "2"]'],
+    ["[1, 2, 3, 4].uniq(String)", "[]"],
     ["[1, 2].map(&:to_string)", "[:1, :2]"],
     ["[1, 2].map(&:to_string)", '["1", "2"]'],
     ["[1, 2].map(&:to_string)", '["1", "2"]'],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.5
 platform: ruby
 authors:
 - Dorian Marié
@@ -345,6 +345,7 @@ files:
 - spec/code/object/nothing_spec.rb
 - spec/code/object/range_spec.rb
 - spec/code/object/string_spec.rb
+- spec/code/object/time_spec.rb
 - spec/code/parser/boolean_spec.rb
 - spec/code/parser/chained_call_spec.rb
 - spec/code/parser/dictionary_spec.rb