Enable some more Class.new specs

opal · Oct 18, 2013 · 8158bfb · 8158bfb
1 parent 2d28028
commit 8158bfb
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/corelib/class.rb b/corelib/class.rb
@@ -1,6 +1,10 @@
 class Class
   def self.new(sup = Object, &block)
     %x{
+      if (!sup._isClass || sup.__mod__) {
+        #{raise TypeError, "superclass must be a Class"};
+      }
+
       function AnonClass(){};
       var klass       = Opal.boot(sup, AnonClass)
       klass._name     = nil;

diff --git a/corelib/module.rb b/corelib/module.rb
@@ -7,6 +7,7 @@ def self.new(&block)
       klass._scope  = Module._scope;
       klass._klass  = Module;
       klass.__dep__ = []
+      klass.__mod__ = true;
 
       if (block !== nil) {
         var block_self = block._s;

diff --git a/corelib/runtime.js b/corelib/runtime.js
@@ -336,7 +336,12 @@
     var scope = base_module._scope;
 
     if (value._isClass && value._name === nil) {
-      value._name = base_module._name + '::' + name;
+      if (base_module === RubyObject) {
+        value._name = name;
+      }
+      else {
+        value._name = base_module._name + '::' + name;
+      }
     }
 
     scope.constants.push(name);

diff --git a/lib/opal/parser.rb b/lib/opal/parser.rb
@@ -2043,7 +2043,7 @@ def process_colon3(exp, level)
 
     def process_casgn3(sexp, level)
       cid, rhs = sexp
-      [f("$opal.Object._scope.#{cid} = "), process(rhs)]
+      [f("$opal.casgn($opal.Object, '#{cid}', "), process(rhs), f(")")]
     end
 
     # super a, b, c

diff --git a/spec/filters/bugs/class.rb b/spec/filters/bugs/class.rb
@@ -1,6 +1,4 @@
 opal_filter "Class" do
   fails "Class.new raises a TypeError if passed a metaclass"
-  fails "Class.new creates a class that can be given a name by assigning it to a constant"
-  fails "Class.new raises a TypeError when given a non-Class"
   fails "Class#new passes the block to #initialize"
 end