code-ruby 0.8.5 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deb295fa0a68512686041fc2d29d7097a429a4e53d31e44f90028bccea2be8c4
-  data.tar.gz: a8011e7b16501d6766b02f15139481dfec4fadc23201dd5e772340550460c9d6
+  metadata.gz: 1f92c4c4db84ee34d5e5d58325ab4de49d9346a738239aba44682db9e2530e7e
+  data.tar.gz: 6d056953ec6852d7824343f45198e0b35f13db881420fdce645753e091249ac7
 SHA512:
-  metadata.gz: 1caa4cfa4ca44dfa4ff820acd8c7f49f8f9586bfefb1b0f43bd6e6eda0fd835d5d8f2bc91ec748dcbdd75a64553bf3cb75adc9059521cdbd64fc480b0f4ea226
-  data.tar.gz: 20cb4e9b6089121edd2d9968726b00a76b9d2f14b7a9adc29de0b3c98711f7724e2d52e6824944b2675681e0c9d7d884eb17ff2a06984f9f6b9e76af1afbaf52
+  metadata.gz: 98ddcc59fe93cf2625cbc521a08b2119bcb8fc1bd8cd6fd3da6fb40039a73aa8835e35234c3e77842fbbcc6fa57fe51377e96f457bfd6e391a5bd96d37229296
+  data.tar.gz: 7b2723a4c912be64c3c7588fb905b40c6cd8fc510a61ca56a7af21037bd8d27d29a667659ea07a97d096d9a44d01dc6a5064f7a45ee58e39770d016a479353af

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    code-ruby (0.8.4)
+    code-ruby (0.9.0)
       activesupport (~> 7)
       bigdecimal (~> 3)
+      json (~> 2)
       language-ruby (~> 0)
       zeitwerk (~> 2)
 
@@ -29,6 +30,7 @@ GEM
       ruby2_keywords
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
+    json (2.7.1)
     language-ruby (0.6.2)
       zeitwerk (~> 2)
     minitest (5.22.2)
@@ -45,7 +47,7 @@ GEM
     rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.0)
+    rspec-support (3.13.1)
     ruby-prof (1.7.0)
     ruby2_keywords (0.0.5)
     tzinfo (2.0.6)

data/README.md

@@ -1,7 +1,3 @@
 # code-ruby
 
 A programming language, like `Code.evaluate("1 + 1") # => 2`
-
-TODO
-
-- [ ] `code` command

data/code-ruby.gemspec

@@ -10,14 +10,15 @@ Gem::Specification.new do |s|
   s.description = 'A programming language, like Code.evaluate("1 + 1") # => 2'
   s.authors = ["Dorian Marié"]
   s.email = "dorian@dorianmarie.fr"
-  s.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  s.files = `git ls-files`.lines.map(&:strip)
   s.require_paths = ["lib"]
   s.homepage = "https://github.com/dorianmariecom/code-ruby"
   s.license = "MIT"
   s.executables = "code"
 
+  s.add_dependency "activesupport", "~> 7"
   s.add_dependency "bigdecimal", "~> 3"
+  s.add_dependency "json", "~> 2"
   s.add_dependency "language-ruby", "~> 0"
-  s.add_dependency "activesupport", "~> 7"
   s.add_dependency "zeitwerk", "~> 2"
 end

data/lib/code/object/argument.rb

@@ -10,14 +10,6 @@ class Code
         @name = name
       end
 
-      def self.name
-        "Argument"
-      end
-
-      def inspect
-        to_s
-      end
-
       def keyword?
         !regular?
       end
@@ -29,10 +21,6 @@ class Code
       def regular?
         !name
       end
-
-      def to_s
-        "<Argument #{value.inspect}>"
-      end
     end
   end
 end

data/lib/code/object/boolean.rb

@@ -60,6 +60,10 @@ class Code
       def truthy?
         raw
       end
+
+      def as_json(...)
+        raw.as_json(...)
+      end
     end
   end
 end

data/lib/code/object/class.rb

@@ -24,6 +24,10 @@ class Code
       def self.name
         "Class"
       end
+
+      def as_json(...)
+        raw.name.as_json(...)
+      end
     end
   end
 end

data/lib/code/object/date.rb

@@ -37,6 +37,10 @@ class Code
       def to_s
         raw.to_s
       end
+
+      def as_json(...)
+        raw.as_json(...)
+      end
     end
   end
 end

data/lib/code/object/decimal.rb

@@ -309,6 +309,10 @@ class Code
       def to_s
         raw.to_s("F")
       end
+
+      def as_json(...)
+        raw.as_json(...)
+      end
     end
   end
 end

data/lib/code/object/dictionary.rb

@@ -648,6 +648,10 @@ class Code
       def to_s
         "{#{raw.map { |key, value| "#{key.inspect} => #{value.inspect}" }.join(", ")}}"
       end
+
+      def as_json(...)
+        raw.as_json(...)
+      end
     end
   end
 end

data/lib/code/object/duration.rb

@@ -43,6 +43,10 @@ class Code
       def to_s
         raw.to_s
       end
+
+      def as_json(...)
+        raw.as_json(...)
+      end
     end
   end
 end

data/lib/code/object/function.rb

@@ -87,6 +87,10 @@ class Code
       def to_s
         ""
       end
+
+      def as_json(...)
+        raw.as_json(...)
+      end
     end
   end
 end

data/lib/code/object/global.rb

@@ -91,10 +91,6 @@ class Code
           end
         end
       end
-
-      def to_s
-        "global"
-      end
     end
   end
 end

data/lib/code/object/integer.rb

@@ -6,15 +6,11 @@ class Code
       attr_reader :raw
 
       def initialize(whole, exponent: nil)
+        whole = whole.raw if whole.is_a?(Integer)
         @raw = whole.to_i
-
         return unless exponent
-
-        unless exponent.is_a?(Number)
-          raise Code::Error::TypeError, "exponent is not a number"
-        end
-
-        @raw *= 10**exponent.raw
+        exponent = exponent.raw if exponent.is_a?(Number)
+        @raw *= 10**exponent
       end
 
       def self.name
@@ -407,6 +403,10 @@ class Code
       def to_s
         raw.to_s
       end
+
+      def as_json(...)
+        raw.as_json(...)
+      end
     end
   end
 end

data/lib/code/object/list.rb

@@ -211,6 +211,10 @@ class Code
       def to_s
         "[#{raw.map(&:inspect).join(", ")}]"
       end
+
+      def as_json(...)
+        raw.as_json(...)
+      end
     end
   end
 end

data/lib/code/object/nothing.rb

@@ -24,6 +24,10 @@ class Code
       def truthy?
         false
       end
+
+      def as_json(...)
+        raw.as_json(...)
+      end
     end
   end
 end

data/lib/code/object/range.rb

@@ -138,6 +138,10 @@ class Code
       def to_s
         raw.to_s
       end
+
+      def as_json(...)
+        raw.as_json(...)
+      end
     end
   end
 end

data/lib/code/object/string.rb

@@ -100,6 +100,10 @@ class Code
       def to_s
         raw
       end
+
+      def as_json(...)
+        raw.as_json(...)
+      end
     end
   end
 end

data/lib/code/object/time.rb

@@ -77,6 +77,10 @@ class Code
       def to_s
         raw.to_s
       end
+
+      def as_json(...)
+        raw.as_json(...)
+      end
     end
   end
 end

data/lib/code/object.rb

@@ -319,5 +319,13 @@ class Code
     def truthy?
       true
     end
+
+    def to_json(...)
+      as_json(...).to_json
+    end
+
+    def as_json(...)
+      raise NotImplementedError, "#{self.class}#as_json"
+    end
   end
 end

data/lib/code/version.rb

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

data/lib/code-ruby.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
+require "active_support"
+require "active_support/core_ext/date/conversions"
+require "active_support/core_ext/numeric/time"
+require "active_support/core_ext/object/json"
 require "bigdecimal"
+require "json"
+require "language-ruby"
 require "stringio"
 require "timeout"
 require "zeitwerk"
-require "language-ruby"
-require "active_support"
-require "active_support/core_ext/numeric/time"
-require "active_support/core_ext/date/conversions"
 
 loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
 loader.ignore("#{__dir__}/code-ruby.rb")

data/lib/code.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Code
-  EMPTY_STRING = ""
   GLOBALS = %i[output error context object].freeze
   DEFAULT_TIMEOUT = 0
 
@@ -9,50 +8,35 @@ class Code
     input,
     output: StringIO.new,
     error: StringIO.new,
-    timeout: DEFAULT_TIMEOUT,
-    ruby: {}
+    timeout: DEFAULT_TIMEOUT
   )
     @input = input
-    @parsed = Timeout.timeout(timeout) { ::Code::Parser.parse(input).to_raw }
     @output = output
     @error = error
     @timeout = timeout || DEFAULT_TIMEOUT
-    @ruby = ::Code::Ruby.to_code(ruby || {}).code_to_context
+    @context = Object::Context.new
   end
 
   def self.evaluate(
     input,
-    context = EMPTY_STRING,
     output: StringIO.new,
     error: StringIO.new,
-    timeout: DEFAULT_TIMEOUT,
-    ruby: {}
+    timeout: DEFAULT_TIMEOUT
   )
-    new(input, output:, error:, timeout:, ruby:).evaluate(context)
+    new(input, output:, error:, timeout:).evaluate
   end
 
-  def evaluate(context = EMPTY_STRING)
+  def evaluate
     Timeout.timeout(timeout) do
-      context =
-        if context == EMPTY_STRING
-          Object::Context.new
-        else
-          Code.evaluate(
-            context,
-            timeout:,
-            output:,
-            error:,
-            ruby:
-          ).code_to_context
-        end
-
-      context = ruby.merge(context)
-
-      Node::Code.new(parsed).evaluate(context:, output:, error:)
+      Node::Code.new(::Code::Parser.parse(input).to_raw).evaluate(
+        context:,
+        output:,
+        error:
+      )
     end
   end
 
   private
 
-  attr_reader :input, :parsed, :timeout, :output, :error, :ruby
+  attr_reader :input, :timeout, :output, :error, :context
 end

data/spec/code/object/dictionary_spec.rb

@@ -3,95 +3,95 @@
 require "spec_helper"
 
 RSpec.describe Code::Object::Dictionary do
-  let(:context) { '{ first_name: "Dorian", language: :code }' }
+  let(:dictionary) { 'dictionary = { first_name: "Dorian", language: :code }' }
 
   [
-    ["{} == {}", "true"],
-    ['{ "name" => "Dorian" } == { name: :Dorian }', "true"],
-    %w[context.first_name :Dorian],
-    ["context[:first_name]", ":Dorian"],
-    %w[context.language :code],
-    ["context > { first_name: :Dorian", "true"],
-    ["{ first_name: :Dorian } < context", "true"],
-    ["context <= context", "true"],
-    ["context >= {}", "true"],
-    ["context <=> context", "0"],
-    ["context === context", "true"],
-    ["{ first_name: :Dorian }.any? { |_, value| value == :Dorian }", "true"],
-    %w[context.any?(String) true],
-    ["{ a: nothing }.compact", "{}"],
-    ["d = { a: nothing } d.compact! d", "{}"],
-    %w[context.dig(:first_name) :Dorian],
-    %w[context.empty? false],
-    %w[context.truthy? true],
-    %w[context.falsy? false],
-    %w[context.fetch(:first_name) :Dorian],
-    ["context.fetch(:unknown) { :Good }", ":Good"],
-    ["context.fetch(:first_name, :language)", "context"],
     [
-      "context.fetch(:first_name, :last_name) { :Marié }",
-      "{ first_name: :Dorian, last_name: :Marié }"
+      "dictionary.select { |key, value, dictionnary, index| key == :first_name }",
+      "{ first_name: :Dorian }"
     ],
-    ["context.delete(:last_name) { true }", "true"],
     [
-      "context.delete(:first_name, :language)",
-      "{ first_name: :Dorian, language: :code }"
+      "dictionary.select { |key, value, dictionnary, index| value == :Dorian }",
+      "{ first_name: :Dorian }"
     ],
-    ["{ first_name: :Dorian }.delete_if(String)", "{}"],
-    ["{ age: 31 }.delete_unless(Number)", "{ age: 31 }"],
-    ["{ age: 31 }.delete_unless(Integer)", "{ age: 31 }"],
-    ["{ first_name: :Dorian }.delete_if { |_, value| value == :Dorian }", "{}"],
-    ["{ age: 31 }.delete_unless { |key| key == :age }", "{ age: 31 }"],
-    ["{ first_name: :Dorian }.keep_if(String)", "{ first_name: :Dorian }"],
-    ["{ age: 31 }.keep_unless(Number)", "{}"],
-    ["{ age: 31 }.keep_unless(Integer)", "{}"],
-    ["{ first_name: :Dorian }.keep_if { |_, value| value != :Dorian }", "{}"],
-    ["{ age: 31 }.keep_unless { |key| key == :age }", "{}"],
-    ["context.except(:first_name, :language)", "{}"],
-    ["context.fetch_values(:first_name, :language)", "[:Dorian, :code]"],
-    ["context.fetch_values(:first_name)", "[:Dorian]"],
-    %w[context.select(String) context],
-    %w[context.select(Integer) {}],
-    ["context.select(Integer) context", "context"],
-    %w[context.select!(Integer) {}],
-    ["context.select!(Integer) context", "{}"],
     [
-      "context.select { |key, value, dictionnary, index| key == :first_name }",
-      "{ first_name: :Dorian }"
+      "dictionary.select { |key, value, dictionnary, index| dictionnary.two? }",
+      "dictionary"
     ],
     [
-      "context.select { |key, value, dictionnary, index| value == :Dorian }",
+      "dictionary.select { |key, value, dictionnary, index| index.zero? }",
       "{ first_name: :Dorian }"
     ],
     [
-      "context.select { |key, value, dictionnary, index| dictionnary.two? }",
-      "context"
+      "dictionary.fetch(:first_name, :last_name) { :Marié }",
+      "{ first_name: :Dorian, last_name: :Marié }"
     ],
+    ["dictionary.delete(:last_name) { true }", "true"],
     [
-      "context.select { |key, value, dictionnary, index| index.zero? }",
-      "{ first_name: :Dorian }"
+      "dictionary.delete(:first_name, :language)",
+      "{ first_name: :Dorian, language: :code }"
     ],
-    ["{ a: 1, b: [2, 3] }.to_list", "[[:a, 1], [:b, [2, 3]]]"],
+    %w[dictionary.any?(String) true],
+    %w[dictionary.dig(:first_name) :Dorian],
+    %w[dictionary.empty? false],
+    %w[dictionary.falsy? false],
+    %w[dictionary.fetch(:first_name) :Dorian],
+    %w[dictionary.first_name :Dorian],
+    %w[dictionary.has_key?(:first_name) true],
+    %w[dictionary.has_key?(:unknown) false],
+    %w[dictionary.has_value?(:Dorian) true],
+    %w[dictionary.has_value?(:Unknown) false],
+    %w[dictionary.key(:Dorian) :first_name],
+    %w[dictionary.key(:Unknown) nothing],
+    %w[dictionary.language :code],
+    %w[dictionary.select!(Integer) {}],
+    %w[dictionary.select(Integer) {}],
+    %w[dictionary.select(String) dictionary],
+    %w[dictionary.truthy? true],
+    ["d = { a: nothing } d.compact! d", "{}"],
+    ["dictionary <= dictionary", "true"],
+    ["dictionary <=> dictionary", "0"],
+    ["dictionary === dictionary", "true"],
+    ["dictionary > { first_name: :Dorian", "true"],
+    ["dictionary >= {}", "true"],
+    ["dictionary.except(:first_name, :language)", "{}"],
+    ["dictionary.fetch(:first_name, :language)", "dictionary"],
+    ["dictionary.fetch(:unknown) { :Good }", ":Good"],
+    ["dictionary.fetch_values(:first_name)", "[:Dorian]"],
+    ["dictionary.fetch_values(:first_name, :language)", "[:Dorian, :code]"],
+    ["dictionary.invert", "{ Dorian: :first_name, code: :language }"],
+    ["dictionary.key(:Unknown) { true }", "true"],
+    ["dictionary.select!(Integer) dictionary", "{}"],
+    ["dictionary.select(Integer) dictionary", "dictionary"],
+    ["dictionary[:first_name]", ":Dorian"],
+    ["{ a: 1 }.merge(b: 2)", "{ a: 1, b: 2 }"],
+    ["{ a: 1 }.merge({ a: 2 }) { |_, old, new| old + new }", "{ a: 3 }"],
+    ["{ a: 1 }.merge({ a: 2 })", "{ a: 2 }"],
+    ["{ a: 1 }.merge({ b: 2 })", "{ a: 1, b: 2 }"],
     ["{ a: 1, b: [2, 3] }.flatten", "[:a, 1, :b, 2, 3]"],
+    ["{ a: 1, b: [2, 3] }.flatten(-1)", "[:a, 1, :b, 2, 3]"],
     ["{ a: 1, b: [2, 3] }.flatten(0)", "[[:a, 1], [:b, [2, 3]]]"],
     ["{ a: 1, b: [2, 3] }.flatten(1)", "[:a, 1, :b, [2, 3]]"],
-    ["{ a: 1, b: [2, 3] }.flatten(-1)", "[:a, 1, :b, 2, 3]"],
-    %w[context.has_key?(:first_name) true],
-    %w[context.has_key?(:unknown) false],
-    %w[context.has_value?(:Dorian) true],
-    %w[context.has_value?(:Unknown) false],
-    ["context.invert", "{ Dorian: :first_name, code: :language }"],
-    %w[context.key(:Dorian) :first_name],
-    %w[context.key(:Unknown) nothing],
-    ["context.key(:Unknown) { true }", "true"],
-    ["{ a: 1 }.merge(b: 2)", "{ a: 1, b: 2 }"],
-    ["{ a: 1 }.merge({ b: 2 })", "{ a: 1, b: 2 }"],
-    ["{ a: 1 }.merge({ a: 2 })", "{ a: 2 }"],
-    ["{ a: 1 }.merge({ a: 2 }) { |_, old, new| old + new }", "{ a: 3 }"]
+    ["{ a: 1, b: [2, 3] }.to_list", "[[:a, 1], [:b, [2, 3]]]"],
+    ["{ a: nothing }.compact", "{}"],
+    ["{ age: 31 }.delete_unless { |key| key == :age }", "{ age: 31 }"],
+    ["{ age: 31 }.delete_unless(Integer)", "{ age: 31 }"],
+    ["{ age: 31 }.delete_unless(Number)", "{ age: 31 }"],
+    ["{ age: 31 }.keep_unless { |key| key == :age }", "{}"],
+    ["{ age: 31 }.keep_unless(Integer)", "{}"],
+    ["{ age: 31 }.keep_unless(Number)", "{}"],
+    ["{ first_name: :Dorian } < dictionary", "true"],
+    ["{ first_name: :Dorian }.any? { |_, value| value == :Dorian }", "true"],
+    ["{ first_name: :Dorian }.delete_if { |_, value| value == :Dorian }", "{}"],
+    ["{ first_name: :Dorian }.delete_if(String)", "{}"],
+    ["{ first_name: :Dorian }.keep_if { |_, value| value != :Dorian }", "{}"],
+    ["{ first_name: :Dorian }.keep_if(String)", "{ first_name: :Dorian }"],
+    ["{} == {}", "true"],
+    ['{ "name" => "Dorian" } == { name: :Dorian }', "true"]
   ].each do |input, expected|
     it "#{input} == #{expected}" do
-      expect(Code.evaluate(input, context)).to eq(
-        Code.evaluate(expected, context)
+      expect(Code.evaluate("#{dictionary} #{input}")).to eq(
+        Code.evaluate("#{dictionary} #{expected}")
       )
     end
   end

data/spec/code/object/string_spec.rb

@@ -2,12 +2,12 @@ require "spec_helper"
 
 RSpec.describe Code::Object::String do
   [
-    [":a", "a"],
-    [":a_b_c_0123", "a_b_c_0123"],
-    ['"Hello"', "Hello"],
-    ["'Hello'", "Hello"],
+    %w[:a a],
+    %w[:a_b_c_0123 a_b_c_0123],
+    %w["Hello" Hello],
+    %w['Hello' Hello],
     ['"Hello\nWorld"', "Hello\nWorld"],
-    ["'Hello\\nWorld'", "Hello\nWorld"],
+    ["'Hello\\nWorld'", "Hello\nWorld"]
   ].each do |input, expected|
     it "(#{input}).to_s == #{expected.inspect}" do
       expect(Code.evaluate(input).to_s).to eq(expected)

data/spec/code_spec.rb

@@ -57,14 +57,14 @@ RSpec.describe Code do
     ["1 >> 1", "0"],
     ["1 ^ 2", "3"],
     ["1 | 2", "3"],
-    ["1.day.ago.after?(1.day.from_now)", 'false'],
-    ["1.day.ago.before?(1.day.from_now)", 'true'],
-    ["1.day.from_now.after?(1.day.ago)", 'true'],
-    ["1.day.from_now.before?(1.day.ago)", 'false'],
-    ["1.day.ago.after?", 'false'],
-    ["1.day.ago.before?", 'true'],
-    ["1.day.from_now.after?", "true"],
-    ["1.day.from_now.before?", "false"],
+    %w[1.day.ago.after?(1.day.from_now) false],
+    %w[1.day.ago.before?(1.day.from_now) true],
+    %w[1.day.from_now.after?(1.day.ago) true],
+    %w[1.day.from_now.before?(1.day.ago) false],
+    %w[1.day.ago.after? false],
+    %w[1.day.ago.before? true],
+    %w[1.day.from_now.after? true],
+    %w[1.day.from_now.before? false],
     ["2 * 3 + 2", "8"],
     ["2 * 3", "6"],
     ["2 ** 3 ** 2", "512"],
@@ -141,13 +141,30 @@ RSpec.describe Code do
     ['"Hello {1}"', '"Hello 1"'],
     ['user = {} user.name = "Dorian" user.name', ":Dorian"],
     ['user = {} user[:name] = "Dorian" user[:name]', ":Dorian"],
-    ['{ "first_name": "Dorian" }', '{"first_name" => "Dorian"}'],
+    ['{ "first_name": "Dorian" }', '{"first_name" => "Dorian"}']
   ].each do |input, expected|
     it "#{input} == #{expected}" do
       expect(Code.evaluate(input)).to eq(Code.evaluate(expected))
     end
+
+    it "#{input} converts to json like #{expected}" do
+      expect(Code.evaluate(input).to_json).to eq(Code.evaluate(expected).to_json)
+    end
   end
 
+  %w[
+    1.day.ago
+    1.day.from_now
+    1.hour.ago
+    1.hour.from_now
+    2.days.ago
+    2.days.from_now
+    2.hours.ago
+    2.hours.from_now
+    Date.tomorrow
+    Time.tomorrow
+  ].each { |input| it(input) { Code.evaluate(input) } }
+
   [["puts(true)", "true\n"], %w[print(false) false]].each do |input, expected|
     it "#{input} prints #{expected}" do
       output = StringIO.new
@@ -155,62 +172,4 @@ RSpec.describe Code do
       expect(output.string).to eq(expected)
     end
   end
-
-  it "converts nil" do
-    ruby = Code::Ruby.from_code(Code.evaluate("a", ruby: { a: nil }))
-
-    expect(ruby).to eq(nil)
-  end
-
-  it "works with downcase" do
-    expect(Code.evaluate("downcase", "{ downcase: 1 }")).to eq(
-      Code.evaluate("1")
-    )
-  end
-
-  describe "#fetch" do
-    it "returns the value when present" do
-      expect(Code.evaluate("fetch(:downcase)", "{ downcase: 1 }")).to eq(
-        Code.evaluate("1")
-      )
-    end
-
-    it "returns the default value when not present" do
-      expect(Code.evaluate("fetch(:downcase) { 2 }")).to eq(
-        Code.evaluate("2")
-      )
-    end
-  end
-
-  it "works with nested objects" do
-    expect(
-      Code.evaluate("items.first.title", ruby: { items: [{ title: "Hello" }] })
-    ).to eq(Code.evaluate(":Hello"))
-  end
-
-  it "works with arrays" do
-    expect(
-      Code.evaluate(
-        "items.map { |item| item.title }",
-        ruby: {
-          items: [{ title: "Hello" }]
-        }
-      )
-    ).to eq(Code.evaluate("[:Hello]"))
-  end
-
-  [
-    "1.day.ago",
-    "1.day.from_now",
-    "1.hour.ago",
-    "1.hour.from_now",
-    "2.days.ago",
-    "2.days.from_now",
-    "2.hours.ago",
-    "2.hours.from_now",
-    "Date.tomorrow",
-    "Time.tomorrow",
-  ].each do |input|
-    it(input) { Code.evaluate(input) }
-  end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.9.1
 platform: ruby
 authors:
 - Dorian Marié
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-26 00:00:00.000000000 Z
+date: 2024-02-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
@@ -25,33 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: language-ruby
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: language-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +144,6 @@ files:
 - lib/code/object/nothing.rb
 - lib/code/object/number.rb
 - lib/code/object/range.rb
-- lib/code/object/ruby_function.rb
 - lib/code/object/string.rb
 - lib/code/object/time.rb
 - lib/code/parser.rb
@@ -174,7 +187,6 @@ files:
 - lib/code/parser/unary_minus.rb
 - lib/code/parser/while.rb
 - lib/code/parser/whitespace.rb
-- lib/code/ruby.rb
 - lib/code/type.rb
 - lib/code/type/hash.rb
 - lib/code/type/maybe.rb

data/lib/code/object/ruby_function.rb

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-class Code
-  class Object
-    class RubyFunction < Function
-      attr_reader :raw
-
-      def initialize(raw)
-        @raw = raw
-      end
-
-      def self.name
-        "RubyFunction"
-      end
-
-      # TODO: fix / refactor
-      def code_call(args:, globals:)
-        regular_arguments =
-          args
-            .select(&:regular?)
-            .map(&:value)
-            .map { |argument| Ruby.from_code(argument) }
-
-        keyword_arguments =
-          args
-            .select(&:keyword?)
-            .map do |argument|
-              [argument.name.to_sym, Ruby.from_code(argument.value)]
-            end
-            .to_h
-
-        Ruby.to_code(raw.call(*regular_arguments, **keyword_arguments))
-      end
-    end
-  end
-end

data/lib/code/ruby.rb

@@ -1,161 +0,0 @@
-# frozen_string_literal: true
-
-class Code
-  class Ruby
-    def initialize(raw = {})
-      @raw = raw
-    end
-
-    def self.to_code(raw)
-      new(raw).to_code
-    end
-
-    def self.from_code(raw)
-      new(raw).from_code
-    end
-
-    def to_code
-      if code?
-        raw
-      elsif nil?
-        ::Code::Object::Nothing.new
-      elsif true?
-        ::Code::Object::Boolean.new(raw)
-      elsif false?
-        ::Code::Object::Boolean.new(raw)
-      elsif string?
-        ::Code::Object::String.new(raw)
-      elsif symbol?
-        ::Code::Object::String.new(raw.to_s)
-      elsif integer?
-        ::Code::Object::Integer.new(raw)
-      elsif float?
-        ::Code::Object::Decimal.new(raw.to_s)
-      elsif big_decimal?
-        ::Code::Object::Decimal.new(raw)
-      elsif hash?
-        ::Code::Object::Dictionary.new(
-          raw
-            .map do |key, value|
-              [::Code::Ruby.to_code(key), ::Code::Ruby.to_code(value)]
-            end
-            .to_h
-        )
-      elsif array?
-        ::Code::Object::List.new(
-          raw.map { |element| ::Code::Ruby.to_code(element) }
-        )
-      elsif proc?
-        ::Code::Object::RubyFunction.new(raw)
-      else
-        raise "Unsupported class #{raw.class} for Ruby to Code conversion"
-      end
-    end
-
-    def from_code
-      if code?
-        if code_nothing? || code_boolean? || code_decimal? || code_integer? ||
-             code_range? || code_string?
-          raw.raw
-        elsif code_dictionnary?
-          raw
-            .raw
-            .map do |key, value|
-              [::Code::Ruby.from_code(key), ::Code::Ruby.from_code(value)]
-            end
-            .to_h
-        elsif code_list?
-          raw.raw.map { |element| ::Code::Ruby.from_code(element) }
-        else
-          raise "Unsupported class #{raw.class} for Code to Ruby conversion"
-        end
-      else
-        raw
-      end
-    end
-
-    private
-
-    attr_reader :raw
-
-    def code?
-      raw.is_a?(::Code::Object)
-    end
-
-    def nil?
-      raw.is_a?(::NilClass)
-    end
-
-    def true?
-      raw.is_a?(::TrueClass)
-    end
-
-    def false?
-      raw.is_a?(::FalseClass)
-    end
-
-    def hash?
-      raw.is_a?(::Hash)
-    end
-
-    def array?
-      raw.is_a?(::Array)
-    end
-
-    def string?
-      raw.is_a?(::String)
-    end
-
-    def symbol?
-      raw.is_a?(::Symbol)
-    end
-
-    def integer?
-      raw.is_a?(::Integer)
-    end
-
-    def float?
-      raw.is_a?(::Float)
-    end
-
-    def big_decimal?
-      raw.is_a?(::BigDecimal)
-    end
-
-    def proc?
-      raw.is_a?(::Proc)
-    end
-
-    def code_nothing?
-      raw.is_a?(::Code::Object::Nothing)
-    end
-
-    def code_boolean?
-      raw.is_a?(::Code::Object::Boolean)
-    end
-
-    def code_decimal?
-      raw.is_a?(::Code::Object::Decimal)
-    end
-
-    def code_integer?
-      raw.is_a?(::Code::Object::Integer)
-    end
-
-    def code_range?
-      raw.is_a?(::Code::Object::Range)
-    end
-
-    def code_string?
-      raw.is_a?(::Code::Object::String)
-    end
-
-    def code_dictionnary?
-      raw.is_a?(::Code::Object::Dictionary)
-    end
-
-    def code_list?
-      raw.is_a?(::Code::Object::List)
-    end
-  end
-end