opal 0.10.0.beta3 → 0.10.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e7bea1b676089d0921e603acafc794fe81fb671
-  data.tar.gz: 798d0eef513a0f7a17eb283d810342ffddb64b03
+  metadata.gz: 39c814d73a4610d5d13c3d5ce1c8c969cb9fe910
+  data.tar.gz: e7e498becdff47976088a5a02bc98451f959d4a5
 SHA512:
-  metadata.gz: c349f1c93f09a28b2e0c9285008901d985c4196548171318fadcd416e370e9dc2bcbc4d8b1e184b5e4646206e8c64efee28c58d8a4e11a0939eceb21f929912c
-  data.tar.gz: 5af01ed324f7c9f0eec062d465d34e051d47bca3e24e33c72e17e6634a7b87cab060f303b3408a5644763e838c3051d29964f8e6d461408f8a18cd2726ceacfa
+  metadata.gz: baf8e4f7a5b411c3cfefb5c1da61d1fb3c5ce73fd0c102c8d46a3cb1968f75fd8cb2b421f55c74ba8e317a61980040cd5ca88971465d1ff660e2e98641f2a0e1
+  data.tar.gz: cb776c46e913187cc3581029256f8ca1ffca2139315dce2ee0d8e014a6858b7ea19445948a06a3be16bb7ef6e054357723308b6bbb6ca3f13f2da733870b8ed8

data/.travis.yml

@@ -26,6 +26,9 @@ matrix:
     - rvm: 2.3.0
       env: RUN=mspec_ruby_sprockets_phantomjs
 
+    - rvm: 2.3.0
+      env: RUN=minitest
+
     - rvm: 2.3.0
       env: RUN=rspec RACK_VERSION='2.0.0.alpha' CHECK_COVERAGE=true
 

data/CHANGELOG.md

@@ -26,6 +26,7 @@ Whitespace conventions:
 
 ### Added
 
+- Pathname#relative_path_from
 - Source maps now include method names
 - `Module#included_modules` works
 - Internal runtime cleanup (#1241)
@@ -40,18 +41,22 @@ Whitespace conventions:
     * `Enumerable#max`
     * `Enumerable#each_entry` (#1303)
     * `Module#const_set`
+    * `Module#module_eval` with a string
 - Add `-L` / `--library` option to compile only the code of the library (#1281)
 - Implement `Kernel.open` method (#1218)
 - Generate meaningful names for functions representing Ruby methods
 - Implement `Pathname#join` and `Pathname#+` methods (#1301)
 - Added support for `begin;rescue;else;end`.
 - Implement `File.extname` method (#1219)
-- Implement File.extname method (#1219)
 - Added support for keyword arguments as lambda parameters.
 - Super works with define_method blocks
 - Added support for kwsplats.
 - Added support for squiggly heredoc.
 - Implement `Method#parameters` and `Proc#parameters`.
+- Implement `File.new("path").mtime`, `File.mtime("path")`, `File.stat("path").mtime`.
+- if-conditions now support `null` and `undefined` as falsy values (#867)
+- Implement IO.read method for Node.js (#1332)
+- Implement IO.each_line method for Node.js (#1221)
 
 
 ### Changed
@@ -78,6 +83,8 @@ Whitespace conventions:
 
 ### Fixed
 
+- `Module#ancestors` and shared code like `====` and `is_a?` deal with singleton class modules better (#1449)
+- `Class#to_s` now shows correct names for singleton classes
 - `Pathname#absolute?` and `Pathname#relative?` now work properly
 - `File::dirname` and `File::basename` are now Rubyspec compliant
 - `SourceMap::VLQ` patch (#1075)
@@ -114,6 +121,7 @@ Whitespace conventions:
 - Fixed Base64 and enabled specs
 - Fixed method definition in method body.
 - Partially implemented `Marshal.load`/`Marshal.dump`. In order to use it require `opal/full`.
+- Fixed docs for Compiled Ruby - Native section. Rename opal variable to win since window was causing error
 
 
 ### Removed

data/HACKING.md

@@ -51,7 +51,7 @@ $ bundle exec rake mspec_ruby_nodejs PATTERN=spec/ruby/core/string/sub_spec.rb
 This will make sure that only `spec/ruby/core/string/sub_spec.rb` is run, and no other specs are executed. Globs can be used too:
 
 ```
-$ bundle exec rake mspec_ruby_nodejs PATTERN=spec/ruby/core/string/*_spec.rb
+$ bundle exec rake mspec_ruby_nodejs PATTERN="spec/ruby/core/string/*_spec.rb"
 ```
 
 Another way to quickly validate ideas and play with your changes is to use `opal-repl`, a tool similar to `irb`. Running `opal-repl` drops you into an interactive environment with your current version of Opal loaded, including any changes you have made.
@@ -82,7 +82,7 @@ Comment out any of the `fail` lines in any of the files in the `spec/filters/bug
 Core classes use each other and your changes may fix other bugs in `spec/filters/bugs`. If you think it's possible, run an inverted test suite by providing environment variable `INVERT_RUNNING_MODE=true`:
 
 ```
-$ env INVERT_RUNNING_MODE=true RUBYSPECS=true PATTERN=spec/ruby/core/string/*_spec.rb rake mspec_ruby_nodejs
+$ env INVERT_RUNNING_MODE=true RUBYSPECS=true PATTERN="spec/ruby/core/string/*_spec.rb" rake mspec_ruby_nodejs
 ```
 
 This command will execute tests marked as "bugs" from every file in the `spec/ruby/core/string` directory. After running it you will get a list of specs that in fact are passing. Feel free to remove them from `spec/filters/bugs`.

data/docs/compiled_ruby.md

@@ -275,26 +275,26 @@ Let's see how it works and wrap `window`:
 ```ruby
 require 'native'
 
-window = Native(`window`) # equivalent to Native::Object.new(`window`)
+win = Native(`window`) # equivalent to Native::Object.new(`window`)
 ```
 
 Now what if we want to access one of its properties?
 
 ```ruby
-window[:location][:href]                         # => "http://dev.mikamai.com/"
-window[:location][:href] = "http://mikamai.com/" # will bring you to mikamai.com
+win[:location][:href]                         # => "http://dev.mikamai.com/"
+win[:location][:href] = "http://mikamai.com/" # will bring you to mikamai.com
 ```
 
 And what about methods?
 
 ```ruby
-window.alert('hey there!')
+win.alert('hey there!')
 ```
 
 So let’s do something more interesting:
 
 ```ruby
-class << window
+class << win
   # A cross-browser window close method (works in IE!)
   def close!
     %x{
@@ -314,7 +314,7 @@ end
 That’s all for now, bye!
 
 ```ruby
-window.close!
+win.close!
 ```
 
 ### Calling JavaScript Methods

data/lib/opal/cli_runners/nodejs.rb

@@ -4,6 +4,8 @@ require 'opal/paths'
 module Opal
   module CliRunners
     class Nodejs
+      NODE_PATH = File.expand_path('../stdlib/nodejs/node_modules', ::Opal.gem_dir)
+
       def initialize(options)
         @output = options.fetch(:output, $stdout)
       end
@@ -14,7 +16,7 @@ module Opal
       end
 
       def node_modules
-        File.expand_path('../stdlib/nodejs/node_modules', ::Opal.gem_dir)
+        NODE_PATH
       end
 
       def run(code, argv)

data/lib/opal/nodes/args/mlhsarg.rb

@@ -39,9 +39,7 @@ module Opal
         line "  #{var_name} = nil;"
         line "}"
 
-        line "if (!#{var_name}.$$is_array) {"
-        line "  #{var_name} = [#{var_name}];"
-        line "}"
+        line "#{var_name} = Opal.to_ary(#{var_name});"
 
         scope.with_inline_args([]) do
           scope.in_mlhs do

data/lib/opal/nodes/def.rb

@@ -48,16 +48,13 @@ module Opal
           compile_post_args
 
           scope.identify!
-
-          if compiler.arity_check?
-            arity_code = arity_check(mid)
-          end
-
           scope_name = scope.identity
 
           compile_block_arg
 
-          line arity_code if arity_code
+          if compiler.arity_check?
+            compile_arity_check
+          end
 
           if scope.uses_zuper
             add_local '$zuper'
@@ -97,60 +94,27 @@ module Opal
           push ", #{scope_name}.$$parameters = #{parameters_code}"
         end
 
-        if recvr
-          unshift 'Opal.defs(', recv(recvr), ", '$#{mid}', "
-          push ')'
-        elsif scope.iter?
-          wrap "Opal.def(self, '$#{mid}', ", ')'
-        elsif scope.module? || scope.class?
-          wrap "Opal.defn(self, '$#{mid}', ", ')'
-        elsif scope.sclass?
-          if scope.defs
-            unshift "Opal.defs(self, '$#{mid}', "
-          else
-            unshift "Opal.defn(self, '$#{mid}', "
-          end
-          push ')'
-        elsif compiler.eval?
-          unshift "Opal.def(self, '$#{mid}', "
-          push ')'
-        elsif scope.top?
-          unshift "Opal.defn(Opal.Object, '$#{mid}', "
-          push ')'
-        elsif scope.def?
-          wrap "Opal.def(self, '$#{mid}', ", ')'
-        else
-          raise "Unsupported use of `def`; please file a bug at https://github.com/opal/opal reporting this message."
+        if    recvr                         then unshift 'Opal.defs(', recv(recvr), ", '$#{mid}', "
+        elsif scope.iter?                   then unshift "Opal.def(self, '$#{mid}', "
+        elsif scope.module? || scope.class? then unshift "Opal.defn(self, '$#{mid}', "
+        elsif scope.sclass? && scope.defs   then unshift "Opal.defs(self, '$#{mid}', "
+        elsif scope.sclass?                 then unshift "Opal.defn(self, '$#{mid}', "
+        elsif compiler.eval?                then unshift "Opal.def(self, '$#{mid}', "
+        elsif scope.top?                    then unshift "Opal.defn(Opal.Object, '$#{mid}', "
+        elsif scope.def?                    then unshift "Opal.def(self, '$#{mid}', "
+        else raise "Unsupported use of `def`; please file a bug at https://github.com/opal/opal/issues/new reporting this message."
         end
+        push ')'
 
         wrap '(', ", nil) && '#{mid}'" if expr?
       end
 
       # Returns code used in debug mode to check arity of method call
-      def arity_check(mid)
-        meth = mid.to_s.inspect
-
-        arity = args.size - 1
-        arity -= (opt_args.size)
-
-        arity -= 1 if rest_arg
-
-        arity -= (keyword_args.size)
-
-        arity = -arity - 1 if !opt_args.empty? or !keyword_args.empty? or rest_arg
-
-        # $arity will point to our received arguments count
-        aritycode = "var $arity = arguments.length;"
-
-        if arity < 0 # splat or opt args
-          min_arity = -(arity + 1)
-          max_arity = args.size - 1
-          checks = []
-          checks << "$arity < #{min_arity}" if min_arity > 0
-          checks << "$arity > #{max_arity}" if max_arity and not(rest_arg)
-          aritycode + "if (#{checks.join(' || ')}) { Opal.ac($arity, #{arity}, this, #{meth}); }" if checks.size > 0
-        else
-          aritycode + "if ($arity !== #{arity}) { Opal.ac($arity, #{arity}, this, #{meth}); }"
+      def compile_arity_check
+        if arity_checks.size > 0
+          meth = scope.mid.to_s.inspect
+          line "var $arity = arguments.length;"
+          push " if (#{arity_checks.join(' || ')}) { Opal.ac($arity, #{arity}, this, #{meth}); }"
         end
       end
     end

data/lib/opal/nodes/helpers.rb

@@ -95,7 +95,7 @@ module Opal
         end
 
         with_temp do |tmp|
-          [fragment("((#{tmp} = "), expr(sexp), fragment(") !== nil && (!#{tmp}.$$is_boolean || #{tmp} == true))")]
+          [fragment("((#{tmp} = "), expr(sexp), fragment(") !== nil && #{tmp} != null && (!#{tmp}.$$is_boolean || #{tmp} == true))")]
         end
       end
 
@@ -109,7 +109,7 @@ module Opal
         end
 
         with_temp do |tmp|
-          [fragment("((#{tmp} = "), expr(sexp), fragment(") === nil || (#{tmp}.$$is_boolean && #{tmp} == false))")]
+          [fragment("((#{tmp} = "), expr(sexp), fragment(") === nil || #{tmp} == null || (#{tmp}.$$is_boolean && #{tmp} == false))")]
         end
       end
 
@@ -131,7 +131,7 @@ module Opal
             expr(sexp)
           end
         elsif [:lvar, :self].include? sexp.type
-          [expr(sexp.dup), fragment(" !== false && "), expr(sexp.dup), fragment(" !== nil")]
+          [expr(sexp.dup), fragment(" !== false && "), expr(sexp.dup), fragment(" !== nil && "), expr(sexp.dup), fragment(" != null")]
         end
       end
     end

data/lib/opal/nodes/iter.rb

@@ -23,14 +23,16 @@ module Opal
           identity = scope.identify!
           add_temp "self = #{identity}.$$s || this"
 
+          compile_block_arg
           compile_shadow_args
-
           compile_inline_args
           compile_post_args
-
-          compile_block_arg
           compile_norm_args
 
+          if compiler.arity_check?
+            compile_arity_check
+          end
+
           body_code = stmt(body)
           to_vars = scope.to_vars
         end
@@ -150,6 +152,33 @@ module Opal
       def has_trailing_comma_in_args?
         args.meta[:has_trailing_comma]
       end
+
+      # Returns code used in debug mode to check arity of method call
+      def compile_arity_check
+        if arity_checks.size > 0
+          parent_scope = scope
+          while !(parent_scope.top? || parent_scope.def? || parent_scope.class_scope?)
+            parent_scope = parent_scope.parent
+          end
+
+          context = if parent_scope.top?
+            "'<main>'"
+          elsif parent_scope.def?
+            "'#{parent_scope.mid}'"
+          elsif parent_scope.class?
+            "'<class:#{parent_scope.name}>'"
+          elsif parent_scope.module?
+            "'<module:#{parent_scope.name}>'"
+          end
+
+          identity = scope.identity
+
+          line "if (#{identity}.$$is_lambda || #{identity}.$$define_meth) {"
+          line "  var $arity = arguments.length;"
+          line "  if (#{arity_checks.join(' || ')}) { Opal.block_ac($arity, #{arity}, #{context}); }"
+          line "}"
+        end
+      end
     end
   end
 end

data/lib/opal/nodes/logic.rb

@@ -86,7 +86,7 @@ module Opal
       def compile
         with_temp do |tmp|
           push expr(value)
-          wrap "(#{tmp} = ", ", (#{tmp} === nil || #{tmp} === false))"
+          wrap "(#{tmp} = ", ", (#{tmp} === nil || #{tmp} === false || #{tmp} == null))"
         end
       end
     end
@@ -138,7 +138,7 @@ module Opal
         with_temp do |tmp|
           push "(((#{tmp} = "
           push expr(lhs)
-          push ") !== false && #{tmp} !== nil) ? #{tmp} : "
+          push ") !== false && #{tmp} !== nil && #{tmp} != null) ? #{tmp} : "
           push expr(rhs)
           push ")"
         end
@@ -146,7 +146,7 @@ module Opal
 
       def compile_if
         with_temp do |tmp|
-          push "if (#{tmp} = ", expr(lhs), ", #{tmp} !== false && #{tmp} !== nil) {"
+          push "if (#{tmp} = ", expr(lhs), ", #{tmp} !== false && #{tmp} !== nil && #{tmp} != null) {"
           indent do
             line tmp
           end
@@ -176,7 +176,7 @@ module Opal
           else
             push "(#{tmp} = "
             push expr(lhs)
-            push ", #{tmp} !== false && #{tmp} !== nil ?"
+            push ", #{tmp} !== false && #{tmp} !== nil && #{tmp} != null ?"
             push expr(rhs)
             push " : #{tmp})"
           end
@@ -188,7 +188,7 @@ module Opal
           if truthy_opt = js_truthy_optimize(lhs)
             push "if (#{tmp} = ", truthy_opt, ") {"
           else
-            push "if (#{tmp} = ", expr(lhs), ", #{tmp} !== false && #{tmp} !== nil) {"
+            push "if (#{tmp} = ", expr(lhs), ", #{tmp} !== false && #{tmp} !== nil && #{tmp} != null) {"
           end
           indent do
             line expr(rhs)

data/lib/opal/nodes/node_with_args.rb

@@ -208,6 +208,37 @@ module Opal
 
         "[#{stringified_parameters.join(', ')}]"
       end
+
+      # Returns an array of JS conditions for raising and argument
+      # error caused by arity check
+      def arity_checks
+        return @arity_checks if @arity_checks
+
+        arity = args.size - 1
+        arity -= (opt_args.size)
+
+        arity -= 1 if rest_arg
+
+        arity -= (keyword_args.size)
+
+        arity = -arity - 1 if !opt_args.empty? or !keyword_args.empty? or rest_arg
+
+        # $arity will point to our received arguments count
+        aritycode = "var $arity = arguments.length;"
+
+        @arity_checks = []
+
+        if arity < 0 # splat or opt args
+          min_arity = -(arity + 1)
+          max_arity = args.size - 1
+          @arity_checks << "$arity < #{min_arity}" if min_arity > 0
+          @arity_checks << "$arity > #{max_arity}" if max_arity and not(rest_arg)
+        else
+          @arity_checks << "$arity !== #{arity}"
+        end
+
+        @arity_checks
+      end
     end
   end
 end

data/lib/opal/parser/lexer.rb

@@ -70,7 +70,8 @@ module Opal
       @scanner_stack = [@scanner]
 
       @case_stmt = nil
-      @start_of_lambda = nil
+      @paren_nest = 0
+      @lambda_stack = []
     end
 
     # Returns next token from source input stream.
@@ -643,8 +644,8 @@ module Opal
             return :tIDENTIFIER
           end
 
-          if @start_of_lambda
-            @start_of_lambda = false
+          if @lambda_stack.last == @paren_nest
+            @lambda_stack.pop
             @lex_state = :expr_beg
             return :kDO_LAMBDA
           elsif cond?
@@ -1010,12 +1011,14 @@ module Opal
           @lex_state = :expr_beg
           cond_push 0
           cmdarg_push 0
+          @paren_nest += 1
 
           return result
 
         elsif scan(/\)/)
           cond_lexpop
           cmdarg_lexpop
+          @paren_nest -= 1
           @lex_state = :expr_end
           @lparen_arg_seen = false
           return :tRPAREN
@@ -1176,9 +1179,8 @@ module Opal
           end
 
         elsif scan(/->/)
-          # FIXME: # should be :expr_arg, but '(' breaks it...
           @lex_state = :expr_end
-          @start_of_lambda = true
+          @lambda_stack.push(@paren_nest)
           return :tLAMBDA
 
         elsif scan(/[+-]/)
@@ -1289,8 +1291,8 @@ module Opal
           return :tCOMMA
 
         elsif scan(/\{/)
-          if @start_of_lambda
-            @start_of_lambda = false
+          if @lambda_stack.last == @paren_nest
+            @lambda_stack.pop
             @lex_state = :expr_beg
             cond_push 0
             cmdarg_push 0