ruby2js 3.0.9 → 3.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 075b7a63226221fc941c3ccd747285d1bf9a3e94cfefd39926e530c9e41ba0a0
-  data.tar.gz: 7a01d0dfef5bba7c05393a4059f4899631d6bac7894b98801dfc04634b4fcb84
+  metadata.gz: fe86f145da2a356f2f0356636b82b7e3dd03c3c20b18e4f4df73c02e94eb8517
+  data.tar.gz: cd4ddff033e394e8752acdf8c28ac36a9c8a9b659514b4e6eed5f1ed6af0d01c
 SHA512:
-  metadata.gz: 62e0c730806b6bb3dc2060028d37dee4a181c9aa43be77415ed9cfca016ebae821388ae1b696d6de9a1f634730163b2a2f9d3b95aac321ca6a11ddfabbc1383e
-  data.tar.gz: ae0a44b9d2a547def9fcc86b5af2dd1e5134881b0224c4e65a80e614215b1803a6be80649270622113829f531070aacfceed99a2edca364f661f2c75521fb214
+  metadata.gz: 3dfe608effc755e3e9f17e68710b9ad5833184fa022a8632ca7227ddeabf2894c207a021a4083da617c865e0499807127a7cb0dc8b32f332cc0de21419c887e2
+  data.tar.gz: 94fe88ca8908058f69d590602108d586a0b191012603648e072686bd35bf8b3413241f4d04200aff3820f823dd22cf6e1dec9548293c343636632f7405390c7f

data/README.md

@@ -19,7 +19,8 @@ For example:
     parenthesis are used
   * otherwise Ruby method calls become JavaScript property accesses.
   * by default, methods and procs return `undefined`
-  * splats are handled (may need to try around or read transliteration_spec)
+  * splats mapped to spread syntax when ES2015 or later is selected, and
+    to equivalents using `apply`, `concat`, `slice`, and `arguments` otherwise.
   * ruby string interpolation is expanded into string + operations
   * `and` and `or` become `&&` and `||`
   * `a ** b` becomes `Math.pow(a,b)`
@@ -38,6 +39,9 @@ For example:
   * Any block becomes and explicit argument `new Promise do; y(); end` becomes `new Promise(function() {y()})`
   * regular expressions are mapped to js
   * `raise` becomes `throw`
+  * expressions enclosed in backtick operators (\`\`) and `%x{}` literals are
+    evaluated in the context of the caller and the results are inserted
+    into the generated JavaScript.
 
 Ruby attribute accessors, methods defined with no parameters and no
 parenthesis, as well as setter method definitions, are

data/lib/ruby2js.rb

@@ -92,6 +92,7 @@ module Ruby2JS
       def on_await(node); on_send(node); end
       def on_call(node); on_send(node); end
       def on_class_extend(node); on_send(node); end
+      def on_class_module(node); on_send(node); end
       def on_constructor(node); on_def(node); end
       def on_defm(node); on_defs(node); end
       def on_defp(node); on_defs(node); end

data/lib/ruby2js/converter.rb

@@ -39,7 +39,8 @@ module Ruby2JS
 
       @ast, @comments, @vars = ast, comments, vars.dup
       @varstack = []
-      @scope = true
+      @scope = ast
+      @inner = nil
       @rbstack = []
       @next_token = :return
 
@@ -66,7 +67,7 @@ module Ruby2JS
     end
 
     def convert
-      parse( @ast, :statement )
+      scope @ast 
 
       if @strict
         if @sep == '; '
@@ -81,15 +82,42 @@ module Ruby2JS
       OPERATORS.index( OPERATORS.find{ |el| el.include? op } ) || -1
     end
     
+    # define a new scope; primarily determines what variables are visible and deals with hoisting of
+    # declarations
     def scope( ast, args=nil )
-      scope, @scope = @scope, true
+      scope, @scope = @scope, ast
+      inner, @inner = @inner, nil 
+      mark = output_location
       @varstack.push @vars
       @vars = args if args
       @vars = Hash[@vars.map {|key, value| [key, true]}]
+
       parse( ast, :statement )
+
+      # retroactively add a declaration for 'pending' variables
+      vars = @vars.select {|key, value| value == :pending}.keys
+      unless vars.empty?
+        insert mark, "#{es2015 ? 'let' : 'var'} #{vars.join(', ')}#{@sep}"
+        vars.each {|var| @vars[var] = true}
+      end
     ensure
       @vars = @varstack.pop
       @scope = scope
+      @inner = inner
+    end
+
+    # handle the oddity where javascript considers there to be a scope (e.g. the body of an if statement),
+    # whereas Ruby does not.
+    def jscope( ast, args=nil )
+      @varstack.push @vars
+      @vars = args if args
+      @vars = Hash[@vars.map {|key, value| [key, true]}]
+
+      parse( ast, :statement )
+    ensure
+      pending = @vars.select {|key, value| value == :pending}
+      @vars = @varstack.pop
+      @vars.merge! pending
     end
 
     def s(type, *args)

data/lib/ruby2js/converter/case.rb

@@ -10,8 +10,7 @@ module Ruby2JS
 
     handle :case do |expr, *whens, other|
       begin
-        scope, @scope = @scope, false
-        mark = output_location
+        inner, @inner = @inner, @ast
 
         has_range = whens.any? do |node| 
           node.children.any? {|child| [:irange, :erange].include? child.type}
@@ -61,16 +60,8 @@ module Ruby2JS
         (put "#{@nl}default:#@ws"; parse other, :statement) if other
 
         sput '}'
-
-        if scope
-          vars = @vars.select {|key, value| value == :pending}.keys
-          unless vars.empty?
-            insert mark, "#{es2015 ? 'let' : 'var'} #{vars.join(', ')}#{@sep}"
-            vars.each {|var| @vars[var] = true}
-          end
-        end
       ensure
-        @scope = scope
+        @inner = inner
       end
     end
   end

data/lib/ruby2js/converter/class.rb

@@ -12,11 +12,11 @@ module Ruby2JS
     #       when ++class is encountered; it signals that this construct is
     #       meant to extend an already existing JavaScrpt class.
 
-    handle :class, :class_extend do |name, inheritance, *body|
-      if @ast.type == :class_extend
+    handle :class, :class_extend, :class_module do |name, inheritance, *body|
+      if @ast.type != :class
         init = nil
       else
-        if es2015 and @ast.type != :class_extend
+        if es2015
           parse @ast.updated(:class2)
           return
         end
@@ -37,6 +37,13 @@ module Ruby2JS
       body.compact!
       visible = {}
       body.map! do |m| 
+        if 
+          @ast.type == :class_module and m.type == :defs and
+          m.children.first == s(:self)
+        then
+          m = m.updated(:def, m.children[1..-1])
+        end
+
         node = if m.type == :def
           if m.children.first == :initialize
             # constructor: remove from body and overwrite init function
@@ -115,6 +122,15 @@ module Ruby2JS
                   enumerable: s(:true),
                   configurable: s(:true)})
             end
+          elsif m.children[1] == :include
+            s(:send, s(:block, s(:send, nil, :lambda), s(:args),
+              s(:begin, *m.children[2..-1].map {|modname|
+              s(:for, s(:lvasgn, :$_), modname,
+              s(:send, s(:send, name, :prototype), :[]=,
+              s(:lvar, :$_), s(:send, modname, :[], s(:lvar, :$_))))
+              })), :[])
+          elsif [:private, :protected, :public].include? m.children[1]
+            raise Error.new("class #{m.children[1]} is not supported", @ast)
           else
             # class method call
             s(:send, name, *m.children[1..-1])
@@ -144,8 +160,19 @@ module Ruby2JS
           s(:send, s(:attr, name, :prototype),
             "#{m.children[0].children.first}=", 
             s(:attr, s(:attr, name, :prototype), m.children[1].children.first))
+        elsif m.type == :class
+          innerclass_name = m.children.first
+          if innerclass_name.children.first
+            innerclass_name = innerclass_name.updated(nil,
+              [s(:attr, innerclass_name.children[0], name),
+              innerclass_name.children[1]])
+          else
+            innerclass_name = innerclass_name.updated(nil,
+              [name, innerclass_name.children[1]])
+          end
+          m.updated(nil, [innerclass_name, *m.children[1..-1]])
         else
-          raise Error.new("class #{ m.type }", @ast)
+          raise Error.new("class #{ m.type } not supported", @ast)
         end
 
         # associate comments
@@ -191,7 +218,7 @@ module Ruby2JS
 
         # collapse sequence to a single assignment
         if 
-          @ast.type == :class and
+          @ast.type != :class_extend and
           (methods > 1 or (methods == 1 and body[start].type == :prop))
         then
           pairs = body[start...start+methods].map do |node|
@@ -214,8 +241,14 @@ module Ruby2JS
             end
             replacement
           end
-          body[start...start+methods] =
-            s(:send, name, :prototype=, s(:hash, *pairs.flatten))
+
+          if @ast.type == :class_module
+            body[start...start+methods] =
+              s(:casgn, *name.children, s(:hash, *pairs.flatten))
+          else
+            body[start...start+methods] =
+              s(:send, name, :prototype=, s(:hash, *pairs.flatten))
+          end
         end
       end
 

data/lib/ruby2js/converter/class2.rb

@@ -124,7 +124,15 @@ module Ruby2JS
                 var = child_sym.children.first
                 put "set #{var}(#{var}) {#{@nl}this._#{var} = #{var}#@nl}"
               end
+            elsif [:private, :protected, :public].include? m.children[1]
+              raise Error.new("class #{m.children[1]} is not supported", @ast)
             else
+              if m.children[1] == :include
+                m = m.updated(:begin, m.children[2..-1].map {|mname|
+                  s(:send, s(:const, nil, :Object), :assign,
+                  s(:attr, name, :prototype), mname)})
+              end
+
               skipped = true
             end
 
@@ -139,7 +147,7 @@ module Ruby2JS
           end
 
           if skipped
-            post << m if skipped
+            post << [m, comments] if skipped
           else
             comments.reverse.each {|comment| insert location, comment}
           end
@@ -148,8 +156,9 @@ module Ruby2JS
         put @nl unless skipped
         put '}'
 
-        post.each do |m|
+        post.each do |m, comments|
           put @sep
+          comments.each {|comment| put comment}
           if m.type == :alias
             parse name
             put '.prototype.'
@@ -158,6 +167,17 @@ module Ruby2JS
             parse name
             put '.prototype.'
             put m.children[1].children[0]
+          elsif m.type == :class
+            innerclass_name = m.children.first
+            if innerclass_name.children.first
+              innerclass_name = innerclass_name.updated(nil,
+                [s(:attr, innerclass_name.children[0], name),
+                 innerclass_name.children[1]])
+            else
+              innerclass_name = innerclass_name.updated(nil,
+                [name, innerclass_name.children[1]])
+            end
+            parse m.updated(nil, [innerclass_name, *m.children[1..-1]])
           else
             parse m, :statement
           end

data/lib/ruby2js/converter/def.rb

@@ -88,7 +88,10 @@ module Ruby2JS
       put 'async ' if @ast.type == :async
 
       # es2015 fat arrow support
-      if not name and es2015 and @state != :method and @ast.type != :defm
+      if 
+        not name and es2015 and @state != :method and @ast.type != :defm and 
+        not @prop
+      then
         put '('; parse args; put ') => '
 
         expr = body

data/lib/ruby2js/converter/if.rb

@@ -16,46 +16,42 @@ module Ruby2JS
 
       if @state == :statement
         begin
-          scope, @scope = @scope, false
-          mark = output_location
+          inner, @inner = @inner, @ast
 
           # use short form when appropriate
           unless else_block or then_block.type == :begin
+            # "Lexical declaration cannot appear in a single-statement context"
+            if [:lvasgn, :gvasgn].include? then_block.type
+              @vars[then_block.children.first] ||= :pending
+            end
+
             put "if ("; parse condition; put ') '
-            wrap { parse then_block, :statement }
+            wrap { jscope then_block }
           else
             put "if ("; parse condition; puts ') {'
-            parse then_block, :statement
+            jscope then_block
             sput '}'
 
             while else_block and else_block.type == :if
               condition, then_block, else_block = else_block.children
               if then_block
                 put ' else if ('; parse condition; puts ') {'
-                parse then_block, :statement
+                jscope then_block
                 sput '}'
               else
                 put ' else if ('; parse s(:not, condition); puts ') {'
-                parse else_block, :statement
+                jscope else_block
                 sput '}'
                 else_block = nil
               end
             end
 
             if else_block
-              puts ' else {'; parse else_block, :statement; sput '}'
-            end
-          end
-
-          if scope
-            vars = @vars.select {|key, value| value == :pending}.keys
-            unless vars.empty?
-              insert mark, "#{es2015 ? 'let' : 'var'} #{vars.join(', ')}#{@sep}"
-              vars.each {|var| @vars[var] = true}
+              puts ' else {'; jscope else_block; sput '}'
             end
           end
         ensure
-          @scope = scope
+          @inner = inner
         end
       else
         else_block ||= s(:nil)

data/lib/ruby2js/converter/kwbegin.rb

@@ -29,16 +29,17 @@ module Ruby2JS
         body, *recovers, otherwise = block.children
         raise Error.new("block else", @ast) if otherwise
 
-        if recovers.any? {|recover| not recover.children[1]}
-          raise Error.new("recover without exception variable", @ast)
-        end
-
         var = recovers.first.children[1]
 
         if recovers.any? {|recover| recover.children[1] != var}
           raise Error.new( 
             "multiple recovers with different exception variables", @ast)
         end
+
+        if recovers[0..-2].any? {|recover| not recover.children[0]}
+          raise Error.new( 
+            "additional recovers after catchall", @ast)
+        end
       else
         body = block
       end
@@ -50,6 +51,8 @@ module Ruby2JS
       puts "try {"; parse body, :statement; sput '}'
 
       if recovers
+        var ||= s(:gvar, :$EXCEPTION)
+
         if recovers.length == 1 and not recovers.first.children.first
           # single catch with no exception named
           put " catch ("; parse var; puts ") {"
@@ -60,6 +63,7 @@ module Ruby2JS
           first = true
           recovers.each do |recover|
             exceptions, var, recovery = recover.children
+            var ||= s(:gvar, :$EXCEPTION)
 
             if exceptions
 
@@ -69,7 +73,11 @@ module Ruby2JS
               put  'if ('
               exceptions.children.each_with_index do |exception, index|
                 put ' || ' unless index == 0
-                parse var; put ' instanceof '; parse exception
+                if exception == s(:const, nil, :String)
+                  put 'typeof '; parse var; put ' == "string"'
+                else
+                  parse var; put ' instanceof '; parse exception
+                end
               end
               puts ') {'
             else

data/lib/ruby2js/converter/masgn.rb

@@ -35,7 +35,7 @@ module Ruby2JS
         end
 
         newvars.each do |var| 
-          @vars[var.children.last] ||= (@scope ? true : :pending)
+          @vars[var.children.last] ||= (@inner ? :pending : true)
         end
 
         put '['

data/lib/ruby2js/converter/module.rb

@@ -6,12 +6,16 @@ module Ruby2JS
     #   (...)
 
     handle :module do |name, *body|
-      symbols = [] 
-
       while body.length == 1 and body.first.type == :begin
         body = body.first.children
       end
 
+      if body.length > 0 and body.all? {|child| child.type == :def}
+        parse @ast.updated(:class_module, [name, nil, *body])
+        return
+      end
+
+      symbols = [] 
       visibility = :public
       omit = []
 

data/lib/ruby2js/converter/regexp.rb

@@ -31,7 +31,8 @@ module Ruby2JS
       if parts.all? {|part| part.type == :str}
         str = parts.map {|part| part.children.first}.join
         unless str.scan('/').length - str.scan("\\").length > 3
-          return put "/#{ str.gsub('/', '\\/') }/#{ opts.join }"
+          return put "/#{ str.gsub('\\/', '/').gsub('/', '\\/') }/" +
+            opts.join
         end
       end
 

data/lib/ruby2js/converter/var.rb

@@ -5,7 +5,11 @@ module Ruby2JS
     # (gvar :$a)
 
     handle :lvar, :gvar do |var|
-      put var
+      if var == :$!
+        put '$EXCEPTION'
+      else
+        put var
+      end
     end
   end
 end

data/lib/ruby2js/converter/vasgn.rb

@@ -31,11 +31,15 @@ module Ruby2JS
           end
         end
 
-        if state == :statement and @scope and not @vars.include?(name) 
-          if es2015
-            var = 'let '
-          else
-            var = 'var ' 
+        hoist = false
+        if state == :statement and not @vars.include?(name) 
+          hoist = hoist?(@scope, @inner, name) if @inner
+          if not hoist
+            if es2015
+              var = 'let '
+            else
+              var = 'var '
+            end
           end
         end
 
@@ -44,9 +48,9 @@ module Ruby2JS
         else
           put "#{ var }#{ name }"
         end
-      ensure
-        if @scope
-          @vars[name] = true
+
+        if not hoist
+          @vars[name] ||= true
         elsif state == :statement
           @vars[name] ||= :pending
         else
@@ -55,6 +59,16 @@ module Ruby2JS
       end
     end
 
+    # is 'name' referenced outside of inner scope?
+    def hoist?(outer, inner, name)
+      outer.children.each do |var|
+        next if var == inner
+        return true if var == name and [:lvar, :gvar].include? outer.type
+        return true if Parser::AST::Node === var and hoist?(var, inner, name)
+      end
+      return false
+    end
+
     def multi_assign_declarations
       undecls = []
       child = @ast

data/lib/ruby2js/filter/functions.rb

@@ -32,7 +32,26 @@ module Ruby2JS
           process S(:send, s(:const, nil, :Object), :keys, target)
 
         elsif method == :merge!
-          process S(:send, s(:const, nil, :Object), :assign, target, *args)
+          if es2015
+            process S(:send, s(:const, nil, :Object), :assign, target, *args)
+          else
+            copy = []
+
+            unless
+               target.type == :send and target.children.length == 2 and
+               target.children[0] == nil
+            then
+               copy << s(:gvasgn, :$0, target)
+               target = s(:gvar, :$0)
+            end
+
+            s(:send, s(:block, s(:send, nil, :lambda), s(:args),
+              s(:begin, *copy, *args.map {|modname|
+              s(:for, s(:lvasgn, :$_), modname,
+              s(:send, target, :[]=,
+              s(:lvar, :$_), s(:send, modname, :[], s(:lvar, :$_))))
+              }, s(:return, target))), :[])
+          end
 
         elsif method == :delete and args.length == 1
           if not target

data/lib/ruby2js/rails.rb

@@ -10,7 +10,15 @@
 # Using an optional filter:
 #
 #   $ echo 'require "ruby2js/filter/functions"' > config/initializers/ruby2js.rb
-
+#
+# Asset Pipeline:
+#
+#  Ruby2JS registers ".rbs" (RuBy Script) extension.
+#  You can add "ruby_thing.js.rbs" to your javascript folder
+#  and '= require ruby_thing' from other js sources.
+#
+#  (options are not yet supported, but by requiring the appropriate files
+#   as shown above, you can configure proejct wide.)
 require 'ruby2js'
 
 module Ruby2JS
@@ -24,6 +32,26 @@ module Ruby2JS
     end
 
     ActionView::Template.register_template_handler :rb, Template
+
+    class SprocketProcessor
+      def initialize( file)
+        @file = file
+      end
+      def render(context , _)
+        context = context.instance_eval { binding } unless context.is_a? Binding
+        Ruby2JS.convert(File.read(@file), binding: context).to_s
+      end
+    end
+
+    class Engine < ::Rails::Engine
+      engine_name "ruby2js"
+
+      config.assets.configure do |env|
+        env.register_engine '.rbs', SprocketProcessor, mime_type: 'text/javascript', silence_deprecation: true
+      end
+
+    end
+
   end
 
 end

data/lib/ruby2js/version.rb

@@ -2,7 +2,7 @@ module Ruby2JS
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = 9
+    TINY  = 10
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 3.0.9
+  version: 3.0.10
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-17 00:00:00.000000000 Z
+date: 2018-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Minimal yet extensible Ruby to JavaScript conversion.