opal 0.7.0.beta1 → 0.7.0.beta2

data/opal/corelib/helpers.rb

@@ -53,7 +53,7 @@ module Opal
     compare = a <=> b
 
     if `compare === nil`
-      raise ArgumentError, "comparison of #{a.class.name} with #{b.class.name} failed"
+      raise ArgumentError, "comparison of #{a.class} with #{b.class} failed"
     end
 
     compare

data/opal/corelib/kernel.rb

@@ -26,7 +26,7 @@ module Kernel
       var meth = self['$' + name];
 
       if (!meth || meth.$$stub) {
-        #{raise NameError, "undefined method `#{name}' for class `#{self.class.name}'"};
+        #{raise NameError, "undefined method `#{name}' for class `#{self.class}'"};
       }
 
       return #{Method.new(self, `meth`, name)};
@@ -40,7 +40,7 @@ module Kernel
       for (var key in self) {
         if (key[0] == "$" && typeof(self[key]) === "function") {
           if (all == false || all === nil) {
-            if (!$opal.hasOwnProperty.call(self, key)) {
+            if (!Opal.hasOwnProperty.call(self, key)) {
               continue;
             }
           }
@@ -288,8 +288,17 @@ module Kernel
     }
   end
 
+  def freeze
+    @___frozen___ = true
+    self
+  end
+
+  def frozen?
+    @___frozen___ || false
+  end
+
   def hash
-    `self.$$id`
+    `[self.$$class.$$name,#{`self.$$class`.__id__},#{__id__}].join(':')`
   end
 
   def initialize_copy(other)
@@ -304,7 +313,7 @@ module Kernel
   end
 
   def instance_variable_defined?(name)
-    `$opal.hasOwnProperty.call(self, name.substr(1))`
+    `Opal.hasOwnProperty.call(self, name.substr(1))`
   end
 
   def instance_variable_get(name)
@@ -384,7 +393,7 @@ module Kernel
   end
 
   def is_a?(klass)
-    `$opal.is_a(self, klass)`
+    `Opal.is_a(self, klass)`
   end
 
   alias kind_of? is_a?
@@ -395,6 +404,10 @@ module Kernel
     block
   end
 
+  def load(file)
+    `Opal.load(Opal.normalize_loadable_path(#{file}))`
+  end
+
   def loop(&block)
     %x{
       while (true) {
@@ -489,8 +502,6 @@ module Kernel
     }
   end
 
-  alias srand rand
-
   def respond_to?(name, include_all = false)
     return true if respond_to_missing?(name)
 
@@ -505,65 +516,70 @@ module Kernel
     false
   end
 
+  def respond_to_missing?(method_name)
+    false
+  end
+
+  def require(file)
+    `Opal.require(Opal.normalize_loadable_path(#{file}))`
+  end
+
+  def require_relative(file)
+    file = File.expand_path File.join(`Opal.current_file`, '..', file)
+
+    `Opal.require(Opal.normalize_loadable_path(#{file}))`
+  end
+
+  # `path` should be the full path to be found in registered modules (`Opal.modules`)
+  def require_tree(path)
+    path = File.expand_path(path)
+
+    %x{
+      for (var name in Opal.modules) {
+        if (#{`name`.start_with?(path)}) {
+          Opal.require(name);
+        }
+      }
+    }
+
+    nil
+  end
+
   alias send        __send__
   alias public_send __send__
 
   def singleton_class
-    %x{$opal.get_singleton_class(self)}
+    %x{Opal.get_singleton_class(self)}
   end
 
   alias sprintf format
 
+  alias srand rand
+
   def String(str)
     `String(str)`
   end
 
-  def tap(&block)
-    yield self
-    self
-  end
-
-  def to_proc
+  def taint
     self
   end
 
-  def to_s
-    `"#<" + #{self.class.name} + ":" + self.$$id + ">"`
+  def tainted?
+    false
   end
 
-  def freeze
-    @___frozen___ = true
+  def tap(&block)
+    yield self
     self
   end
 
-  def frozen?
-    @___frozen___ || false
-  end
-
-  def respond_to_missing?(method_name)
-    false
-  end
-
-  def require file
-    `$opal.require( $opal.normalize_loadable_path(#{file}) )`
+  def to_proc
+    self
   end
 
-  # `path` should be the ful path to be found in registered modules (`Opal.modules`)
-  def require_tree path
-    %x{
-      var file_name, file_names = Object.keys($opal.modules);
-      path = path.replace(/\/?$/, '/');
-      for (var i = 0; i < file_names.length; i++) {
-        file_name = file_names[i];
-        if (file_name['$start_with?'](path)) {
-          $opal.require(file_name);
-        }
-      }
-    }
-    nil
+  def to_s
+    "#<#{self.class}:0x#{__id__.to_s(16)}>"
   end
 
-  def load file
-    `$opal.load( $opal.normalize_loadable_path(#{file}) )`
-  end
+  alias untaint taint
 end

data/opal/corelib/match_data.rb

@@ -1,17 +1,8 @@
 class MatchData
   attr_reader :post_match, :pre_match, :regexp, :string
 
-  def self.new(regexp, match_groups)
-    data = super(regexp, match_groups)
-
-    $` = data.pre_match
-    $' = data.post_match
-    $~ = data
-
-    data
-  end
-
   def initialize(regexp, match_groups)
+    $~          = self
     @regexp     = regexp
     @begin      = `match_groups.index`
     @string     = `match_groups.input`

data/opal/corelib/method.rb

@@ -31,7 +31,7 @@ class Method
   end
 
   def inspect
-    "#<Method: #{@obj.class.name}##@name}>"
+    "#<Method: #{@obj.class}##@name}>"
   end
 end
 

data/opal/corelib/module.rb

@@ -10,7 +10,7 @@ class Module
       klass.$$proto  = {};
 
       // inherit scope from parent
-      $opal.create_scope(Opal.Module.$$scope, klass);
+      Opal.create_scope(Opal.Module.$$scope, klass);
 
       if (block !== nil) {
         var block_self = block.$$s;
@@ -26,7 +26,7 @@ class Module
   def ===(object)
     return false if `object == null`
 
-    `$opal.is_a(object, self)`
+    `Opal.is_a(object, self)`
   end
 
   def <(other)
@@ -50,7 +50,7 @@ class Module
       self.$$proto['$' + newname] = self.$$proto['$' + oldname];
 
       if (self.$$methods) {
-        $opal.donate(self, ['$' + newname ])
+        Opal.donate(self, ['$' + newname ])
       }
     }
     self
@@ -99,7 +99,7 @@ class Module
           }
           else {
             proto['$' + name] = func;
-            $opal.donate(self, ['$' + name ]);
+            Opal.donate(self, ['$' + name ]);
           }
         })(names[i]);
       }
@@ -121,7 +121,7 @@ class Module
           }
           else {
             proto['$' + name + '='] = func;
-            $opal.donate(self, ['$' + name + '=']);
+            Opal.donate(self, ['$' + name + '=']);
           }
         })(names[i]);
       }
@@ -198,17 +198,18 @@ class Module
 
   def const_missing(const)
     %x{
-      var autoloader;
+      if (self.$$autoload) {
+        var file = self.$$autoload[#{const}];
 
-      if (self.$$autoload && (autoloader = self.$$autoload[#{const}])) {
-        self.$require(autoloader);
-        return self.$$scope.get(#{const});
+        if (file) {
+          self.$require(file);
+
+          return #{const_get const};
+        }
       }
     }
 
-    name = `self.$$name`
-
-    raise NameError, "uninitialized constant #{name}::#{const}"
+    raise NameError, "uninitialized constant #{self}::#{const}"
   end
 
   def const_set(name, value)
@@ -220,10 +221,9 @@ class Module
       raise TypeError, 'conversion with #to_str failed'
     end
 
-    %x{
-      $opal.casgn(self, name, value);
-      return #{value}
-    }
+    `Opal.casgn(self, name, value)`
+
+    value
   end
 
   def define_method(name, method = undefined, &block)
@@ -242,7 +242,7 @@ class Module
       block.$$def  = block;
 
       self.$$proto[jsid] = block;
-      $opal.donate(self, [jsid]);
+      Opal.donate(self, [jsid]);
 
       return name;
     }
@@ -254,8 +254,8 @@ class Module
       var current = self.$$proto[jsid];
       delete self.$$proto[jsid];
 
-      // Check if we need to reverse $opal.donate
-      // $opal.retire(self, [jsid]);
+      // Check if we need to reverse Opal.donate
+      // Opal.retire(self, [jsid]);
       return self;
     }
   end
@@ -305,20 +305,37 @@ class Module
 
   def instance_methods(include_super = false)
     %x{
-      var methods = [], proto = self.$$proto;
+      var methods = [],
+          proto   = self.$$proto;
 
-      for (var prop in self.$$proto) {
-        if (!include_super && !proto.hasOwnProperty(prop)) {
+      for (var prop in proto) {
+        if (!prop.charAt(0) === '$') {
           continue;
         }
 
-        if (!include_super && proto[prop].$$donated) {
+        if (typeof(proto[prop]) !== "function") {
           continue;
         }
 
-        if (prop.charAt(0) === '$') {
-          methods.push(prop.substr(1));
+        if (proto[prop].$$stub) {
+          continue;
         }
+
+        if (!self.$$is_mod) {
+          if (self !== Opal.BasicObject && proto[prop] === Opal.BasicObject.$$proto[prop]) {
+            continue;
+          }
+
+          if (!include_super && !proto.hasOwnProperty(prop)) {
+            continue;
+          }
+
+          if (!include_super && proto[prop].$$donated) {
+            continue;
+          }
+        }
+
+        methods.push(prop.substr(1));
       }
 
       return methods;
@@ -375,10 +392,15 @@ class Module
 
   def module_function(*methods)
     %x{
-      for (var i = 0, length = methods.length; i < length; i++) {
-        var meth = methods[i], func = self.$$proto['$' + meth];
+      if (methods.length === 0) {
+        self.$$module_function = true;
+      }
+      else {
+        for (var i = 0, length = methods.length; i < length; i++) {
+          var meth = methods[i], func = self.$$proto['$' + meth];
 
-        self.constructor.prototype['$' + meth] = func;
+          self.constructor.prototype['$' + meth] = func;
+        }
       }
 
       return self;
@@ -402,7 +424,7 @@ class Module
 
         base = base.$$base_module;
 
-        if (base === $opal.Object) {
+        if (base === Opal.Object) {
           break;
         }
       }
@@ -415,7 +437,14 @@ class Module
     }
   end
 
-  def public(*)
+  def public(*methods)
+    %x{
+      if (methods.length === 0) {
+        self.$$module_function = false;
+      }
+
+      return nil;
+    }
   end
 
   alias private public
@@ -452,11 +481,12 @@ class Module
   end
 
   def to_s
-    name.to_s
+    name || "#<#{`self.$$is_mod ? 'Module' : 'Class'`}:0x#{__id__.to_s(16)}>"
   end
 
   def undef_method(symbol)
-    `$opal.add_stub_for(self.$$proto, "$" + symbol)`
+    `Opal.add_stub_for(self.$$proto, "$" + symbol)`
+
     self
   end
 end

data/opal/corelib/nil_class.rb

@@ -40,7 +40,7 @@ class NilClass
   end
 
   def to_h
-    `$opal.hash()`
+    `Opal.hash()`
   end
 
   def to_i
@@ -52,11 +52,6 @@ class NilClass
   def to_s
     ''
   end
-
-  def object_id
-    `#{NilClass}.$$id || (#{NilClass}.$$id = $opal.uid())`
-  end
-  alias hash object_id
 end
 
 NIL = nil

data/opal/corelib/numeric.rb

@@ -312,7 +312,7 @@ class Numeric
   end
 
   def hash
-    `self.toString()`
+    `'Numeric:'+self.toString()`
   end
 
   def integer?
@@ -376,8 +376,11 @@ class Numeric
     `self - 1`
   end
 
-  def round
-    `Math.round(self)`
+  def round(ndigits=0)
+    %x{
+      var scale = Math.pow(10, ndigits);
+      return Math.round(self * scale) / scale;
+    }
   end
 
   def step(limit, step = 1, &block)