opal 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f894d4150a0535a93f352701ed5b9d204b74409
-  data.tar.gz: 1551213eccd9d9177e3868722429c56624a40b5b
+  metadata.gz: 6c3f8f806c3ccc492181271b934421d199875687
+  data.tar.gz: 1793e3beab6345556bcb5d9255cbf0bbf6463f68
 SHA512:
-  metadata.gz: a14ce6ec8c51a5a64d29c0b10865daaf426c17703f978fc99f2aad2d0bb9b2562f9de495cb1d0cf2f40281305ebe3f3cd4eb4442e68b3a92bbf9d6c5b5eb3d52
-  data.tar.gz: b697aeeca8bfee4fcc2f70bbc6fd52df6bf140938983b114e905f3d08c01ba080756e21e331301d9713b735db090f9b5b670dee7c56d64d2f7655b55c7f238d3
+  metadata.gz: 1d3c05b2ef2434e3056b58981e4851964e207d92a5936914e1a54d73f04be7fe9651d43981dd5596c6b6244d3b652395af4cd99944c302d83b385cecfa6e2806
+  data.tar.gz: a2a98bee95fceb779251cd2cea489fac101aa936e32ff3bccb9395056c4e848c5b5c7907a6648970f0e4fc3658dd3853bf28bdf5ceb7692eda825247511f5182

data/.gitignore

@@ -5,3 +5,4 @@
 Gemfile.lock
 build/
 /.github_access_token
+/cdn

data/.gitmodules

@@ -1,3 +1,27 @@
-[submodule "spec/opal/rubyspec"]
-	path = spec/opal/rubyspec
-	url = git://github.com/rubyspec/rubyspec.git
+[submodule "spec/corelib"]
+	path = spec/corelib
+	url = https://github.com/rubyspec/rubyspec
+[submodule "spec/stdlib/rubysl-singleton"]
+	path = spec/stdlib/rubysl-singleton
+	url = https://github.com/rubysl/rubysl-singleton
+[submodule "spec/stdlib/rubysl-observer"]
+	path = spec/stdlib/rubysl-observer
+	url = https://github.com/rubysl/rubysl-observer
+[submodule "spec/stdlib/rubysl-strscan"]
+	path = spec/stdlib/rubysl-strscan
+	url = https://github.com/rubysl/rubysl-strscan
+[submodule "spec/stdlib/rubysl-delegate"]
+	path = spec/stdlib/rubysl-delegate
+	url = https://github.com/rubysl/rubysl-delegate
+[submodule "spec/stdlib/rubysl-erb"]
+	path = spec/stdlib/rubysl-erb
+	url = https://github.com/rubysl/rubysl-erb
+[submodule "spec/stdlib/rubysl-set"]
+	path = spec/stdlib/rubysl-set
+	url = https://github.com/rubysl/rubysl-set
+[submodule "spec/stdlib/rubysl-pathname"]
+	path = spec/stdlib/rubysl-pathname
+	url = https://github.com/rubysl/rubysl-pathname
+[submodule "spec/stdlib/rubysl-date"]
+	path = spec/stdlib/rubysl-date
+	url = https://github.com/rubysl/rubysl-date

data/.rspec

@@ -1,3 +1,3 @@
 --color
 --format progress
---pattern mri_spec/**/*_spec.rb
+--pattern spec/cli/**/*_spec.rb

data/CHANGELOG.md

@@ -1,11 +1,35 @@
-## edge
+## 0.6.1 2014-04-15
+
+*   Updated RubySpecs to master and added `rubysl-*` specs. Thanks to Mike Owens (@mieko)
+
+*   Added `Kernel#require_remote(url)` in `opal-parser` that requires files with basic synchronous ajax
+    GET requests. It is used to load `<scripts type="text/ruby" src="…url…">`.
+
+*   Various parsing fixes (Hash parsing, `def` returns method name, cleanup `core/util`, Enumerator fixes)
+
+*   Added `#native_reader`, `#native_writer` and `#native_accessor`as class methods
+    donated by `include Native`
+
+*   Added specs for Sprockets' processors (both .js.rb and .opalerb), backported from `opal-rails`
+
+*   Set 2.1.1 as RUBY_VERSION
+
+*   Add `opal-build` command utility to easily build libraries to js
+
+*   Add `opal-repl` to gemspec executables,
+    previously was only available by using Opal from source
+
+*   Fix parsing `=>` in hash literals where it would sometimes incorrectly
+    parse as a key name.
+
+## 0.6.0 2014-03-05
 
 *   Fix parsing of escapes in single-strings ('foo\n'). Only ' and \
     characters now get escaped in single quoted strings. Also, more escape
     sequences in double-quoted strings are now supported: `\a`, `\v`, `\f`,
     `\e`, `\s`, octal (`\314`), hex (`\xff`) and unicode (`\u1234`).
 
-*   Sourcemaps revamp. Lexer now tracks column and line info for ever token to
+*   Sourcemaps revamp. Lexer now tracks column and line info for every token to
     produce much more accurate sourcemaps. All method calls are now located on
     the correct source line, and multi-line xstrings are now split to generate
     a map line-to-line for long inline javascript parts.
@@ -46,7 +70,7 @@
 *   Add `time.rb` to stdlib and moved `Time.parse()` and `Time.iso8601()`
     methods there.
 
-*   `!` is now treated as a unary method call on the object. Opal now parsed
+*   `!` is now treated as an unary method call on the object. Opal now parsed
     `!` as a def method name, and implements the method on `BasicObject`,
     `NilClass` and `Boolean`.
 
@@ -67,7 +91,7 @@
     `#to_f`, `#clone`, `#split`.
 
 *   Fix `Array` method compliance: `#first`, `#fetch`, `#insert`, `#delete_at`,
-    `#last, `#splice`, `.try_convert`.
+    `#last`, `#splice`, `.try_convert`.
 
 *   Fix compliance of `Kernel#extend` and ensure it calls `#extended()` hook.
 
@@ -92,7 +116,7 @@
 *   Support any Tilt template for `index_path` in `Opal::Server`. All index
     files are now run through `Tilt` (now supports haml etc).
 
-*   Fix code generation of `op_asgn_1` calls (foo[val] += 10).
+*   Fix code generation of `op_asgn_1` calls (`foo[val] += 10`).
 
 *   Add `base64` to stdlib.
 

data/README.md

@@ -8,7 +8,7 @@ Opal is a ruby to javascript source-to-source compiler. It also has an
 implementation of the ruby corelib.
 
 Opal is [hosted on github](http://github.com/opal/opal), and there
-is a Freenode IRC channel at [#opal](http://webchat.freenode.net/?channels=opal), 
+is a Freenode IRC channel at [#opal](http://webchat.freenode.net/?channels=opal),
 ask questions on [stackoverflow#opalrb](http://stackoverflow.com/questions/ask?tags=opalrb).
 
 
@@ -58,17 +58,36 @@ First, install dependencies:
 
     $ bundle install
 
-Rubyspecs must be cloned as a gitsubmodule:
+RubySpec related repos must be cloned as a gitsubmodules:
 
     $ git submodule update --init
 
-Tests can be run with phantomjs using:
+The test suite can be run using (requires [phantomjs][]):
 
     $ rake
 
+This will command will run all RSpec and MSpec examples in sequence.
+
+### MSpec
+
+[MSpec][] tests can be run with:
+
+    $ rake mspec
+
 Alternatively, you can just load up a rack instance using `rackup spec/config.ru`, and
 visit `http://localhost:9292/` in any web browser.
 
+### Rspec
+
+[RSpec][] tests can be run with
+
+    $ rake rspec
+
+Alternatively [spectator][] can be used in an autotest fashion with this command:
+
+    BASE_DIR_GLOB='lib/opal' SPEC_DIR_GLOB='spec/cli' spectator
+
+
 ## Code Overview
 
 What code is supposed to run where?
@@ -95,6 +114,10 @@ StringScanner, Date, etc.
 
 ### spec
 
+* **rubyspecs** (file) a whitelist of RubySpec files to be ran
+* **corelib** RubySpec examples (submodule)
+* **stdlib** `rubysl-*` examples (submodules)
+* **filters** The list of MSpec/RubySpec examples that are either bugs or unsupported
 * **opal** opal additions/special behaviour in the runtime/corelib
 * **cli** specs for opal lib (parser, lexer, grammar, compiler etc)
 
@@ -145,3 +168,7 @@ THE SOFTWARE.
 
 [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/opal/opal/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
 
+[phantomjs]: http://phantomjs.org
+[spectator]: https://github.com/elia/spectator#readme
+[MSpec]: https://github.com/rubyspec/mspec#readme
+[RSpec]: https://github.com/rspec/rspec#readme

data/Rakefile

@@ -15,20 +15,29 @@ MSpec::Opal::RakeTask.new(:mspec)
 task :default => [:rspec, :mspec]
 
 
-desc 'Build opal.js and opal-parser.js to build/'
+desc <<-DESC
+Build *corelib* and *stdlib* to "build/"
+
+You can restrict the file list with the FILES env var (comma separated)
+and the destination dir with the DIR env var.
+
+Example: rake dist DIR=/tmp/foo FILES='opal.rb,base64.rb'
+DESC
 task :dist do
   require 'opal/util'
 
   Opal::Processor.arity_check_enabled = false
   Opal::Processor.const_missing_enabled = false
-
   env = Opal::Environment.new
 
-  Dir.mkdir 'build' unless File.directory? 'build'
-  libs = Dir['{opal,stdlib}/*.rb'].map { |lib| File.basename(lib, '.rb') }
-  width = libs.map(&:size).max
+  build_dir = ENV['DIR'] || 'build'
+  files     = ENV['FILES'] ? ENV['FILES'].split(',') :
+              Dir['{opal,stdlib}/*.rb'].map { |lib| File.basename(lib, '.rb') }
+
+  Dir.mkdir build_dir unless File.directory? build_dir
+  width = files.map(&:size).max
 
-  libs.each do |lib|
+  files.each do |lib|
     print "* building #{lib}...".ljust(width+'* building ... '.size)
     $stdout.flush
 
@@ -36,9 +45,9 @@ task :dist do
     min = Opal::Util.uglify src
     gzp = Opal::Util.gzip min
 
-    File.open("build/#{lib}.js", 'w+')        { |f| f << src }
-    File.open("build/#{lib}.min.js", 'w+')    { |f| f << min } if min
-    File.open("build/#{lib}.min.js.gz", 'w+') { |f| f << gzp } if gzp
+    File.open("#{build_dir}/#{lib}.js", 'w+')        { |f| f << src }
+    File.open("#{build_dir}/#{lib}.min.js", 'w+')    { |f| f << min } if min
+    File.open("#{build_dir}/#{lib}.min.js.gz", 'w+') { |f| f << gzp } if gzp
 
     print "done. ("
     print "development: #{('%.2f' % (src.size/1000.0)).rjust(6)}KB"

data/bin/opal

@@ -12,7 +12,7 @@ else
   cli = Opal::CLI.new options.options.merge(:filename => ARGV.first)
   begin
     cli.run
-  rescue Opal::CLI::MissingNode => e
+  rescue Opal::CLI::MissingNodeJS => e
     $stderr.puts e.message
     exit 127
   end

data/bin/opal-build

@@ -1,14 +1,77 @@
 #!/usr/bin/env ruby
 
-require 'opal'
+require 'optparse'
 
-if ARGV.first == '--gem'
-  gem_name = ARGV[1]
+module Opal
+  class BuilderOptions < OptionParser
+    def initialize
+      @options = {}
 
-  require 'rubygems'
-  Opal.use_gem gem_name
+      super do |opts|
+        opts.banner = 'Usage: opal-build [options] -- [libname]'
+
+        opts.separator ''
+        opts.separator 'Options:'
+
+        opts.on("-h", "--help", "Show this message") do
+          puts opts
+          exit
+        end
+
+        opts.on('-g', '--gem GEM_NAME', String,
+                'Adds the specified GEM_NAME to Opal\'s load path.',
+                'E.g.: opal-build --require opal-browser browser`',
+                'Will build browser.rb from the Opal gem opal-browser') do |g|
+          options[:gems] ||= []
+          options[:gems] << g
+        end
+
+        opts.on('-s', '--stub STUB', String) do |stub|
+          options[:stubs] ||= []
+          options[:stubs] << stub
+        end
+
+        opts.on('-r', '--require LIBRARY', String,
+                'Require the library before executing your script',
+                'E.g.: opal-build --require opal-browser browser`',
+                'Will build browser.rb from the Opal gem opal-browser') do |library|
+          options[:requires] ||= []
+          options[:requires] << library
+        end
+
+        opts.on('-o', '--output FILE', String,
+                'Write the built lib to a file (defaults to STDOUT)') do |file|
+          options[:output] = file
+        end
+      end
+    end
+
+    attr_reader :options
+  end
+end
+
+option_parser = Opal::BuilderOptions.new
+option_parser.parse!
+
+if ARGV.empty?
+  puts options
+else
+  require 'opal'
+  options = option_parser.options
+
+  if options[:gems]
+    require 'rubygems'
+    options[:gems].each { |gem_name| Opal.use_gem gem_name }
+  end
+
+  if options[:requires]
+    options[:requires].each { |required_lib| require required_lib }
+  end
+
+  lib_name = ARGV.first
+
+  output = options[:output] ? File.open(options[:output], 'w') : $stdout
+  output.puts Opal::Builder.build(lib_name.dup.untaint)
 end
 
-require_file = ARGV[1..-1].last || gem_name.dup.untaint.gsub('-','/')
-puts Opal::Builder.build require_file
 

data/lib/mspec/opal/rake_task.rb

@@ -5,7 +5,7 @@ class Opal::Nodes::CallNode
   add_special :language_version do
     if meth == :language_version and scope.top?
       lang_type = arglist[2][1]
-      target = "rubyspec/language/versions/#{lang_type}_1.9"
+      target = "corelib/language/versions/#{lang_type}_1.9"
 
       if File.exist?(target)
         compiler.requires << target
@@ -25,7 +25,7 @@ require 'webrick'
 module MSpec
   module Opal
     DEFAULT_PATTERN = 'spec/opal/{parser,core,compiler,stdlib}/**/*_spec.rb'
-    DEFAULT_BASEDIR = 'spec/opal'
+    DEFAULT_BASEDIR = 'spec'
 
     require 'rake'
     require 'rake/tasklib'
@@ -111,7 +111,6 @@ module MSpec
         @pattern = pattern || DEFAULT_PATTERN
         @basedir = basedir = File.expand_path(basedir || DEFAULT_BASEDIR)
         append_path basedir
-        append_path "#{basedir}/rubyspec"
         use_gem 'mspec'
 
         stubs.each do |asset|
@@ -158,9 +157,8 @@ module MSpec
       end
 
       def rubyspec_paths
-        rubyspec_dir = "#{basedir}/rubyspec"
         rubyspec_white_list.map do |path|
-          dirname = File.join rubyspec_dir, path
+          dirname = File.join([basedir, path])
           if File.directory? dirname
             rubyspec_paths_in_dir(dirname, path)
           else
@@ -178,9 +176,9 @@ module MSpec
       end
 
       def rubyspec_white_list
-        File.read("#{basedir}/rubyspecs").split("\n").reject do |line|
-          line.empty? || line.start_with?('#')
-        end
+        File.read("#{basedir}/rubyspecs").split("\n").map do |line|
+          line.sub(/#.*/, '').strip
+        end.reject(&:empty?)
       end
 
       def files_to_run(pattern=nil)
@@ -251,4 +249,3 @@ module MSpec
 
   end
 end
-

data/lib/opal/cli.rb

@@ -76,7 +76,7 @@ module Opal
       begin
         stdin, stdout, stderr = Open3.popen3('node')
       rescue Errno::ENOENT
-        raise MissingNode, 'Please install Node.js to be able to run Opal scripts.'
+        raise MissingNodeJS, 'Please install Node.js to be able to run Opal scripts.'
       end
 
       stdin.write code
@@ -88,7 +88,7 @@ module Opal
       end
     end
 
-    class MissingNode < StandardError
+    class MissingNodeJS < StandardError
     end
 
     def start_server

data/lib/opal/nodes/call.rb

@@ -98,7 +98,7 @@ module Opal
         if SPECIALS.include? meth
           if result = __send__("handle_#{meth}")
             push result
-          return true
+            return true
           end
         elsif RuntimeHelpers.compatible?(recvr, meth, arglist)
           push(RuntimeHelpers.new(@sexp, @level, @compiler).compile)

data/lib/opal/nodes/def.rb

@@ -114,7 +114,7 @@ module Opal
           unshift "def#{jsid} = "
         end
 
-        wrap '(', ', nil)' if expr?
+        wrap '(', ", nil) && '#{mid}'" if expr?
       end
 
       # Returns code used in debug mode to check arity of method call

data/lib/opal/nodes/rescue.rb

@@ -91,16 +91,17 @@ module Opal
 
       def compile
         push "if ("
-
-        rescue_classes.each_with_index do |cls, idx|
-          push ', ' unless idx == 0
-          call = s(:call, cls, :===, s(:arglist, s(:js_tmp, '$err')))
-          push expr(call)
+        if rescue_exprs.empty?
+          # if no expressions are given, then catch all errors
+          push "true"
+        else
+          push "$opal.$rescue($err, ["
+          rescue_exprs.each_with_index do |rexpr, idx|
+            push ', ' unless idx == 0
+            push expr(rexpr)
+          end
+          push "])"
         end
-
-        # if no classes are given, then catch all errors
-        push "true" if rescue_classes.empty?
-
         push ") {"
 
         if variable = rescue_variable
@@ -112,18 +113,18 @@ module Opal
         line "}"
       end
 
-      def rescue_variable
-        variable = args.last
+      def rescue_variable?(variable)
+        Sexp === variable and [:lasgn, :iasgn].include?(variable.type)
+      end
 
-        if Sexp === variable and [:lasgn, :iasgn].include?(variable.type)
-          variable.dup
-        end
+      def rescue_variable
+        rescue_variable?(args.last) ? args.last.dup : nil
       end
 
-      def rescue_classes
-        classes = args.children
-        classes.pop if classes.last and classes.last.type != :const
-        classes
+      def rescue_exprs
+        exprs = args.dup
+        exprs.pop if rescue_variable?(exprs.last)
+        exprs.children
       end
 
       def rescue_body