therubyracer 0.8.2.pre → 0.8.2.pre2

data/.gitignore

@@ -1,4 +1,5 @@
 .bundle
+.rvmrc
 Gemfile.lock
 v8.bundle
 v8.so

data/Changelog.md

@@ -2,7 +2,10 @@
 
 ## Edge
 
+* expose the V8 debugger via V8::C::Debug::EnableAgent()
 * force UTf-8 encoding on strings returned from javascript in ruby 1.9
+* remove deprecated evaluate() methods
+* make the currently executing JavaScript stack available via Context#stack
 
 ## 0.8.1 - 2011/03/07
 

data/README.md

@@ -126,11 +126,11 @@ More documentation can be found on the [github wiki](https://github.com/cowboyd/
 
 
 ## DEVELOP
-* git clone git://github.com/cowboyd/therubyracer.git
-* cd therubyracer
-* git submodule update --init
-* bundle install
-* rake compile
+    git clone git://github.com/cowboyd/therubyracer.git
+    cd therubyracer
+    git submodule update --init
+    bundle install
+    rake compile
 
 ## LICENSE:
 

data/ext/v8/v8.cpp

@@ -13,6 +13,8 @@
 #include "v8_external.h"
 #include "v8_exception.h"
 #include "v8_locker.h"
+#include "v8_debug.h"
+#include "v8_v8.h"
 
 #include <stdio.h>
 
@@ -37,5 +39,7 @@ extern "C" {
         rr_init_v8_external();
         rr_init_v8_exception();
         rr_init_v8_locker();
+        rr_init_v8_debug();
+        rr_init_v8_v8();
     }
 }

data/ext/v8/v8_debug.cpp

@@ -0,0 +1,17 @@
+#include "rr.h"
+#include "v8_debug.h"
+#include "v8-debug.h"
+
+using namespace v8;
+
+namespace {
+
+  VALUE EnableAgent(VALUE self, VALUE application_name, VALUE port) {
+    return rr_v82rb(v8::Debug::EnableAgent(RSTRING_PTR(application_name), NUM2INT(port), false));
+  }
+}
+
+void rr_init_v8_debug() {
+  VALUE DebugModule = rr_define_module("Debug");
+  rr_define_singleton_method(DebugModule, "EnableAgent", EnableAgent, 2);
+}

data/ext/v8/v8_debug.h

@@ -0,0 +1,6 @@
+#ifndef _RR_V8_DEBUG_
+#define _RR_V8_DEBUG_
+
+void rr_init_v8_debug();
+
+#endif

data/ext/v8/v8_exception.cpp

@@ -69,21 +69,27 @@ namespace {
      return V8_Ref_Get<StackFrame>(value);
     }
     VALUE GetLineNumber(VALUE self) {
+      HandleScope scope;
       return rr_v82rb(frame(self)->GetLineNumber());
     }
     VALUE GetColumn(VALUE self) {
+      HandleScope scope;
       return rr_v82rb(frame(self)->GetColumn());
     }
     VALUE GetScriptName(VALUE self) {
+      HandleScope scope;
       return rr_v82rb(frame(self)->GetScriptName());
     }
     VALUE GetFunctionName(VALUE self) {
+      HandleScope scope;
       return rr_v82rb(frame(self)->GetFunctionName());
     }
     VALUE IsEval(VALUE self) {
+      HandleScope scope;
       return rr_v82rb(frame(self)->IsEval());
     }
     VALUE IsConstructor(VALUE self) {
+      HandleScope scope;
       return rr_v82rb(frame(self)->IsConstructor());
     }
   }
@@ -102,7 +108,7 @@ void rr_init_v8_exception() {
   rr_define_singleton_method(ExceptionClass, "Error", Error, 1);
 
   StackTraceClass = rr_define_class("StackTrace");
-  rr_define_singleton_method(StackTraceClass, "CurrentStackTrace", Trace::CurrentStackTrace, 0);
+  rr_define_singleton_method(StackTraceClass, "CurrentStackTrace", Trace::CurrentStackTrace, 1);
   rr_define_method(StackTraceClass, "GetFrame", Trace::GetFrame, 1);
   rr_define_method(StackTraceClass, "GetFrameCount", Trace::GetFrameCount, 0);
   rr_define_method(StackTraceClass, "AsArray", Trace::AsArray, 0);
@@ -123,6 +129,6 @@ void rr_init_v8_exception() {
 VALUE rr_reflect_v8_stacktrace(Handle<StackTrace> value) {
   return rr_v8_ref_create(StackTraceClass, value);
 }
-VALUE rr_reflect_v8_stackframe(Handle<StackTrace> value) {
+VALUE rr_reflect_v8_stackframe(Handle<StackFrame> value) {
   return rr_v8_ref_create(StackFrameClass, value);
 }

data/ext/v8/v8_func.cpp

@@ -39,9 +39,11 @@ namespace {
     return rr_v8_ref_create(rr_cV8_C_Object, function->NewInstance(argc, argv));
   }
   VALUE GetName(VALUE self) {
+    HandleScope scope;
     return rr_v82rb(unwrap(self)->GetName());
   }
   VALUE SetName(VALUE self, VALUE name) {
+    HandleScope scope;
     Local<String> str = V8_Ref_Get<String>(name);
     unwrap(self)->SetName(str);
     return Qnil;

data/ext/v8/v8_v8.cpp

@@ -0,0 +1,28 @@
+
+#include "rr.h"
+
+using namespace v8;
+
+namespace {
+
+  VALUE IsDead(VALUE self) {
+    return rr_v82rb(V8::IsDead());
+  }
+
+  VALUE AdjustAmountOfExternalAllocatedMemory(VALUE self, VALUE bytes) {
+    V8::AdjustAmountOfExternalAllocatedMemory(NUM2INT(bytes));
+    return Qnil;
+  }
+
+   VALUE IdleNotification(VALUE self) {
+     return rr_v82rb(V8::IdleNotification());
+   }
+}
+
+
+void rr_init_v8_v8() {
+  VALUE V8Module = rr_define_module("V8");
+  rr_define_singleton_method(V8Module, "IsDead", IsDead, 0);
+  rr_define_singleton_method(V8Module, "AdjustAmountOfExternalAllocatedMemory", AdjustAmountOfExternalAllocatedMemory, 1);
+  rr_define_singleton_method(V8Module, "IdleNotification", IdleNotification, 0);
+}

data/ext/v8/v8_v8.h

@@ -0,0 +1,6 @@
+#ifndef _RR_V8_V8_
+#define _RR_V8_V8_
+
+void rr_init_v8_v8();
+
+#endif

data/lib/v8.rb

@@ -13,4 +13,5 @@ module V8
   require 'v8/tap'
   require 'v8/access'
   require 'v8/error'
+  require 'v8/stack'
 end

data/lib/v8/context.rb

@@ -1,8 +1,9 @@
 require 'stringio'
 
 module V8
-  class Context    
+  class Context
     attr_reader :native, :scope, :access
+
     def initialize(opts = {})
       @access = Access.new
       @to = Portal.new(self, @access)
@@ -11,10 +12,11 @@ module V8
         @global = @native.Global()
         @scope = @to.rb(@global)
         @global.SetHiddenValue(C::String::New("TheRubyRacer::RubyObject"), C::External::New(opts[:with])) if opts[:with]
+        @global.SetHiddenValue(C::String::NewSymbol("TheRubyRacer::RubyContext"), C::External::New(self))
       end
       yield(self) if block_given?
     end
-    
+
     def eval(javascript, filename = "<eval>", line = 1)
       if IO === javascript || StringIO === javascript
         javascript = javascript.read()
@@ -39,31 +41,29 @@ module V8
       raise err if err
       return value
     end
-            
-    def evaluate(*args)
-      self.eval(*args)
-    end
-    
+
     def load(filename)
       File.open(filename) do |file|
-        evaluate file, filename, 1
-      end      
+        self.eval file, filename, 1
+      end
     end
-    
+
     def [](key)
       @scope[key]
     end
-    
+
     def []=(key, value)
       @scope[key] = value
     end
 
-    def self.eval(source)
-      new.eval(source)
-    end
-    
-    def V8.eval(*args)
-      V8::Context.eval(*args)
+    def self.stack(limit = 99)
+      if native = C::Context::GetEntered()
+        global = native.Global().instance_eval {@native}
+        cxt = global.GetHiddenValue(C::String::NewSymbol("TheRubyRacer::RubyContext")).Value()
+        cxt.instance_eval {@to.rb(C::StackTrace::CurrentStackTrace(limit))}
+      else
+        []
+      end
     end
   end
 

data/lib/v8/function.rb

@@ -24,5 +24,19 @@ module V8
         to.rb(@native.NewInstance(to.v8(args)))
       end
     end
+
+    def name
+      @portal.open do |to|
+        to.rb(@native.GetName())
+      end
+    end
+
+    def name=(name)
+      name.tap do
+        @portal.open do |to|
+          @native.SetName(to.v8(name))
+        end
+      end
+    end
   end
 end

data/lib/v8/portal.rb

@@ -78,12 +78,13 @@ module V8
 
     def rb(value)
       case value
-      when V8::C::Function  then peer(value) {V8::Function}
-      when V8::C::Array     then peer(value) {V8::Array}
-      when V8::C::Object    then peer(value) {V8::Object}
-      when V8::C::String    then value.Utf8Value.tap {|s| return s.respond_to?(:force_encoding) ? s.force_encoding("UTF-8") : s}
-      when V8::C::Date      then Time.at(value.NumberValue() / 1000)
-      when V8::C::Value     then nil if value.IsEmpty()
+      when V8::C::Function    then peer(value) {V8::Function}
+      when V8::C::Array       then peer(value) {V8::Array}
+      when V8::C::Object      then peer(value) {V8::Object}
+      when V8::C::String      then value.Utf8Value.tap {|s| return s.respond_to?(:force_encoding) ? s.force_encoding("UTF-8") : s}
+      when V8::C::Date        then Time.at(value.NumberValue() / 1000)
+      when V8::C::StackTrace  then V8::StackTrace.new(self, value)
+      when V8::C::Value       then nil if value.IsEmpty()
       else
         value
       end

data/lib/v8/stack.rb

@@ -0,0 +1,66 @@
+
+module V8
+
+  class StackTrace
+    include Enumerable
+
+    def initialize(to, native)
+      @to = to
+      @native = native
+    end
+
+    def length
+      @native.GetFrameCount()
+    end
+
+    def each
+      for i in 0..length - 1
+        yield V8::StackFrame.new(@to, @native.GetFrame(i))
+      end
+    end
+
+    def to_s
+      map {|f|"at #{f}"}.join("\n")
+    end
+  end
+
+  class StackFrame
+
+    def initialize(portal, native)
+      @to = portal
+      @native = native
+    end
+
+    def script_name
+      @to.rb(@native.GetScriptName())
+    end
+
+    def function_name
+      @to.rb(@native.GetFunctionName())
+    end
+
+    def line_number
+      @native.GetLineNumber()
+    end
+
+    def column
+      @native.GetColumn()
+    end
+
+    def eval?
+      @native.IsEval()
+    end
+
+    def constructor?
+      @native.IsConstructor()
+    end
+
+    def to_s
+      if @native.GetFunctionName()
+        "#{function_name} (#{script_name}:#{line_number}:#{column})"
+      else
+        "#{script_name}:#{line_number}:#{column}"
+      end
+    end
+  end
+end

data/lib/v8/version.rb

@@ -1,3 +1,3 @@
 module V8
-  VERSION = "0.8.2.pre"
+  VERSION = "0.8.2.pre2"
 end

data/spec/ext/cxt_spec.rb

@@ -4,9 +4,44 @@ require "#{File.dirname(__FILE__)}/../spec_helper.rb"
 include V8
 
 describe C::Context do  
-  
+
   it "should not have a current context if no context is open" do
     C::Context::GetEntered().should be_nil
   end
 
+  it "can get the current javascript execution stack" do
+    V8::Context.new do |cxt|
+      cxt['getTrace'] = lambda do
+        V8::Context.stack
+      end
+      trace = cxt.eval(<<-JS, 'trace.js')
+      function one() {
+        return two();
+      }
+      
+      function two() {
+        return three();
+      }
+      
+      function three() {
+        return getTrace()
+      }
+      one();
+JS
+
+      trace.length.should be(4)
+      trace.first.tap do |frame|
+        frame.line_number.should == 10
+        frame.column.should == 16
+        frame.script_name.should == 'trace.js'
+        frame.function_name.should == 'three'
+        frame.should_not be_eval
+        frame.should_not be_constructor
+      end
+    end
+  end
+
+  it "has an empty stack if there is no enterned context" do
+    V8::Context.stack.should be_empty
+  end
 end

data/spec/ext/func_spec.rb

@@ -46,4 +46,19 @@ describe C::Function do
       cxt.eval('say("Hello", 3)').should == "HelloHelloHello"
     end
   end
+  
+  it "has a name" do
+    Context.new do |cxt|
+      f = cxt.eval('(function hi() {return "Hello World"})', '<eval>')
+      f.name.should == "hi"
+    end
+  end
+
+  it "can have its name set" do
+    Context.new do |cxt|
+      f = cxt.eval('(function () {return "Goodbye World"})', '<eval>')
+      f.name = 'bye'
+      f.name.should == 'bye'
+    end
+  end
 end

data/spec/redjs/jsapi_spec.rb

@@ -39,7 +39,7 @@ describe "Ruby Javascript API" do
     end  
 
     it "treats nil and the empty string as the same thing when it comes to eval" do
-      @cxt.eval(nil).should == Context.eval('')
+      @cxt.eval(nil).should == @cxt.eval('')
     end
 
     it "can pass back strings to ruby" do
@@ -406,7 +406,8 @@ describe "Ruby Javascript API" do
         end
         o = Class.new.class_eval do
           include m
-        end.new
+          new
+        end
         Context.new(:with => o) do |cxt|
           cxt.eval('this.foo').should == "FOO"
           cxt.eval('this.foo = "bar!"')
@@ -787,14 +788,9 @@ describe "Ruby Javascript API" do
     end
 
     it "can load a file into the runtime" do
-      mock(:JavascriptSourceFile).tap do |file|
-        File.should_receive(:open).with("path/to/mysource.js").and_yield(file)
-        Context.new do |cxt|
-          cxt.should_receive(:evaluate).with(file, "path/to/mysource.js", 1)
-          cxt.load("path/to/mysource.js")
-        end
+      Context.new do |cxt|
+        cxt.load(Pathname(__FILE__).dirname.join("loadme.js")).should == "I am Legend"
       end
-
     end
   end
 
@@ -851,7 +847,7 @@ EOJS
   describe "Exception Handling" do
     it "raises javascript exceptions as ruby exceptions" do
       lambda {
-        Context.eval('foo')
+        Context.new.eval('foo')
       }.should raise_error(JSError)
     end
 

data/spec/redjs/loadme.js

@@ -0,0 +1 @@
+"I am Legend"

metadata

@@ -2,7 +2,7 @@
 name: therubyracer
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 0.8.2.pre
+  version: 0.8.2.pre2
 platform: ruby
 authors: 
 - Charles Lowell
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-09 00:00:00 -06:00
+date: 2011-04-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -808,6 +808,8 @@ files:
 - ext/v8/v8_cxt.h
 - ext/v8/v8_date.cpp
 - ext/v8/v8_date.h
+- ext/v8/v8_debug.cpp
+- ext/v8/v8_debug.h
 - ext/v8/v8_exception.cpp
 - ext/v8/v8_exception.h
 - ext/v8/v8_external.cpp
@@ -830,6 +832,8 @@ files:
 - ext/v8/v8_template.h
 - ext/v8/v8_try_catch.cpp
 - ext/v8/v8_try_catch.h
+- ext/v8/v8_v8.cpp
+- ext/v8/v8_v8.h
 - ext/v8/v8_value.cpp
 - ext/v8/v8_value.h
 - lib/v8.rb
@@ -842,6 +846,7 @@ files:
 - lib/v8/object.rb
 - lib/v8/portal.rb
 - lib/v8/portal/functions.rb
+- lib/v8/stack.rb
 - lib/v8/tap.rb
 - lib/v8/version.rb
 - spec/ext/cxt_spec.rb
@@ -853,6 +858,7 @@ files:
 - therubyracer.gemspec
 - spec/redjs/README.txt
 - spec/redjs/jsapi_spec.rb
+- spec/redjs/loadme.js
 has_rdoc: true
 homepage: http://github.com/cowboyd/therubyracer
 licenses: []
@@ -868,7 +874,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2344231307376719393
+      hash: 2038989837834402101
       segments: 
       - 0
       version: "0"