lib/code.rb in code-ruby-0.3.1 vs lib/code.rb in code-ruby-0.4.0

@@ -1,30 +1,44 @@
 class Code
+  GLOBALS = [:io, :context, :object]
   DEFAULT_TIMEOUT = Template::DEFAULT_TIMEOUT
 
-  def initialize(input, io: $stdout, timeout: DEFAULT_TIMEOUT)
+  def initialize(input, io: $stdout, timeout: DEFAULT_TIMEOUT, ruby: {})
     @input = input
-    @parsed = Timeout.timeout(timeout) { ::Code::Parser::Code.new.parse(@input) }
+    @parsed =
+      Timeout.timeout(timeout) { ::Code::Parser::Code.new.parse(@input) }
     @io = io
     @timeout = timeout || DEFAULT_TIMEOUT
+    @ruby = ::Code::Ruby.to_code(ruby || {})
   end
 
-  def self.evaluate(input, context = "", io: $stdout, timeout: DEFAULT_TIMEOUT)
-    new(input, io: io, timeout: timeout).evaluate(context)
+  def self.evaluate(input, context = "", io: $stdout, timeout: DEFAULT_TIMEOUT, ruby: {})
+    new(input, io: io, timeout: timeout, ruby: ruby).evaluate(context)
   end
 
   def evaluate(context = "")
     Timeout.timeout(timeout) do
       if context.present?
-        context = ::Code.evaluate(context, timeout: timeout)
+        context = ::Code.evaluate(
+          context,
+          timeout: timeout,
+          io: io,
+          ruby: ruby
+        )
       else
         context = ::Code::Object::Dictionnary.new
       end
 
+      if !context.is_a?(::Code::Object::Dictionnary)
+        raise ::Code::Error::IncompatibleContext.new("context must be a dictionnary")
+      end
+
+      context = context.merge(ruby)
+
       ::Code::Node::Code.new(parsed).evaluate(context: context, io: io)
     end
   end
 
   private
 
-  attr_reader :input, :parsed, :timeout, :io
+  attr_reader :input, :parsed, :timeout, :io, :ruby
 end