opal 0.3.20 → 0.3.21

data/lib/opal/rake_task.rb

@@ -0,0 +1,66 @@
+require 'opal'
+require 'opal/builder'
+require 'fileutils'
+
+module Opal
+  class RakeTask
+    include Rake::DSL if defined? Rake::DSL
+
+    attr_accessor :name, :build_dir, :specs_dir, :files, :dependencies
+
+    def initialize(namespace = nil)
+      @project_dir = Dir.getwd
+
+      @name         = File.basename(@project_dir)
+      @build_dir    = 'build'
+      @specs_dir    = 'spec'
+      @files        = Dir['lib/**/*.{rb,js}']
+      @dependencies = []
+
+      yield self if block_given?
+
+      define_tasks
+    end
+
+    def build_gem(name)
+      out = File.join @build_dir, "#{ name }.js"
+      puts " * #{out}"
+      write_code Opal.build_gem(name), out
+    rescue Gem::LoadError => e
+      puts "  - Error: Could not find gem #{name}"
+    end
+
+    def write_code(code, out)
+      FileUtils.mkdir_p File.dirname(out)
+      File.open(out, 'w+') { |o| o.puts code }
+    end
+
+    def define_tasks
+      desc "Build opal project"
+      task 'opal:build' do
+        out = File.join @build_dir, "#{ @name }.js"
+        puts " * #{out}"
+        write_code Opal.build_files(@files), out
+      end
+
+      desc "Build specs"
+      task 'opal:spec' do
+        out = File.join @build_dir, 'specs.js'
+        puts " * #{out}"
+        write_code Opal.build_files(@specs_dir), out
+      end
+
+      desc "Build dependencies"
+      task 'opal:dependencies' do
+        out = File.join @build_dir, 'opal.js'
+        puts " * #{out}"
+        write_code Opal.runtime, File.join(@build_dir, 'opal.js')
+
+        @dependencies.each { |dep| build_gem dep }
+      end
+
+      desc "Build opal files, dependencies and specs"
+      task :opal => %w(opal:build opal:dependencies opal:spec)
+    end
+  end
+end

data/lib/opal/scope.rb

@@ -30,6 +30,9 @@ module Opal
       # singleton methods defined on classes/modules
       attr_reader :smethods
 
+      # uses parents super method
+      attr_accessor :uses_super
+
       def initialize(type, parser)
         @parser  = parser
         @type    = type
@@ -79,13 +82,17 @@ module Opal
       # used for optimizing ivars as we can set them to nil in the
       # class body
       def def_in_class?
-        @type == :def && @parent && @parent.class?
+        !@defs && @type == :def && @parent && @parent.class?
       end
 
       def proto
         "#{ @name }_prototype"
       end
 
+      def m_tbl
+        "#{ @name }_methods"
+      end
+
       ##
       # Vars to use inside each scope
       def to_vars
@@ -111,16 +118,17 @@ module Opal
       # Generates code for this module to donate methods
       def to_donate_methods
         out = ""
+        return out unless @type == :module
 
         unless @methods.empty?
           out += "%s;#{@name}._donate([%s]);" %
             [@parser.parser_indent, @methods.map(&:inspect).join(', ')]
         end
 
-        unless @smethods.empty?
-          out += "%s;#{@name}._sdonate([%s]);" %
-            [@parser.parser_indent, @smethods.map(&:inspect).join(', ')]
-        end
+        # unless @smethods.empty?
+          # out += "%s;#{@name}._sdonate([%s]);" %
+            # [@parser.parser_indent, @smethods.map(&:inspect).join(', ')]
+        # end
 
         out
       end

data/lib/opal/version.rb

@@ -1,3 +1,3 @@
 module Opal
-  VERSION = "0.3.20"
+  VERSION = "0.3.21"
 end

data/opal.gemspec

@@ -14,4 +14,6 @@ Gem::Specification.new do |s|
   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']
+  
+  s.add_development_dependency 'rspec', '~> 2.10'
 end

data/spec/browser_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe 'opal core features', :js, :type => :request do
+  before do
+    Capybara.app = lambda do |env|
+      path = env['PATH_INFO']
+      base_path = File.expand_path('../../test/index.html', __FILE__)
+  
+      case path
+      when /\.js/
+        contents = File.read(File.join(File.dirname(base_path), '..', path))
+        [200, {'Content-Type' => 'application/x-javascript'}, [contents]]
+      else
+        contents = File.read(base_path)
+        [200, {'Content-Type' => 'text/html'}, [contents]]
+      end 
+    end
+  end
+  
+  it 'runs all specs in the browser' do
+    path = File.expand_path '../../test/index.html', __FILE__
+    p path
+    visit '/'
+    within '.summary' do
+      page.should have_content(' 0 failures ')
+    end
+  end
+end

data/spec/builder/lib_name_for_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "Builder#lib_name_for" do
   before do
@@ -16,9 +16,4 @@ describe "Builder#lib_name_for" do
     @builder.lib_name_for('app/title.rb').should == 'app/title'
     @builder.lib_name_for('spec/spec_helper.rb').should == 'spec/spec_helper'
   end
-
-  it "should remove the optional 'lib/opal/' prefix as well" do
-    @builder.lib_name_for('lib/opal/json.rb').should == 'json'
-    @builder.lib_name_for('lib/opal/json/parser.js').should == 'json/parser'
-  end
 end

data/spec/grammar/alias_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "The alias keyword" do
   describe "with fitem" do

data/spec/grammar/and_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "The and statement" do
   it "should always return s(:and)" do

data/spec/grammar/array_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "Arrays" do
   it "should parse empty arrays as s(:array)" do

data/spec/grammar/attrasgn_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "Attribute assignments" do
   it "should return a s(:attrasgn) for simple assignments" do

data/spec/grammar/begin_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "The begin keyword" do
   it "should be removed when used without a resuce or enusre body" do

data/spec/grammar/block_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "Block statements" do
   it "should return the direct expression if only one expresssion in block" do

data/spec/grammar/break_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "The break keyword" do
   it "should return s(:break) when given no args" do

data/spec/grammar/call_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "Method calls" do
   it "should use 'nil' for calls without a receiver" do

data/spec/grammar/class_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "The class keyword" do
   it "returns a plain s(:scope) when given an empty body" do

data/spec/grammar/const_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "Constants" do
   it "should always become a s(:const)" do

data/spec/grammar/cvar_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "Class variables" do
   it "should always be returned as s(:cvar)" do

data/spec/grammar/def_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "The def keyword" do
   describe "for normal definitions" do

data/spec/grammar/false_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "The false keyword" do
   it "should always return s(:false)" do

data/spec/grammar/file_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "The __FILE__ keyword" do
   it "should always return a s(:str) with given parser filename" do

data/spec/grammar/gvar_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "Global variables" do
   it "should be returned as s(:gvar)" do

data/spec/grammar/hash_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "Hash literals" do
   it "without any assocs should return an empty hash sexp" do

data/spec/grammar/iasgn_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "Instance variable assignment" do
   it "always returns an s(:iasgn)" do

data/spec/grammar/if_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "The if keyword" do
   it "should return an s(:if) with given truthy and falsy bodies" do

data/spec/grammar/iter_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "Iters" do
   describe "Iter on a command" do

data/spec/grammar/ivar_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "Instance variables" do
   it "always return an s(:ivar)" do

data/spec/grammar/lambda_spec.rb

@@ -1,4 +1,4 @@
-File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "Lambda literals" do
   it "should parse with either do/end construct or curly braces" do

data/spec/grammar/lasgn_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "Local assignment" do
   it "returns an s(:lasgn)" do

data/spec/grammar/line_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "The __LINE__ keyword" do
   it "should always return a literal number of the current line" do

data/spec/grammar/lvar_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "An lvar" do
   describe "in any scope" do

data/spec/grammar/masgn_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "Masgn" do
   describe "with a single lhs splat" do

data/spec/grammar/module_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "The module keyword" do
   it "returns a plain s(:scope) when given an empty body" do

data/spec/grammar/nil_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "The nil keyword" do
   it "always returns s(:nil)" do

data/spec/grammar/not_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "The not keyword" do
   it "returns s(:not) with the single argument" do

data/spec/grammar/op_asgn1_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "op_asgn1" do
   it "returns s(:op_asgn1)" do

data/spec/grammar/op_asgn2_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "op_asgn2" do
   it "returns s(:op_asgn2)" do

data/spec/grammar/or_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "The or statement" do
   it "should always return s(:or)" do

data/spec/grammar/return_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "The return keyword" do
   it "should return s(:return) when given no arguments" do

data/spec/grammar/sclass_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "Singleton classes" do
   it "returns an empty s(:scope) when given an empty body" do

data/spec/grammar/self_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "The self keyword" do
   it "always returns s(:self)" do

data/spec/grammar/str_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "Strings" do
   it "parses empty strings" do

data/spec/grammar/super_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "The super keyword" do
   it "should return s(:zsuper) when no arguments or parans" do

data/spec/grammar/true_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "The true keyword" do
   it "always returns s(:true)" do

data/spec/grammar/undef_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "The undef keyword" do
   it "returns s(:undef) with the argument as an s(:lit)" do

data/spec/grammar/unless_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "The unless keyword" do
   it "returns s(:if) with reversed true and false bodies" do