opal 0.9.0 → 0.9.2

data/lib/opal/parser/grammar.y

@@ -1220,7 +1220,7 @@ opt_block_args_tail: tCOMMA block_args_tail
                       exc = val[1] || s(:array)
                       exc << new_assign(val[2], val[2], s(:gvar, '$!'.intern)) if val[2]
                       result = [s(:resbody, exc, val[4])]
-                      result.push val[5].first if val[5]
+                      result.concat val[5] if val[5]
                     }
                 | # none
                     {

data/lib/opal/sprockets/server.rb

@@ -1,10 +1,4 @@
-require 'rack/file'
-require 'rack/static'
-require 'rack/urlmap'
-require 'rack/builder'
-require 'rack/deflater'
-require 'rack/directory'
-require 'rack/showexceptions'
+require 'rack'
 require 'opal/source_map'
 require 'sprockets'
 require 'sourcemap'
@@ -79,8 +73,6 @@ module Opal
         use Index, server if server.use_index
         if source_map_enabled
           map(maps_prefix) do
-            require 'rack/conditionalget'
-            require 'rack/etag'
             use Rack::ConditionalGet
             use Rack::ETag
             run maps_app

data/lib/opal/version.rb

@@ -1,5 +1,5 @@
 module Opal
   # WHEN RELEASING:
   # Remember to update RUBY_ENGINE_VERSION in opal/corelib/constants.rb too!
-  VERSION = '0.9.0'
+  VERSION = '0.9.2'
 end

data/opal/corelib/constants.rb

@@ -1,8 +1,8 @@
 RUBY_PLATFORM       = 'opal'
 RUBY_ENGINE         = 'opal'
 RUBY_VERSION        = '2.2.3'
-RUBY_ENGINE_VERSION = '0.9.0'
-RUBY_RELEASE_DATE   = '2015-12-20'
+RUBY_ENGINE_VERSION = '0.9.2'
+RUBY_RELEASE_DATE   = '2016-01-10'
 RUBY_PATCHLEVEL     = 0
 RUBY_REVISION       = 0
 RUBY_COPYRIGHT      = 'opal - Copyright (C) 2013-2015 Adam Beynon'

data/spec/lib/compiler_spec.rb

@@ -133,6 +133,123 @@ describe Opal::Compiler do
       end
     end
   end
+  
+  describe 'truthy check' do
+    context 'no parentheses' do
+      context 'with operators' do
+        it 'excludes nil check for primitives' do
+          expect_compiled('foo = 42 if 2 > 3').to include('if ($rb_gt(2, 3))')
+          expect_compiled('foo = 42 if 2.5 > 3.5').to include('if ($rb_gt(2.5, 3.5))')
+          expect_compiled('foo = 42 if true > false').to include('if ($rb_gt(true, false))')
+          
+          expect_compiled('foo = 42 if 2 == 3').to include("if ((2)['$=='](3))")
+          expect_compiled('foo = 42 if 2.5 == 3.5').to include("if ((2.5)['$=='](3.5))")
+          expect_compiled('foo = 42 if true == false').to include("if (true['$=='](false))")
+        end
+      
+        it 'adds nil check for strings' do
+          expect_compiled('foo = 42 if "test" > "bar"').to include('if ((($a = $rb_gt("test", "bar")) !== nil && (!$a.$$is_boolean || $a == true)))')
+        end
+        
+        it 'specifically == excludes nil check for strings' do
+          expect_compiled('foo = 42 if "test" == "bar"').to include("if (\"test\"['$=='](\"bar\"))")
+        end
+      
+        it 'adds nil check for lvars' do
+          expect_compiled("bar = 4\nfoo = 42 if bar > 5").to include('if ((($a = $rb_gt(bar, 5)) !== nil && (!$a.$$is_boolean || $a == true)))')
+        end
+        
+        it 'specifically == excludes nil check for lvars' do
+          expect_compiled("bar = 4\nfoo = 42 if bar == 5").to include("if (bar['$=='](5))")
+        end
+      
+        it 'adds nil check for constants' do
+          expect_compiled("foo = 42 if Test > 4").to include("if ((($a = $rb_gt($scope.get('Test'), 4)) !== nil && (!$a.$$is_boolean || $a == true))) ")
+        end
+        
+        it 'specifically == excludes nil check for constants' do
+          expect_compiled("foo = 42 if Test == 4").to include("if ($scope.get('Test')['$=='](4))")
+        end
+      end
+    
+      context 'without operators' do
+        it 'adds nil check for primitives' do
+          expect_compiled('foo = 42 if 2').to include('if ((($a = 2) !== nil && (!$a.$$is_boolean || $a == true)))')
+          expect_compiled('foo = 42 if 2.5').to include('if ((($a = 2.5) !== nil && (!$a.$$is_boolean || $a == true)))')
+          expect_compiled('foo = 42 if true').to include('if ((($a = true) !== nil && (!$a.$$is_boolean || $a == true)))')
+        end
+        
+        it 'adds nil check for boolean method calls' do
+          expect_compiled('foo = 42 if true.something').to include('if ((($a = true.$something()) !== nil && (!$a.$$is_boolean || $a == true)))')
+        end
+      
+        it 'adds nil check for strings' do
+          expect_compiled('foo = 42 if "test"').to include('if ((($a = "test") !== nil && (!$a.$$is_boolean || $a == true)))')
+        end
+      
+        it 'adds nil check for lvars' do
+          expect_compiled("bar = 4\nfoo = 42 if bar").to include('if (bar !== false && bar !== nil)')
+        end
+      
+        it 'adds nil check for constants' do
+          expect_compiled("foo = 42 if Test").to include("if ((($a = $scope.get('Test')) !== nil && (!$a.$$is_boolean || $a == true)))")
+        end
+      end
+    end
+    
+    context 'parentheses' do
+      context 'with operators' do
+        it 'adds nil check for primitives' do
+          expect_compiled('foo = 42 if (2 > 3)').to include('if ((($a = ($rb_gt(2, 3))) !== nil && (!$a.$$is_boolean || $a == true)))')
+          expect_compiled('foo = 42 if (2.5 > 3.5)').to include('if ((($a = ($rb_gt(2.5, 3.5))) !== nil && (!$a.$$is_boolean || $a == true)))')
+          expect_compiled('foo = 42 if (true > false)').to include('if ((($a = ($rb_gt(true, false))) !== nil && (!$a.$$is_boolean || $a == true)))')
+          
+          expect_compiled('foo = 42 if (2 == 3)').to include("if ((($a = ((2)['$=='](3))) !== nil && (!$a.$$is_boolean || $a == true)))")
+          expect_compiled('foo = 42 if (2.5 == 3.5)').to include("if ((($a = ((2.5)['$=='](3.5))) !== nil && (!$a.$$is_boolean || $a == true)))")
+          expect_compiled('foo = 42 if (true == false)').to include("if ((($a = (true['$=='](false))) !== nil && (!$a.$$is_boolean || $a == true)))")
+        end
+      
+        it 'adds nil check for strings' do
+          expect_compiled('foo = 42 if ("test" > "bar")').to include('if ((($a = ($rb_gt("test", "bar"))) !== nil && (!$a.$$is_boolean || $a == true)))')
+          expect_compiled('foo = 42 if ("test" == "bar")').to include("if ((($a = (\"test\"['$=='](\"bar\"))) !== nil && (!$a.$$is_boolean || $a == true)))")
+        end
+      
+        it 'adds nil check for lvars' do
+          expect_compiled("bar = 4\nfoo = 42 if (bar > 5)").to include('if ((($a = ($rb_gt(bar, 5))) !== nil && (!$a.$$is_boolean || $a == true)))')
+          expect_compiled("bar = 4\nfoo = 42 if (bar == 5)").to include("if ((($a = (bar['$=='](5))) !== nil && (!$a.$$is_boolean || $a == true))) ")
+        end
+      
+        it 'adds nil check for constants' do
+          expect_compiled("foo = 42 if (Test > 4)").to include("if ((($a = ($rb_gt($scope.get('Test'), 4))) !== nil && (!$a.$$is_boolean || $a == true)))")
+          expect_compiled("foo = 42 if (Test == 4)").to include("if ((($a = ($scope.get('Test')['$=='](4))) !== nil && (!$a.$$is_boolean || $a == true)))")
+        end
+      end
+    
+      context 'without operators' do
+        it 'adds nil check for primitives' do
+          expect_compiled('foo = 42 if (2)').to include('if ((($a = (2)) !== nil && (!$a.$$is_boolean || $a == true)))')
+          expect_compiled('foo = 42 if (2.5)').to include('if ((($a = (2.5)) !== nil && (!$a.$$is_boolean || $a == true)))')
+          expect_compiled('foo = 42 if (true)').to include('if ((($a = (true)) !== nil && (!$a.$$is_boolean || $a == true)))')
+        end
+        
+        it 'adds nil check for boolean method calls' do
+          expect_compiled('foo = 42 if (true.something)').to include('if ((($a = (true.$something())) !== nil && (!$a.$$is_boolean || $a == true)))')
+        end
+      
+        it 'adds nil check for strings' do
+          expect_compiled('foo = 42 if ("test")').to include('if ((($a = ("test")) !== nil && (!$a.$$is_boolean || $a == true)))')
+        end
+      
+        it 'adds nil check for lvars' do
+          expect_compiled("bar = 4\nfoo = 42 if (bar)").to include('if ((($a = (bar)) !== nil && (!$a.$$is_boolean || $a == true)))')
+        end
+      
+        it 'adds nil check for constants' do
+          expect_compiled("foo = 42 if (Test)").to include("if ((($a = ($scope.get('Test'))) !== nil && (!$a.$$is_boolean || $a == true)))")
+        end
+      end      
+    end
+  end
 
   def expect_compiled(*args)
     expect(Opal::Compiler.new(*args).compile)

data/spec/opal/core/runtime/rescue_spec.rb

@@ -35,4 +35,27 @@ describe "The rescue keyword" do
   it "returns nil if no expr given in rescue body" do
     RescueReturningSpec.new.empty_rescue.should be_nil
   end
+
+  it 'Fix using more than two "rescue" in sequence #1269' do
+    # As a statement
+    begin
+      raise IOError, 'foo'
+    rescue RangeError              # this one is correct
+    rescue TypeError               # miss a return
+    rescue IOError                 # following two lines disappear in js
+      $ScratchPad << "I got #{$!.message}"
+    end
+    $ScratchPad.last.should == "I got foo"
+
+    # As an expression
+    a = begin
+      raise IOError, 'foo'
+    rescue RangeError              # this one is correct
+    rescue TypeError               # miss a return
+    rescue IOError                 # following two lines disappear in js
+      "I got #{$!.message}"
+    end
+    a.should == "I got foo"
+  end
+
 end

data/spec/opal/core/runtime/truthy_spec.rb

@@ -4,6 +4,14 @@ class Boolean
   end
 end
 
+class JsNil
+  def <(other)
+    %x{
+      return nil;
+    }
+  end
+end
+
 describe "Opal truthyness" do
   it "should evaluate to true using js `true` as an object" do
     if true.self_as_an_object
@@ -20,4 +28,10 @@ describe "Opal truthyness" do
 
     called.should be_nil
   end
+  
+  it "should evaluate to false if js `nil` is used with an operator" do
+    is_falsey = JsNil.new < 2 ? false : true
+    
+    is_falsey.should be_true
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.2
 platform: ruby
 authors:
 - Adam Beynon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-20 00:00:00.000000000 Z
+date: 2016-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sourcemap