opal 0.7.0.beta1 → 0.7.0.beta2

data/lib/opal/nodes/yield.rb

@@ -11,14 +11,14 @@ module Opal
 
         if yields_single_arg?(children)
           push expr(children.first)
-          wrap "$opal.$yield1(#{block_name}, ", ')'
+          wrap "Opal.yield1(#{block_name}, ", ')'
         else
           push expr(s(:arglist, *children))
 
           if uses_splat?(children)
-            wrap "$opal.$yieldX(#{block_name}, ", ')'
+            wrap "Opal.yieldX(#{block_name}, ", ')'
           else
-            wrap "$opal.$yieldX(#{block_name}, [", '])'
+            wrap "Opal.yieldX(#{block_name}, [", '])'
           end
         end
       end

data/lib/opal/parser.rb

@@ -589,13 +589,15 @@ module Opal
     end
 
     def new_dsym(str)
-      return s(:nil) unless str
+      return s(:sym, :"") unless str
       case str.type
       when :str
         str.type = :sym
         str[1] = str[1].to_sym
       when :dstr
         str.type = :dsym
+      when :evstr
+        str = s(:dsym, str)
       end
 
       str

data/lib/opal/parser/lexer.rb

@@ -100,6 +100,10 @@ module Opal
       [:expr_fname, :expr_dot].include? @lex_state
     end
 
+    def label_state?
+      [:expr_beg, :expr_endfn].include?(@lex_state) or arg?
+    end
+
     def spcarg?
       arg? and @space_seen and !space?
     end
@@ -501,7 +505,7 @@ module Opal
     def process_identifier(matched, cmd_start)
       last_state = @lex_state
 
-      if !check(/::/) and scan(/:/)
+      if label_state? and !check(/::/) and scan(/:/)
         @lex_state = :expr_beg
         self.yylval = matched
         return :tLABEL
@@ -800,7 +804,7 @@ module Opal
           self.set_arg_state
           return :tPIPE
 
-        elsif scan(/\%[QqWwixr]/)
+        elsif scan(/\%[QqWwixrs]/)
           str_type = scanner.matched[1, 1]
           paren = term = scan(/./)
 
@@ -827,6 +831,8 @@ module Opal
                           [:tXSTRING_BEG, STR_XQUOTE]
                         when 'r'
                           [:tREGEXP_BEG, STR_REGEXP]
+                        when 's'
+                          [:tSTRING_BEG, STR_SQUOTE]
                         end
 
           self.strterm = new_strterm2(func, term, paren)

data/lib/opal/paths.rb

@@ -20,15 +20,25 @@ module Opal
   end
 
   def self.use_gem(gem_name, include_dependecies = true)
+    require_paths_for_gem(gem_name, include_dependecies).each do |path|
+      append_path path
+    end
+  end
+
+  def self.require_paths_for_gem(gem_name, include_dependecies)
+    paths = []
     spec = Gem::Specification.find_by_name(gem_name)
 
     spec.runtime_dependencies.each do |dependency|
-      use_gem dependency.name
+      paths += require_paths_for_gem(dependency.name, include_dependecies)
     end if include_dependecies
 
-    spec.require_paths.each do |path|
-      Opal.append_path File.join(spec.gem_dir, path)
+    gem_dir = spec.gem_dir
+    spec.require_paths.map do |path|
+      paths << File.join(gem_dir, path)
     end
+
+    paths
   end
 
   # Private, don't add to these directly (use .append_path instead).

data/lib/opal/sprockets/server.rb

@@ -73,7 +73,7 @@ module Opal
       @use_index   = true
       @public_root = nil
       @public_urls = ['/']
-      @sprockets   = Environment.new
+      @sprockets   = options.fetch(:sprockets, Environment.new)
       @debug       = options.fetch(:debug, true)
       @prefix      = options.fetch(:prefix, '/assets')
 

data/lib/opal/version.rb

@@ -1,3 +1,3 @@
 module Opal
-  VERSION = '0.7.0.beta1'
+  VERSION = '0.7.0.beta2'
 end

data/opal.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   required_ruby_version = '>= 1.9.3'
 
   s.add_dependency 'sourcemap', '~> 0.1.0'
-  s.add_dependency 'sprockets', '>= 2.2.1', '< 4.0.0'
+  s.add_dependency 'sprockets', '>= 2.2.3', '< 4.0.0'
   s.add_dependency 'hike', '~> 1.2'
   s.add_dependency 'tilt', '~> 1.4'
 

data/opal/corelib/array.rb

@@ -462,7 +462,7 @@ class Array
       %x{
         while (true) {
           for (var i = 0, length = self.length; i < length; i++) {
-            var value = $opal.$yield1(block, self[i]);
+            var value = Opal.yield1(block, self[i]);
 
             if (value === $breaker) {
               return $breaker.$v;
@@ -480,7 +480,7 @@ class Array
 
         while (n > 0) {
           for (var i = 0, length = self.length; i < length; i++) {
-            var value = $opal.$yield1(block, self[i]);
+            var value = Opal.yield1(block, self[i]);
 
             if (value === $breaker) {
               return $breaker.$v;
@@ -524,7 +524,7 @@ class Array
       var result = [];
 
       for (var i = 0, length = self.length; i < length; i++) {
-        var value = Opal.$yield1(block, self[i]);
+        var value = Opal.yield1(block, self[i]);
 
         if (value === $breaker) {
           return $breaker.$v;
@@ -542,7 +542,7 @@ class Array
 
     %x{
       for (var i = 0, length = self.length; i < length; i++) {
-        var value = Opal.$yield1(block, self[i]);
+        var value = Opal.yield1(block, self[i]);
 
         if (value === $breaker) {
           return $breaker.$v;
@@ -677,7 +677,7 @@ class Array
 
     %x{
       for (var i = 0, length = self.length; i < length; i++) {
-        var value = $opal.$yield1(block, self[i]);
+        var value = Opal.yield1(block, self[i]);
 
         if (value == $breaker) {
           return $breaker.$v;
@@ -693,7 +693,7 @@ class Array
 
     %x{
       for (var i = 0, length = self.length; i < length; i++) {
-        var value = $opal.$yield1(block, i);
+        var value = Opal.yield1(block, i);
 
         if (value === $breaker) {
           return $breaker.$v;
@@ -916,7 +916,16 @@ class Array
   end
 
   def hash
-    `self.$$id || (self.$$id = Opal.uid())`
+    %x{
+      var hash = ['A'], item, item_hash;
+      for (var i = 0, length = self.length; i < length; i++) {
+        item = self[i];
+        // Guard against recursion
+        item_hash = self === item ? 'self' : item.$hash();
+        hash.push(item_hash);
+      }
+      return hash.join(',');
+    }
   end
 
   def include?(member)
@@ -986,21 +995,21 @@ class Array
 
   def inspect
     %x{
-      var i, inspect, el, el_insp, length, object_id;
-
-      inspect = [];
-      object_id = #{object_id};
-      length = self.length;
-
-      for (i = 0; i < length; i++) {
-        el = #{self[`i`]};
+      var result = [],
+          id     = #{__id__};
 
-        // Check object_id to ensure it's not the same array get into an infinite loop
-        el_insp = #{`el`.object_id} === object_id ? '[...]' : #{`el`.inspect};
+      for (var i = 0, length = self.length; i < length; i++) {
+        var item = #{self[`i`]};
 
-        inspect.push(el_insp);
+        if (#{`item`.__id__} === id) {
+          result.push('[...]');
+        }
+        else {
+          result.push(#{`item`.inspect});
+        }
       }
-      return '[' + inspect.join(', ') + ']';
+
+      return '[' + result.join(', ') + ']';
     }
   end
 
@@ -1265,7 +1274,7 @@ class Array
       for (var i = 0, length = self.length, item, value; i < length; i++) {
         item = self[i];
 
-        if ((value = $opal.$yield1(block, item)) === $breaker) {
+        if ((value = Opal.yield1(block, item)) === $breaker) {
           return $breaker.$v;
         }
 

data/opal/corelib/array/inheritance.rb

@@ -3,10 +3,10 @@ class Array
     replace = Class.new(Array::Wrapper)
 
     %x{
-      klass.$$proto        = replace.$$proto;
+      klass.$$proto         = replace.$$proto;
       klass.$$proto.$$class = klass;
-      klass.$$alloc        = replace.$$alloc;
-      klass.$$parent      = #{Array::Wrapper};
+      klass.$$alloc         = replace.$$alloc;
+      klass.$$parent        = #{Array::Wrapper};
 
       klass.$allocate = replace.$allocate;
       klass.$new      = replace.$new;

data/opal/corelib/basic_object.rb

@@ -68,6 +68,8 @@ class BasicObject
   end
 
   def method_missing(symbol, *args, &block)
-    Kernel.raise NoMethodError, "undefined method `#{symbol}' for BasicObject instance"
+    Kernel.raise NoMethodError, `self.$inspect && !self.$inspect.$$stub` ?
+      "undefined method `#{symbol}' for #{inspect}:#{`self.$$class`}" :
+      "undefined method `#{symbol}' for #{`self.$$class`}"
   end
 end

data/opal/corelib/class.rb

@@ -13,7 +13,7 @@ class Class
       klass.$$parent = sup;
 
       // inherit scope from parent
-      $opal.create_scope(sup.$$scope, klass);
+      Opal.create_scope(sup.$$scope, klass);
 
       sup.$inherited(klass);
 

data/opal/corelib/comparable.rb

@@ -11,7 +11,8 @@ module Comparable
     return true if equal?(other)
 
     return false unless cmp = (self <=> other)
-    return Comparable.normalize(cmp) == 0
+
+    return `#{Comparable.normalize(cmp)} == 0`
   rescue StandardError
     false
   end
@@ -21,7 +22,7 @@ module Comparable
       raise ArgumentError, "comparison of #{self.class} with #{other.class} failed"
     end
 
-    Comparable.normalize(cmp) > 0
+    `#{Comparable.normalize(cmp)} > 0`
   end
 
   def >=(other)
@@ -29,7 +30,7 @@ module Comparable
       raise ArgumentError, "comparison of #{self.class} with #{other.class} failed"
     end
 
-    Comparable.normalize(cmp) >= 0
+    `#{Comparable.normalize(cmp)} >= 0`
   end
 
   def <(other)
@@ -37,7 +38,7 @@ module Comparable
       raise ArgumentError, "comparison of #{self.class} with #{other.class} failed"
     end
 
-    Comparable.normalize(cmp) < 0
+    `#{Comparable.normalize(cmp)} < 0`
   end
 
   def <=(other)
@@ -45,7 +46,7 @@ module Comparable
       raise ArgumentError, "comparison of #{self.class} with #{other.class} failed"
     end
 
-    Comparable.normalize(cmp) <= 0
+    `#{Comparable.normalize(cmp)} <= 0`
   end
 
   def between?(min, max)

data/opal/corelib/dir.rb

@@ -1,15 +1,15 @@
 class Dir
   class << self
     def chdir(dir)
-      prev_cwd = `$opal.current_dir`
-      `$opal.current_dir = #{dir}`
+      prev_cwd = `Opal.current_dir`
+      `Opal.current_dir = #{dir}`
       yield
     ensure
-      `$opal.current_dir = #{prev_cwd}`
+      `Opal.current_dir = #{prev_cwd}`
     end
 
     def pwd
-      `$opal.current_dir` || '.'
+      `Opal.current_dir` || '.'
     end
     alias getwd pwd
 

data/opal/corelib/enumerable.rb

@@ -5,7 +5,7 @@ module Enumerable
 
       if (block !== nil) {
         self.$each.$$p = function() {
-          var value = $opal.$yieldX(block, arguments);
+          var value = Opal.yieldX(block, arguments);
 
           if (value === $breaker) {
             result = $breaker.$v;
@@ -39,7 +39,7 @@ module Enumerable
 
       if (block !== nil) {
         self.$each.$$p = function() {
-          var value = $opal.$yieldX(block, arguments);
+          var value = Opal.yieldX(block, arguments);
 
           if (value === $breaker) {
             result = $breaker.$v;
@@ -78,7 +78,7 @@ module Enumerable
       var result = [];
 
       self.$each.$$p = function() {
-        var value = $opal.$yieldX(block, arguments);
+        var value = Opal.yieldX(block, arguments);
 
         if (value === $breaker) {
           result = $breaker.$v;
@@ -113,7 +113,7 @@ module Enumerable
       }
 
       self.$each.$$p = function() {
-        var value = $opal.$yieldX(block, arguments);
+        var value = Opal.yieldX(block, arguments);
 
         if (value === $breaker) {
           result = $breaker.$v;
@@ -146,7 +146,7 @@ module Enumerable
 
       self.$each.$$p = function() {
         var param = #{Opal.destructure(`arguments`)},
-            value = $opal.$yield1(block, param);
+            value = Opal.yield1(block, param);
 
         if (value === $breaker) {
           result = $breaker.$v;
@@ -171,7 +171,7 @@ module Enumerable
       %x{
         while (true) {
           for (var i = 0, length = all.length; i < length; i++) {
-            var value = $opal.$yield1(block, all[i]);
+            var value = Opal.yield1(block, all[i]);
 
             if (value === $breaker) {
               return $breaker.$v;
@@ -183,7 +183,7 @@ module Enumerable
       %x{
         while (n > 1) {
           for (var i = 0, length = all.length; i < length; i++) {
-            var value = $opal.$yield1(block, all[i]);
+            var value = Opal.yield1(block, all[i]);
 
             if (value === $breaker) {
               return $breaker.$v;
@@ -204,7 +204,7 @@ module Enumerable
 
       self.$each.$$p = function() {
         var params = #{Opal.destructure(`arguments`)},
-            value  = $opal.$yield1(block, params);
+            value  = Opal.yield1(block, params);
 
         if (value === $breaker) {
           result = $breaker.$v;
@@ -268,7 +268,7 @@ module Enumerable
         var param = #{Opal.destructure(`arguments`)};
 
         if (dropping) {
-          var value = $opal.$yield1(block, param);
+          var value = Opal.yield1(block, param);
 
           if (value === $breaker) {
             result = $breaker.$v;
@@ -318,7 +318,7 @@ module Enumerable
         slice.push(param);
 
         if (slice.length === n) {
-          if ($opal.$yield1(block, slice) === $breaker) {
+          if (Opal.yield1(block, slice) === $breaker) {
             result = $breaker.$v;
             return $breaker;
           }
@@ -335,7 +335,7 @@ module Enumerable
 
       // our "last" group, if smaller than n then won't have been yielded
       if (slice.length > 0) {
-        if ($opal.$yield1(block, slice) === $breaker) {
+        if (Opal.yield1(block, slice) === $breaker) {
           return $breaker.$v;
         }
       }
@@ -423,7 +423,7 @@ module Enumerable
 
       self.$each.$$p = function() {
         var param = #{Opal.destructure(`arguments`)},
-            value = $opal.$yield1(block, param);
+            value = Opal.yield1(block, param);
 
         if (value === $breaker) {
           result = $breaker.$v;
@@ -462,7 +462,7 @@ module Enumerable
       }
       else if (block !== nil) {
         self.$each.$$p = function() {
-          var value = $opal.$yieldX(block, arguments);
+          var value = Opal.yieldX(block, arguments);
 
           if (value === $breaker) {
             result = $breaker.$v;
@@ -540,7 +540,7 @@ module Enumerable
               value = #{pattern === `param`};
 
           if (#{Opal.truthy?(`value`)}) {
-            value = $opal.$yield1(block, param);
+            value = Opal.yield1(block, param);
 
             if (value === $breaker) {
               result = $breaker.$v;
@@ -578,7 +578,7 @@ module Enumerable
 
       self.$each.$$p = function() {
         var param = #{Opal.destructure(`arguments`)},
-            value = $opal.$yield1(block, param);
+            value = Opal.yield1(block, param);
 
         if (value === $breaker) {
           result = $breaker.$v;
@@ -630,7 +630,7 @@ module Enumerable
             return;
           }
 
-          value = $opal.$yieldX(block, [result, value]);
+          value = Opal.yieldX(block, [result, value]);
 
           if (value === $breaker) {
             result = $breaker.$v;
@@ -740,7 +740,7 @@ module Enumerable
 
       self.$each.$$p = function() {
         var param = #{Opal.destructure(`arguments`)},
-            value = $opal.$yield1(block, param);
+            value = Opal.yield1(block, param);
 
         if (result === undefined) {
           result = param;
@@ -826,7 +826,7 @@ module Enumerable
 
       self.$each.$$p = function() {
         var param = #{Opal.destructure(`arguments`)},
-            value = $opal.$yield1(block, param);
+            value = Opal.yield1(block, param);
 
         if (result === undefined) {
           result = param;
@@ -865,7 +865,7 @@ module Enumerable
 
       if (block !== nil) {
         self.$each.$$p = function() {
-          var value = $opal.$yieldX(block, arguments);
+          var value = Opal.yieldX(block, arguments);
 
           if (value === $breaker) {
             result = $breaker.$v;
@@ -901,7 +901,7 @@ module Enumerable
 
       if (block !== nil) {
         self.$each.$$p = function() {
-          var value = $opal.$yieldX(block, arguments);
+          var value = Opal.yieldX(block, arguments);
 
           if (value === $breaker) {
             result = $breaker.$v;
@@ -947,7 +947,7 @@ module Enumerable
 
       self.$each.$$p = function() {
         var param = #{Opal.destructure(`arguments`)},
-            value = $opal.$yield1(block, param);
+            value = Opal.yield1(block, param);
 
         if (value === $breaker) {
           result = $breaker.$v;
@@ -978,7 +978,7 @@ module Enumerable
 
       self.$each.$$p = function() {
         var param = #{Opal.destructure(`arguments`)},
-            value = $opal.$yield1(block, param);
+            value = Opal.yield1(block, param);
 
         if (value === $breaker) {
           result = $breaker.$v;
@@ -1009,7 +1009,7 @@ module Enumerable
       self.$each();
 
       for (var i = result.length - 1; i >= 0; i--) {
-        $opal.$yieldX(block, result[i]);
+        Opal.yieldX(block, result[i]);
       }
 
       return result;
@@ -1031,7 +1031,7 @@ module Enumerable
           if (pattern === undefined) {
             self.$each.$$p = function() {
               var param = #{Opal.destructure(`arguments`)},
-                  value = $opal.$yield1(block, param);
+                  value = Opal.yield1(block, param);
 
               if (#{Opal.truthy?(`value`)} && slice.length > 0) {
                 #{e << `slice`};
@@ -1104,7 +1104,7 @@ module Enumerable
 
       self.$each.$$p = function() {
         var param = #{Opal.destructure(`arguments`)},
-            value = $opal.$yield1(block, param);
+            value = Opal.yield1(block, param);
 
         if (value === $breaker) {
           result = $breaker.$v;