opal · May 22, 2015 · May 22, 2015 · May 22, 2015 · May 22, 2015 · May 22, 2015
Showing with 59 additions and 4 deletions.

+11 −3 opal/corelib/runtime.js

+48 −1 spec/opal/core/runtime/bridged_classes_spec.rb
diff --git a/opal/corelib/runtime.js b/opal/corelib/runtime.js
@@ -155,7 +155,7 @@
     }
     else if (typeof(superklass) === 'function') {
       // passed native constructor as superklass, so bridge it as ruby class
-      return bridge_class(id, superklass);
+      return bridge_class(id, superklass, base);
     }
     else {
       // if class doesnt exist, create a new one with given superclass
@@ -560,14 +560,22 @@
    *
    * @param [String] name the name of the ruby class to create
    * @param [Function] constructor native javascript constructor to use
+   * @param [Object] base where the bridge class is being created. If none is supplied, the top level scope (Opal) will be used
    * @return [Class] returns new ruby class
    */
-  function bridge_class(name, constructor) {
+  function bridge_class(name, constructor, base) {
     var klass = boot_class_object(ObjectClass, constructor);
 
     klass.$$name = name;
 
-    create_scope(Opal, klass, name);
+	if (base === undefined) {
+	  base = Opal;		
+	}
+	else {
+	  base = base.$$scope;
+	}
+
+    create_scope(base, klass, name);
     bridged_classes.push(klass);
 
     var object_methods = BasicObjectClass.$$methods.concat(ObjectClass.$$methods);

diff --git a/spec/opal/core/runtime/bridged_classes_spec.rb b/spec/opal/core/runtime/bridged_classes_spec.rb
@@ -4,7 +4,6 @@
   var bridge_class_demo = function(){};
   bridge_class_demo.prototype.$foo = function() { return "bar" };
 }
-
 class TopBridgedClassDemo < `bridge_class_demo`
   def some_bridged_method
     [1, 2, 3]
@@ -62,3 +61,51 @@ def some_bridged_method
     end
   end
 end
+
+class ModularizedBridgeClass
+  def something
+    'different module'
+  end
+end
+
+%x{
+  var bridge_class_demo_module = function(){};
+  bridge_class_demo_module.prototype.$foo = function() { return "foobar" };
+}
+
+module BridgeModule
+  class ModularizedBridgeClass < `bridge_class_demo_module`
+    def some_bridged_method
+      [4, 5, 6]
+    end
+  end
+end
+
+describe 'Bridged classes in different modules' do
+  before do
+    @bridged = BridgeModule::ModularizedBridgeClass
+    @instance = `new bridge_class_demo_module`
+  end
+
+  it "should expose the given class not at the top level scope" do
+    @bridged.should be_kind_of(Class)
+  end
+
+  it 'should not disturb an existing class at the top level scope' do
+    ModularizedBridgeClass.new.something.should == 'different module'
+  end
+
+  it "gives the class the correct name" do
+    @bridged.name.should == "BridgeModule::ModularizedBridgeClass"
+  end
+
+  it "instances of class should be able to call native ruby methods" do
+    @instance.foo.should == "foobar"
+    @bridged.new.foo.should == "foobar"
+  end
+
+  it "allows new methods to be defined on the bridged prototype" do
+    @instance.some_bridged_method.should == [4, 5, 6]
+    @bridged.new.some_bridged_method.should == [4, 5, 6]
+  end
+end