opal 0.3.29 → 0.3.30

data/core/json.rb

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

data/core/kernel.rb

@@ -11,6 +11,23 @@ module Kernel
     `#{self} == other`
   end
 
+  def method(name)
+    %x{
+      var recv = #{self},
+          meth = recv['$' + name],
+          func = function() {
+            return meth.apply(recv, __slice.call(arguments, 0));
+          };
+
+      if (!meth) {
+        #{ raise NameError };
+      }
+
+      func._klass = #{Method};
+      return func;
+    }
+  end
+
   def methods(all = true)
     %x{
       var methods = [];
@@ -83,6 +100,135 @@ module Kernel
     }
   end
 
+  def format(format, *args)
+    %x{
+      var idx = 0;
+      return format.replace(/%(\\d+\\$)?([-+ 0]*)(\\d*|\\*(\\d+\\$)?)(?:\\.(\\d*|\\*(\\d+\\$)?))?([cspdiubBoxXfgeEG])|(%%)/g, function(str, idx_str, flags, width_str, w_idx_str, prec_str, p_idx_str, spec, escaped) {
+        if (escaped) {
+          return '%';
+        }
+
+        var width,
+        prec,
+        is_integer_spec = ("diubBoxX".indexOf(spec) != -1),
+        is_float_spec = ("eEfgG".indexOf(spec) != -1),
+        prefix = '',
+        obj;
+
+        if (width_str === undefined) {
+          width = undefined;
+        } else if (width_str.charAt(0) == '*') {
+          var w_idx = idx++;
+          if (w_idx_str) {
+            w_idx = parseInt(w_idx_str, 10) - 1;
+          }
+          width = #{`args[w_idx]`.to_i};
+        } else {
+          width = parseInt(width_str, 10);
+        }
+        if (prec_str === undefined) {
+          prec = is_float_spec ? 6 : undefined;
+        } else if (prec_str.charAt(0) == '*') {
+          var p_idx = idx++;
+          if (p_idx_str) {
+            p_idx = parseInt(p_idx_str, 10) - 1;
+          }
+          prec = #{`args[p_idx]`.to_i};
+        } else {
+          prec = parseInt(prec_str, 10);
+        }
+        if (idx_str) {
+          idx = parseInt(idx_str, 10) - 1;
+        }
+        switch (spec) {
+        case 'c':
+          obj = args[idx];
+          if (obj._isString) {
+            str = obj.charAt(0);
+          } else {
+            str = String.fromCharCode(#{`obj`.to_i});
+          }
+          break;
+        case 's':
+          str = #{`args[idx]`.to_s};
+          if (prec !== undefined) {
+            str = str.substr(0, prec);
+          }
+          break;
+        case 'p':
+          str = #{`args[idx]`.inspect};
+          if (prec !== undefined) {
+            str = str.substr(0, prec);
+          }
+          break;
+        case 'd':
+        case 'i':
+        case 'u':
+          str = #{`args[idx]`.to_i}.toString();
+          break;
+        case 'b':
+        case 'B':
+          str = #{`args[idx]`.to_i}.toString(2);
+          break;
+        case 'o':
+          str = #{`args[idx]`.to_i}.toString(8);
+          break;
+        case 'x':
+        case 'X':
+          str = #{`args[idx]`.to_i}.toString(16);
+          break;
+        case 'e':
+        case 'E':
+          str = #{`args[idx]`.to_f}.toExponential(prec);
+          break;
+        case 'f':
+          str = #{`args[idx]`.to_f}.toFixed(prec);
+          break;
+        case 'g':
+        case 'G':
+          str = #{`args[idx]`.to_f}.toPrecision(prec);
+          break;
+        }
+        idx++;
+        if (is_integer_spec || is_float_spec) {
+          if (str.charAt(0) == '-') {
+            prefix = '-';
+            str = str.substr(1);
+          } else {
+            if (flags.indexOf('+') != -1) {
+              prefix = '+';
+            } else if (flags.indexOf(' ') != -1) {
+              prefix = ' ';
+            }
+          }
+        }
+        if (is_integer_spec && prec !== undefined) {
+          if (str.length < prec) {
+            str = #{'0' * `prec - str.length`} + str;
+          }
+        }
+        var total_len = prefix.length + str.length;
+        if (width !== undefined && total_len < width) {
+          if (flags.indexOf('-') != -1) {
+            str = str + #{' ' * `width - total_len`};
+          } else {
+            var pad_char = ' ';
+            if (flags.indexOf('0') != -1) {
+              str = #{'0' * `width - total_len`} + str;
+            } else {
+              prefix = #{' ' * `width - total_len`} + prefix;
+            }
+          }
+        }
+        var result = prefix + str;
+        if ('XEG'.indexOf(spec) != -1) {
+          result = result.toUpperCase();
+        }
+        return result;
+      });
+    }
+  end
+
   def hash
     `#{self}._id`
   end
@@ -184,6 +330,14 @@ module Kernel
     `#{self}._id || (#{self}._id = unique_id++)`
   end
 
+  def printf(*args)
+    if args.length > 0
+      fmt = args.shift
+      print format(fmt, *args)
+    end
+    nil
+  end
+
   def proc(&block)
     %x{
       if (block === nil) {
@@ -277,6 +431,8 @@ module Kernel
     }
   end
 
+  alias sprintf format
+
   def tap(&block)
     yield self
     self
@@ -293,4 +449,4 @@ module Kernel
   def to_s
     `return "#<" + #{self}._klass._name + ":" + #{self}._id + ">";`
   end
-end
+end

data/core/load_order

@@ -14,5 +14,6 @@ numeric
 proc
 range
 time
+date
 json
-template
+template

data/core/proc.rb

@@ -27,4 +27,6 @@ class Proc < `Function`
   def arity
     `this.length - 1`
   end
-end
+end
+
+class Method < Proc; end

data/core/string.rb

@@ -16,12 +16,11 @@ class String < `String`
   end
 
   def %(data)
-    %x{
-      var idx = 0;
-      return #{self}.replace(/%((%)|s)/g, function (match) {
-        return match[2] || data[idx++] || '';
-      });
-    }
+    if data.is_a?(Array)
+      format(self, *data)
+    else
+      format(self, data)
+    end
   end
 
   def *(count)
@@ -517,4 +516,4 @@ class String < `String`
   alias_native :upcase, :toUpperCase
 end
 
-Symbol = String
+Symbol = String

data/core/time.rb

@@ -56,6 +56,8 @@ class Time < `Date`
 
   alias_native :hour, :getHours
 
+  alias_native :inspect, :toString
+
   alias mday day
 
   alias_native :min, :getMinutes
@@ -92,6 +94,8 @@ class Time < `Date`
     `parseInt(#{self}.getTime() / 1000)`
   end
 
+  alias to_s inspect
+
   def tuesday?
     `#{self}.getDay() === 2`
   end

data/lib/opal.rb

@@ -1,4 +1,5 @@
 require 'opal/parser'
+require 'opal/erb'
 require 'opal/builder'
 require 'opal/version'
 

data/lib/opal/erb.rb

@@ -0,0 +1,13 @@
+module Opal
+  def self.parse_erb(str, name = '(erb)')
+    body = str.gsub('"', '\\"').gsub(/<%=([\s\S]+?)%>/) do
+      inner = $1.gsub(/\\'/, "'").gsub(/\\"/, '"')
+      "\")\nout.<<(#{ inner })\nout.<<(\""
+    end.gsub(/<%([\s\S]+?)%>/) do
+      "\")\n#{ $1 }\nout.<<(\""
+    end
+
+    code = "Template.new('#{name}') do\nout = []\nout.<<(\"#{ body }\")\nout.join\nend\n"
+    "// #{ name } (erb)\n#{ Opal.parse(code) }\n"
+  end
+end

data/lib/opal/lexer.rb

@@ -183,13 +183,8 @@ module Opal
 
       if rest
         res << rest
-        @scope.add_local begin
-          rest.to_s[1..-1].to_sym
-        rescue ArgumentError => e
-          # Rescue from empty symbol error on Ruby 1.8
-          raise unless e.message =~ /empty/
-          ''
-        end
+        rest_str = rest.to_s[1..-1]
+        @scope.add_local rest_str.to_sym unless rest_str.empty?
       end
 
       if block
@@ -732,6 +727,8 @@ module Opal
               @string_parse = { :beg => '/', :end => '/', :interpolate => true, :regexp => true }
               return :REGEXP_BEG, scanner.matched
             end
+          else
+            @lex_state = :expr_beg
           end
 
           return '/', '/'
@@ -1151,7 +1148,7 @@ module Opal
 
         elsif scanner.check(/[0-9]/)
           @lex_state = :expr_end
-          if scanner.scan(/[\d_]+\.[\d_]+\b/)
+          if scanner.scan(/[\d_]+\.[\d_]+\b|[\d_]+(\.[\d_]+)?[eE][-+]?[\d_]+\b/)
             return [:FLOAT, scanner.matched.gsub(/_/, '').to_f]
           elsif scanner.scan(/[\d_]+\b/)
             return [:INTEGER, scanner.matched.gsub(/_/, '').to_i]
@@ -1276,7 +1273,10 @@ module Opal
 
           when 'rescue'
             return :IDENTIFIER, matched if [:expr_dot, :expr_fname].include? @lex_state
-            return :RESCUE, matched if @lex_state == :expr_beg
+            if @lex_state == :expr_beg
+              @lex_state = :expr_mid
+              return :RESCUE, matched
+            end
             @lex_state = :expr_beg
             return :RESCUE_MOD, matched
 

data/lib/opal/parser.rb

@@ -179,14 +179,14 @@ module Opal
           code = @indent + process(s(:scope, sexp), :stmt)
         }
 
-        vars << "__opal = Opal"
-        vars << "self = __opal.top"
-        vars << "__scope = __opal"
-        vars << "nil = __opal.nil"
-        vars << "def = #{current_self}._klass.prototype" if @scope.defines_defn
-        vars.concat @helpers.keys.map { |h| "__#{h} = __opal.#{h}" }
+        @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 "def = #{current_self}._klass.prototype" if @scope.defines_defn
+        @helpers.keys.each { |h| @scope.add_temp "__#{h} = __opal.#{h}" }
 
-        code = "#{INDENT}var #{vars.join ', '};\n" + INDENT + @scope.to_vars + "\n" + code
+        code = INDENT + @scope.to_vars + "\n" + code
       end
 
       "(function() {\n#{ code }\n})();"
@@ -497,15 +497,19 @@ module Opal
       meth, recv, arg = sexp
       mid = mid_to_jsid meth.to_s
 
-      with_temp do |a|
-        with_temp do |b|
-          l = process recv, :expr
-          r = process arg, :expr
+      if @parser_uses_optimized_operators
+        with_temp do |a|
+          with_temp do |b|
+            l = process recv, :expr
+            r = process arg, :expr
 
-          "(%s = %s, %s = %s, typeof(%s) === 'number' ? %s %s %s : %s%s(%s))" %
-            [a, l, b, r, a, a, meth.to_s, b, a, mid, b]
+            "(%s = %s, %s = %s, typeof(%s) === 'number' ? %s %s %s : %s%s(%s))" %
+              [a, l, b, r, a, a, meth.to_s, b, a, mid, b]
+          end
         end
       end
+
+      "#{process recv, :recv}#{mid}(#{process arg, :expr})"
     end
 
     def js_block_given(sexp, level)
@@ -1233,7 +1237,7 @@ module Opal
         map = hash_keys.map { |k| "#{k}: #{hash_obj[k]}"}
 
         @helpers[:hash2] = true
-        "__hash2([#{hash_keys.join ', '}], {#{map.join(', ')}})"
+        "__hash2({#{map.join(', ')}})"
       else
         @helpers[:hash] = true
         "__hash(#{sexp.map { |p| process p, :expr }.join ', '})"
@@ -1871,18 +1875,18 @@ module Opal
 
     def process_rescue(exp, level)
       body = exp.first.first == :resbody ? s(:nil) : exp.shift
-      body = process body, level
+      body = indent { process body, level }
 
       parts = []
       until exp.empty?
-        part = process exp.shift, level
+        part = indent { process exp.shift, level }
         part = "else " + part unless parts.empty?
         parts << part
       end
       # if no rescue statement captures our error, we should rethrow
-      parts << "else { throw $err; }"
+      parts << indent { "else { throw $err; }" }
 
-      code = "try {#@space#{body}#@space} catch ($err) {#@space#{parts.join @space}#{@space}}"
+      code = "try {#@space#{INDENT}#{body}#@space} catch ($err) {#@space#{parts.join @space}#{@space}}"
       code = "(function() { #{code} }).call(#{current_self})" if level == :expr
 
       code

data/lib/opal/scope.rb

@@ -173,7 +173,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.29'
+  VERSION = '0.3.30'
 end

data/spec/core/date/new_spec.rb

@@ -0,0 +1,8 @@
+describe "Date.new" do
+  it "creates a date with arguments" do
+    d = Date.new(2000, 3, 5)
+    d.year.should == 2000
+    d.month.should == 3
+    d.day.should == 5
+  end
+end

data/spec/core/date/to_s_spec.rb

@@ -0,0 +1,5 @@
+describe "Date#to_s" do
+  it "returns a string representation of date (YYYY-MM-DD)" do
+    Date.new(2012, 10, 26).to_s.should == "2012-10-26"
+  end
+end

data/spec/core/date/today_spec.rb

@@ -0,0 +1,5 @@
+describe "Date.today" do
+  it "creates a new instance for current date" do
+    Date.today.should be_kind_of(Date)
+  end
+end