mustang 0.1.1 → 0.2.0

data/README.md

@@ -1,4 +1,4 @@
-This code is proudly sponsored by [Cubox, Agile Rails Devshop](http://cuboxsa.com)
+Mustang development is proudly sponsored by [Cubox, Agile Rails Devshop](http://cuboxsa.com)
 
 # Mustang - V8 engine in Ruby's body
 
@@ -6,6 +6,12 @@ Mustang is ruby proxy library for awesome Google V8 JavaScript engine.
 
 ## Installation
 
+Before you install mustang gem make sure you have `scons` installed.
+
+    $ sudo apt-get install scons # on debian
+    $ sudo pacman -S scons       # on archlinux
+    $ brew install scons         # on mac...
+
 Using rubygems:
 
     $ gem install mustang
@@ -28,6 +34,10 @@ For now it's only proof of concept. It implements very simple evaluation of java
     cxt.eval("var a=1;")
     cxt.eval("a+5;") # => 6
 
+    cxt[:puts] = method(:puts)
+    cxt.eval("puts(a)") # displays "1" on the screen
+    cxt[:a] # => 1
+
 ## Note on Patches/Pull Requests
  
 * Fork the project.

data/Rakefile

@@ -9,7 +9,7 @@ end
 begin
   require 'rake/extensiontask'
   Rake::ExtensionTask.new("v8") do |ext|
-    ext.lib_dir = 'lib'
+    ext.lib_dir = 'lib/mustang'
     ext.source_pattern = "*.{cpp,h}"
   end
 rescue LoadError

data/TODO.md

@@ -6,4 +6,5 @@
 * specs for support modules
 * v8 debug stuff
 * support for ObjectTemplates
-* reflecting ruby classes to FunctionTemplates
+* reflecting ruby classes to FunctionTemplates
+* getting entered context

data/ext/v8/extconf.rb

@@ -52,8 +52,10 @@ find_library('v8', nil, lib)
 have_library('pthread')
 have_header('v8.h')
 
+CONFIG['LDSHARED'] = '$(CXX) -shared' unless darwin?
+
 %w[-Wall -g -rdynamic -fPIC].each { |flag| 
   $CPPFLAGS += " #{flag}" unless $CPPFLAGS.include?(flag)
 }
 
-create_makefile('v8')
+create_makefile('mustang/v8')

data/ext/v8/v8_array.cpp

@@ -36,6 +36,8 @@ Handle<Value> to_v8_array(VALUE value)
 static VALUE rb_v8_array_new(VALUE klass, VALUE data)
 {
   HandleScope scope;
+  PREVENT_CREATION_WITHOUT_CONTEXT();
+  
   VALUE ary = rb_funcall2(data, rb_intern("to_a"), 0, NULL);
   VALUE self = v8_ref_new(klass, to_v8_array(ary));
 

data/ext/v8/v8_context.cpp

@@ -11,6 +11,8 @@ UNWRAPPER(Context);
 
 /* V8::Context methods */
 
+static VALUE rb_v8_context_enter(VALUE self);
+
 /*
  * call-seq:
  *   V8::Context.new  => new_context
@@ -24,6 +26,7 @@ static VALUE rb_v8_context_new(VALUE self)
   Persistent<Context> context(Context::New());
 
   VALUE ref = v8_ref_new(self, context);
+  rb_v8_context_enter(ref);
   rb_iv_set(ref, "@errors", rb_ary_new());
 
   context.Dispose();
@@ -129,6 +132,19 @@ static VALUE rb_v8_context_global(VALUE self)
   return to_ruby(global);
 }
 
+/*
+ * call-seq:
+ *   cxt.entered?  => true or false
+ *
+ * Returns <code>true</code> when this context is entered.
+ *
+ */
+static VALUE rb_v8_context_entered_p(VALUE self)
+{
+  HandleScope scope;
+  return unwrap(self) == Context::GetEntered() ? Qtrue : Qfalse;
+}
+
 /*
  * call-seq:
  *   cxt.exit  => nil
@@ -139,21 +155,31 @@ static VALUE rb_v8_context_global(VALUE self)
 static VALUE rb_v8_context_exit(VALUE self)
 {
   HandleScope scope;
-  unwrap(self)->Exit();
+  Handle<Context> context;
+  
+  if (Context::InContext()) {
+    context->Exit();
+  }
+  
   return Qnil;
 }
 
 /*
  * call-seq:
- *   cxt.entered?  => true or false
+ *   V8::Context.exit_all!  => nil
  *
- * Returns <code>true</code> when this context is entered.
+ * Exits from all entered context.
  *
  */
-static VALUE rb_v8_context_entered_p(VALUE self)
+static VALUE rb_v8_context_exit_all_bang(VALUE klass)
 {
   HandleScope scope;
-  return unwrap(self) == Context::GetEntered() ? Qtrue : Qfalse;
+
+  while (Context::InContext()) {
+    Context::GetEntered()->Exit();
+  }
+
+  return Qnil;
 }
 
 
@@ -162,6 +188,7 @@ void Init_V8_Context()
 {
   rb_cV8Context = rb_define_class_under(rb_mV8, "Context", rb_cObject);
   rb_define_singleton_method(rb_cV8Context, "new", RUBY_METHOD_FUNC(rb_v8_context_new), 0);
+  rb_define_singleton_method(rb_cV8Context, "exit_all!", RUBY_METHOD_FUNC(rb_v8_context_exit_all_bang), 0);
   rb_define_method(rb_cV8Context, "evaluate", RUBY_METHOD_FUNC(rb_v8_context_evaluate), 2);
   rb_define_method(rb_cV8Context, "eval", RUBY_METHOD_FUNC(rb_v8_context_evaluate), 2);
   rb_define_method(rb_cV8Context, "prototype", RUBY_METHOD_FUNC(rb_v8_context_prototype), 0);

data/ext/v8/v8_date.cpp

@@ -28,6 +28,7 @@ Handle<Value> to_v8_date(VALUE value)
 static VALUE rb_v8_date_new(VALUE klass, VALUE time)
 {
   HandleScope scope;
+  PREVENT_CREATION_WITHOUT_CONTEXT();  
   return v8_ref_new(klass, to_v8_date(time));
 }
 

data/ext/v8/v8_external.cpp

@@ -29,6 +29,7 @@ Handle<Value> to_v8_external(VALUE value)
 static VALUE rb_v8_external_new(VALUE klass, VALUE obj)
 {
   HandleScope scope;
+  PREVENT_CREATION_WITHOUT_CONTEXT();
   return v8_ref_new(klass, to_v8_external(obj));
 }
   

data/ext/v8/v8_function.cpp

@@ -61,6 +61,8 @@ Handle<Value> to_v8_function(VALUE value)
 static VALUE rb_v8_function_new(int argc, VALUE *argv, VALUE klass)
 {
   HandleScope scope;
+  PREVENT_CREATION_WITHOUT_CONTEXT();
+
   VALUE orig;
   
   if (rb_block_given_p()) {
@@ -76,6 +78,7 @@ static VALUE rb_v8_function_new(int argc, VALUE *argv, VALUE klass)
 
   VALUE self = v8_ref_new(klass, to_v8_function(orig), orig);
   rb_iv_set(self, "@origin", orig);
+  rb_iv_set(self, "@receiver", Qnil);
   v8_set_peer(self);
 
   return self;

data/ext/v8/v8_integer.cpp

@@ -28,6 +28,7 @@ Handle<Value> to_v8_integer(VALUE value)
 static VALUE rb_v8_integer_new(VALUE klass, VALUE data)
 {
   HandleScope scope;
+  PREVENT_CREATION_WITHOUT_CONTEXT();
   VALUE num = rb_funcall2(data, rb_intern("to_i"), 0, NULL);
   return v8_ref_new(klass, to_v8_integer(num));
 }

data/ext/v8/v8_macros.h

@@ -27,4 +27,10 @@
     return v8_ref_get<T>(self);			\
   }
 
+#define PREVENT_CREATION_WITHOUT_CONTEXT()				                \
+  if (!Context::InContext()) {					                        \
+    rb_raise(rb_eRuntimeError, "can't create V8 object without entering into context");	\
+    return Qnil;							                \
+  }				       
+
 #endif//__V8_MACROS_H

data/ext/v8/v8_main.cpp

@@ -46,7 +46,9 @@ static VALUE rb_v8_version(VALUE self)
 /* V8 module initializer. */
 void Init_V8()
 {
-  rb_mV8 = rb_define_module("V8");
+  VALUE rb_mMustang = rb_define_module("Mustang");
+  
+  rb_mV8 = rb_define_module_under(rb_mMustang, "V8");
   rb_define_singleton_method(rb_mV8, "dead?", RUBY_METHOD_FUNC(rb_v8_dead_p), 0);
   rb_define_singleton_method(rb_mV8, "alive?", RUBY_METHOD_FUNC(rb_v8_alive_p), 0);
   rb_define_singleton_method(rb_mV8, "version", RUBY_METHOD_FUNC(rb_v8_version), 0);

data/ext/v8/v8_number.cpp

@@ -28,6 +28,7 @@ Handle<Value> to_v8_number(VALUE value)
 static VALUE rb_v8_number_new(VALUE klass, VALUE data)
 {
   HandleScope scope;
+  PREVENT_CREATION_WITHOUT_CONTEXT();
   VALUE num = rb_funcall2(data, rb_intern("to_f"), 0, NULL);
   return v8_ref_new(klass, to_v8_number(num));
 }

data/ext/v8/v8_object.cpp

@@ -51,6 +51,8 @@ Handle<Value> to_v8_object(VALUE value)
 static VALUE rb_v8_object_new(int argc, VALUE *argv, VALUE klass)
 {
   HandleScope scope;
+  PREVENT_CREATION_WITHOUT_CONTEXT();
+
   VALUE self;
   
   switch (argc) {

data/ext/v8/v8_regexp.cpp

@@ -61,6 +61,7 @@ Handle<Value> to_v8_regexp(VALUE value)
 static VALUE rb_v8_regexp_new(int argc, VALUE *argv, VALUE klass)
 {
   HandleScope scope;
+  PREVENT_CREATION_WITHOUT_CONTEXT();
 
   if (argc == 1) {
     return v8_ref_new(klass, to_v8_regexp(argv[0]));

data/ext/v8/v8_string.cpp

@@ -28,6 +28,7 @@ Handle<Value> to_v8_string(VALUE value)
 static VALUE rb_v8_string_new(VALUE klass, VALUE data)
 {
   HandleScope scope;
+  PREVENT_CREATION_WITHOUT_CONTEXT();
   VALUE str = rb_funcall2(data, rb_intern("to_s"), 0, NULL);
   return v8_ref_new(klass, to_v8_string(str));
 }

data/ext/v8/v8_value.cpp

@@ -21,6 +21,8 @@ UNWRAPPER(Value);
  */
 static VALUE rb_v8_value_new(VALUE self, VALUE data)
 {
+  HandleScope scope; 
+  PREVENT_CREATION_WITHOUT_CONTEXT();
   return v8_ref_new(self, to_v8(data));
 }
 

data/lib/mustang.rb

@@ -1,21 +1,21 @@
-require 'v8'
-require 'v8/context'
-require 'v8/object'
-require 'v8/string'
-require 'v8/integer'
-require 'v8/number'
-require 'v8/array'
-require 'v8/date'
-require 'v8/regexp'
-require 'v8/function'
-require 'v8/external'
-require 'v8/error'
-
-require 'support/delegated'
-
-require 'core_ext/object'
-require 'core_ext/class'
-require 'core_ext/symbol'
+require 'mustang/support/delegated'
+
+require 'mustang/v8'
+require 'mustang/v8/context'
+require 'mustang/v8/object'
+require 'mustang/v8/string'
+require 'mustang/v8/integer'
+require 'mustang/v8/number'
+require 'mustang/v8/array'
+require 'mustang/v8/date'
+require 'mustang/v8/regexp'
+require 'mustang/v8/function'
+require 'mustang/v8/external'
+require 'mustang/v8/error'
+
+require 'mustang/core_ext/object'
+require 'mustang/core_ext/class'
+require 'mustang/core_ext/symbol'
 
 require 'mustang/context'
 
@@ -26,19 +26,12 @@ module Mustang
     global
   end
 
-  # Global context.
   def self.global
     @global or reset!
   end
 
-  # Resets global context state. Appartently just creates new global
-  # context and enters it. 
+  # Resets global context state (just creates new global context and enters to it). 
   def self.reset!(*args, &block)
-    @global = GlobalContext.new(*args, &block)
+    @global = Context.new(*args, &block)
   end
-
-  # We need enter into global context to avoid segfaults. Apart of my laziness
-  # keeping one global context is much easier than handling errors in all 
-  # V8 datatypes implementation... 
-  enter
 end # Mustang

data/lib/mustang/context.rb

@@ -3,10 +3,6 @@ module Mustang
   class ScriptNotFoundError < Errno::ENOENT 
   end
 
-  # Raised when try to exit from global context. 
-  class ImmortalContextError < RuntimeError
-  end
-
   # Extended and more user-friendly version of <tt>Mustang::V8::Context</tt>.
   class Context < V8::Context
     # Evaluates given javascript source. Before evaluation it's able to
@@ -43,27 +39,5 @@ module Mustang
     def errors
       @errors ||= []
     end
-
-    # Returns <tt>true</tt> when it is global (immortal) context.
-    def global?
-      false
-    end
   end # Context
-
-  # This kind of context is used by <tt>Mustang</tt> module. 
-  class GlobalContext < Context
-    def initialize(*)
-      super 
-      enter
-    end
-
-    def exit
-      # We have to disable exit, because global context is immortal. 
-      raise ImmortalContextError, "Global context can't be exited"
-    end
-    
-    def global?
-      true
-    end
-  end # GlobalContext
 end # Mustang

data/lib/{core_ext → mustang/core_ext}/class.rb

@@ -9,6 +9,6 @@ class Class
       klass = klass.superclass
     end
 
-    result
+    result.map { |m| m.to_sym }
   end
 end # Class

data/lib/{core_ext → mustang/core_ext}/object.rb

@@ -1,12 +1,10 @@
-require 'v8'
-
 class Object
   # From now on each object can be easily converted to <tt>V8::*</tt> object
   # using <tt>#to_v8</tt> method. 
-  include V8::Cast
+  include Mustang::V8::Cast
 
   # Returns <tt>true</tt> when given object is reflected from within V8.
   def v8?
-    kind_of?(V8::Data)
+    kind_of?(Mustang::V8::Data)
   end
 end # Object

data/lib/mustang/v8/array.rb

@@ -0,0 +1,21 @@
+module Mustang
+  module V8
+    class Array
+      include Comparable
+      include Enumerable
+      include Delegated
+      
+      def <=>(other)
+        to_a <=> other
+      end
+      
+      def each(*args, &block)
+        to_a.each(*args, &block)
+      end
+      
+      def delegate
+        to_a
+      end
+    end # Array
+  end # V8
+end # Mustang

data/lib/mustang/v8/context.rb

@@ -0,0 +1,15 @@
+module Mustang
+  module V8
+    class Context
+      def get(key)
+        prototype[key]
+      end
+      alias_method :[], :get
+
+      def set(key, value)
+        prototype[key] = value
+      end
+      alias_method :[]=, :set
+    end # Context
+  end # V8
+end # Mustang

data/lib/mustang/v8/date.rb

@@ -0,0 +1,20 @@
+module Mustang
+  module V8
+    class Date
+      include Comparable
+      include Delegated
+
+      def to_time
+        Time.at(to_i);
+      end
+      
+      def <=>(other)
+        to_time <=> other
+      end
+
+      def delegate
+        to_time
+      end
+    end # Date
+  end # V8
+end # Mustang