opal 0.3.40 → 0.3.41

data/.gitignore

@@ -3,5 +3,3 @@
 .yardoc
 .bundle
 Gemfile.lock
-build
-gh-pages

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Edge
+
+*   Depreceate Opal::Environment. The Opal::Server class provides a better
+    method of using the opal load paths. Opal.paths still stores a list of
+    load paths for generic sprockets based apps to use.
+
 ## 0.3.40 2013-02-23
 
 *   Add Opal::Server as an easy to configure rack server for testing and

data/Gemfile

@@ -3,4 +3,4 @@ gemspec
 
 gem 'rake'
 gem 'racc'
-gem 'opal-spec', '~> 0.2.12'
+gem 'opal-spec', '~> 0.2.13'

data/README.md

@@ -33,7 +33,7 @@ The `lib` directory holds the opal parser/compiler used to compile ruby
 into javascript. It is also built ready for the browser into `opal-parser.js`
 to allow compilation in any javascript environment.
 
-### lib/assets/javascripts
+### opal
 
 This directory holds the opal runtime and corelib implemented in ruby and
 javascript. These are built using `rake`, as above.

data/Rakefile

@@ -1,23 +1,21 @@
 require 'bundler'
 Bundler.require
 
+Opal::Processor.arity_check_enabled = true
+
 require 'opal/spec/rake_task'
 Opal::Spec::RakeTask.new(:default)
 
-desc "Run tests with method_missing turned off"
-task :test_no_method_missing do
-  # some specs will fail (namely method_missing based specs)
-  Opal::Processor.method_missing_enabled = false
-  Rake::Task[:default].invoke 
-end
-
 desc "Check file sizes for opal.js runtime"
 task :sizes do
-  o = Opal::Environment.new['opal'].to_s
-  m = uglify o
-  g = gzip m
+  env = Sprockets::Environment.new
+  Opal.paths.each { |p| env.append_path p }
+
+  src = env['opal'].to_s
+  min = uglify src
+  gzp = gzip min
 
-  puts "development: #{o.size}, minified: #{m.size}, gzipped: #{g.size}"
+  puts "development: #{src.size}, minified: #{min.size}, gzipped: #{gzp.size}"
 end
 
 desc "Rebuild grammar.rb for opal parser"

data/config.ru

@@ -1,13 +1,8 @@
 require 'bundler'
 Bundler.require
 
-require 'opal/spec/server'
-
-# method_missing can be turned off if required (on by default)
-# Opal::Processor.method_missing_enabled = false
-
-# Run in non-debug mode (faster, all files concatenated into 1 file)
-run Opal::Spec::Server.new(false)
-
-# Run in debug mode - all files loaded seperately, but slower
-# run Opal::Spec::Server.new
+run Opal::Server.new { |s|
+  s.main = 'opal/spec/sprockets_runner'
+  s.append_path 'spec'
+  s.debug = false
+}

data/lib/opal.rb

@@ -1,11 +1,16 @@
 require 'opal/parser'
 require 'opal/processor'
-require 'opal/environment'
 require 'opal/server'
 require 'opal/version'
 
 # Opal is a ruby to javascript compiler, with a runtime for running
 # in any javascript environment.
+#
+# Opal::Parser is the core class used for parsing ruby and generating
+# javascript from its syntax tree. Opal::Processor is the main system used
+# for compiling larger programs. Opal::Processor uses sprockets to maintain
+# an environment of load paths, which can be used to require other ruby or
+# javascript sources.
 module Opal
 
   # Parse given string of ruby into javascript
@@ -20,10 +25,20 @@ module Opal
     Parser.new.parse str, :file => file
   end
 
+  # Returns the path to the opal corelib. Used by Opal::Processor to load
+  # opal runtime and core lib.
+  #
+  # @return [String]
   def self.core_dir
-    File.join File.dirname(__FILE__), 'assets', 'javascripts'
+    File.expand_path('../../opal', __FILE__)
   end
 
+  # Add a file path to opals load path. Any gem containing ruby code that Opal
+  # has access to should add a load path through this method. Load paths added
+  # here should only be paths which contain code targeted at being compiled by
+  # Opal.
+  #
+  # @param [String] path file path to add
   def self.append_path(path)
     paths << path
   end

data/lib/opal/lexer.rb

@@ -42,6 +42,12 @@ module Opal
       raise "parse error on value #{val.inspect} :#{@file}:#{@line}"
     end
 
+    # LexerScope is used during lexing to keep track of local variables
+    # created inside a scope. A lexer scope can be asked if it has a local
+    # variable defined, and it can also check its parent scope if applicable.
+    #
+    # A LexerScope is created automatically as a new scope is entered during
+    # the lexing stage.
     class LexerScope
       attr_reader :locals
       attr_accessor :parent

data/lib/opal/parser.rb

@@ -585,7 +585,6 @@ module Opal
       str = sexp.shift
       if str == @file
         @uses_file = true
-        # "'FILE'"
         @file.inspect
       else
         str.inspect
@@ -621,8 +620,6 @@ module Opal
       with_temp do |tmp|
         "(#{tmp} = #{process(sexp.shift, :expr)}, (#{tmp} === nil || #{tmp} === false))"
       end
-      # code = "!#{process sexp.shift, :expr}"
-      # code
     end
 
     def process_block_pass(exp, level)
@@ -1133,7 +1130,6 @@ module Opal
           end
 
           code += stmt_code
-          # code += "\n#@indent" + process(stmts, :stmt)
 
           if @scope.uses_block? and !block_name
             params = params.empty? ? yielder : "#{params}, #{yielder}"
@@ -1662,12 +1658,8 @@ module Opal
       t = nil
 
       with_temp do |tmp|
-        # if t = js_truthy_optimize(lhs)
-          # "((%s = %s) ? %s : %s)" % [tmp, t, tmp, process(rhs, :expr)]
-        # else
-          "((%s = %s), %s !== false && %s !== nil ? %s : %s)" %
-            [tmp, process(lhs, :expr), tmp, tmp, tmp, process(rhs, :expr)]
-        # end
+        "((%s = %s), %s !== false && %s !== nil ? %s : %s)" %
+          [tmp, process(lhs, :expr), tmp, tmp, tmp, process(rhs, :expr)]
       end
     end
 
@@ -1874,9 +1866,7 @@ module Opal
         identity = @scope.identify!
         cls_name = @scope.parent.name
         jsid     = mid_to_jsid @scope.mid.to_s
-        # base     = @scope.defs ? '' : ".prototype"
 
-        # "%s._super%s%s.apply(this, %s)" % [cls_name, base, jsid, args]
         if @scope.defs
           "%s._super%s.apply(this, %s)" % [cls_name, jsid, args]
         else
@@ -1972,7 +1962,6 @@ module Opal
       err = types.map { |t|
         call = s(:call, t, :===, s(:arglist, s(:js_tmp, "$err")))
         a = process call, :expr
-        #puts a
         a
       }.join ', '
       err = "true" if err.empty?
@@ -1984,7 +1973,6 @@ module Opal
       end
 
       "if (#{err}) {#{@space}#{val}#{body}}"
-      # raise exp.inspect
     end
 
     # FIXME: Hack.. grammar should remove top level begin.

data/lib/opal/server.rb

@@ -7,7 +7,9 @@ module Opal
     attr_accessor :debug, :index_path, :main, :public_dir, :sprockets
 
     def initialize(debug = true)
-      @sprockets = Opal::Environment.new
+      @sprockets = Sprockets::Environment.new
+      Opal.paths.each { |p| @sprockets.append_path p }
+
       @public_dir = '.'
       @debug = debug
 

data/lib/opal/version.rb

@@ -1,3 +1,3 @@
 module Opal
-  VERSION = '0.3.40'
+  VERSION = '0.3.41'
 end

data/opal.gemspec

@@ -11,7 +11,6 @@ Gem::Specification.new do |s|
   s.description  = 'Ruby runtime and core library for javascript.'
 
   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'] 
 

data/opal/opal-parser.js.erb

@@ -0,0 +1,7 @@
+<% require_asset 'opal/racc' %>
+<% require_asset 'opal/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/scope opal).each do |f| %>
+  <%= Opal.parse File.read(File.join Opal.core_dir, '..', 'lib', "#{f}.rb") %>
+<% end %>

data/{lib/assets/javascripts → opal}/opal/runtime.js

@@ -177,6 +177,9 @@
     constructor.$to_s = module_to_s;
     constructor.toString = module_to_s;
 
+    constructor['$[]'] = undefined;
+    constructor['$call'] = undefined;
+
     var smethods;
 
     smethods = superklass._smethods.slice();

data/spec/core/kernel/block_given.rb

@@ -27,4 +27,4 @@ describe "Kernel#block_given?" do
     BlockGivenSpecs.is_block_given(&nil).should == false
     BlockGivenSpecs.is_block_given(&:x).should == true
   end
-end
+end if false

data/spec/core_ext/class/proc_methods_spec.rb

@@ -0,0 +1,23 @@
+require "spec_helper"
+
+module ClassProcMethodsSpec
+  class A; end
+
+  class B
+    def self.[](a); :foo; end
+  end
+
+  class C < B; end
+end
+
+describe "Class: proc methods" do
+  it "classes should not inherit proc methods" do
+    ClassProcMethodsSpec::A.respond_to?(:[]).should be_false
+    ClassProcMethodsSpec::A.respond_to?(:call).should be_false
+  end
+
+  it "subclasses inherit proc methods if defined on suprt class" do
+    ClassProcMethodsSpec::B[nil].should eq(:foo)
+    ClassProcMethodsSpec::C[nil].should eq(:foo)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opal
 version: !ruby/object:Gem::Version
-  version: 0.3.40
+  version: 0.3.41
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-23 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -29,8 +29,7 @@ dependencies:
         version: '0'
 description: Ruby runtime and core library for javascript.
 email: adam.beynon@gmail.com
-executables:
-- opal
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -42,37 +41,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/opal
 - config.ru
-- lib/assets/javascripts/opal-parser.js.erb
-- lib/assets/javascripts/opal.rb
-- lib/assets/javascripts/opal/array.rb
-- lib/assets/javascripts/opal/basic_object.rb
-- lib/assets/javascripts/opal/boolean.rb
-- lib/assets/javascripts/opal/class.rb
-- lib/assets/javascripts/opal/comparable.rb
-- lib/assets/javascripts/opal/date.rb
-- lib/assets/javascripts/opal/enumerable.rb
-- lib/assets/javascripts/opal/enumerator.rb
-- lib/assets/javascripts/opal/error.rb
-- lib/assets/javascripts/opal/hash.rb
-- lib/assets/javascripts/opal/json.rb
-- lib/assets/javascripts/opal/kernel.rb
-- lib/assets/javascripts/opal/native.rb
-- lib/assets/javascripts/opal/nil_class.rb
-- lib/assets/javascripts/opal/numeric.rb
-- lib/assets/javascripts/opal/parser.js
-- lib/assets/javascripts/opal/proc.rb
-- lib/assets/javascripts/opal/racc.rb
-- lib/assets/javascripts/opal/range.rb
-- lib/assets/javascripts/opal/regexp.rb
-- lib/assets/javascripts/opal/runtime.js
-- lib/assets/javascripts/opal/string.rb
-- lib/assets/javascripts/opal/strscan.rb
-- lib/assets/javascripts/opal/template.rb
-- lib/assets/javascripts/opal/time.rb
 - lib/opal.rb
-- lib/opal/environment.rb
 - lib/opal/grammar.rb
 - lib/opal/grammar.y
 - lib/opal/lexer.rb
@@ -82,6 +52,32 @@ files:
 - lib/opal/server.rb
 - lib/opal/version.rb
 - opal.gemspec
+- opal/opal-parser.js.erb
+- opal/opal.rb
+- opal/opal/array.rb
+- opal/opal/basic_object.rb
+- opal/opal/boolean.rb
+- opal/opal/class.rb
+- opal/opal/comparable.rb
+- opal/opal/date.rb
+- opal/opal/enumerable.rb
+- opal/opal/enumerator.rb
+- opal/opal/error.rb
+- opal/opal/hash.rb
+- opal/opal/json.rb
+- opal/opal/kernel.rb
+- opal/opal/native.rb
+- opal/opal/nil_class.rb
+- opal/opal/numeric.rb
+- opal/opal/proc.rb
+- opal/opal/racc.rb
+- opal/opal/range.rb
+- opal/opal/regexp.rb
+- opal/opal/runtime.js
+- opal/opal/string.rb
+- opal/opal/strscan.rb
+- opal/opal/template.rb
+- opal/opal/time.rb
 - spec/core/array/allocate_spec.rb
 - spec/core/array/append_spec.rb
 - spec/core/array/assoc_spec.rb
@@ -381,6 +377,7 @@ files:
 - spec/core_ext/array/to_json_spec.rb
 - spec/core_ext/basic_object/send_spec.rb
 - spec/core_ext/class/_inherited_spec.rb
+- spec/core_ext/class/proc_methods_spec.rb
 - spec/core_ext/class/singleton_methods_spec.rb
 - spec/core_ext/constants_spec.rb
 - spec/core_ext/method_missing_spec.rb
@@ -793,6 +790,7 @@ test_files:
 - spec/core_ext/array/to_json_spec.rb
 - spec/core_ext/basic_object/send_spec.rb
 - spec/core_ext/class/_inherited_spec.rb
+- spec/core_ext/class/proc_methods_spec.rb
 - spec/core_ext/class/singleton_methods_spec.rb
 - spec/core_ext/constants_spec.rb
 - spec/core_ext/method_missing_spec.rb

data/bin/opal

@@ -1,24 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'optparse'
-require 'opal'
-
-options = {}
-parser = OptionParser.new do |opts|
-  opts.banner = "Usage: opal [options] file.rb"
-
-  opts.on("-v", "--version", "Opal Version") do |v|
-    puts Opal::VERSION
-    exit
-  end
-end
-
-parser.parse!
-
-if ARGV.empty?
-  puts parser.banner
-else
-  src = ARGV.first
-  src = File.read src if File.exist? src
-  puts Opal.parse(src)
-end

data/lib/assets/javascripts/opal-parser.js.erb

@@ -1,8 +0,0 @@
-<% require_asset 'opal/racc' %>
-<% require_asset 'opal/strscan' %>
-<% require_asset 'opal/parser' %>
-
-// We need (some) of the libs from our real ruby parser (not in sprockets load path)
-<% ['/grammar', '/lexer', '/parser', '/scope', ''].each do |f| %>
-  <%= Opal.parse File.read(File.join Opal.core_dir, '..', '..', "opal#{f}.rb") %>
-<% end %>

data/lib/assets/javascripts/opal/parser.js

@@ -1,57 +0,0 @@
-(function() {
-  // quick exit if not insde browser
-  if (typeof(window) === 'undefined' || typeof(document) === 'undefined') {
-    return;
-  }
-
-  function findRubyScripts() {
-    var all = document.getElementsByTagName('script');
-    for (var i = 0, script; i < all.length; i++) {
-      script = all[i];
-      if (script.type === 'text/ruby') {
-        if (script.src) {
-          request(script.src, function(result) {
-            runRuby(result);
-          });
-        }
-        else {
-          runRuby(script.innerHTML);
-        }
-      }
-      else if (script.type === 'text/erb') {
-        runERB(script.innerHTML);
-      }
-    }
-  }
-
-  function runRuby(source) {
-    var js = Opal.Opal.Parser.$new().$parse(source);
-    eval('(' + js + ')()');
-  }
-
-  function request(url, callback) {
-    var xhr = new (window.ActiveXObject || XMLHttpRequest)('Microsoft.XMLHTTP');
-    xhr.open('GET', url, true);
-    if ('overrideMimeType' in xhr) {
-      xhr.overrideMimeType('text/plain');
-    }
-    xhr.onreadystatechange = function() {
-      if (xhr.readyState === 4) {
-        if (xhr.status === 0 || xhr.status === 200) {
-          callback(xhr.responseText);
-        }
-        else {
-          throw new Error('Could not load ruby at: ' + url);
-        }
-      }
-    };
-    xhr.send(null);
-  }
-
-  if (window.addEventListener) {
-    window.addEventListener('DOMContentLoaded', findRubyScripts, false);
-  }
-  else {
-    window.attachEvent('onload', findRubyScripts);
-  }
-})();

data/lib/opal/environment.rb

@@ -1,12 +0,0 @@
-require 'opal'
-require 'sprockets'
-
-module Opal
-  class Environment < Sprockets::Environment
-    def initialize(*)
-      super
-      
-      Opal.paths.each { |path| append_path path }
-    end
-  end
-end