opal 0.3.21 → 0.3.22

data/lib/opal/rake_task.rb

@@ -14,7 +14,7 @@ module Opal
       @name         = File.basename(@project_dir)
       @build_dir    = 'build'
       @specs_dir    = 'spec'
-      @files        = Dir['lib/**/*.{rb,js}']
+      @files        = Dir['lib/**/*.{rb,js,erb}']
       @dependencies = []
 
       yield self if block_given?
@@ -54,7 +54,7 @@ module Opal
       task 'opal:dependencies' do
         out = File.join @build_dir, 'opal.js'
         puts " * #{out}"
-        write_code Opal.runtime, File.join(@build_dir, 'opal.js')
+        write_code Opal.runtime, out
 
         @dependencies.each { |dep| build_gem dep }
       end

data/lib/opal/scope.rb

@@ -89,10 +89,6 @@ module Opal
         "#{ @name }_prototype"
       end
 
-      def m_tbl
-        "#{ @name }_methods"
-      end
-
       ##
       # Vars to use inside each scope
       def to_vars
@@ -118,17 +114,16 @@ 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
@@ -166,6 +161,10 @@ module Opal
         @temps.push *tmps
       end
 
+      def has_temp?(tmp)
+        @temps.include? tmp
+      end
+
       def new_temp
         return @queue.pop unless @queue.empty?
 
@@ -225,7 +224,7 @@ module Opal
 
           elsif scope.type == :def
             defn = scope.identify!
-            mid  = "'#{scope.mid}'"
+            mid  = "'$#{scope.mid}'"
             break
 
           else

data/lib/opal/version.rb

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

data/{test → spec}/core/class/new_spec.rb

@@ -1,3 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
+
 describe "Class.new with a block given" do
   it "uses the given block as the class' body" do
     klass = Class.new do

data/{test → spec}/core/enumerable/all_spec.rb

@@ -1,3 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
+
 describe "Enumerable#all?" do
 
   before :each do

data/{test → spec}/core/hash/element_reference_spec.rb

@@ -12,7 +12,7 @@ describe "Hash#[]" do
     {0 => 0}[5].should == nil
   end
 
-  it "returns the default (imediate) value for missing keys" do
+  it "returns the default (immediate) value for missing keys" do
     h = Hash.new 5
     h[:a].should == 5
     h[:a] = 0
@@ -25,4 +25,17 @@ describe "Hash#[]" do
     h[:a] = nil
     h[:a].should == nil
   end
+
+  it "returns the default (dynamic) value for missing keys" do
+    h = Hash.new { |hsh, k| k.kind_of?(Numeric) ? hsh[k] = k + 2 : hsh[k] = k }
+    h[1].should == 3
+    h['this'].should == 'this'
+    h.should == {1 => 3, 'this' => 'this'}
+
+    i = 0
+    h = Hash.new { |hsh, key| i += 1 }
+    h[:foo].should == 1
+    h[:foo].should == 2
+    h[:bar].should == 3
+  end
 end

data/{test → spec}/core/hash/new_spec.rb

@@ -8,4 +8,12 @@ describe "Hash.new" do
     Hash.new(5).default.should == 5
     Hash.new({}).default.should == {}
   end
+
+  it "creates a Hash with a default_proc if passed a block" do
+    Hash.new.default_proc.should == nil
+
+    h = Hash.new { |x| "Answer to #{x}" }
+    h.default_proc.call(5).should == "Answer to 5"
+    h.default_proc.call("x").should == "Answer to x"
+  end
 end

data/{test → spec}/core/kernel/proc_spec.rb

@@ -6,4 +6,8 @@ describe "Kernel#proc" do
   it "raises an ArgumentError when no block is given" do
     lambda { proc }.should raise_error(ArgumentError)
   end
+  
+  it "is not a lambda" do
+    proc { true }.lambda?.should == false
+  end
 end

data/spec/core/proc/proc_tricks_spec.rb

@@ -0,0 +1,7 @@
+describe 'Proc' do
+  describe '#new' do
+    it 'is not a lambda' do
+      Proc.new {}.lambda?.should == false
+    end
+  end
+end