opal 0.6.0 → 0.6.1

data/lib/opal/parser/grammar.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.9
+# This file is automatically generated by Racc 1.4.11
 # from Racc grammer file "".
 #
 
@@ -2217,7 +2217,7 @@ racc_reduce_table = [
   3, 192, :_reduce_256,
   4, 192, :_reduce_257,
   3, 162, :_reduce_258,
-  4, 162, :_reduce_none,
+  4, 162, :_reduce_259,
   2, 162, :_reduce_260,
   1, 190, :_reduce_none,
   1, 190, :_reduce_none,
@@ -4004,7 +4004,12 @@ def _reduce_258(val, _values, result)
     result
 end
 
-# reduce 259 omitted
+def _reduce_259(val, _values, result)
+                      val[0] << s(:splat, val[3])
+                      result = s(:array, *val[0])
+                    
+    result
+end
 
 def _reduce_260(val, _values, result)
                       result = s(:splat, val[1])

data/lib/opal/parser/grammar.y

@@ -700,6 +700,10 @@ rule
                       result = s(:array, *val[0])
                     }
                 | args tCOMMA tSTAR arg_value
+                    {
+                      val[0] << s(:splat, val[3])
+                      result = s(:array, *val[0])
+                    }
                 | tSTAR arg_value
                     {
                       result = s(:splat, val[1])

data/lib/opal/parser/lexer.rb

@@ -241,6 +241,9 @@ module Opal
       eos_regx = /[ \t]*#{Regexp.escape(str_parse[:term])}(\r*\n|$)/
       expand = true
 
+      # Don't escape single-quoted heredoc identifiers
+      escape = str_parse[:func] != STR_SQUOTE
+
       if check(eos_regx)
         scan(/[ \t]*#{Regexp.escape(str_parse[:term])}/)
 
@@ -272,7 +275,7 @@ module Opal
         elsif expand && check(/#(?=[\$\@\{])/)
           break
         elsif scan(/\\/)
-          str_buffer << self.read_escape
+          str_buffer << (escape ? self.read_escape : scanner.matched)
         else
           reg = Regexp.new("[^\#\0\\\\\n]+|.")
 
@@ -471,9 +474,11 @@ module Opal
     end
 
     def heredoc_identifier
-      if scan(/(-?)['"]?(\w+)['"]?/)
-        heredoc = @scanner[2]
-        self.strterm = new_strterm(STR_DQUOTE, heredoc, heredoc)
+      if scan(/(-?)(['"])?(\w+)\2?/)
+        escape_method = (@scanner[2] == "'") ? STR_SQUOTE : STR_DQUOTE
+        heredoc = @scanner[3]
+
+        self.strterm = new_strterm(escape_method, heredoc, heredoc)
         self.strterm[:type] = :heredoc
 
         # if ruby code at end of line after heredoc, we have to store it to
@@ -510,7 +515,7 @@ module Opal
         result = :tIDENTIFIER
       else
         if @lex_state == :expr_fname
-          if scan(/\=/)
+          if !check(/\=\>/) and scan(/\=/)
             result = :tIDENTIFIER
             matched += scanner.matched
           end

data/lib/opal/sprockets/environment.rb

@@ -1,6 +1,15 @@
 require 'sprockets'
+require 'opal/sprockets/processor'
+require 'opal/sprockets/erb'
 
 module Opal
+  # Proccess using Sprockets
+  #
+  #   Opal.process('opal-jquery')   # => String
+  def self.process asset
+    Environment.new[asset].to_s
+  end
+
   # Environment is a subclass of Sprockets::Environment which already has our opal
   # load paths loaded. This makes it easy for stand-alone rack apps, or test runners
   # that have opal load paths ready to use. You can also add an existing gem's lib

data/lib/opal/sprockets/erb.rb

@@ -1,22 +1,30 @@
 require 'opal'
-require 'opal/compiler'
+require 'tilt'
+require 'opal/erb'
 require 'sprockets'
 
 module Opal
   module ERB
     class Processor < Tilt::Template
+      # vvv BOILERPLATE vvv
       self.default_mime_type = 'application/javascript'
 
       def self.engine_initialized?
         true
       end
 
+      def self.version
+        ::Opal::VERSION
+      end
+
       def initialize_engine
         require_template_library 'opal'
       end
 
       def prepare
       end
+      # ^^^ BOILERPLATE ^^^
+
 
       def evaluate(context, locals, &block)
         context.require_asset 'erb'

data/lib/opal/sprockets/processor.rb

@@ -5,13 +5,6 @@ require 'opal/version'
 $OPAL_SOURCE_MAPS = {}
 
 module Opal
-  # Proccess using Sprockets
-  #
-  #   Opal.process('opal-jquery')   # => String
-  def self.process asset
-    Environment.new[asset].to_s
-  end
-
   # The Processor class is used to make ruby files (with rb or opal extensions)
   # available to any sprockets based server. Processor will then get passed any
   # ruby source file to build. There are some options you can override globally
@@ -26,6 +19,7 @@ module Opal
   #   * irb_enabled                 [false by default]
   #
   class Processor < Tilt::Template
+    # vvv BOILERPLATE vvv
     self.default_mime_type = 'application/javascript'
 
     def self.engine_initialized?
@@ -36,6 +30,15 @@ module Opal
       ::Opal::VERSION
     end
 
+    def initialize_engine
+      require_template_library 'opal'
+    end
+
+    def prepare
+    end
+    # ^^^ BOILERPLATE ^^^
+
+
     class << self
       attr_accessor :method_missing_enabled
       attr_accessor :arity_check_enabled
@@ -60,13 +63,6 @@ module Opal
       @stubbed_files ||= Set.new
     end
 
-    def initialize_engine
-      require_template_library 'opal'
-    end
-
-    def prepare
-    end
-
     def evaluate(context, locals, &block)
       options = {
         :method_missing           => self.class.method_missing_enabled,

data/lib/opal/util.rb

@@ -4,26 +4,61 @@ module Opal
 
     # Used for uglifying source to minify
     def uglify(str)
-      IO.popen('uglifyjs 2> /dev/null', 'r+') do |i|
-        i.puts str
-        i.close_write
-        return i.read
-      end
-    rescue Errno::ENOENT, Errno::EPIPE
-      $stderr.puts '"uglifyjs" command not found (install with: "npm install -g uglify-js")'
-      nil
+      uglifyjs = DigestSourceCommand.new(:uglifyjs, nil, ' (install with: "npm install -g uglify-js")')
+      uglifyjs.digest(str)
     end
 
     # Gzip code to check file size
     def gzip(str)
-      IO.popen('gzip -f 2> /dev/null', 'r+') do |i|
-        i.puts str
-        i.close_write
-        return i.read
+      gzip = DigestSourceCommand.new(:gzip, '-f', ', it is required to produce the .gz version')
+      gzip.digest(str)
+    end
+
+
+    class DigestSourceCommand
+      def initialize(command, options, message)
+        @command, @options, @message = command, options, message
+      end
+      attr_reader :command, :options, :message
+
+      def digest(source)
+        return unless command_installed? command, message
+        IO.popen("#{command} #{options} #{hide_stderr}", 'r+') do |i|
+          i.puts source
+          i.close_write
+          i.read
+        end
+      end
+
+
+      private
+
+      def hide_stderr
+        if (/mswin|mingw/ =~ RUBY_PLATFORM).nil?
+          '2> /dev/null'
+        else
+          '2> nul'
+        end
+      end
+
+      # Code from http://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby
+      def which(cmd)
+        exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+        ENV['PATH'].split(File::PATH_SEPARATOR).find do |path|
+          exts.find { |ext|
+            exe = File.join(path, "#{cmd}#{ext}")
+            exe if File.executable? exe
+          }
+        end
+      end
+
+      INSTALLED = {}
+      def command_installed?(cmd, install_comment)
+        command_installed = INSTALLED[cmd.to_s] ||= which(cmd)
+        $stderr.puts %Q("#{cmd}" command not found#{install_comment}) unless command_installed
+        command_installed
       end
-    rescue Errno::ENOENT, Errno::EPIPE
-      $stderr.puts '"gzip" command not found, it is required to produce the .gz version'
-      nil
     end
+
   end
 end

data/lib/opal/version.rb

@@ -1,3 +1,3 @@
 module Opal
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

data/opal.gemspec

@@ -13,10 +13,10 @@ Gem::Specification.new do |s|
   s.description  = 'Ruby runtime and core library for javascript.'
   s.license      = 'MIT'
 
-  s.files          = `git ls-files`.split("\n")
-  s.executables    = ['opal']
-  s.test_files     = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.require_paths  = ['lib']
+  s.files         = `git ls-files`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.require_paths = ['lib']
 
   s.add_dependency 'source_map'
   s.add_dependency 'sprockets'

data/opal/corelib/enumerable.rb

@@ -664,7 +664,7 @@ module Enumerable
 
       self.$each();
 
-      return result;
+      return result == undefined ? nil : result;
     }
   end
 

data/opal/corelib/enumerator.rb

@@ -35,10 +35,14 @@ class Enumerator
     end
   end
 
-  def each(&block)
-    return self unless block
+  def each(*args, &block)
+    return self if block.nil? && args.empty?
 
-    @object.__send__(@method, *@args, &block)
+    args = @args + args
+
+    return self.class.new(@object, @method, *args) if block.nil?
+
+    @object.__send__(@method, *args, &block)
   end
 
   def size

data/opal/corelib/hash.rb

@@ -13,6 +13,8 @@ class Hash
 
       hash.map  = {};
       hash.keys = [];
+      hash.none = nil;
+      hash.proc = nil;
 
       return hash;
     }
@@ -20,14 +22,8 @@ class Hash
 
   def initialize(defaults = undefined, &block)
     %x{
-      if (defaults != null) {
-        self.none = defaults;
-      }
-      else if (block !== nil) {
-        self.proc = block;
-      }
-
-      return self;
+      self.none = (defaults === undefined ? nil : defaults);
+      self.proc = block;
     }
   end
 
@@ -50,8 +46,7 @@ class Hash
 
       for (var i = 0, length = self.keys.length; i < length; i++) {
         var key = self.keys[i], obj = map[key], obj2 = map2[key];
-
-        if (#{`obj` != `obj2`}) {
+        if (obj2 === undefined || #{`obj` != `obj2`}) {
           return false;
         }
       }
@@ -141,11 +136,19 @@ class Hash
   end
 
   def default(val = undefined)
-    @none
+    %x{
+      if (val !== undefined && self.proc !== nil) {
+        return #{@proc.call(self, val)};
+      }
+      return self.none;
+    }
   end
 
   def default=(object)
-    @none = object
+    %x{
+      self.proc = nil;
+      return (self.none = object);
+    }
   end
 
   def default_proc
@@ -153,10 +156,20 @@ class Hash
   end
 
   def default_proc=(proc)
-    @proc = proc
+    %x{
+      if (proc !== nil) {
+        proc = #{Opal.coerce_to!(proc, Proc, :to_proc)};
+
+        if (#{proc.lambda?} && #{proc.arity.abs} != 2) {
+          #{raise TypeError, "default_proc takes two arguments"};
+        }
+      }
+      self.none = nil;
+      return (self.proc = proc);
+    }
   end
 
-  def delete(key)
+  def delete(key, &block)
     %x{
       var map  = self.map, result = map[key];
 
@@ -167,6 +180,9 @@ class Hash
         return result;
       }
 
+      if (block !== nil) {
+        return #{block.call(key)};
+      }
       return nil;
     }
   end
@@ -448,6 +464,10 @@ class Hash
 
   def merge(other, &block)
     %x{
+      if (! #{Hash === other}) {
+        other = #{Opal.coerce_to!(other, Hash, :to_hash)};
+      }
+
       var keys = self.keys, map = self.map,
           result = $opal.hash(), keys2 = result.keys, map2 = result.map;
 
@@ -491,6 +511,10 @@ class Hash
 
   def merge!(other, &block)
     %x{
+      if (! #{Hash === other}) {
+        other = #{Opal.coerce_to!(other, Hash, :to_hash)};
+      }
+
       var keys = self.keys, map = self.map,
           keys2 = other.keys, map2 = other.map;
 

data/opal/corelib/kernel.rb

@@ -44,8 +44,9 @@ module Kernel
               continue;
             }
           }
-
-          methods.push(key.substr(1));
+          if (self[key].rb_stub === undefined) {
+            methods.push(key.substr(1));
+          }
         }
       }
 
@@ -139,6 +140,8 @@ module Kernel
     Enumerator.for(self, method, *args, &block)
   end
 
+  alias to_enum enum_for
+
   def equal?(other)
     `self === other`
   end
@@ -464,6 +467,7 @@ module Kernel
         exception = #{exception.new string};
       }
 
+      #{$! = exception};
       throw exception;
     }
   end