opal 0.9.4 → 0.10.0.beta1

data/lib/opal/parser/lexer.rb

@@ -113,7 +113,9 @@ module Opal
     end
 
     def cmdarg_push(n)
-      @cmdarg = (@cmdarg << 1) | (n & 1)
+      unless @lparen_arg_seen
+        @cmdarg = (@cmdarg << 1) | (n & 1)
+      end
     end
 
     def cmdarg_pop
@@ -263,6 +265,22 @@ module Opal
         scanner[1].to_i(16).chr
       elsif scan(/u([0-9a-zA-Z]{1,4})/)
         scanner[1].to_i(16).chr(Encoding::UTF_8)
+      elsif scan(/C-([a-zA-Z])/)
+        # Control character ?\C-z or ?\C-Z
+        # ?\C-a = "\u0001" = 1
+        (scanner[1].downcase.ord - 'a'.ord + '1'.to_i(16)).chr(Encoding::UTF_8)
+      elsif scan(/C-([0-9])/)
+        # Control character ?\C-0
+        # ?\C-0 = "\u0010"
+        (scanner[1].ord - '0'.ord + '10'.to_i(16)).chr(Encoding::UTF_8)
+      elsif scan(/M-\\C-([a-zA-Z])/)
+        # Meta control character ?\M-\C-z or ?\M-\C-Z
+        # ?\M-\C-z = "\x81"
+        (scanner[1].downcase.ord - 'a'.ord + '81'.to_i(16)).chr(Encoding::UTF_8)
+      elsif scan(/M-\\C-([0-9])/)
+        # Meta control character ?\M-\C-0
+        # ?\M-\C-0 = "\x90"
+        (scanner[1].ord - '0'.ord + '90'.to_i(16)).chr(Encoding::UTF_8)
       else
         # escaped char doesnt need escaping, so just return it
         scan(/./)
@@ -279,7 +297,7 @@ module Opal
 
     def here_document(str_parse)
       eos_regx = /[ \t]*#{Regexp.escape(str_parse[:term])}(\r*\n|$)/
-      expand = true
+      expand = (str_parse[:func] & STR_FUNC_EXPAND) != 0
 
       # Don't escape single-quoted heredoc identifiers
       escape = str_parse[:func] != STR_SQUOTE
@@ -327,6 +345,15 @@ module Opal
       complete_str = str_buffer.join ''
       @line += complete_str.count("\n")
 
+      if str_parse[:squiggly_heredoc]
+        # "squiggly" heredoc should be post-processed.
+        # here we remove the indentation of the least-indented
+        # line from each line of the content
+        lines = complete_str.lines
+        min_indent = lines.map { |line| line.scan(/#{REGEXP_START}\s+/)[0].length }.min
+        complete_str = lines.map { |line| line[min_indent, line.length] }.join
+      end
+
       self.yylval = complete_str
       return :tSTRING_CONTENT
     end
@@ -402,6 +429,14 @@ module Opal
           return :tSTRING_DBEG
         else
           str_buffer << scanner.matched
+
+          # For qword without interpolation containing its :paren symbols
+          # like %w(()) ow %i{{}} we should mark our str_parse expression
+          # as nesting. As a result, #add_string_content will try to read 1 more
+          # closing ')' or '}' from the string
+          if qwords && scanner.matched.match(Regexp.new(Regexp.escape(str_parse[:paren])))
+            str_parse[:nesting] += 1
+          end
         end
 
       # causes error, so we will just collect it later on with other text
@@ -514,12 +549,34 @@ module Opal
     end
 
     def heredoc_identifier
-      if scan(/(-?)(['"])?(\w+)\2?/)
-        escape_method = (@scanner[2] == "'") ? STR_SQUOTE : STR_DQUOTE
-        heredoc = @scanner[3]
+      starts_with_minus = !!scan(/-/) # optional heredoc beginning
+
+      squiggly_heredoc = !starts_with_minus && !!scan(/~/)
+
+      # Escaping character can be ' or " or can be blank
+      scan(/(['"]?)/)
+      escape_char = @scanner[0]
+
+      if escape_char != ''
+        # When heredoc identified starts with ' or "
+        # we should read until the same closing character appears
+        # again in the source
+        regexp = Regexp.new("([^#{escape_char}]+)")
+      else
+        # Otherwise we read all characters until whitespace found
+        regexp = /\w+/
+      end
+
+      if scan(regexp)
+        escape_method = (escape_char == "'") ? STR_SQUOTE : STR_DQUOTE
+        heredoc = @scanner[0]
 
         self.strterm = new_strterm(escape_method, heredoc, heredoc)
         self.strterm[:type] = :heredoc
+        self.strterm[:squiggly_heredoc] = squiggly_heredoc
+
+        # read closing ' or " character
+        scan(Regexp.new(escape_char)) if escape_char
 
         # if ruby code at end of line after heredoc, we have to store it to
         # parse after heredoc is finished parsing
@@ -629,6 +686,8 @@ module Opal
         @lex_state = :expr_end
       end
 
+      self.yylval = matched
+
       return matched =~ /#{REGEXP_START}[A-Z]/ ? :tCONSTANT : :tIDENTIFIER
     end
 
@@ -695,8 +754,13 @@ module Opal
           if scan(/\*\*\=/)
             return new_op_asgn('**')
           elsif scan(/\*\*/)
-            self.set_arg_state
-            return :tPOW
+            if [:expr_beg, :expr_mid].include? @lex_state
+              # kwsplat like **{ a: 1 }
+              return :tDSTAR
+            else
+              self.set_arg_state
+              return :tPOW
+            end
           elsif scan(/\*\=/)
             return new_op_asgn('*')
           else
@@ -835,7 +899,7 @@ module Opal
           self.set_arg_state
           return :tPIPE
 
-        elsif scan(/\%[QqWwixrs]/)
+        elsif scan(/\%[QqWwIixrs]/)
           str_type = scanner.matched[1, 1]
           paren = term = scan(/./)
 
@@ -844,7 +908,8 @@ module Opal
           when '[' then term = ']'
           when '{' then term = '}'
           when '<' then term = '>'
-          else paren = "\0"
+          else
+            paren = "\0"
           end
 
           token, func = case str_type
@@ -852,7 +917,7 @@ module Opal
                           [:tSTRING_BEG, STR_DQUOTE]
                         when 'q'
                           [:tSTRING_BEG, STR_SQUOTE]
-                        when 'W'
+                        when 'W', 'I'
                           skip(/\s*/)
                           [:tWORDS_BEG, STR_DWORD]
                         when 'w', 'i'
@@ -893,15 +958,27 @@ module Opal
           return :tDIVIDE
 
         elsif scan(/\%/)
-          if scan(/\=/)
+          if check(/\=/) && @lex_state != :expr_beg
+            scan(/\=/)
             return new_op_asgn('%')
           elsif check(/[^\s]/)
+
             if @lex_state == :expr_beg or
-               (@lex_state == :expr_arg && @space_seen) or
+               @lex_state == :expr_arg && @space_seen or
                @lex_state == :expr_mid
-              start_word  = scan(/./)
-              end_word    = { '(' => ')', '[' => ']', '{' => '}', '<' => '>' }[start_word] || start_word
-              self.strterm = new_strterm2(STR_DQUOTE, end_word, start_word)
+
+              paren = term = scan(/./)
+
+              case term
+              when '(' then term = ')'
+              when '[' then term = ']'
+              when '{' then term = '}'
+              when '<' then term = '>'
+              else
+                paren = "\0"
+              end
+
+              self.strterm = new_strterm2(STR_DQUOTE, term, paren)
               return :tSTRING_BEG
             end
           end
@@ -920,9 +997,12 @@ module Opal
 
         elsif scan(/\(/)
           result = scanner.matched
+          @lparen_arg_seen = false
+
           if beg?
             result = :tLPAREN
           elsif @space_seen && arg?
+            @lparen_arg_seen = true
             result = :tLPAREN_ARG
           else
             result = :tLPAREN2
@@ -1185,6 +1265,9 @@ module Opal
           elsif scan(/\$\w+/)
             @lex_state = :expr_end
             return :tGVAR
+          elsif scan(/\$-[0-9a-zA-Z]/)
+            @lex_state = :expr_end
+            return :tGVAR
           else
             raise "Bad gvar name: #{scanner.peek(5).inspect}"
           end
@@ -1214,7 +1297,12 @@ module Opal
             return :tLAMBEG
 
           elsif arg? or @lex_state == :expr_end
-            result = :tLCURLY
+            if @lparen_arg_seen
+              @lparen_arg_seen = false
+              result = :tLBRACE_ARG
+            else
+              result = :tLCURLY
+            end
           elsif @lex_state == :expr_endarg
             result = :LBRACE_ARG
           else
@@ -1240,7 +1328,7 @@ module Opal
         elsif check(/[0-9]/)
           return process_numeric
 
-        elsif scan(/(\w)+(\?|(\!(?!=)))?/)
+        elsif scan(IDENTIFIER_REGEXP)
           return process_identifier scanner.matched, cmd_start
         end
 

data/lib/opal/parser/sexp.rb

@@ -28,6 +28,10 @@ module Opal
       @array[1..-1]
     end
 
+    def meta
+      @meta ||= {}
+    end
+
     def method_missing(sym, *args, &block)
       @array.send sym, *args, &block
     end

data/lib/opal/paths.rb

@@ -33,6 +33,8 @@ module Opal
     # @param gem_name [String] the name of the gem
     # @param include_dependencies [Boolean] whether or not to add recursively
     #   the gem's dependencies
+    # @raise [Opal::GemNotFound]
+    #   if gem or any of its runtime dependencies not found
     def use_gem(gem_name, include_dependencies = true)
       append_paths(*require_paths_for_gem(gem_name, include_dependencies))
     end
@@ -41,7 +43,9 @@ module Opal
 
     def require_paths_for_gem(gem_name, include_dependencies)
       paths = []
+
       spec = Gem::Specification.find_by_name(gem_name)
+      raise GemNotFound, gem_name unless spec
 
       spec.runtime_dependencies.each do |dependency|
         paths += require_paths_for_gem(dependency.name, include_dependencies)

data/lib/opal/regexp_anchors.rb

@@ -1,5 +1,23 @@
 module Opal
   REGEXP_START = RUBY_ENGINE == 'opal' ? '^' : '\A'.freeze
-  REGEXP_END = RUBY_ENGINE == 'opal' ? '$' : '\z'.freeze 
+  REGEXP_END = RUBY_ENGINE == 'opal' ? '$' : '\z'.freeze
+
+  # Unicode characters in ranges
+  # \u0001 - \u0020 (blank unicode characters + space)
+  # \u0022 - \u002F ("#$%&'()*+,-./ chars)
+  # \u003A - \u003E (:;<=> chars)
+  # \u0040          (@ char)
+  # \u005B - \u005E ([\]^ chars)
+  # \u0060          (` char)
+  # \u007B - \u007F ({|}~ chars})
+  # are not allowed to be used in identifier in any form
+  # This regexp contains a common rule for filtering Ruby identifiers
+  FORBIDDEN_IDENTIFIER_CHARS = "\\u0001-\\u0020\\u0022-\\u002F\\u003A-\\u003E\\u0040\\u005B-\\u005E\\u0060\\u007B-\\u007F"
+  IDENTIFIER_REGEXP = Regexp.new("[^#{FORBIDDEN_IDENTIFIER_CHARS}]+")
+
+  # For constants rules are pretty much the same, but ':' is allowed and '?!' are not.
+  # Plus it may start with a '::' which indicates that the constant comes from toplevel.
+  FORBIDDEN_CONST_NAME_CHARS = "\\u0001-\\u0020\\u0021-\\u002F\\u003B-\\u003F\\u0040\\u005B-\\u005E\\u0060\\u007B-\\u007F"
+  CONST_NAME_REGEXP = Regexp.new("#{REGEXP_START}(::)?[A-Z][^#{FORBIDDEN_CONST_NAME_CHARS}]*#{REGEXP_END}")
 end
 

data/lib/opal/sprockets.rb

@@ -4,25 +4,25 @@ require 'opal/sprockets/server'
 
 module Opal
   module Sprockets
-    # Public: Bootstraps modules loaded by sprockets on `Opal.modules` marking any
-    #   non-Opal asset as already loaded.
+    # Bootstraps modules loaded by sprockets on `Opal.modules` marking any
+    # non-Opal asset as already loaded.
     #
-    # name      - The name of the main asset to be loaded (with or without ext)
-    # sprockets - A Sprockets::Environment instance
-    #
-    # Example
+    # @example
     #
     #   Opal::Sprockets.load_asset(Rails.application.assets, 'application')
     #
-    # Will output the following JavaScript:
+    # @example Will output the following JavaScript:
     #
     #   if (typeof(Opal) !== 'undefined') {
-    #     Opal.mark_as_loaded("opal");
-    #     Opal.mark_as_loaded("jquery.self");
+    #     Opal.loaded("opal");
+    #     Opal.loaded("jquery.self");
     #     Opal.load("application");
     #   }
     #
-    # Returns a String containing JavaScript code.
+    # @param name      [String] The logical name of the main asset to be loaded (without extension)
+    # @param sprockets [Sprockets::Environment]
+    #
+    # @return [String] JavaScript code
     def self.load_asset(name, sprockets)
       asset = sprockets[name.sub(/(\.(js|rb|opal))*#{REGEXP_END}/, '.js')]
       return '' if asset.nil?
@@ -35,7 +35,7 @@ module Opal
       path_extnames     = -> path  { File.basename(path).scan(/\.[^.]+/) }
       mark_loaded       = -> paths { "Opal.loaded([#{paths.map(&:inspect).join(',')}]);" }
       processed_by_opal = -> asset { (path_extnames[asset.pathname] & opal_extnames).any? }
-      stubbed_files     = ::Opal::Processor.stubbed_files
+      stubbed_files     = ::Opal::Config.stubbed_files
 
       non_opal_assets = ([asset]+asset.dependencies)
         .select { |asset| not(processed_by_opal[asset]) }
@@ -54,20 +54,23 @@ module Opal
       "}"
     end
 
-    # Public: Generate a `<script>` tag for Opal assets.
+    # Generate a `<script>` tag for Opal assets.
     #
-    # name    - The name of the asset to be loaded
-    # options - (default: {}):
-    #   :sprockets - A Sprockets::Environment instance
-    #   :prefix    - The prefix String at which is mounted Sprockets
-    #   :debug     - Wether to enable debug mode along with sourcemaps support
+    # @param [String] name     The logical name of the asset to be loaded (without extension)
+    # @param [Hash]   options  The options about sprockets
+    # @option options [Sprockets::Environment] :sprockets  The sprockets instance
+    # @option options [String]                 :prefix     The prefix String at which is mounted Sprockets, e.g. '/assets'
+    # @option options [Boolean]                :debug      Wether to enable debug mode along with sourcemaps support
     #
-    # Returns a string of HTML code containing `<script>` tags.
+    # @return a string of HTML code containing `<script>` tags.
     def self.javascript_include_tag(name, options = {})
       sprockets = options.fetch(:sprockets)
       prefix    = options.fetch(:prefix)
       debug     = options.fetch(:debug)
 
+      # Avoid double slashes
+      prefix = prefix.chop if prefix.end_with? '/'
+
       asset = sprockets[name]
       raise "Cannot find asset: #{name}" if asset.nil?
       scripts = []

data/lib/opal/sprockets/environment.rb

@@ -3,16 +3,8 @@ require 'opal/sprockets/processor'
 require 'opal/sprockets/erb'
 
 module Opal
-  # @deprecated
-  def self.process asset
-    Environment.new[asset].to_s
-  end
-
-  # @deprecated
   class Environment < ::Sprockets::Environment
     def initialize *args
-      warn "WARNING: Opal::Sprockets::Environment is deprecated. "\
-           "Please use Opal::Server directly or append Opal.paths to the environment manually."
       super
       append_opal_paths
     end

data/lib/opal/sprockets/processor.rb

@@ -12,13 +12,6 @@ module Opal
   #   extensions) available to any sprockets based server. Processor will then
   #   get passed any ruby source file to build.
   class Processor < TiltTemplate
-    # Deprecated: Support legacy accessors to default options,
-    #   now moved to Opal::Config
-    Opal::Config.default_config.keys.each do |config_option|
-      define_singleton_method(config_option) { Opal::Config.config[config_option] }
-      define_singleton_method("#{config_option}=") { |value| Opal::Config.config[config_option] = value }
-    end
-
     @@cache_key = nil
     def self.cache_key
       @@cache_key ||= ['Opal', Opal::VERSION, Opal::Config.config].to_json.freeze
@@ -100,7 +93,7 @@ module Opal
         required_tree = dirname.join(file, '..', required_tree)
 
         unless required_tree.directory?
-          raise ArgumentError, "require_tree argument must be a directory: #{[original_required_tree, required_tree].inspect}"
+          raise ArgumentError, "require_tree argument must be a directory: #{{source: original_required_tree, pathname: required_tree}.inspect}"
         end
 
         context.depend_on required_tree.to_s
@@ -125,21 +118,25 @@ module Opal
       end
     end
 
-    # Deprecated: Moved to Opal::Sprockets.load_asset(sprockets, name)
-    def self.load_asset_code(sprockets, name)
-      ::Opal::Sprockets.load_asset(name, sprockets)
-    end
-
+    # @deprecated
     def self.stubbed_files
-      @stubbed_files ||= Set.new
+      warn "Deprecated: use `::Opal::Config.stubbed_files` instead"
+      puts caller(5)
+      ::Opal::Config.stubbed_files
     end
 
+    # @deprecated
     def self.stub_file(name)
-      stubbed_files << name.to_s
+      warn "Deprecated: use `::Opal::Config.stubbed_files << #{name.inspect}.to_s` instead"
+      puts caller(5)
+      ::Opal::Config.stubbed_files << name.to_s
     end
 
+
+    private
+
     def stubbed_files
-      self.class.stubbed_files
+      ::Opal::Config.stubbed_files
     end
   end
 end

data/lib/opal/sprockets/server.rb

@@ -13,15 +13,7 @@ module Opal
     attr_accessor :debug, :use_index, :index_path, :main, :public_root,
                   :public_urls, :sprockets, :prefix
 
-    def initialize debug_or_options = {}
-      unless Hash === debug_or_options
-        warn "passing a boolean to control debug is deprecated.\n"+
-             "Please pass an Hash instead: Server.new(debug: true)"
-        options = {:debug => debug_or_options}
-      else
-        options = debug_or_options
-      end
-
+    def initialize options = {}
       @use_index   = true
       @public_root = nil
       @public_urls = ['/']
@@ -41,11 +33,11 @@ module Opal
     end
 
     def source_map=(enabled)
-      Opal::Processor.source_map_enabled = enabled
+      Opal::Config.source_map_enabled = enabled
     end
 
     def source_map_enabled
-      Opal::Processor.source_map_enabled
+      Opal::Config.source_map_enabled
     end
 
     def append_path path
@@ -117,7 +109,9 @@ module Opal
       def javascript_include_tag name
         sprockets = @server.sprockets
         prefix = @server.prefix
-        ::Opal::Sprockets.javascript_include_tag(name, sprockets: @server.sprockets, prefix: @server.prefix, debug: @server.debug)
+        debug = @server.debug
+
+        ::Opal::Sprockets.javascript_include_tag(name, sprockets: sprockets, prefix: prefix, debug: debug)
       end
 
       def source