opal 0.3.30 → 0.3.31

data/core/array.rb

@@ -28,7 +28,7 @@ class Array < `Array`
         }
         else {
           for (var i = 0; i < size; i++) {
-            arr[i] = block.call(__context, i);
+            arr[i] = block(i);
           }
         }
       }
@@ -228,7 +228,7 @@ class Array < `Array`
       var result = [];
 
       for (var i = 0, length = #{self}.length, value; i < length; i++) {
-        if ((value = block.call(__context, #{self}[i])) === __breaker) {
+        if ((value = block(#{self}[i])) === __breaker) {
           return __breaker.$v;
         }
 
@@ -242,7 +242,7 @@ class Array < `Array`
   def collect!(&block)
     %x{
       for (var i = 0, length = #{self}.length, val; i < length; i++) {
-        if ((val = block.call(__context, #{self}[i])) === __breaker) {
+        if ((val = block(#{self}[i])) === __breaker) {
           return __breaker.$v;
         }
 
@@ -350,7 +350,7 @@ class Array < `Array`
   def delete_if(&block)
     %x{
       for (var i = 0, length = #{self}.length, value; i < length; i++) {
-        if ((value = block.call(__context, #{self}[i])) === __breaker) {
+        if ((value = block(#{self}[i])) === __breaker) {
           return __breaker.$v;
         }
 
@@ -409,7 +409,7 @@ class Array < `Array`
       }
 
       if (block !== nil) {
-        return block(__context, original);
+        return block(original);
       }
 
       #{ raise "Array#fetch" };
@@ -489,7 +489,7 @@ class Array < `Array`
       }
       else if (block !== nil) {
         for (var i = 0, length = #{self}.length, value; i < length; i++) {
-          if ((value = block.call(__context, #{self}[i])) === __breaker) {
+          if ((value = block(#{self}[i])) === __breaker) {
             return __breaker.$v;
           }
 
@@ -561,7 +561,7 @@ class Array < `Array`
   def keep_if(&block)
     %x{
       for (var i = 0, length = #{self}.length, value; i < length; i++) {
-        if ((value = block.call(__context, #{self}[i])) === __breaker) {
+        if ((value = block(#{self}[i])) === __breaker) {
           return __breaker.$v;
         }
 
@@ -651,7 +651,7 @@ class Array < `Array`
       var result = [];
 
       for (var i = 0, length = #{self}.length, value; i < length; i++) {
-        if ((value = block.call(__context, #{self}[i])) === __breaker) {
+        if ((value = block(#{self}[i])) === __breaker) {
           return __breaker.$v;
         }
 
@@ -699,7 +699,7 @@ class Array < `Array`
     %x{
       if (block !== nil) {
         for (var i = #{self}.length - 1, value; i >= 0; i--) {
-          if ((value = block.call(__context, #{self}[i])) === __breaker) {
+          if ((value = block(#{self}[i])) === __breaker) {
             return __breaker.$v;
           }
 
@@ -727,7 +727,7 @@ class Array < `Array`
       for (var i = 0, length = #{self}.length, item, value; i < length; i++) {
         item = #{self}[i];
 
-        if ((value = block.call(__context, item)) === __breaker) {
+        if ((value = block(item)) === __breaker) {
           return __breaker.$v;
         }
 
@@ -791,7 +791,7 @@ class Array < `Array`
       for (var i = 0, length = #{self}.length, item, value; i < length; i++) {
         item = #{self}[i];
 
-        if ((value = block.call(__context, item)) === __breaker) {
+        if ((value = block(item)) === __breaker) {
           return __breaker.$v;
         }
 
@@ -902,7 +902,7 @@ class Array < `Array`
 
       if (block !== nil) {
         for (var i = 0; i < size; i++) {
-          block.call(__context, result[i]);
+          block(result[i]);
         }
 
         return nil;

data/core/class.rb

@@ -8,7 +8,10 @@ class Class
       sup.$inherited(klass);
 
       if (block !== nil) {
+        var block_self = block._s;
+        block._s = null;
         block.call(klass);
+        block._s = block_self;
       }
 
       return klass;
@@ -101,6 +104,7 @@ class Class
       var jsid    = '$' + name;
       block._jsid = jsid;
       block._sup  = #{self}.prototype[jsid];
+      block._s    = null;
 
       #{self}.prototype[jsid] = block;
       #{self}._donate([jsid]);
@@ -158,7 +162,13 @@ class Class
         no_block_given();
       }
 
-      return block.call(#{self});
+      var block_self = block._s, result;
+
+      block._s = null;
+      result = block.call(#{self});
+      block._s = block_self;
+
+      return result;
     }
   end
 

data/core/enumerable.rb

@@ -7,7 +7,7 @@ module Enumerable
         proc = function(obj) {
           var value;
 
-          if ((value = block.call(__context, obj)) === __breaker) {
+          if ((value = block(obj)) === __breaker) {
             return __breaker.$v;
           }
 
@@ -45,7 +45,7 @@ module Enumerable
         proc = function(obj) {
           var value;
 
-          if ((value = block.call(__context, obj)) === __breaker) {
+          if ((value = block(obj)) === __breaker) {
             return __breaker.$v;
           }
 
@@ -82,7 +82,7 @@ module Enumerable
       var proc = function() {
         var obj = __slice.call(arguments), value;
 
-        if ((value = block.apply(__context, obj)) === __breaker) {
+        if ((value = block.apply(null, obj)) === __breaker) {
           return __breaker.$v;
         }
 
@@ -103,7 +103,7 @@ module Enumerable
       var proc = function() {
         var obj = __slice.call(arguments), value;
 
-        if ((value = block.apply(__context, [result].concat(obj))) === __breaker) {
+        if ((value = block.apply(null, [result].concat(obj))) === __breaker) {
           result = __breaker.$v;
           __breaker.$v = nil;
 
@@ -134,7 +134,7 @@ module Enumerable
       var proc = function(obj) {
         var value;
 
-        if ((value = block.call(__context, obj)) === __breaker) {
+        if ((value = block(obj)) === __breaker) {
           return __breaker.$v;
         }
 
@@ -157,7 +157,7 @@ module Enumerable
       #{self}.$each._p = function(obj) {
         var value;
 
-        if ((value = block.call(__context, obj)) === __breaker) {
+        if ((value = block(obj)) === __breaker) {
           return __breaker.$v;
         }
 
@@ -209,7 +209,7 @@ module Enumerable
       #{self}.$each._p = function(obj) {
         var value;
 
-        if ((value = block.call(__context, obj)) === __breaker) {
+        if ((value = block(obj)) === __breaker) {
           return __breaker;
         }
 
@@ -235,7 +235,7 @@ module Enumerable
       #{self}.$each._p = function(obj) {
         var value;
 
-        if ((value = block.call(__context, obj, index)) === __breaker) {
+        if ((value = block(obj, index)) === __breaker) {
           return __breaker.$v;
         }
 
@@ -253,7 +253,7 @@ module Enumerable
       #{self}.$each._p = function(obj) {
         var value;
 
-        if ((value = block.call(__context, obj, object)) === __breaker) {
+        if ((value = block(obj, object)) === __breaker) {
           return __breaker.$v;
         }
       };
@@ -287,7 +287,7 @@ module Enumerable
       #{self}.$each._p = function(obj) {
         var value;
 
-        if ((value = block.call(__context, obj)) === __breaker) {
+        if ((value = block(obj)) === __breaker) {
           return __breaker.$v;
         }
 
@@ -319,7 +319,7 @@ module Enumerable
         proc = function(obj) {
           var value;
 
-          if ((value = block.call(__context, obj)) === __breaker) {
+          if ((value = block(obj)) === __breaker) {
             return __breaker.$v;
           }
 
@@ -379,7 +379,7 @@ module Enumerable
             var value = #{pattern === `obj`};
 
             if (value !== false && value !== nil) {
-              if ((value = block.call(__context, obj)) === __breaker) {
+              if ((value = block(obj)) === __breaker) {
                 return __breaker.$v;
               }
 

data/core/{template.rb → erb.rb}

@@ -1,4 +1,4 @@
-class Template
+class ERB
   @_cache = {}
   def self.[](name)
     @_cache[name]
@@ -11,10 +11,10 @@ class Template
   def initialize(name, &body)
     @body = body
     @name = name
-    Template[name] = self
+    ERB[name] = self
   end
 
   def render(ctx=self)
     ctx.instance_eval(&@body)
   end
-end
+end

data/core/hash.rb

@@ -189,7 +189,7 @@ class Hash
       var map = #{self}.map, value;
 
       for (var key in map) {
-        if ((value = block.call(__context, key, map[key])) === __breaker) {
+        if ((value = block(key, map[key])) === __breaker) {
           return __breaker.$v;
         }
 
@@ -209,7 +209,7 @@ class Hash
       var map = #{self}.map;
 
       for (var key in map) {
-        if (block.call(__context, key, map[key]) === __breaker) {
+        if (block(key, map[key]) === __breaker) {
           return __breaker.$v;
         }
       }
@@ -223,7 +223,7 @@ class Hash
       var map = #{self}.map;
 
       for (var key in map) {
-        if (block.call(__context, key) === __breaker) {
+        if (block(key) === __breaker) {
           return __breaker.$v;
         }
       }
@@ -239,7 +239,7 @@ class Hash
       var map = #{self}.map;
 
       for (var key in map) {
-        if (block.call(__context, map[key]) === __breaker) {
+        if (block(map[key]) === __breaker) {
           return __breaker.$v;
         }
       }
@@ -271,7 +271,7 @@ class Hash
       if (block !== nil) {
         var value;
 
-        if ((value = block.call(__context, key)) === __breaker) {
+        if ((value = block(key)) === __breaker) {
           return __breaker.$v;
         }
 
@@ -403,7 +403,7 @@ class Hash
       for (var key in map) {
         var obj = map[key];
 
-        if ((value = block.call(__context, key, obj)) === __breaker) {
+        if ((value = block(key, obj)) === __breaker) {
           return __breaker.$v;
         }
 
@@ -467,7 +467,7 @@ class Hash
             map2[key] = map[key];
           }
           else {
-            map2[key] = block.call(__context, key, map2[key], map[key]);
+            map2[key] = block(key, map2[key], map[key]);
           }
         }
       }
@@ -491,7 +491,7 @@ class Hash
             map[key] = map2[key];
           }
           else {
-            map[key] = block.call(__context, key, map[key], map2[key]);
+            map[key] = block(key, map[key], map2[key]);
           }
         }
       }
@@ -523,7 +523,7 @@ class Hash
       for (var key in map) {
         var obj = map[key], value;
 
-        if ((value = block.call(__context, key, obj)) === __breaker) {
+        if ((value = block(key, obj)) === __breaker) {
           return __breaker.$v;
         }
 
@@ -555,7 +555,7 @@ class Hash
       for (var key in map) {
         var obj = map[key], value;
 
-        if ((value = block.call(__context, key, obj)) === __breaker) {
+        if ((value = block(key, obj)) === __breaker) {
           return __breaker.$v;
         }
 
@@ -575,7 +575,7 @@ class Hash
       for (var key in map) {
         var obj = map[key];
 
-        if ((value = block.call(__context, key, obj)) === __breaker) {
+        if ((value = block(key, obj)) === __breaker) {
           return __breaker.$v;
         }
 
@@ -686,4 +686,5 @@ class Hash
       return result;
     }
   end
-end
+end
+

data/core/kernel.rb

@@ -78,7 +78,8 @@ module Kernel
 
       var jsid   = '$' + name;
       body._jsid = jsid;
-      body._sup  = #{self}[jsid]
+      body._sup  = #{self}[jsid];
+      body._s    = null;
 
       #{self}[jsid] = body;
 
@@ -246,7 +247,13 @@ module Kernel
         no_block_given();
       }
 
-      return block.call(#{self}, #{self});
+      var block_self = block._s, result;
+
+      block._s = null;
+      result = block.call(#{self}, #{self});
+      block._s = block_self;
+
+      return result;
     }
   end
 

data/core/load_order

@@ -16,4 +16,4 @@ range
 time
 date
 json
-template
+erb

data/core/numeric.rb

@@ -106,7 +106,7 @@ class Numeric < `Number`
   def downto(finish, &block)
     %x{
       for (var i = #{self}; i >= finish; i--) {
-        if (block.call(__context, i) === __breaker) {
+        if (block(i) === __breaker) {
           return __breaker.$v;
         }
       }
@@ -162,7 +162,7 @@ class Numeric < `Number`
   def times(&block)
     %x{
       for (var i = 0; i < #{self}; i++) {
-        if (block.call(__context, i) === __breaker) {
+        if (block(i) === __breaker) {
           return __breaker.$v;
         }
       }
@@ -190,7 +190,7 @@ class Numeric < `Number`
   def upto(finish, &block)
     %x{
       for (var i = #{self}; i <= finish; i++) {
-        if (block.call(__context, i) === __breaker) {
+        if (block(i) === __breaker) {
           return __breaker.$v;
         }
       }

data/core/proc.rb

@@ -11,7 +11,7 @@ class Proc < `Function`
   end
 
   def call(*args)
-    `#{self}.apply(#{self}._s, #{args})`
+    `#{self}.apply(null, #{args})`
   end
 
   def to_proc
@@ -29,4 +29,4 @@ class Proc < `Function`
   end
 end
 
-class Method < Proc; end
+class Method < Proc; end

data/core/string.rb

@@ -405,7 +405,7 @@ class String < `String`
       if (block !== nil) {
         return #{self}.replace(pattern, function(str, a) {
           #{ $1 = `a` };
-          return block.call(__context, str);
+          return block(str);
         });
       }
       else if (replace != null) {

data/lib/opal/erb.rb

@@ -7,7 +7,8 @@ module Opal
       "\")\n#{ $1 }\nout.<<(\""
     end
 
-    code = "Template.new('#{name}') do\nout = []\nout.<<(\"#{ body }\")\nout.join\nend\n"
+    code = "ERB.new('#{name}') do\nout = []\nout.<<(\"#{ body }\")\nout.join\nend\n"
     "// #{ name } (erb)\n#{ Opal.parse(code) }\n"
   end
-end
+end
+

data/lib/opal/parser.rb

@@ -633,6 +633,7 @@ module Opal
       code = ""
       params = nil
       scope_name = nil
+      identity = nil
 
       args = nil if Fixnum === args # argh
       args ||= s(:masgn, s(:array))
@@ -651,6 +652,9 @@ module Opal
 
       indent do
         in_scope(:iter) do
+          identity = @scope.identify!
+          @scope.add_temp "self = #{identity}._s || this"
+
           args[1..-1].each do |arg|
            arg = arg[1]
            arg = "#{arg}$" if RESERVED.include? arg.to_s
@@ -685,19 +689,13 @@ module Opal
           end
 
           code = "\n#@indent#{@scope.to_vars}\n#@indent#{code}"
-
-          scope_name = @scope.identity
         end
       end
 
-      with_temp do |tmp|
-        itercode = "function(#{params.join ', '}) {\n#{code}\n#@indent}"
-        itercode = "#{scope_name} = #{itercode}" if scope_name
-
-        call << ("(%s = %s, %s._s = %s, %s)" % [tmp, itercode, tmp, current_self, tmp])
+      itercode = "function(#{params.join ', '}) {\n#{code}\n#@indent}"
+      call << ("(%s = %s, %s._s = %s, %s)" % [identity, itercode, identity, current_self, identity])
 
-        process call, level
-      end
+      process call, level
     end
 
     def js_block_args(sexp)
@@ -790,7 +788,7 @@ module Opal
           @requires << path[1]
         end
 
-        return "//= require #{path[1]}"
+        return ""
       when :respond_to?
         return handle_respond_to(sexp, level)
       end
@@ -1081,11 +1079,11 @@ module Opal
           scope_name = @scope.identity
 
           if @scope.uses_block?
-            @scope.add_temp '__context'
+            # @scope.add_temp '__context'
             @scope.add_temp yielder
 
-            blk = "\n%s%s = %s._p || nil, __context = %s._s, %s._p = null;\n%s" %
-              [@indent, yielder, scope_name, yielder, scope_name, @indent]
+            blk = "\n%s%s = %s._p || nil, %s._p = null;\n%s" %
+              [@indent, yielder, scope_name, scope_name, @indent]
 
             code = blk + code
           end
@@ -1165,7 +1163,9 @@ module Opal
         'self'
       elsif @scope.top?
         'self'
-      else # def, iter
+      elsif @scope.iter?
+        'self'
+      else # def
         'this'
       end
     end
@@ -1647,12 +1647,12 @@ module Opal
       @scope.uses_block!
 
       splat = sexp.any? { |s| s.first == :splat }
-      sexp.unshift s(:js_tmp, '__context') unless splat    # self
+      # sexp.unshift s(:js_tmp, '__context') unless splat    # self
       args = process_arglist sexp, level
 
       y = @scope.block_name || '__yield'
 
-      splat ? "#{y}.apply(__context, #{args})" : "#{y}.call(#{args})"
+      splat ? "#{y}.apply(null, #{args})" : "#{y}(#{args})"
     end
 
     def process_break(exp, level)
@@ -1816,7 +1816,7 @@ module Opal
       elsif @scope.type == :iter
         chain, defn, mid = @scope.get_super_chain
         trys = chain.map { |c| "#{c}._sup" }.join ' || '
-        "(#{trys} || this._klass._super.prototype[#{mid}]).apply(this, #{args})"
+        "(#{trys} || #{current_self}._klass._super.prototype[#{mid}]).apply(#{current_self}, #{args})"
       else
         raise "Cannot call super() from outside a method block"
       end

data/lib/opal/version.rb

@@ -1,3 +1,3 @@
 module Opal
-  VERSION = '0.3.30'
-end
+  VERSION = '0.3.31'
+end

data/spec/language/proc_spec.rb

@@ -0,0 +1,37 @@
+class ProcSpec
+  define_method :defined_method do
+    self
+  end
+
+  def call_proc
+    get_proc.call
+  end
+
+  def get_proc
+    proc { self }
+  end
+end
+
+describe "Procs" do
+  before do
+    @obj = ProcSpec.new
+  end
+
+  it "should use the 'self' value of wrapping scope" do
+    @obj.call_proc.should eq(@obj)
+  end
+
+  it "instance_eval correctly sets proc self value" do
+    arr = []
+    arr.instance_eval(&@obj.get_proc).should eq(arr)
+  end
+
+  it "procs used by define_method use correct self value" do
+    @obj.defined_method.should eq(@obj)
+  end
+
+  it "procs used by define_singleton_method use correct self value" do
+    @obj.define_singleton_method(:bar) { self }
+    @obj.bar.should eq(@obj)
+  end
+end

data/spec/parser/erb_spec.rb

@@ -4,8 +4,8 @@ describe "Opal.parse_erb" do
     @quoted = opal_eval_compiled(Opal.parse_erb('<div class="foo">hello <%= "there " + @name %></div>', "quoted_test"))
   end
 
-  it "should be an instance of Template" do
-    @simple.should be_kind_of(Template)
+  it "should be an instance of ERB" do
+    @simple.should be_kind_of(ERB)
   end
 
   it "calling the block with a context should render the block" do
@@ -18,15 +18,15 @@ describe "Opal.parse_erb" do
     @quoted.render(self).should == "<div class=\"foo\">hello there adam</div>"
   end
 
-  it 'stores created templates in Template[] by name' do
-    Template['simple_test'].should == @simple
-    Template['quoted_test'].should == @quoted
+  it 'stores created templates in ERB[] by name' do
+    ERB['simple_test'].should == @simple
+    ERB['quoted_test'].should == @quoted
   end
 
   describe '.parse' do
     it 'parses erb content by running it through compiler' do
       opal_eval_compiled Opal.parse_erb("hi there", 'test_parse')
-      Template['test_parse'].should be_kind_of(Template)
+      ERB['test_parse'].should be_kind_of(ERB)
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opal
 version: !ruby/object:Gem::Version
-  version: 0.3.30
+  version: 0.3.31
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-02 00:00:00.000000000 Z
+date: 2012-12-10 00:00:00.000000000 Z
 dependencies: []
 description: Ruby runtime and core library for javascript.
 email: adam.beynon@gmail.com
@@ -33,6 +33,7 @@ files:
 - core/comparable.rb
 - core/date.rb
 - core/enumerable.rb
+- core/erb.rb
 - core/error.rb
 - core/hash.rb
 - core/json.rb
@@ -48,7 +49,6 @@ files:
 - core/regexp.rb
 - core/runtime.js
 - core/string.rb
-- core/template.rb
 - core/test_runner/runner.js
 - core/time.rb
 - lib/opal.rb
@@ -410,6 +410,7 @@ files:
 - spec/language/next_spec.rb
 - spec/language/or_spec.rb
 - spec/language/predefined_spec.rb
+- spec/language/proc_spec.rb
 - spec/language/regexp_spec.rb
 - spec/language/send_spec.rb
 - spec/language/singleton_class_spec.rb
@@ -799,6 +800,7 @@ test_files:
 - spec/language/next_spec.rb
 - spec/language/or_spec.rb
 - spec/language/predefined_spec.rb
+- spec/language/proc_spec.rb
 - spec/language/regexp_spec.rb
 - spec/language/send_spec.rb
 - spec/language/singleton_class_spec.rb