opal 0.3.44 → 0.4.0

data/lib/opal/processor.rb

@@ -1,4 +1,5 @@
 require 'sprockets'
+require 'opal/sprockets_parser'
 
 module Opal
   # Proccess using Sprockets
@@ -13,9 +14,13 @@ module Opal
   # ruby source file to build. There are some options you can override globally
   # which effect how certain ruby features are handled:
   #
-  #   * method_missing_enabled [true by default]
+  #   * method_missing_enabled      [true by default]
   #   * optimized_operators_enabled [true by default]
-  #   * arity_check_enabled [false by default]
+  #   * arity_check_enabled         [false by default]
+  #   * const_missing_enabled       [true by default]
+  #   * dynamic_require_severity    [true by default]
+  #   * source_map_enabled          [true by default]
+  #   * irb_enabled                 [false by default]
   #
   class Processor < Tilt::Template
     self.default_mime_type = 'application/javascript'
@@ -30,13 +35,17 @@ module Opal
       attr_accessor :arity_check_enabled
       attr_accessor :const_missing_enabled
       attr_accessor :dynamic_require_severity
+      attr_accessor :source_map_enabled
+      attr_accessor :irb_enabled
     end
 
-    self.method_missing_enabled = true
+    self.method_missing_enabled      = true
     self.optimized_operators_enabled = true
-    self.arity_check_enabled = false
-    self.const_missing_enabled = true
-    self.dynamic_require_severity = :error # :error, :warning or :ignore
+    self.arity_check_enabled         = false
+    self.const_missing_enabled       = true
+    self.dynamic_require_severity    = :error # :error, :warning or :ignore
+    self.source_map_enabled          = true
+    self.irb_enabled                 = false
 
     def initialize_engine
       require_template_library 'opal'
@@ -52,10 +61,13 @@ module Opal
         :arity_check              => self.class.arity_check_enabled,
         :const_missing            => self.class.const_missing_enabled,
         :dynamic_require_severity => self.class.dynamic_require_severity,
-        :file                     => context.logical_path
+        :source_map_enabled       => self.class.source_map_enabled,
+        :irb                      => self.class.irb_enabled,
+        :file                     => context.logical_path,
+        :source_file              => context.pathname.to_s,
       }
 
-      parser = Opal::Parser.new
+      parser = Opal::SprocketsParser.new
       result = parser.parse data, options
 
       parser.requires.each { |r| context.require_asset r }

data/lib/opal/server.rb

@@ -1,4 +1,8 @@
 require 'erb'
+require 'rack'
+require 'rack/showexceptions'
+require 'opal/sprockets_source_map_header'
+require 'opal/source_map'
 
 module Opal
   class Environment < ::Sprockets::Environment
@@ -6,6 +10,39 @@ module Opal
       super
       Opal.paths.each { |p| append_path p }
     end
+
+    def use_gem gem_name
+      append_path File.join(Gem::Specification.find_by_name(gem_name).gem_dir, 'lib')
+    end
+  end
+
+  class SourceMapServer
+    def initialize sprockets
+      @sprockets = sprockets
+    end
+
+    attr_reader :sprockets
+
+    attr_writer :prefix
+
+    def prefix
+      @prefix ||= '/__opal_source_maps__'
+    end
+
+    def inspect
+      "#<#{self.class}:#{object_id}>"
+    end
+
+    def call(env)
+      path   = env['PATH_INFO'].gsub(/^\/|\.js\.map$/, '')
+      asset  = sprockets[path]
+      return [404, {}, []] if asset.nil?
+
+      source = asset.to_s
+      map    = Opal::SourceMap.new(source, asset.pathname.to_s)
+
+      return [200, {"Content-Type" => "text/json"}, [map.to_s]]
+    end
   end
 
   class Server
@@ -25,16 +62,26 @@ module Opal
       @sprockets.append_path path
     end
 
+    def use_gem gem_name
+      @sprockets.use_gem gem_name
+    end
+
     def create_app
       server, sprockets = self, @sprockets
 
       @app = Rack::Builder.app do
+        use Rack::ShowExceptions
         map('/assets') { run sprockets }
+        map(server.source_maps.prefix) { run server.source_maps }
         use Index, server
         run Rack::Directory.new(server.public_dir)
       end
     end
 
+    def source_maps
+      @source_maps ||= SourceMapServer.new(@sprockets)
+    end
+
     def call(env)
       @app.call env
     end

data/lib/opal/source_map.rb

@@ -0,0 +1,63 @@
+require 'opal'
+require 'source_map'
+
+module Opal
+  class SourceMap
+    LINE_REGEXP = %r{/\*:(\d+)\*/}.freeze
+    FILE_REGEXP = %r{/\*-file:(.+?)-\*/}.freeze
+
+    attr_reader :generated, :file
+
+    def initialize generated, file
+      @generated = generated
+      @file = file
+    end
+
+    def map
+      @map ||= ::SourceMap.new.tap do |map|
+        source_file = file
+        generated.lines.each_with_index do |line, index|
+          generated_line = index+1
+          if line =~ FILE_REGEXP
+            source_file = "file://#{$1}"
+            map.add_mapping(
+              :generated_line => generated_line,
+              :generated_col  => 0,
+              :source_line    => 1,
+              :source_col     => 0,
+              :source         => source_file
+            )
+          end
+
+          pos = 0
+          while (pos = line.index(LINE_REGEXP, pos))
+            pos          += $~.size
+            source_line   = $1.to_i + 1
+            source_col    = 0 # until column info will be available
+            generated_col = pos
+            map.add_mapping(
+              :generated_line => generated_line,
+              :generated_col  => generated_col,
+              :source_line    => source_line,
+              :source_col     => source_col,
+              :source         => source_file
+            )
+          end
+        end
+      end
+    end
+
+    def as_json
+      map.as_json
+    end
+
+    def to_s
+      map.to_s
+    end
+
+    def magic_comment map_path
+      "\n//@ sourceMappingURL=file://#{map_path}"
+    end
+  end
+
+end

data/lib/opal/sprockets_parser.rb

@@ -0,0 +1,77 @@
+require 'opal/parser'
+
+module Opal
+  class SprocketsParser < Parser
+
+    def self.parse source, options = {}
+      self.new.parse source, options
+    end
+
+    # Holds an array of paths which this file 'requires'.
+    # @return Array<String>
+    attr_reader :requires
+
+    def parse source, options = {}
+      @requires = []
+      @dynamic_require_severity = (options[:dynamic_require_severity] || :error)
+      super source, options
+    end
+
+    def process_call sexp, level
+      if sexp[1] == :require
+        return handle_require sexp[2][1]
+      end
+
+      super sexp, level
+    end
+
+    def handle_require(sexp)
+      str = handle_require_sexp sexp
+      @requires << str unless str.nil? if @requires
+      fragment("", sexp)
+    end
+
+    def handle_require_sexp(sexp)
+      type = sexp.shift
+
+      if type == :str
+        return sexp[0]
+      elsif type == :call
+        recv, meth, args = sexp
+        parts = args[1..-1].map { |s| handle_require_sexp s }
+
+        if recv == [:const, :File]
+          if meth == :expand_path
+            return handle_expand_path(*parts)
+          elsif meth == :join
+            return handle_expand_path parts.join("/")
+          elsif meth == :dirname
+            return handle_expand_path parts[0].split("/")[0...-1].join("/")
+          end
+        end
+      end
+
+
+      case @dynamic_require_severity
+      when :error
+        error "Cannot handle dynamic require"
+      when :warning
+        warning "Cannot handle dynamic require"
+      end
+    end
+
+    def handle_expand_path(path, base = '')
+      "#{base}/#{path}".split("/").inject([]) do |p, part|
+        if part == ''
+          # we had '//', so ignore
+        elsif part == '..'
+          p.pop
+        else
+          p << part
+        end
+
+        p
+      end.join "/"
+    end
+  end
+end

data/lib/opal/sprockets_source_map_header.rb

@@ -0,0 +1,21 @@
+require 'sprockets/server'
+
+module Sprockets
+  module Server
+
+    # Adds the source map header to all sprocket responses for assets
+    # with a .rb or .opal extension in the extension chain.
+    def headers_with_opal_source_maps(env, asset, length)
+      headers_without_opal_source_maps(env, asset, length).tap do |headers|
+        if asset.pathname.to_s =~ /\.(rb|opal)\b/
+          headers['X-SourceMap'] = '/__opal_source_maps__/'+asset.logical_path + '.map'
+        end
+      end
+    end
+
+    # Poor man's alias_method_chain :)
+    alias headers_without_opal_source_maps headers
+    alias headers headers_with_opal_source_maps
+
+  end
+end

data/lib/opal/target_scope.rb

@@ -113,12 +113,12 @@ module Opal
     ##
     # Vars to use inside each scope
     def to_vars
-      vars = @locals.map { |l| "#{l} = nil" }
-      vars.push(*@temps)
+      vars = @temps.dup
+      vars.push(*@locals.map { |l| "#{l} = nil" })
       current_self = @parser.current_self
 
       iv = ivars.map do |ivar|
-       "if (#{current_self}#{ivar} == null) #{current_self}#{ivar} = nil;\n"
+        "if (#{current_self}#{ivar} == null) #{current_self}#{ivar} = nil;\n"
       end
 
       indent = @parser.parser_indent
@@ -126,19 +126,26 @@ module Opal
       str = ivars.empty? ? res : "#{res}\n#{indent}#{iv.join indent}"
 
       if class? and !@proto_ivars.empty?
+        #raise "FIXME to_vars"
         pvars = @proto_ivars.map { |i| "#{proto}#{i}"}.join(' = ')
-        "%s\n%s%s = nil;" % [str, indent, pvars]
+        result = "%s\n%s%s = nil;" % [str, indent, pvars]
       else
-        str
+        result = str
       end
+
+      fragment(result)
+    end
+
+    def fragment(code, sexp = nil)
+      @parser.fragment code
     end
 
     # Generates code for this module to donate methods
     def to_donate_methods
       if should_donate? and !@methods.empty?
-        "%s;__opal.donate(#{@name}, [%s]);" % [@parser.parser_indent, @methods.map(&:inspect).join(', ')]
+        fragment("%s;__opal.donate(#{@name}, [%s]);" % [@parser.parser_indent, @methods.map(&:inspect).join(', ')])
       else
-        ""
+        fragment("")
       end
     end
 

data/lib/opal/version.rb

@@ -1,3 +1,3 @@
 module Opal
-  VERSION = '0.3.44'
+  VERSION = '0.4.0'
 end

data/opal.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'rake'
   s.add_dependency 'racc'
   s.add_dependency 'sprockets'
+  s.add_dependency 'source_map'
 
   s.add_development_dependency 'mspec', '1.5.18'
+  s.add_development_dependency 'uglifier'
 end

data/opal/opal-browser/script_loader.rb

@@ -2,10 +2,10 @@ class BrowserScriptLoader
   def run
     handler = proc { find_scripts }
 
-    if $window.respond_to? :addEventListener
-      $window.addEventListener 'DOMContentLoaded', handler, false
-    else
-      $window.attachEvent 'onload', handler
+    if $global.respond_to? :addEventListener
+      $global.addEventListener 'DOMContentLoaded', handler, false
+    elsif @global.respond_to? :attachEvent
+      $global.attachEvent 'onload', handler
     end
   end
 
@@ -20,16 +20,16 @@ class BrowserScriptLoader
   end
 
   def ruby_scripts
-    $document.getElementsByTagName('script').to_a.select { |s|
+    $global.document.getElementsByTagName('script').to_a.select { |s|
       s.type == "text/ruby" }
   end
 
   def run_ruby str
-    $window.Opal.eval str
+    $global.Opal.eval str
   end
 end
 
-if $window and $document
+if $global.respond_to? :document
   BrowserScriptLoader.new.run
 end
 

data/opal/opal-parser.js.erb

@@ -3,8 +3,8 @@
 <% require_asset 'strscan' %>
 
 // We need (some) of the libs from our real ruby parser (not in sprockets load path)
-<% %w(opal/grammar opal/lexer opal/parser opal/target_scope opal/core_ext opal/lexer_scope opal/grammar_helpers opal/parser opal).each do |f| %>
-<%= Opal.parse File.read(File.join Opal.core_dir, '..', 'lib', "#{f}.rb") %>
+<% %w(opal/version opal/grammar opal/lexer opal/parser opal/target_scope opal/core_ext opal/lexer_scope opal/grammar_helpers opal/parser opal).each do |f| %>
+<%= Opal::SprocketsParser.parse File.read(File.join Opal.core_dir, '..', 'lib', "#{f}.rb") %>
 <% end %>
 
 Opal.eval = function(str) {

data/opal/opal-source-maps.js.erb

@@ -0,0 +1,2 @@
+<% require_asset 'source_map' %>
+<%= Opal::SprocketsParser.parse File.read(File.join Opal.core_dir, '..', 'lib', "opal/source_map.rb") %>

data/opal/opal.rb

@@ -17,6 +17,7 @@ require 'opal/proc'
 require 'opal/range'
 require 'opal/time'
 require 'opal/json'
+require 'opal/native'
 
 # regexp matches
 $& = $~ = $` = $' = nil
@@ -27,10 +28,8 @@ $:            = []
 # split lines
 $/            = "\n"
 
-# native globals
-$global = `Opal.global`
-$window = $global
-$document = $window.document
+# native global
+$$ = $global = `Opal.global`
 
 ARGV          = []
 ARGF          = Object.new

data/opal/opal/array.rb

@@ -165,22 +165,22 @@ class Array
       for (var i = 0, length = #{self}.length, tmp1, tmp2; i < length; i++) {
         tmp1 = #{self}[i];
         tmp2 = #{other}[i];
-        
+
         //recursive
-        if ((typeof(tmp1.indexOf) == "function") &&
-            (typeof(tmp2.indexOf) == "function") &&  
+        if (tmp1 && (typeof(tmp1.indexOf) == "function") &&
+            (typeof(tmp2.indexOf) == "function") &&  tmp2 &&
             (tmp1.indexOf(tmp2) == tmp2.indexOf(tmp1))) {
           if (tmp1.indexOf(tmp1) == tmp2.indexOf(tmp2)) {
             continue;
           }
         }
-        
+
         if (!#{`#{self}[i]` == `other[i]`}) {
           return false;
         }
-        
+
       }
-      
+
 
       return true;
     }
@@ -285,6 +285,7 @@ class Array
     %x{
       var result = [];
 
+
       for (var i = 0, length = #{self}.length, value; i < length; i++) {
         if ((value = block(#{self}[i])) === __breaker) {
           return __breaker.$v;
@@ -667,20 +668,20 @@ class Array
   def last(count = undefined)
     %x{
       var length = #{self}.length;
-      
-      if (count === nil || typeof(count) == 'string') { 
+
+      if (count === nil || typeof(count) == 'string') {
         #{ raise TypeError, "no implicit conversion to integer" };
       }
-        
+
       if (typeof(count) == 'object') {
         if (typeof(count['$to_int']) == 'function') {
           count = count['$to_int']();
-        } 
+        }
         else {
           #{ raise TypeError, "no implicit conversion to integer" };
         }
       }
-      
+
       if (count == null) {
         return length === 0 ? nil : #{self}[length - 1];
       }
@@ -783,7 +784,9 @@ class Array
     `#{self}.slice(0).reverse()`
   end
 
-  alias_native :reverse!, :reverse
+  def reverse!
+    `#{self}.reverse()`
+  end
 
   def reverse_each(&block)
     reverse.each &block
@@ -856,7 +859,7 @@ class Array
 
   alias size length
 
-  def shuffle()
+  def shuffle
     %x{
         for (var i = #{self}.length - 1; i > 0; i--) {
           var j = Math.floor(Math.random() * (i + 1));
@@ -894,7 +897,7 @@ class Array
       var copy = #{self}.slice();
       var t_arg_error = false;
       var t_break = [];
-        
+
       if (block !== nil) {
         var result = copy.sort(function(x, y) {
           var result = block(x, y);
@@ -902,12 +905,12 @@ class Array
             t_break.push(__breaker.$v);
           }
           if (result === nil) {
-            t_arg_error = true;  
+            t_arg_error = true;
           }
-          if (result['$<=>'] && typeof(result['$<=>']) == "function") {
+          if ((result != null) && result['$<=>'] && typeof(result['$<=>']) == "function") {
             result = result['$<=>'](0);
           }
-          if ([-1, 0, 1].indexOf(result) == -1) {
+          if (result !== -1 && result !== 0 && result !== 1) {
             t_arg_error = true;
           }
           return result;
@@ -920,26 +923,26 @@ class Array
 
         return result;
       }
-      
-      var result = copy.sort(function(a, b){ 
+
+      var result = copy.sort(function(a, b){
         if (typeof(a) !== typeof(b)) {
           t_arg_error = true;
         }
-        
+
         if (a['$<=>'] && typeof(a['$<=>']) == "function") {
           var result = a['$<=>'](b);
           if (result === nil) {
             t_arg_error = true;
-          } 
-          return result; 
-        }  
+          }
+          return result;
+        }
         if (a > b)
           return 1;
         if (a < b)
           return -1;
-        return 0;  
+        return 0;
       });
-      
+
       if (t_arg_error)
         #{raise ArgumentError, "Array#sort"};
 
@@ -1008,15 +1011,15 @@ class Array
     }
   end
 
-  def to_native
+  def to_n
     %x{
       var result = [], obj
 
       for (var i = 0, len = #{self}.length; i < len; i++) {
         obj = #{self}[i];
 
-        if (obj.$to_native) {
-          result.push(#{ `obj`.to_native });
+        if (obj.$to_n) {
+          result.push(#{ `obj`.to_n });
         }
         else {
           result.push(obj);