johnson 1.1.2 → 1.2.0

data/test/johnson/spidermonkey/ruby_land_proxy_test.rb

@@ -63,7 +63,9 @@ module Johnson
       end
       
       def test_calling_non_functions_complains
-        assert_raise(RuntimeError) { @runtime.evaluate("new Object()").call }
+        o = @runtime.evaluate("new Object()")
+        assert_equal(false, o.respond_to?(:call))
+        assert_raise(NoMethodError) { o.call }
       end
       
       def test_functions_can_be_called
@@ -102,6 +104,20 @@ module Johnson
         assert_equal(42, proxy["bar"])
       end
       
+      def test_can_be_indexed_by_symbol
+        proxy = @runtime.evaluate("x = { foo: 42 }")
+        assert_kind_of(Johnson::SpiderMonkey::RubyLandProxy, proxy)
+        
+        assert_equal(42, proxy[:foo])
+        
+        proxy[:foo] = 99
+        proxy[:bar] = 42
+        
+        assert_js_equal(99, "x.foo")
+        assert_equal(99, proxy[:foo])
+        assert_equal(42, proxy[:bar])
+      end
+      
       def test_multilevel_indexing_works
         proxy = @runtime.evaluate("x = { foo: { bar: 42 , baz: function() { return 42 } } }")
         assert_equal(42, proxy["foo"]["bar"])

data/test/johnson/spidermonkey/runtime_test.rb

@@ -12,6 +12,30 @@ module Johnson
           Johnson::SpiderMonkey::Runtime.new
         }
       end
+
+      def test_default_is_no_debugger
+        assert_equal false, @runtime.debugger?
+      end
+
+      def test_only_accepts_real_debugger_instance
+        assert_raises(TypeError) {
+          @runtime.debugger = 17
+        }
+        assert_raises(TypeError) {
+          @runtime.debugger = "Yes please!"
+        }
+        assert_raises(TypeError) {
+          @runtime.debugger = Object.new
+        }
+        assert_raises(TypeError) {
+          @runtime.debugger = @runtime
+        }
+      end
+
+      def test_reports_a_debugger_is_registered
+        @runtime.debugger = Johnson::SpiderMonkey::Debugger.new(nil)
+        assert @runtime.debugger?
+      end
     end
   end
 end

data/vendor/spidermonkey/jsprf.c

@@ -58,6 +58,8 @@
 */
 #ifdef HAVE_VA_COPY
 #define VARARGS_ASSIGN(foo, bar)        VA_COPY(foo,bar)
+#elif defined(va_copy)
+#define VARARGS_ASSIGN(foo, bar)        va_copy(foo,bar)
 #elif defined(HAVE_VA_LIST_AS_ARRAY)
 #define VARARGS_ASSIGN(foo, bar)        foo[0] = bar[0]
 #else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: johnson
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors: 
 - John Barnette
@@ -12,18 +12,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-29 00:00:00 -07:00
+date: 2010-01-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rake-compiler
+  name: gemcutter
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.0
+        version: 0.2.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rake-compiler
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "0.6"
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -33,7 +43,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.2
+        version: 2.5.0
     version: 
 description: |-
   Johnson wraps JavaScript in a loving Ruby embrace. It embeds the
@@ -83,12 +93,13 @@ files:
 - ext/spidermonkey/runtime.h
 - ext/spidermonkey/spidermonkey.c
 - ext/spidermonkey/spidermonkey.h
-- js/johnson/cli.js
-- js/johnson/prelude.js
 - lib/johnson.rb
 - lib/johnson/cli.rb
 - lib/johnson/cli/options.rb
 - lib/johnson/error.rb
+- lib/johnson/js/cli.js
+- lib/johnson/js/core.js
+- lib/johnson/js/prelude.js
 - lib/johnson/nodes.rb
 - lib/johnson/nodes/binary_node.rb
 - lib/johnson/nodes/for.rb
@@ -99,7 +110,9 @@ files:
 - lib/johnson/nodes/ternary_node.rb
 - lib/johnson/parser.rb
 - lib/johnson/parser/syntax_error.rb
+- lib/johnson/ruby_land_proxy.rb
 - lib/johnson/runtime.rb
+- lib/johnson/spidermonkey.rb
 - lib/johnson/spidermonkey/context.rb
 - lib/johnson/spidermonkey/debugger.rb
 - lib/johnson/spidermonkey/immutable_node.rb
@@ -107,7 +120,6 @@ files:
 - lib/johnson/spidermonkey/mutable_tree_visitor.rb
 - lib/johnson/spidermonkey/ruby_land_proxy.rb
 - lib/johnson/spidermonkey/runtime.rb
-- lib/johnson/version.rb
 - lib/johnson/visitable.rb
 - lib/johnson/visitors.rb
 - lib/johnson/visitors/dot_visitor.rb
@@ -115,7 +127,6 @@ files:
 - lib/johnson/visitors/enumerating_visitor.rb
 - lib/johnson/visitors/sexp_visitor.rb
 - lib/johnson/visitors/visitor.rb
-- lib/rails/init.rb
 - test/helper.rb
 - test/johnson/browser_test.rb
 - test/johnson/conversions/array_test.rb
@@ -129,6 +140,7 @@ files:
 - test/johnson/conversions/struct_test.rb
 - test/johnson/conversions/symbol_test.rb
 - test/johnson/conversions/thread_test.rb
+- test/johnson/custom_conversions_test.rb
 - test/johnson/error_test.rb
 - test/johnson/extensions_test.rb
 - test/johnson/nodes/array_literal_test.rb
@@ -458,6 +470,7 @@ test_files:
 - test/johnson/conversions/struct_test.rb
 - test/johnson/conversions/symbol_test.rb
 - test/johnson/conversions/thread_test.rb
+- test/johnson/custom_conversions_test.rb
 - test/johnson/error_test.rb
 - test/johnson/extensions_test.rb
 - test/johnson/nodes/array_literal_test.rb

data/js/johnson/prelude.js

@@ -1,80 +0,0 @@
-var Johnson = {};
-
-Johnson.Symbol = function(string) {
-  this.string = string;
-};
-
-Johnson.Symbol.prototype = {
-  toString: function() {
-    return this.string;
-  },
-
-  inspect: function() {
-    return ":" + this.toString();
-  }
-};
-
-Johnson.symbolCache = {};
-
-Johnson.symbolize = function(string) {
-  if (!Johnson.symbolCache[string])
-    Johnson.symbolCache[string] = new Johnson.Symbol(string);
-    
-  return Johnson.symbolCache[string];
-};
-
-Object.defineProperty(String.prototype, "toSymbol", function() {
-  return Johnson.symbolize(this.toString());
-}, Object.READ_ONLY | Object.NON_DELETABLE);
-
-Johnson.Generator = function(enumerableProxy) {
-  this.items = enumerableProxy.toArray();
-  this.index = 0;
-};
-
-Johnson.Generator.prototype.hasNext = function() {
-  var len = this.items.length;
-  if (typeof len != 'number') len = this.items.length();
-  return this.index < len;
-}
-
-Johnson.Generator.prototype.next = function() {
-  if (this.hasNext()) {
-    return this.items[this.index++];
-  }
-  throw StopIteration;
-}
-
-Johnson.Generator.create = function() {
-  return new Johnson.Generator(this);
-}
-
-Johnson.required = {};
-
-Johnson.require = function(file) {
-  file = Ruby.File.join(Ruby.File.dirname(file),
-    Ruby.File.basename(file, ".js") + ".js");
-  
-  if(Johnson.required[file]) return false;
-  
-  for(var directory in Ruby["$LOAD_PATH"]) {
-    var path = Ruby.File.join(directory, file);
-    
-    if(Ruby.File.send("file?", path)) {
-      Johnson.required[file] = true;
-      Johnson.runtime.load(path);
-      
-      return true;
-    }
-  }
-  
-  throw Ruby.LoadError;
-}
-
-this.__defineGetter__("__FILE__", function() { 
-  try { throw new Error; } catch(e) {
-    return e.stack.split("\n")[2].split("@")[1].split(":").slice(0,-1).join(":");
-  }
-})
-
-null; // no need to marshal a result

data/lib/johnson/version.rb

@@ -1,3 +0,0 @@
-module Johnson #:nodoc:
-  VERSION = "1.1.2"
-end

data/lib/rails/init.rb

@@ -1,37 +0,0 @@
-require 'johnson'
-
-class EJSHandler < ActionView::TemplateHandler
-  class EJSProxy # :nodoc:
-    def initialize(controller)
-      @controller = controller
-    end
-
-    def key?(pooperty)
-      @controller.instance_variables.include?("@#{pooperty}")
-    end
-
-    def [](pooperty)
-      @controller.instance_variable_get("@#{pooperty}")
-    end
-
-    def []=(pooperty, value)
-      @controller.instance_variable_set("@#{pooperty}", value)
-    end
-  end
-
-  def initialize(view)
-    @view = view
-  end
-
-  def render(template)
-    ctx = Johnson::Runtime.new
-    ctx.evaluate('Johnson.require("johnson/template");')
-    ctx['template'] = template.source
-    ctx['controller'] = @view.controller
-    ctx['at'] = EJSProxy.new(@view.controller)
-
-    ctx.evaluate('Johnson.templatize(template).call(at)')
-  end
-end
-
-ActionView::Template.register_template_handler("ejs", EJSHandler)