RubyGems - opal - Versions diffs - 0.3.15 → 0.3.16 - Mend

@@ -6,4 +6,12 @@ describe "Regexps with interpolation" do
     str = "foo|bar"
     /#{str}/.should == /foo|bar/
   end
+  it "allows interpolation to interact with other Regexp constructs" do
+    str = "foo)|(bar"
+    /(#{str})/.should == /(foo)|(bar)/
+    str = "a"
+    /[#{str}-z]/.should == /[a-z]/
+  end
 end

data/{runtime/spec → core_spec}/language/regexp_spec.rb RENAMED Viewed

File without changes

data/{runtime/spec → core_spec}/language/send_spec.rb RENAMED Viewed

File without changes

data/{runtime/spec → core_spec}/language/string_spec.rb RENAMED Viewed

File without changes

data/{runtime/spec → core_spec}/language/super_spec.rb RENAMED Viewed

File without changes

data/{runtime/spec → core_spec}/language/symbol_spec.rb RENAMED Viewed

File without changes

data/{runtime/spec → core_spec}/language/undef_spec.rb RENAMED Viewed

File without changes

data/{runtime/spec → core_spec}/language/unless_spec.rb RENAMED Viewed

File without changes

data/{runtime/spec → core_spec}/language/until_spec.rb RENAMED Viewed

File without changes

data/core_spec/language/variables_spec.rb ADDED Viewed

@@ -0,0 +1,112 @@
+require File.expand_path('../../spec_helper', __FILE__)
+describe "Basic assignment" do
+  it "allows the rhs to be assigned to the lhs" do
+    a = nil
+    a.should == nil
+  end
+  it "assigns nil to lhs when rhs is an empty expression" do
+    a = ()
+    a.should be_nil
+  end
+  it "assigns [] to lhs when rhs is an empty splat expression" do
+    a = *()
+    a.should == []
+  end
+  it "allows the assignment of the rhs to the lhs using the rhs splat operator" do
+    a = *nil;       a.should == []
+    a = *1;         a.should == [1]
+    a = *[];        a.should == []
+    a = *[1];       a.should == [1]
+    a = *[nil];     a.should == [nil]
+    a = *[[]];      a.should == [[]]
+    a = *[1,2];     a.should == [1,2]
+  end
+end
+describe "Assigning multiple values" do
+  it "allows parallel assignment" do
+    a, b = 1, 2
+    a.should == 1
+    b.should == 2
+    a, = 1,2
+    a.should == 1
+  end
+  it "allows safe parallel swapping" do
+    a, b = 1, 2
+    a, b = b, a
+    a.should == 2
+    b.should == 1
+  end
+  it "bundles remaining values to an array when using the splat operator" do
+    a, *b = 1, 2, 3
+    a.should == 1
+    b.should == [2, 3]
+    *a = 1, 2, 3
+    a.should == [1, 2, 3]
+    *a = 4
+    a.should == [4]
+    *a = nil
+    a.should == [nil]
+    a, = *[1]
+    a.should == 1
+  end
+end
+describe "Single assignment" do
+  it "Assignment does not modify the lhs, it reassigns its reference" do
+    a = 'Foobar'
+    b = a
+    b = 'Bazquux'
+    a.should == 'Foobar'
+    b.should == 'Bazquux'
+  end
+  it "Assignment does not copy the object being assigned, just creates a new reference to it" do
+    a = []
+    b = a
+    b << 1
+    a.should == [1]
+  end
+  it "If rhs has multiple arguments, lhs becomes an Array of them" do
+    a = [1, 2, 3]
+    a.should == [1, 2, 3]
+    a = 1, (), 3
+    a.should == [1, nil, 3]
+  end
+end
+describe "Multiple assignment without grouping or splatting" do
+  it "An equal number of arguments on lhs and rhs assigns positionally" do
+    a, b, c, d = 1, 2, 3, 4
+    a.should == 1
+    b.should == 2
+    c.should == 3
+    d.should == 4
+  end
+  it "If rhs has too few arguments, the missing ones on lhs are assigned nil" do
+    a, b, c = 1, 2
+    a.should == 1
+    b.should == 2
+    c.should == nil
+  end
+  it "If rhs has too many arguments, the extra ones are silently not assigned anywhere" do
+    a, b = 1, 2, 3
+    a.should == 1
+    b.should == 2
+  end
+end

data/{runtime/spec → core_spec}/language/versions/hash_1.9.rb RENAMED Viewed

File without changes

data/{runtime/spec → core_spec}/language/while_spec.rb RENAMED Viewed

File without changes

data/{runtime/spec → core_spec}/opal/opal/defined_spec.rb RENAMED Viewed

File without changes

data/{runtime/spec → core_spec}/opal/opal/function_spec.rb RENAMED Viewed

File without changes

data/{runtime/spec → core_spec}/opal/opal/native_spec.rb RENAMED Viewed

File without changes

data/{runtime/spec → core_spec}/opal/opal/null_spec.rb RENAMED Viewed

File without changes

data/{runtime/spec → core_spec}/opal/opal/number_spec.rb RENAMED Viewed

File without changes

data/{runtime/spec → core_spec}/opal/opal/object_spec.rb RENAMED Viewed

File without changes

data/{runtime/spec → core_spec}/opal/opal/string_spec.rb RENAMED Viewed

File without changes

data/{runtime/spec → core_spec}/opal/opal/typeof_spec.rb RENAMED Viewed

File without changes

data/{runtime/spec → core_spec}/opal/opal/undefined_spec.rb RENAMED Viewed

File without changes

data/{runtime/spec → core_spec}/opal/true/case_compare_spec.rb RENAMED Viewed

File without changes

data/{runtime/spec → core_spec}/opal/true/class_spec.rb RENAMED Viewed

File without changes

data/{docs/spec_runner.html → core_spec/release_runner.html} RENAMED Viewed

@@ -6,11 +6,12 @@
   <title>Opal Spec Runner</title>
 </head>
 <body>
-  <script src="../opal.debug.js"></script>
+  <script src="../opal.js"></script>
   <script src="../opal-spec.js"></script>
-  <script src="../opal.test.js"></script>
+  <script src="../core_spec.js"></script>
   <script>
-    opal.main('/runtime/spec/spec_helper.rb');
+    opal.main('/core_spec/spec_helper.rb');
   </script>
 </body>
 </html>

data/core_spec/runner.html ADDED Viewed

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8">
+  <title>Opal Spec Runner</title>
+</head>
+<body>
+  <script src="../opal.debug.js"></script>
+  <script src="../opal-spec.debug.js"></script>
+  <script src="../core_spec.debug.js"></script>
+  <script>
+    opal.main('/core_spec/spec_helper.rb');
+  </script>
+</body>
+</html>

data/core_spec/spec_helper.rb ADDED Viewed

@@ -0,0 +1,23 @@
+# make sure these tests are indeed running inside opal, not any other
+# ruby engine.
+unless RUBY_ENGINE =~ /opal/
+  abort <<-EOS
+Opal Tests
+==========
+These tests MUST be run inside opal, not `#{RUBY_ENGINE}' engine
+To run Array#first tests, for example:
+    opal core_spec/core/array/first_spec.rb
+EOS
+end
+require 'opal/spec/autorun'
+# Spec runner - if in browser, and spec_helper.rb is the main file then
+# just run the spec files immediately.
+if $0 == __FILE__
+  Dir['core_spec/**/*.rb'].each { |spec| require spec }
+end

data/lib/opal.rb CHANGED Viewed

@@ -5,15 +5,98 @@ require 'opal/context'
 require 'opal/version'
 module Opal
+  # Base Opal directory - used by build tools
+  # @return [String]
   def self.opal_dir
     File.expand_path '../..', __FILE__
   end
+  # Returns a string of javascript code for the opal runtime in normal
+  # mode.
+  # @return [String]
   def self.runtime_code
-    File.read File.join(opal_dir, 'opal.js')
+    path = File.join opal_dir, 'opal.js'
+    return File.read path if File.exists? path
+    build_runtime false
   end
+  # Debug mode code for opal runtime
+  # @return [String]
   def self.runtime_debug_code
-    File.read File.join(opal_dir, 'opal.debug.js')
+    path = File.join opal_dir, 'opal.debug.js'
+    return File.read path if File.exists? path
+    build_runtime true
+  end
+  # Builds the runtime in normal mode by default.
+  #
+  # @param [Boolean] debug whether to build in debug mode (or not)
+  # @return [String] string of javascript code
+  def self.build_runtime(debug = false)
+    code = []
+    code << HEADER
+    code << '(function(undefined) {'
+    code << kernel_source(debug)
+    code << method_names
+    code << corelib_source(debug)
+    code << '}).call(this);'
+    code.join "\n"
+  end
+  # Returns the source ruby code for the corelib as a string. Corelib is
+  # always parsed as one large file.
+  # @return [String]
+  def self.corelib_source(debug = false)
+    order  = File.read(File.join(opal_dir, 'core/load_order')).strip.split
+    parser = Opal::Parser.new :debug => debug
+    if debug
+      order << 'debug'
+      order.map do |c|
+        parsed = parser.parse File.read(File.join(opal_dir, "core/#{c}.rb")), c
+        "opal.FILE = '/core/#{c}.rb';\n#{parsed}"
+      end.join("\n")
+    else
+      source = order.map { |c| File.read File.join(opal_dir, "core/#{c}.rb") }.join("\n")
+      parser.parse source, '(corelib)'
+    end
+  end
+  # Returns javascript source for the kernel/runtime of opal.
+  # @return [String]
+  def self.kernel_source(debug = false)
+    order = %w[runtime]
+    order << 'debug' if debug
+    order.map { |c| File.read File.join(opal_dir, "core/#{c}.js") }.join("\n")
   end
+  # Get all special method names from the parser and generate js code that
+  # is passed into runtime. This saves having special names duplicated in
+  # runtime AND parser.
+  # @return [String]
+  def self.method_names
+    methods = Opal::Parser::METHOD_NAMES.map { |f, t| "'#{f}': '$#{t}$'" }
+    %Q{
+      var method_names = {#{ methods.join ', ' }};
+      var reverse_method_names = {};
+      for (var id in method_names) {
+        reverse_method_names[method_names[id]] = id;
+      }
+    }
+  end
+  # Header used in generated runtime code
+  HEADER = <<-HEADER
+/*!
+ * opal v#{VERSION}
+ * http://opalrb.org
+ *
+ * Copyright 2012, Adam Beynon
+ * Released under the MIT license
+ */
+  HEADER
 end

data/lib/opal/builder.rb CHANGED Viewed

@@ -1,74 +1,157 @@
+#### Opal Builder
+#
+# Builder class is used to build one or more ruby files into a combined
+# output script. The simplest form would be building a single ruby file
+# back into the current working dir:
+#
+#     Opal::Builder.new(:files => 'foo.rb')
+#
+# Which would create two files, `foo.js` and `foo.debug.js` to be used
+# in release and debug environments respectively.
+#
+# In real world scenarios, Builder will be used to build entire
+# directories. This is achieved just as easily:
+#
+#     Opal::Builder.new(:files => 'my_libs')
+#
+# Where `my_libs` is a directory. This will create a `my_libs.js` and
+# `my_libs.debug.js` file in the current directory.
+#
+# As a special case, when building the `lib` directory, the basename of
+# the current working directory (assumed to be the app/gem name) will be
+# used to construct the output name:
+#
+#     # in dir ~/dev/vienna
+#     Opal::Builder.new(:files => 'lib')
+#
+# This creates the specially named `vienna.js` and `vienna.debug.js`.
+#
+# As a second special case, building a `spec` or `test` directory will
+# append `test` to the basename of the current directory to name the
+# output files.
+#
+# A custom output destination can be specified using the `:out` option
+# which should point to the output file for the release build mode. The
+# debug output will prefix the extname with `.debug`:
+#
+#     Opal::Builder.new(:files => 'lib', :out => 'vienna-0.1.0.js')
+#
+# This will give you `vienna-0.1.0.js` and `vienna-0.1.0.debug.js`.
+#
+# If no input files are specified, then `Builder` will automatically
+# build the `lib/` directory.
+#
+#     Opal::Builder.new.build
+#
+# FileUtils are useful for making sure output directory exists.
 require 'fileutils'
 module Opal
+  # `Builder.new` takes an optional hash of options to control which
+  # files to build and to where. The `options` hash takes these options:
+  #
+  # * `:files`: specifies an array (or single string) of files/directories
+  #   to recursively build. _Defaults to `['lib']`_.
+  #
+  # * `:out`: the file to write the result to. When building a debug build
+  #   as well, 'debug' will be injected before the extname. Defaults to the
+  #   first file name.
   class Builder
-    def initialize(sources, options = {})
-      @sources = Array(sources)
+    def initialize(options = {})
+      @sources = Array(options[:files])
       @options = options
-      @options[:out] = '.' if @options[:out] == '' or !@options[:out]
     end
     def build
-      @parser     = Parser.new @options
-      @factories  = {}
+      release_out = nil
+      debug_out   = nil
-      @sources.each { |s| build_source '.', s }
+      raise "No files given" if @sources.empty?
-      if @options[:join]
-        File.open(@options[:join], 'w+') do |o|
-          @factories.each { |path, factory| o.write factory }
+      if out = @options[:out]
+        release_out = out
+        debug_out = out.chomp(File.extname(out)) + '.debug.js'
+      else
+        if @sources == ['lib']
+          out = File.basename(Dir.getwd)
+        elsif @sources.include? 'spec'
+          out = File.basename(Dir.getwd) + '.test'
+        elsif @sources.size == 1
+          out = File.basename(@sources[0], '.*')
+        else
+          out = File.basename(@sources[0], '.*')
         end
+        release_out = out + '.js'
+        debug_out   = out + '.debug.js'
       end
-    end
-    def build_source(base, source)
-      path = base == '.' ? source : File.join(base, source)
+      puts "[#{File.basename(Dir.getwd)}] sources: [#{@sources.join ', '}] (#{release_out}, #{debug_out})"
-      if File.directory? path
-        Dir.entries(path).each do |e|
-          next if e == '.' or e == '..'
-          build_source path, e
-        end
+      FileUtils.mkdir_p File.dirname(release_out)
-      elsif File.extname(path) == '.rb'
-        build_file base, source
-      end
+      files = files_for @sources
+      build_to release_out, files, false
+      build_to debug_out, files, true
     end
-    def build_file(base, source)
-      path  = base == '.' ? source : File.join(base, source)
-      code  = @parser.parse File.read(path), path
+    # Returns an array of all ruby source files to build from the given
+    # sources array. The passed sources can be files or directories, where
+    # directories will be globbed for all ruby sources.
+    # @param [Array<String>] sources array of files/dirs to build
+    # @return [Array<String>]
+    def files_for(sources)
+      files = []
-      if /^lib/ =~ path
-        code = "opal.lib('#{path[4..-4]}', function() {\n#{code}\n});\n"
-      else
-        code = "opal.file('/#{path}', function() {\n#{code}\n});\n"
+      sources.each do |s|
+        if File.directory? s
+          files.push *Dir[File.join s, '**/*.rb']
+        elsif File.extname(s) == '.rb'
+          files << s
+        end
       end
-      if @options[:join]
-        @factories[path] = code
-      elsif @options[:out]
-        out = output_path base, source
+      files
+    end
+    def build_to(out, files, debug)
+      @parser    = Parser.new(:debug => debug)
+      File.open(out, 'w+') do |o|
+        # In debug mode, make sure opal runtime is also debug mode
+        if debug
+          o.puts "if (!opal.debug) {"
+          o.puts "  throw new Error('This file requires opal.debug.js');"
+          o.puts "}"
+        end
-        FileUtils.mkdir_p File.dirname(out)
-        File.open(out, 'w+') { |o| o.write code }
+        files.each { |path| o.write build_file(path) }
       end
     end
-    def output_path(base, source)
-      fname = source.chomp('.rb') + '.js'
-      if @options[:out] == '.'
-        base == '.' ? fname : File.join(base, fname)
+    # Build an individual file at the given path, and return a wapped result
+    # used to register the factory with the opal runtime. The parser used
+    # will be the one set in `#build_to`.
+    #
+    # @example
+    #
+    #     builder.build_file 'lib/foo.rb'
+    #     # => "opal.lib('foo', function() { ... });
+    #
+    #     builder.build_file 'spec/foo_spec.rb'
+    #     # => "opal.file('/spec/foo_spec.rb', function() { ... });
+    #
+    # @param [String] path relative path to the file to be built
+    # @return [String] factory wrapped compiled code
+    def build_file(path)
+      code  = @parser.parse File.read(path), path
+      if /^lib/ =~ path
+        "opal.lib('#{path[4..-4]}', function() {\n#{code}\n});\n"
       else
-        if base == '.'
-          File.join @options[:out], fname
-        else
-          parts = base.split '/'
-          parts[0] = @options[:out]
-          parts << fname
-          File.join *parts
-        end
+        "opal.file('/#{path}', function() {\n#{code}\n});\n"
       end
     end
   end