code-ruby 0.6.7 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8a60610e77a80b5fcd90d969b7d9e324670afad9809d5ce1334f0e0ce249f91
-  data.tar.gz: 5910d5e6441c3ca32b57cb22bb282ef6c019df18256532db99ab3839931d892c
+  metadata.gz: 6c1825b3354247a5986c1eb78223a6b16bff33119f38b3f8a55ee1e7b7fb354d
+  data.tar.gz: 125688c0383d89e4801b847665952af382326764c3bda9e8e8f52942b65ced73
 SHA512:
-  metadata.gz: e79009191406e846bad409795fee979aac6af54e9ae8befdbeb6260e59c5b62c2cc0f5c641179f8d1cdeec000f04734746da44d1821818f28e89e36b1dbf02fe
-  data.tar.gz: c25b97130a21e805d593c4691a9baecef2b7e19130e3ef3fca945a149e755a5881a128211592658e719c243f7049c5114dfc61be93509c4ea27623b00071043c
+  metadata.gz: 8bd85f1991b52e9848e19ac1a019716148788d348f3fbc9d98dbd625f973a6f1a46ea43a853b2b0bdf30d1c611fe12c36c0e6572f29dbac0d4339574409eb03e
+  data.tar.gz: f126c93f039f0c8ef0f9229d744dd63e4a996b10847756dc5c67db3ea7cf340a01aea5062e2543df56b50c316205f407bcfe68e318d69e6db0a9c595d33dc621

data/lib/code/object/global.rb

@@ -10,7 +10,7 @@ class Code
       def call(**args)
         operator = args.fetch(:operator, nil)
         arguments = args.fetch(:arguments, [])
-        io = args.fetch(:io)
+        output = args.fetch(:output)
         context = args.fetch(:context)
         multi_fetch(args, *GLOBALS)
         value = arguments.first&.value
@@ -60,13 +60,16 @@ class Code
           Code.evaluate(value.to_s)
         when "p"
           sig(args) { Object.repeat }
-          io.puts(*arguments.map(&:value).map(&:inspect)) || Nothing.new
+          output.puts(*arguments.map(&:value).map(&:inspect))
+          Nothing.new
         when "print"
           sig(args) { Object.repeat }
-          io.print(*arguments.map(&:value)) || Nothing.new
+          output.print(*arguments.map(&:value))
+          Nothing.new
         when "puts"
           sig(args) { Object.repeat }
-          io.puts(*arguments.map(&:value)) || Nothing.new
+          output.puts(*arguments.map(&:value))
+          Nothing.new
         else
           context = context.lookup!(operator)
           result = context.code_fetch(operator)

data/lib/code/version.rb

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

data/lib/code.rb

@@ -2,45 +2,51 @@
 
 class Code
   EMPTY_STRING = ""
-  GLOBALS = %i[io context object].freeze
+  GLOBALS = %i[output error context object].freeze
   DEFAULT_TIMEOUT = 0
 
-  def initialize(input, io: StringIO.new, timeout: DEFAULT_TIMEOUT, ruby: {})
+  def initialize(
+    input,
+    output: StringIO.new,
+    error: StringIO.new,
+    timeout: DEFAULT_TIMEOUT,
+    ruby: {}
+  )
     @input = input
-    @parsed = Timeout.timeout(timeout) { ::Code::Parser.parse(@input).to_raw }
-    @io = io
+    @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
   end
 
   def self.evaluate(
     input,
-    context = "",
-    io: StringIO.new,
+    context = EMPTY_STRING,
+    output: StringIO.new,
+    error: StringIO.new,
     timeout: DEFAULT_TIMEOUT,
     ruby: {}
   )
-    new(input, io:, timeout:, ruby:).evaluate(context)
+    new(input, output:, error:, timeout:, ruby:).evaluate(context)
   end
 
-  def evaluate(context = "")
+  def evaluate(context = EMPTY_STRING)
     Timeout.timeout(timeout) do
       context =
         if context == EMPTY_STRING
           Object::Context.new
         else
-          Code.evaluate(context, timeout:, io:, ruby:).code_to_context
+          Code.evaluate(context, timeout:, output:, error:, ruby:).code_to_context
         end
 
-      raise(Error::IncompatibleContext) unless context.is_a?(Object::Context)
-
-      context = context.merge(ruby)
+      context = ruby.merge(context)
 
-      Node::Code.new(parsed).evaluate(context:, io:)
+      Node::Code.new(parsed).evaluate(context:, output:, error:)
     end
   end
 
   private
 
-  attr_reader :input, :parsed, :timeout, :io, :ruby
+  attr_reader :input, :parsed, :timeout, :output, :error, :ruby
 end

data/spec/code_spec.rb

@@ -134,9 +134,9 @@ RSpec.describe Code do
 
   [["puts(true)", "true\n"], %w[print(false) false]].each do |input, expected|
     it "#{input} prints #{expected}" do
-      io = StringIO.new
-      Code.evaluate(input, io:)
-      expect(io.string).to eq(expected)
+      output = StringIO.new
+      Code.evaluate(input, output:)
+      expect(output.string).to eq(expected)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.0
 platform: ruby
 authors:
 - Dorian Marié
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-08 00:00:00.000000000 Z
+date: 2024-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal