opal 0.3.43 → 0.3.44

data/lib/opal/target_scope.rb

@@ -136,7 +136,7 @@ module Opal
     # Generates code for this module to donate methods
     def to_donate_methods
       if should_donate? and !@methods.empty?
-        "%s;#{@name}._donate([%s]);" % [@parser.parser_indent, @methods.map(&:inspect).join(', ')]
+        "%s;__opal.donate(#{@name}, [%s]);" % [@parser.parser_indent, @methods.map(&:inspect).join(', ')]
       else
         ""
       end
@@ -182,7 +182,7 @@ module Opal
     def new_temp
       return @queue.pop unless @queue.empty?
 
-      tmp = "_#{@unique}"
+      tmp = "$#{@unique}"
       @unique = @unique.succ
       @temps << tmp
       tmp

data/lib/opal/version.rb

@@ -1,3 +1,3 @@
 module Opal
-  VERSION = '0.3.43'
+  VERSION = '0.3.44'
 end

data/opal/opal-browser/script_loader.rb

@@ -1,23 +1,18 @@
 class BrowserScriptLoader
-  def initialize
-    @doc = Native.global.document
-    @win = Native.global
-  end
-
   def run
     handler = proc { find_scripts }
 
-    if @win.key? :addEventListener
-      @win.addEventListener 'DOMContentLoaded', handler, false
+    if $window.respond_to? :addEventListener
+      $window.addEventListener 'DOMContentLoaded', handler, false
     else
-      @win.attachEvent 'onload', handler
+      $window.attachEvent 'onload', handler
     end
   end
 
   def find_scripts
     ruby_scripts.each do |script|
       if src = script.src and src != ""
-        puts "Cannot currently load script src: #{src}"
+        puts "Cannot currently load remote script: #{src}"
       else
         run_ruby script.innerHTML
       end
@@ -25,16 +20,16 @@ class BrowserScriptLoader
   end
 
   def ruby_scripts
-    all = @doc.getElementsByTagName 'script' 
-    all.to_a.select { |s| s.type == "text/ruby" }
+    $document.getElementsByTagName('script').to_a.select { |s|
+      s.type == "text/ruby" }
   end
 
   def run_ruby str
-    Native.global.Opal.eval str
+    $window.Opal.eval str
   end
 end
 
-if Native.global.key? :window and  Native.global.key? :document
+if $window and $document
   BrowserScriptLoader.new.run
 end
 

data/opal/opal.rb

@@ -17,18 +17,36 @@ require 'opal/proc'
 require 'opal/range'
 require 'opal/time'
 require 'opal/json'
-require 'opal/native'
 
 # regexp matches
-$~ = nil
+$& = $~ = $` = $' = nil
+
+# stub library path
+$:            = []
 
 # split lines
-$/ = "\n"
+$/            = "\n"
 
-$stderr = $stdout = Object.new
+# native globals
+$global = `Opal.global`
+$window = $global
+$document = $window.document
+
+ARGV          = []
+ARGF          = Object.new
+ENV           = {}
+TRUE          = true
+FALSE         = false
+NIL           = nil
+
+STDERR        = $stderr = Object.new
+STDIN         = $stdin  = Object.new
+STDOUT        = $stdout = Object.new
 
-RUBY_ENGINE   = 'opal'
 RUBY_PLATFORM = 'opal'
+RUBY_ENGINE   = 'opal'
+RUBY_VERSION  = '1.9.3'
+RUBY_RELEASE_DATE = '2013-05-02'
 
 def to_s
   'main'

data/opal/opal/array.rb

@@ -1,4 +1,4 @@
-class Array < `Array`
+class Array
   include Enumerable
 
   # Mark all javascript arrays as being valid ruby arrays
@@ -51,12 +51,18 @@ class Array < `Array`
 
       for (var i = 0, length = #{self}.length; i < length; i++) {
         var item = #{self}[i];
+        if (item._isString) {
+          item = item.toString();
+        }
 
         if (!seen[item]) {
           for (var j = 0, length2 = other.length; j < length2; j++) {
             var item2 = other[j];
+            if (item2._isString) {
+              item2 = item2.toString();
+            }
 
-            if ((item === item2) && !seen[item]) {
+            if (item === item2 && !seen[item]) {
               seen[item] = true;
 
               result.push(item);
@@ -90,7 +96,38 @@ class Array < `Array`
   end
 
   def -(other)
-    reject { |i| other.include? i }
+    %x{
+      var a = #{self},
+          b = #{other},
+          tmp = [],
+          result = [];
+      
+     if (typeof(b) == "object" && !(b instanceof Array))  {
+        if (b['$to_ary'] && typeof(b['$to_ary']) == "function") {
+          b = b['$to_ary']();
+        } else {
+          #{raise TypeError.new("can't convert to Array. Array#-") };
+        }
+      }else if ((typeof(b) != "object")) {
+        #{raise TypeError.new("can't convert to Array. Array#-") }; 
+      }      
+
+      if (a.length == 0)
+        return [];
+      if (b.length == 0)
+        return a;    
+          
+      for(var i = 0, length = b.length; i < length; i++) { 
+        tmp[b[i]] = true;
+      }
+      for(var i = 0, length = a.length; i < length; i++) {
+        if (!tmp[a[i]]) { 
+          result.push(a[i]);
+        }  
+     }
+     
+      return result; 
+    }
   end
 
   def <<(object)
@@ -125,11 +162,25 @@ class Array < `Array`
         return false;
       }
 
-      for (var i = 0, length = #{self}.length; i < length; i++) {
+      for (var i = 0, length = #{self}.length, tmp1, tmp2; i < length; i++) {
+        tmp1 = #{self}[i];
+        tmp2 = #{other}[i];
+        
+        //recursive
+        if ((typeof(tmp1.indexOf) == "function") &&
+            (typeof(tmp2.indexOf) == "function") &&  
+            (tmp1.indexOf(tmp2) == tmp2.indexOf(tmp1))) {
+          if (tmp1.indexOf(tmp1) == tmp2.indexOf(tmp2)) {
+            continue;
+          }
+        }
+        
         if (!#{`#{self}[i]` == `other[i]`}) {
           return false;
         }
+        
       }
+      
 
       return true;
     }
@@ -139,7 +190,7 @@ class Array < `Array`
     %x{
       var size = #{self}.length;
 
-      if (typeof index !== 'number') {
+      if (typeof index !== 'number' && !index._isNumber) {
         if (index._isRange) {
           var exclude = index.exclude;
           length      = index.end;
@@ -382,9 +433,19 @@ class Array < `Array`
   def each(&block)
     return enum_for :each unless block_given?
 
-    `for (var i = 0, length = #{self}.length; i < length; i++) {`
-      yield `#{self}[i]`
-    `}`
+    if block.arity > 0
+      %x{
+        for (var i = 0, length = #{self}.length; i < length; i++) {
+          if (block.apply(null, #{self}[i]._isArray ? #{self}[i] : [#{self}[i]]) === __breaker) return __breaker.$v;
+        }
+      }
+    else
+      %x{
+        for (var i = 0, length = #{self}.length; i < length; i++) {
+          #{yield `#{self}[i]`};
+        }
+      }
+    end
 
     self
   end
@@ -831,22 +892,75 @@ class Array < `Array`
   def sort(&block)
     %x{
       var copy = #{self}.slice();
-
+      var t_arg_error = false;
+      var t_break = [];
+        
       if (block !== nil) {
-        return copy.sort(block);
+        var result = copy.sort(function(x, y) {
+          var result = block(x, y);
+          if (result === __breaker) {
+            t_break.push(__breaker.$v);
+          }
+          if (result === nil) {
+            t_arg_error = true;  
+          }
+          if (result['$<=>'] && typeof(result['$<=>']) == "function") {
+            result = result['$<=>'](0);
+          }
+          if ([-1, 0, 1].indexOf(result) == -1) {
+            t_arg_error = true;
+          }
+          return result;
+        });
+
+        if (t_break.length > 0)
+          return t_break[0];
+        if (t_arg_error)
+          #{raise ArgumentError, "Array#sort"};
+
+        return result;
       }
+      
+      var result = copy.sort(function(a, b){ 
+        if (typeof(a) !== typeof(b)) {
+          t_arg_error = true;
+        }
+        
+        if (a['$<=>'] && typeof(a['$<=>']) == "function") {
+          var result = a['$<=>'](b);
+          if (result === nil) {
+            t_arg_error = true;
+          } 
+          return result; 
+        }  
+        if (a > b)
+          return 1;
+        if (a < b)
+          return -1;
+        return 0;  
+      });
+      
+      if (t_arg_error)
+        #{raise ArgumentError, "Array#sort"};
 
-      return copy.sort();
+      return result;
     }
   end
 
   def sort!(&block)
     %x{
+      var result;
       if (block !== nil) {
-        return #{self}.sort(block);
+        //strangely
+        result = #{self}.slice().sort(block);
+      } else {
+        result = #{self}.slice()['$sort']();
       }
-
-      return #{self}.sort();
+      #{self}.length = 0;
+      for(var i = 0; i < result.length; i++) {
+        #{self}.push(result[i]);
+      }
+      return #{self};
     }
   end
 

data/opal/opal/boolean.rb

@@ -1,4 +1,4 @@
-class Boolean < `Boolean`
+class Boolean
   `def._isBoolean = true`
 
   def &(other)

data/opal/opal/class.rb

@@ -82,7 +82,7 @@ class Class
       }
 
       if (klass.$included_in) {
-        klass._donate(methods.slice(), true);
+        __opal.donate(klass, methods.slice(), true);
       }
     }
 
@@ -103,7 +103,7 @@ class Class
           var func = function() { return this[name] };
 
           if (cls._isSingleton) {
-            proto._defs('$' + name, func);
+            __opal.defs(proto, '$' + name, func);
           }
           else {
             proto['$' + name] = func;
@@ -124,7 +124,7 @@ class Class
           var func = function(value) { return this[name] = value; };
 
           if (cls._isSingleton) {
-            proto._defs('$' + name + '=', func);
+            __opal.defs(proto, '$' + name + '=', func);
           }
           else {
             proto['$' + name + '='] = func;
@@ -137,19 +137,85 @@ class Class
 
   alias attr attr_accessor
 
-  def const_defined?(name)
-    `!!(#{self}._scope[#{name}])`
+  # when self is Module (or Class), implement 1st form:
+  # - global constants, classes and modules in global scope
+  # when self is not Module (or Class), implement 2nd form:
+  # - constants, classes and modules scoped to instance
+  def constants
+    %x{
+      var result = [];
+      var name_re = /^[A-Z][A-Za-z0-9_]+$/;
+      var scopes = [#{self}._scope];
+      var own_only;
+      if (#{self} === Opal.Class) {
+        own_only = false;
+      }
+      else {
+        own_only = true;
+        var parent = #{self}._super;
+        while (parent !== Opal.Object) {
+          scopes.push(parent._scope);
+          parent = parent._super;
+        }
+      }
+      for (var i = 0, len = scopes.length; i < len; i++) {
+        var scope = scopes[i]; 
+        for (name in scope) {
+          if ((!own_only || scope.hasOwnProperty(name)) && name_re.test(name)) {
+            result.push(name);
+          }
+        }
+      }
+
+      return result;
+    }
   end
 
-  def const_get(name)
+  # check for constant within current scope
+  # if inherit is true or self is Object, will also check ancestors
+  def const_defined?(name, inherit = true)
+    raise NameError, "wrong constant name #{name}" unless name =~ /^[A-Z]\w+$/
     %x{
-      var result = #{self}._scope[name];
+      scopes = [#{self}._scope];
+      if (inherit || #{self} === Opal.Object) {
+        var parent = #{self}._super;
+        while (parent !== Opal.BasicObject) {
+          scopes.push(parent._scope);
+          parent = parent._super;
+        }
+      }
 
-      if (result == null) {
-        return #{ const_missing name };
+      for (var i = 0, len = scopes.length; i < len; i++) {
+        if (scopes[i].hasOwnProperty(name)) {
+          return true;
+        }
       }
 
-      return result;
+      return false;
+    }
+  end
+
+  # check for constant within current scope
+  # if inherit is true or self is Object, will also check ancestors
+  def const_get(name, inherit = true)
+    raise NameError, "wrong constant name #{name}" unless name =~ /^[A-Z]\w+$/
+    %x{
+      var scopes = [#{self}._scope];
+      if (inherit || #{self} == Opal.Object) {
+        var parent = #{self}._super;
+        while (parent !== Opal.BasicObject) {
+          scopes.push(parent._scope);
+          parent = parent._super;
+        }
+      }
+
+      for (var i = 0, len = scopes.length; i < len; i++) {
+        if (scopes[i].hasOwnProperty(name)) {
+          return scopes[i][name];
+        }
+       }
+ 
+      return #{const_missing name};
     }
   end
 
@@ -159,8 +225,7 @@ class Class
   end
 
   def const_set(name, value)
-    raise NameError, "wrong constant name #{name}" unless name =~ /^[A-Z]/
-    raise NameError, "wrong constant name #{name}" unless name =~ /^[\w_]+$/
+    raise NameError, "wrong constant name #{name}" unless name =~ /^[A-Z]\w+$/
     begin
       name = name.to_str
     rescue
@@ -188,7 +253,7 @@ class Class
       block._s    = null;
 
       #{self}.prototype[jsid] = block;
-      #{self}._donate([jsid]);
+      __opal.donate(#{self}, [jsid]);
 
       return nil;
     }
@@ -283,12 +348,21 @@ class Class
 
   def new(*args, &block)
     %x{
-      var obj = new #{self};
-      obj._id = Opal.uid();
+      if (#{self}.prototype.$initialize) {
+        var obj = new #{self};
+        obj._id = Opal.uid();
 
-      obj.$initialize._p = block;
-      obj.$initialize.apply(obj, args);
-      return obj;
+        obj.$initialize._p = block;
+        obj.$initialize.apply(obj, args);
+        return obj;
+      }
+      else {
+        var cons = function() {};
+        cons.prototype = #{self}.prototype;
+        var obj = new cons;
+        #{self}.apply(obj, args);
+        return obj;
+      }
     }
   end