therubyracer 0.4.7-x86-darwin-10 → 0.4.8-x86-darwin-10

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.4.8 2010-02-08
+* 1 major enhancements
+  * expose line number and source name on JavascriptErrors.
+
 === 0.4.5 2010-01-18
 * 3 major enhancements
   * case munging so that ruby methods(perl_case) are accessed through javascript in camelCase.

data/Manifest.txt

@@ -4,7 +4,6 @@ Manifest.txt
 README.rdoc
 Rakefile
 docs/data_conversion.txt
-ext/v8/Makefile
 ext/v8/callbacks.cpp
 ext/v8/callbacks.h
 ext/v8/convert_ruby.cpp

data/Rakefile

@@ -41,6 +41,11 @@ Rake::ExtensionTask.new("v8", $hoe.spec) do |ext|
   ext.source_pattern = "*.{cpp,h}"
 end
 
+
+task :clean do
+  sh "rm -f ext/v8/Makefile"
+end
+
 require 'newgem/tasks'
 Dir['tasks/**/*.rake'].each { |t| load t }
 

data/ext/v8/v8.cpp

@@ -43,7 +43,7 @@ extern "C" {
         rb_define_singleton_method(V8_C_Context, "GetCurrent", (VALUE(*)(...)) v8_Context_GetCurrent, 0);
         rb_define_method(V8_C_Context, "Global", (VALUE(*)(...)) v8_cxt_Global, 0);
         rb_define_method(V8_C_Context, "open", (VALUE(*)(...)) v8_cxt_open, 0);
-        rb_define_method(V8_C_Context, "eval", (VALUE(*)(...)) v8_cxt_eval, 1);
+        rb_define_method(V8_C_Context, "eval", (VALUE(*)(...)) v8_cxt_eval, 2);
         rb_define_method(V8_C_Context, "eql?", (VALUE(*)(...)) v8_cxt_eql, 1);
         rb_define_method(V8_C_Context, "==", (VALUE(*)(...)) v8_cxt_eql, 1);
         
@@ -75,6 +75,14 @@ extern "C" {
         
         V8_C_Message = rb_define_class_under(rb_mNative, "Message", rb_cObject);
         rb_define_method(V8_C_Message, "Get", (VALUE(*)(...))v8_Message_Get, 0);
+        rb_define_method(V8_C_Message, "GetSourceLine", (VALUE(*)(...))v8_Message_GetSourceLine, 0);
+        rb_define_method(V8_C_Message, "GetScriptResourceName", (VALUE(*)(...))v8_Message_GetScriptResourceName, 0);
+        rb_define_method(V8_C_Message, "GetLineNumber", (VALUE(*)(...))v8_Message_GetLineNumber, 0);
+        rb_define_method(V8_C_Message, "GetStartPosition", (VALUE(*)(...))v8_Message_GetStartPosition, 0);
+        rb_define_method(V8_C_Message, "GetEndPosition", (VALUE(*)(...)) v8_Message_GetEndPosition, 0);
+        rb_define_method(V8_C_Message, "GetStartColumn", (VALUE(*)(...)) v8_Message_GetStartColumn, 0);
+        rb_define_method(V8_C_Message, "GetEndColumn", (VALUE(*)(...)) v8_Message_GetEndColumn, 0);
+        
         
         V8_C_Function = rb_define_class_under(rb_mNative, "Function", V8_C_Object);
     }

data/ext/v8/v8_cxt.cpp

@@ -20,7 +20,6 @@ VALUE v8_Context_New(int argc, VALUE *argv, VALUE self) {
     Persistent<Context> context = Context::New(0, Racer_Create_V8_ObjectTemplate(scope));
     Context::Scope enter(context);
     context->Global()->SetHiddenValue(String::New("TheRubyRacer::RubyObject"), External::Wrap((void *)scope));
-    // context->Global()->SetPointerInInternalField(0, (void*)scope);
     VALUE ref = V8_Ref_Create(self, context, scope);
     context.Dispose();
     return ref;
@@ -59,13 +58,14 @@ VALUE v8_cxt_open(VALUE self) {
   }
 }
 
-VALUE v8_cxt_eval(VALUE self, VALUE source) {
+VALUE v8_cxt_eval(VALUE self, VALUE source, VALUE filename) {
   HandleScope handles;
   TryCatch exceptions;
   Local<Context> cxt = V8_Ref_Get<Context>(self);
   Context::Scope enter(cxt);
   Local<Value> source_str = RB2V8(source);
-  Local<Script> script = Script::Compile(source_str->ToString());
+  Local<Value> source_name = RTEST(filename) ? RB2V8(filename) : *String::New("<eval>");
+  Local<Script> script = Script::Compile(source_str->ToString(), source_name);
 	if (exceptions.HasCaught()) {
 		return V8_Ref_Create(V8_C_Message, exceptions.Message());
 	}

data/ext/v8/v8_cxt.h

@@ -14,7 +14,7 @@ VALUE v8_Context_InContext(VALUE self);
 VALUE v8_Context_GetCurrent(VALUE self);
 VALUE v8_cxt_Global(VALUE self);
 VALUE v8_cxt_open(VALUE self);
-VALUE v8_cxt_eval(VALUE self, VALUE source);
+VALUE v8_cxt_eval(VALUE self, VALUE source, VALUE filename);
 VALUE v8_cxt_eql(VALUE self, VALUE other);
 
 #endif

data/ext/v8/v8_msg.cpp

@@ -14,4 +14,41 @@ VALUE v8_Message_Get(VALUE self) {
   Local<Message> message = V8_Ref_Get<Message>(self);
   Local<Value> str = message->Get();
   return V82RB(str);
-}
+}
+
+VALUE v8_Message_GetSourceLine(VALUE self) {
+  Local<Message> message = V8_Ref_Get<Message>(self);
+  Local<Value> line = message->GetSourceLine();
+  return V82RB(line);
+}
+
+VALUE v8_Message_GetScriptResourceName(VALUE self) {
+  Local<Message> message = V8_Ref_Get<Message>(self);
+  Handle<Value> name = message->GetScriptResourceName();
+  return V82RB(name);
+}
+
+VALUE v8_Message_GetLineNumber(VALUE self) {
+  Local<Message> message = V8_Ref_Get<Message>(self);
+  return INT2FIX(message->GetLineNumber());
+}
+
+VALUE v8_Message_GetStartPosition(VALUE self) {
+  Local<Message> message = V8_Ref_Get<Message>(self);
+  return INT2FIX(message->GetStartPosition());
+}
+
+VALUE v8_Message_GetEndPosition(VALUE self) {
+  Local<Message> message = V8_Ref_Get<Message>(self);
+  return INT2FIX(message->GetEndPosition());
+}
+
+VALUE v8_Message_GetStartColumn(VALUE self) {
+  Local<Message> message = V8_Ref_Get<Message>(self);
+  return INT2FIX(message->GetStartColumn());
+}
+
+VALUE v8_Message_GetEndColumn(VALUE self) {
+  Local<Message> message = V8_Ref_Get<Message>(self);
+  return INT2FIX(message->GetEndColumn());
+}

data/ext/v8/v8_msg.h

@@ -7,4 +7,12 @@
 extern VALUE V8_C_Message;
 VALUE V8_Wrap_Message(v8::Handle<v8::Message> msg);
 VALUE v8_Message_Get(VALUE self);
+VALUE v8_Message_GetSourceLine(VALUE self);
+VALUE v8_Message_GetScriptResourceName(VALUE self);
+VALUE v8_Message_GetLineNumber(VALUE self);
+VALUE v8_Message_GetStartPosition(VALUE self);
+VALUE v8_Message_GetEndPosition(VALUE self);
+VALUE v8_Message_GetStartColumn(VALUE self);
+VALUE v8_Message_GetEndColumn(VALUE self);
+
 #endif

data/lib/v8.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module V8
-  VERSION = '0.4.7'
+  VERSION = '0.4.8'
   require 'v8/v8' #native glue
   require 'v8/to'
   require 'v8/context'

data/lib/v8/context.rb

@@ -23,7 +23,7 @@ module V8
         javascript = javascript.read()
       end
       @native.open do        
-        @native.eval(javascript).tap do |result|
+        @native.eval(javascript, sourcename).tap do |result|
           raise JavascriptError.new(result) if result.kind_of?(C::Message)
           return To.ruby(result)
         end
@@ -79,8 +79,22 @@ module V8
   end
   class JavascriptError < StandardError
     def initialize(v8_message)
-      super(v8_message.Get())
+      super("#{v8_message.Get()}: #{v8_message.GetSourceLine()}")
+      @native = v8_message
     end
+
+    def source_name
+      @native.GetScriptResourceName()      
+    end
+    
+    def source_line
+      @native.GetSourceLine()
+    end
+    
+    def line_number
+      @native.GetLineNumber()
+    end
+    
   end
   class RunawayScriptError < ContextError
   end

data/spec/redjs/jsapi_spec.rb

@@ -390,5 +390,16 @@ end
     		Context.eval('does not compiles')
     	}.should raise_error
     end
+    
+    it "should track message state" do
+      begin        
+        Context.open do |cxt|
+          cxt.eval("var foo = 'bar';\nsyntax error!", "foo.js")
+        end
+      rescue JavascriptError => e
+        e.line_number.should == 2
+        e.source_name.should == "foo.js"
+      end
+    end
   end
 end

data/therubyracer.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{therubyracer}
-  s.version = "0.4.7"
+  s.version = "0.4.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Charles Lowell", "Bill Robertson"]
-  s.date = %q{2010-02-04}
+  s.date = %q{2010-02-08}
   s.description = %q{Embed the V8 Javascript interpreter into Ruby.}
   s.email = ["cowboyd@thefrontside.net", "billrobertson42@gmail.com"]
   s.extensions = ["ext/v8/extconf.rb"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: therubyracer
 version: !ruby/object:Gem::Version 
-  version: 0.4.7
+  version: 0.4.8
 platform: x86-darwin-10
 authors: 
 - Charles Lowell
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-05 00:00:00 -06:00
+date: 2010-02-08 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,7 +48,6 @@ files:
 - README.rdoc
 - Rakefile
 - docs/data_conversion.txt
-- ext/v8/Makefile
 - ext/v8/callbacks.cpp
 - ext/v8/callbacks.h
 - ext/v8/convert_ruby.cpp

data/ext/v8/Makefile

@@ -1,169 +0,0 @@
-
-SHELL = /bin/sh
-
-#### Start of system configuration section. ####
-
-srcdir = .
-topdir = /opt/local/lib/ruby/1.8/i686-darwin10
-hdrdir = $(topdir)
-VPATH = $(srcdir):$(topdir):$(hdrdir)
-exec_prefix = $(prefix)
-prefix = $(DESTDIR)/opt/local
-sharedstatedir = $(prefix)/com
-mandir = $(DESTDIR)/opt/local/share/man
-psdir = $(docdir)
-oldincludedir = $(DESTDIR)/usr/include
-localedir = $(datarootdir)/locale
-bindir = $(exec_prefix)/bin
-libexecdir = $(exec_prefix)/libexec
-sitedir = $(libdir)/ruby/site_ruby
-htmldir = $(docdir)
-vendorarchdir = $(vendorlibdir)/$(sitearch)
-includedir = $(prefix)/include
-infodir = $(datarootdir)/info
-vendorlibdir = $(vendordir)/$(ruby_version)
-sysconfdir = $(prefix)/etc
-libdir = $(exec_prefix)/lib
-sbindir = $(exec_prefix)/sbin
-rubylibdir = $(libdir)/ruby/$(ruby_version)
-docdir = $(datarootdir)/doc/$(PACKAGE)
-dvidir = $(docdir)
-vendordir = $(DESTDIR)/opt/local/lib/ruby/vendor_ruby
-datarootdir = $(prefix)/share
-pdfdir = $(docdir)
-archdir = $(rubylibdir)/$(arch)
-sitearchdir = $(sitelibdir)/$(sitearch)
-datadir = $(datarootdir)
-localstatedir = $(prefix)/var
-sitelibdir = $(sitedir)/$(ruby_version)
-
-CC = /usr/bin/gcc-4.2
-LIBRUBY = $(LIBRUBY_SO)
-LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
-
-RUBY_EXTCONF_H = 
-CFLAGS   =  -fno-common -O2 -arch x86_64  -fno-common -pipe -fno-common $(cflags) -arch x86_64
-INCFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)
-DEFS     = 
-CPPFLAGS =  -I/Users/cowboyd/Projects/therubyracer/ext/v8/upstream/2.0.6/include -I/opt/local/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE $(DEFS) $(cppflags) -Wall
-CXXFLAGS = $(CFLAGS) 
-ldflags  = -L. -L/opt/local/lib
-dldflags = 
-archflag = -arch x86_64
-DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
-LDSHARED = $(CC) -dynamic -bundle -undefined suppress -flat_namespace
-AR = ar
-EXEEXT = 
-
-RUBY_INSTALL_NAME = ruby
-RUBY_SO_NAME = ruby
-arch = i686-darwin10
-sitearch = i686-darwin10
-ruby_version = 1.8
-ruby = /opt/local/bin/ruby
-RUBY = $(ruby)
-RM = rm -f
-MAKEDIRS = mkdir -p
-INSTALL = /usr/bin/install -c
-INSTALL_PROG = $(INSTALL) -m 0755
-INSTALL_DATA = $(INSTALL) -m 644
-COPY = cp
-
-#### End of system configuration section. ####
-
-preload = 
-
-libpath = . $(libdir) /Users/cowboyd/Projects/therubyracer/ext/v8/upstream/2.0.6
-LIBPATH =  -L. -L$(libdir) -L/Users/cowboyd/Projects/therubyracer/ext/v8/upstream/2.0.6
-DEFFILE = 
-
-CLEANFILES = mkmf.log
-DISTCLEANFILES = 
-
-extout = 
-extout_prefix = 
-target_prefix = 
-LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED)  -lpthread -ldl -lobjc  
-SRCS = callbacks.cpp convert_ruby.cpp convert_string.cpp convert_v8.cpp converters.cpp v8.cpp v8_cxt.cpp v8_func.cpp v8_msg.cpp v8_obj.cpp v8_ref.cpp v8_script.cpp v8_standalone.cpp v8_str.cpp v8_template.cpp
-OBJS = callbacks.o convert_ruby.o convert_string.o convert_v8.o converters.o v8.o v8_cxt.o v8_func.o v8_msg.o v8_obj.o v8_ref.o v8_script.o v8_standalone.o v8_str.o v8_template.o
-TARGET = v8
-DLLIB = $(TARGET).bundle
-EXTSTATIC = 
-STATIC_LIB = 
-
-BINDIR        = $(bindir)
-RUBYCOMMONDIR = $(sitedir)$(target_prefix)
-RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
-RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
-
-TARGET_SO     = $(DLLIB)
-CLEANLIBS     = $(TARGET).bundle $(TARGET).il? $(TARGET).tds $(TARGET).map
-CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
-
-all:		$(DLLIB)
-static:		$(STATIC_LIB)
-
-clean:
-		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
-
-distclean:	clean
-		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
-		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
-
-realclean:	distclean
-install: install-so install-rb
-
-install-so: $(RUBYARCHDIR)
-install-so: $(RUBYARCHDIR)/$(DLLIB)
-$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
-	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
-install-rb: pre-install-rb install-rb-default
-install-rb-default: pre-install-rb-default
-pre-install-rb: Makefile
-pre-install-rb-default: Makefile
-$(RUBYARCHDIR):
-	$(MAKEDIRS) $@
-
-site-install: site-install-so site-install-rb
-site-install-so: install-so
-site-install-rb: install-rb
-
-.SUFFIXES: .c .m .cc .cxx .cpp .C .o
-
-.cc.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.cxx.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.cpp.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.C.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.c.o:
-	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
-
-$(DLLIB): $(OBJS) Makefile
-	@-$(RM) $@
-	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
-
-
-
-$(OBJS): ruby.h defines.h
-
-test: all
-	@echo running spec...
-	spec -O spec/spec.opts spec/therubyracer_spec.rb
-
-docs/cpp:
-	mkdir -p docs/cpp
-
-docs: all docs/cpp
-	@echo Generate C++ docs to docs/cpp/html
-	doxygen Doxyfile
-