opal 0.3.37 → 0.3.38

data/lib/assets/javascripts/opal/json.rb

@@ -38,11 +38,12 @@ module JSON
             return arr;
           }
           else {
-            var hash = #{ {} }, v, map = hash.map;
+            var hash = #{ {} }, v, map = hash.map, keys = hash.keys;
 
             for (var k in value) {
               if (__hasOwn.call(value, k)) {
                 v = to_opal(value[k]);
+                keys.push(k);
                 map[k] = v;
               }
             }
@@ -52,4 +53,4 @@ module JSON
       }
     };
   }
-end
+end

data/lib/assets/javascripts/opal/kernel.rb

@@ -8,6 +8,10 @@ module Kernel
   alias :instance_eval :instance_eval
   alias :instance_exec :instance_exec
 
+  def method_missing(symbol, *args, &block)
+    raise NoMethodError, "undefined method `#{symbol}' for #{inspect}"
+  end
+
   def =~(obj)
     false
   end
@@ -16,6 +20,10 @@ module Kernel
     `#{self} == other`
   end
 
+  def as_json
+    nil
+  end
+
   def method(name)
     %x{
       var recv = #{self},
@@ -64,7 +72,7 @@ module Kernel
   end
 
   def class
-    `return #{self}._klass`
+    `#{self}._klass`
   end
 
   def define_singleton_method(name, &body)

data/lib/assets/javascripts/opal/native.rb

@@ -0,0 +1,29 @@
+module Native
+  def initialize(native)
+    %x{
+      if (#{native} == null) {
+        #{ raise "null or undefined passed to Native" };
+      }
+    }
+
+    @native = native
+  end
+
+  def method_missing(symbol, *args, &block)
+    native = @native
+
+    %x{
+      var func;
+
+      if (func = #{native}[#{symbol}]) {
+        return func.call(#{native});
+      }
+    }
+
+    nil
+  end
+
+  def to_native
+    @native
+  end
+end

data/lib/assets/javascripts/opal/nil_class.rb

@@ -15,6 +15,10 @@ class NilClass
     `other === nil`
   end
 
+  def as_json
+    self
+  end
+
   def inspect
     'nil'
   end
@@ -31,6 +35,10 @@ class NilClass
     []
   end
 
+  def to_h
+    `__opal.hash()`
+  end
+
   def to_i
     0
   end
@@ -48,4 +56,4 @@ class NilClass
   def to_s
     ''
   end
-end
+end

data/lib/assets/javascripts/opal/numeric.rb

@@ -1,10 +1,8 @@
 class Numeric < `Number`
-  %x{
-    Numeric.prototype._isNumber = true;
-  }
-
   include Comparable
 
+  `def._isNumber = true`
+
   def +(other)
     `#{self} + other`
   end
@@ -95,6 +93,10 @@ class Numeric < `Number`
     `Math.abs(#{self})`
   end
 
+  def as_json
+    self
+  end
+
   def ceil
     `Math.ceil(#{self})`
   end

data/lib/assets/javascripts/opal/parser.js

@@ -0,0 +1,57 @@
+(function() {
+  // quick exit if not insde browser
+  if (typeof(window) === 'undefined' || typeof(document) === 'undefined') {
+    return;
+  }
+
+  function findRubyScripts() {
+    var all = document.getElementsByTagName('script');
+    for (var i = 0, script; i < all.length; i++) {
+      script = all[i];
+      if (script.type === 'text/ruby') {
+        if (script.src) {
+          request(script.src, function(result) {
+            runRuby(result);
+          });
+        }
+        else {
+          runRuby(script.innerHTML);
+        }
+      }
+      else if (script.type === 'text/erb') {
+        runERB(script.innerHTML);
+      }
+    }
+  }
+
+  function runRuby(source) {
+    var js = Opal.Opal.Parser.$new().$parse(source);
+    eval('(' + js + ')()');
+  }
+
+  function request(url, callback) {
+    var xhr = new (window.ActiveXObject || XMLHttpRequest)('Microsoft.XMLHTTP');
+    xhr.open('GET', url, true);
+    if ('overrideMimeType' in xhr) {
+      xhr.overrideMimeType('text/plain');
+    }
+    xhr.onreadystatechange = function() {
+      if (xhr.readyState === 4) {
+        if (xhr.status === 0 || xhr.status === 200) {
+          callback(xhr.responseText);
+        }
+        else {
+          throw new Error('Could not load ruby at: ' + url);
+        }
+      }
+    };
+    xhr.send(null);
+  }
+
+  if (window.addEventListener) {
+    window.addEventListener('DOMContentLoaded', findRubyScripts, false);
+  }
+  else {
+    window.attachEvent('onload', findRubyScripts);
+  }
+})();

data/lib/assets/javascripts/opal/proc.rb

@@ -1,8 +1,6 @@
 class Proc < `Function`
-  %x{
-    Proc.prototype._isProc = true;
-    Proc.prototype.is_lambda = true;
-  }
+  `def._isProc = true`
+  `def.is_lambda = true`
 
   def self.new(&block)
     `if (block === nil) no_block_given();`
@@ -14,6 +12,8 @@ class Proc < `Function`
     `#{self}.apply(null, #{args})`
   end
 
+  alias [] call
+
   def to_proc
     self
   end
@@ -25,7 +25,7 @@ class Proc < `Function`
   end
 
   def arity
-    `this.length - 1`
+    `#{self}.length - 1`
   end
 end
 

data/lib/assets/javascripts/opal/regexp.rb

@@ -69,4 +69,4 @@ class Regexp < `RegExp`
 end
 
 class MatchData
-end
+end

data/lib/assets/javascripts/opal/runtime.js

@@ -142,6 +142,10 @@
     constructor._donate = __donate;
     constructor._sdonate = __sdonate;
 
+    constructor['$==='] = module_eqq;
+    constructor.$to_s = module_to_s;
+    constructor.toString = module_to_s;
+
     Opal[id] = constructor;
 
     return constructor;
@@ -169,6 +173,7 @@
 
     constructor['$==='] = module_eqq;
     constructor.$to_s = module_to_s;
+    constructor.toString = module_to_s;
 
     var smethods;
 
@@ -199,6 +204,7 @@
 
     constructor['$==='] = module_eqq;
     constructor.$to_s = module_to_s;
+    constructor.toString = module_to_s;
 
     var smethods = constructor._smethods = Class._methods.slice();
     for (var i = 0, length = smethods.length; i < length; i++) {
@@ -221,6 +227,13 @@
   };
 
   Opal.puts = function(a) { console.log(a); };
+  
+  // Method missing dispatcher
+  Opal.mm = function(mid) {
+    return function() {
+      return this.$method_missing.apply(this, [mid].concat(__slice.call(arguments)));
+    }
+  };
 
   // Initialization
   // --------------

data/lib/assets/javascripts/opal/string.rb

@@ -1,8 +1,8 @@
 class String < `String`
-  `String.prototype._isString = true`
-
   include Comparable
 
+  `def._isString = true`
+
   def self.try_convert(what)
     what.to_str
   rescue
@@ -131,6 +131,10 @@ class String < `String`
     }
   end
 
+  def as_json
+    self
+  end
+
   def capitalize
     `#{self}.charAt(0).toUpperCase() + #{self}.substr(1).toLowerCase()`
   end
@@ -179,7 +183,14 @@ class String < `String`
   def count(str)
     `(#{self}.length - #{self}.replace(new RegExp(str,"g"), '').length) / str.length`
   end
-  
+
+  def dasherize
+    `#{self}.replace(/[-\\s]+/g, '-')
+                .replace(/([A-Z\\d]+)([A-Z][a-z])/g, '$1-$2')
+                .replace(/([a-z\\d])([A-Z])/g, '$1-$2')
+                .toLowerCase()`
+  end
+
   def demodulize
     %x{
       var idx = #{self}.lastIndexOf('::');

data/lib/assets/javascripts/opal/time.rb

@@ -107,4 +107,4 @@ class Time < `Date`
   end
 
   alias_native :year, :getFullYear
-end
+end

data/lib/opal.rb

@@ -16,7 +16,7 @@ module Opal
   # @param [String] file the filename to use when parsing
   # @return [String] the resulting javascript code
   def self.parse(str, file='(file)')
-    Parser.new.parse str, file
+    Parser.new.parse str, :file => file
   end
 
   def self.core_dir

data/lib/opal/parser.rb

@@ -83,10 +83,9 @@ module Opal
     # @param [String] source the ruby code to parse
     # @param [String] file the filename representing this code
     # @return [String] string of javascript code
-    def parse(source, file = '(file)')
+    def parse(source, options = {})
       @grammar  = Grammar.new
       @requires = []
-      @file     = file
       @line     = 1
       @indent   = ''
       @unique   = 0
@@ -96,7 +95,12 @@ module Opal
         :slice    => true
       }
 
-      top @grammar.parse(source, file)
+      # options
+      @file     = options[:file] || '(file)'
+      @method_missing = (options[:method_missing] != false)
+      @optimized_operators = (options[:optimized_operators] != false)
+
+      top @grammar.parse(source, @file)
     end
 
     # This is called when a parsing/processing error occurs. This
@@ -179,17 +183,17 @@ module Opal
           code = @indent + process(s(:scope, sexp), :stmt)
         }
 
-        @scope.add_temp "__opal = Opal"
         @scope.add_temp "self = __opal.top"
         @scope.add_temp "__scope = __opal"
         @scope.add_temp "nil = __opal.nil"
+        @scope.add_temp "$mm = __opal.mm"
         @scope.add_temp "def = #{current_self}._klass.prototype" if @scope.defines_defn
         @helpers.keys.each { |h| @scope.add_temp "__#{h} = __opal.#{h}" }
 
         code = INDENT + @scope.to_vars + "\n" + code
       end
 
-      "(function() {\n#{ code }\n})();\n"
+      "(function(__opal) {\n#{ code }\n})(Opal);\n"
     end
 
     # Every time the parser enters a new scope, this is called with
@@ -497,7 +501,7 @@ module Opal
       meth, recv, arg = sexp
       mid = mid_to_jsid meth.to_s
 
-      if @parser_uses_optimized_operators
+      if @optimized_operators
         with_temp do |a|
           with_temp do |b|
             l = process recv, :expr
@@ -507,9 +511,9 @@ module Opal
               [a, l, b, r, a, a, meth.to_s, b, a, mid, b]
           end
         end
+      else
+        "#{process recv, :recv}#{mid}(#{process arg, :expr})"
       end
-
-      "#{process recv, :recv}#{mid}(#{process arg, :expr})"
     end
 
     def js_block_given(sexp, level)
@@ -807,16 +811,38 @@ module Opal
         tmprecv = @scope.new_temp
       elsif splat and recv != [:self] and recv[0] != :lvar
         tmprecv = @scope.new_temp
+      else # method_missing
+       tmprecv = @scope.new_temp
       end
 
       args      = ""
 
       recv_code = process recv, :recv
 
-      args = process arglist, :expr
+      if @method_missing
+        call_recv = s(:js_tmp, tmprecv || recv_code)
+        arglist.insert 1, call_recv unless splat
+        args = process arglist, :expr
+
+        dispatch = if tmprecv
+          "((#{tmprecv} = #{recv_code})#{mid} || $mm('#{ meth.to_s }'))"
+        else
+          "(#{recv_code}#{mid} || $mm('#{ meth.to_s }'))"
+        end
+
+        result = if splat
+          "#{dispatch}.apply(#{process call_recv, :expr}, #{args})"
+        else
+          "#{dispatch}.call(#{args})"
+        end
+      else
+        args = process arglist, :expr
+        dispatch = tmprecv ? "(#{tmprecv} = #{recv_code})#{mid}" : "#{recv_code}#{mid}"
+        result = splat ? "#{dispatch}.apply(#{tmprecv || recv_code}, #{args})" : "#{dispatch}(#{args})"
+      end
 
-      dispatch = tmprecv ? "(#{tmprecv} = #{recv_code})#{mid}" : "#{recv_code}#{mid}"
-      splat ? "#{dispatch}.apply(#{tmprecv || recv_code}, #{args})" : "#{dispatch}(#{args})"
+      @scope.queue_temp tmprecv if tmprecv
+      result
     end
 
     # s(:arglist, [arg [, arg ..]])
@@ -1256,7 +1282,7 @@ module Opal
         map = hash_keys.map { |k| "#{k}: #{hash_obj[k]}"}
 
         @helpers[:hash2] = true
-        "__hash2({#{map.join(', ')}})"
+        "__hash2([#{hash_keys.join ', '}], {#{map.join(', ')}})"
       else
         @helpers[:hash] = true
         "__hash(#{sexp.map { |p| process p, :expr }.join ', '})"
@@ -1808,7 +1834,7 @@ module Opal
     #
     # s(:zsuper)
     def process_zsuper(exp, level)
-      js_super "[self].concat(__slice.call(arguments))"
+      js_super "__slice.call(arguments)"
     end
 
     def js_super args