ruby2js 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: '009edffb834a3c8c298d4ad601160d30c4781891a4fe7b229e6dbc6f4284569e'
-  data.tar.gz: 186d6e6ec33a0fee107623c3ed7994e9dea0741cf454bb79005acbb6be7f6429
+SHA1:
+  metadata.gz: a00761caa853bb0ecbd0d4531a47373e5bfde02c
+  data.tar.gz: 96f676c25a71ea845b8f914303bd5a550e3a564d
 SHA512:
-  metadata.gz: de2efb3d8d13a282af0401ce3a6216423564933483d3be4ed160eb1ef2bbf3092fdae6c9325d09298d6c86012de936c764178a0767a08b66b49b6d6d53bd9daa
-  data.tar.gz: 3558c528e771c98fd50ece66410dd12d3a33c57af85e89e47a1c04f743f4a531cb971dbdf197291f8e6b1530d1895ea9c40aaf8814d64d094eb2f397092504a2
+  metadata.gz: b41112e1bce8ff9a65c3dd2fa12f25e7b7fdd460c80f022e24486ede24848cca05895c30b602189c001472dc3e7be00c032e8ab6b2324dccb27d71089beafdb6
+  data.tar.gz: 8656d7be7bc9a581216096b122fd8b887943bb02b9302706bfa0d047e12f0fadc20e07adbf3e17ce837492fae120bd0f9ca274bfad7dce9392e3627f687f102b

data/README.md

@@ -45,6 +45,12 @@ mapped to
 [Object.defineProperty](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/defineProperty?redirectlocale=en-US&redirectslug=JavaScript%2FReference%2FGlobal_Objects%2FObject%2FdefineProperty),
 so avoid these if you wish to target users running IE8 or lower.
 
+While both Ruby and JavaScript have open classes, Ruby unifies the syntax for
+defining and extending an existing class, whereas JavaScript does not.  This
+means that Ruby2JS needs to be told when a class is being extended, which is
+done by prepending the `class` keyword with two plus signs, thus:
+`++class C; ...; end`.
+
 Filters may be provided to add Ruby-specific or framework specific
 behavior.  Filters are essentially macro facilities that operate on
 an AST representation of the code.

data/lib/ruby2js.rb

@@ -84,14 +84,16 @@ module Ruby2JS
         @ast = ast
       end
 
-      # handle all of the 'invented' ast types
+      # handle all of the 'invented/synthetic' ast types
       def on_async(node); on_def(node); end
       def on_asyncs(node); on_defs(node); end
       def on_attr(node); on_send(node); end
       def on_autoreturn(node); on_return(node); end
       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_constructor(node); on_def(node); end
+      def on_defm(node); on_defs(node); end
       def on_defp(node); on_defs(node); end
       def on_for_of(node); on_for(node); end
       def on_in?(node); on_send(node); end

data/lib/ruby2js/converter.rb

@@ -19,7 +19,7 @@ module Ruby2JS
       :=== => :'!=='
     }
 
-    GROUP_OPERATORS = [:begin, :dstr, :dsym, :and, :or]
+    GROUP_OPERATORS = [:begin, :dstr, :dsym, :and, :or, :casgn]
 
     VASGN = [:cvasgn, :ivasgn, :gvasgn, :lvasgn]
 
@@ -182,7 +182,7 @@ module Ruby2JS
       walk = proc do |ast|
         if ast.loc and ast.loc.expression
           filename = ast.loc.expression.source_buffer.name
-          if filename
+          if filename and not filename.empty?
             filename = filename.dup.untaint
             @timestamps[filename] ||= File.mtime(filename)
           end

data/lib/ruby2js/converter/case.rb

@@ -13,13 +13,39 @@ module Ruby2JS
         scope, @scope = @scope, false
         mark = output_location
 
-        put 'switch ('; parse expr; puts ') {'
+        has_range = whens.any? do |node| 
+          node.children.any? {|child| [:irange, :erange].include? child.type}
+        end
+
+        if has_range
+          # https://stackoverflow.com/questions/5619832/switch-on-ranges-of-integers-in-javascript
+          puts 'switch (true) {'
+        else
+          put 'switch ('; parse expr; puts ') {'
+        end
 
         whens.each_with_index do |node, index|
           puts '' unless index == 0
 
           *values, code = node.children
-          values.each {|value| put 'case '; parse value; put ":#@ws"}
+
+          values.each do |value| 
+            put 'case '; 
+            if has_range
+              if value.type == :irange
+                parse expr; put ' >= '; parse value.children.first; put " && "
+                parse expr; put ' <= '; parse value.children.last; put ":#@ws"
+              elsif value.type == :erange
+                parse expr; put ' >= '; parse value.children.first; put " && "
+                parse expr; put ' < '; parse value.children.last; put ":#@ws"
+              else
+                parse expr; put ' == '; parse value; put ":#@ws"
+              end
+            else
+              parse value; put ":#@ws"
+            end
+          end
+
           parse code, :statement
           put "#{@sep}break#@sep" if other or index < whens.length-1
         end

data/lib/ruby2js/converter/casgn.rb

@@ -8,10 +8,12 @@ module Ruby2JS
       multi_assign_declarations if @state == :statement
 
       begin
-        if es2015
-          put "const "
-        else
-          put "var "
+        if @state == :statement
+          if es2015
+            put "const "
+          else
+            put "var "
+          end
         end
 
         cbase ||= @rbstack.map {|rb| rb[var]}.compact.last

data/lib/ruby2js/converter/class.rb

@@ -8,16 +8,24 @@ module Ruby2JS
 
     # NOTE: :prop and :method macros are defined at the bottom of this file
 
-    handle :class do |name, inheritance, *body|
-      if es2015
-        parse @ast.updated(:class2)
-        return
-      end
+    # NOTE: class_extend is not generated by the parser, but instead produced
+    #       when ++class is encountered; it signals that this construct is
+    #       meant to extend an already existing JavaScrpt class.
 
-      if inheritance
-        init = s(:def, :initialize, s(:args), s(:super))
+    handle :class, :class_extend do |name, inheritance, *body|
+      if @ast.type == :class_extend
+        init = nil
       else
-        init = s(:def, :initialize, s(:args), nil)
+        if es2015 and @ast.type != :class_extend
+          parse @ast.updated(:class2)
+          return
+        end
+
+        if inheritance
+          init = s(:def, :initialize, s(:args), s(:super))
+        else
+          init = s(:def, :initialize, s(:args), nil)
+        end
       end
 
       body.compact!
@@ -53,7 +61,7 @@ module Ruby2JS
               # method: add to prototype
               s(:method, s(:attr, name, :prototype),
                 :"#{m.children[0].to_s.chomp('!')}=",
-                s(:def, nil, *m.children[1..-1]))
+                s(:defm, nil, *m.children[1..-1]))
             end
           end
 
@@ -182,7 +190,10 @@ module Ruby2JS
         end
 
         # collapse sequence to a single assignment
-        if methods > 1 or (methods == 1 and body[start].type == :prop)
+        if 
+          @ast.type == :class and
+          (methods > 1 or (methods == 1 and body[start].type == :prop))
+        then
           pairs = body[start...start+methods].map do |node|
             if node.type == :method
               replacement = node.updated(:pair, [
@@ -209,9 +220,26 @@ module Ruby2JS
       end
 
       # prepend constructor
-      constructor = init.updated(:constructor, [name, *init.children[1..-1]])
-      @comments[constructor] = @comments[init] unless @comments[init].empty?
-      body.unshift constructor
+      if init
+        constructor = init.updated(:constructor, [name, *init.children[1..-1]])
+        @comments[constructor] = @comments[init] unless @comments[init].empty?
+
+        if @ast.type == :class_extend
+          if es2015
+            constructor = s(:masgn, s(:mlhs, 
+              s(:attr, s(:casgn, *name.children, constructor), :prototype)), 
+              s(:array, s(:attr, name, :prototype)))
+          else
+            constructor = s(:send, s(:block, s(:send, nil, :proc),
+              s(:args, s(:shadowarg, :$_)), s(:begin,
+              s(:gvasgn, :$_, s(:attr, name, :prototype)),
+              s(:send, s(:casgn, *name.children, constructor),
+              :prototype=, s(:gvar, :$_)))), :[])
+          end
+        end
+
+        body.unshift constructor
+      end
 
       begin
         # save class name

data/lib/ruby2js/converter/const.rb

@@ -7,7 +7,17 @@ module Ruby2JS
       # resolve anonymous receivers against rbstack
       receiver ||= @rbstack.map {|rb| rb[name]}.compact.last
 
-      parse receiver; put '.' if receiver; put name
+      if receiver
+        if Parser::AST::Node === receiver and receiver.type == :cbase
+          put 'Function("return this")().'
+        else
+          parse receiver
+          put '.'
+        end
+
+      end
+      
+      put name
     end
   end
 end

data/lib/ruby2js/converter/def.rb

@@ -6,7 +6,7 @@ module Ruby2JS
     #     (arg :x)
     #   (...)
 
-    handle :def, :async do |name, args, body=nil|
+    handle :def, :defm, :async do |name, args, body=nil|
       body ||= s(:begin)
       if name =~ /[!?]$/
         raise NotImplementedError, "invalid method name #{ name }"
@@ -91,7 +91,7 @@ module Ruby2JS
       put 'async ' if @ast.type == :async
 
       # es2015 fat arrow support
-      if not name and es2015 and @state != :method
+      if not name and es2015 and @state != :method and @ast.type != :defm
         put '('; parse args; put ') => '
 
         expr = body

data/lib/ruby2js/converter/send.rb

@@ -131,7 +131,16 @@ module Ruby2JS
         put ')'
 
       elsif [:-@, :+@, :~, '~'].include? method
-        put method.to_s[0]; parse receiver
+        if 
+          receiver.type == :send and
+          receiver.children[1] == :+@ and
+          Parser::AST::Node === receiver.children[0] and
+          receiver.children[0].type == :class
+        then
+          parse receiver.children[0].updated(:class_extend)
+        else
+          put method.to_s[0]; parse receiver
+        end
 
       elsif method == :=~
         parse args.first; put '.test('; parse receiver; put ')'
@@ -143,7 +152,8 @@ module Ruby2JS
         parse receiver; put '.push('; parse args.first; put ')'
 
       elsif method == :<=>
-        raise NotImplementedError, "use of <=>"
+        parse receiver; put ' < '; parse args.first; put ' ? -1 : '
+        parse receiver; put ' > '; parse args.first; put ' ? 1 : 0'
 
       elsif OPERATORS.flatten.include?(method) and not LOGICAL.include?(method)
         (group_receiver ? group(receiver) : parse(receiver))
@@ -153,7 +163,7 @@ module Ruby2JS
       elsif method =~ /=$/
         multi_assign_declarations if @state == :statement
 
-        parse receiver
+        (group_receiver ? group(receiver) : parse(receiver))
         put "#{ '.' if receiver }#{ method.to_s.sub(/=$/, ' =') } "
         parse args.first, (@state == :method ? :method : :expression)
 
@@ -195,7 +205,7 @@ module Ruby2JS
           end
         elsif args.length == 1 and args.first.type == :send
           # accommodation for JavaScript like new syntax w/argument list
-          parse s(:send, s(:const, nil, args.first.children[1]), :new,
+          parse s(:send, s(:const, *args.first.children[0..1]), :new,
             *args.first.children[2..-1]), @state
         elsif args.length == 1 and args.first.type == :const
           # accommodation for JavaScript like new syntax w/o argument list

data/lib/ruby2js/filter/functions.rb

@@ -112,18 +112,26 @@ module Ruby2JS
           process S(:send, target, :==, s(:nil))
 
         elsif [:start_with?, :end_with?].include? method and args.length == 1
-          if args.first.type == :str
-            length = S(:int, args.first.children.first.length)
-          else
-            length = S(:attr, *args, :length)
-          end
-
-          if method == :start_with?
-            process S(:send, S(:send, target, :substring, s(:int, 0), 
-              length), :==, *args)
+          if es2015
+	    if method == :start_with?
+              process S(:send, target, :startsWith, *args)
+            else
+              process S(:send, target, :endsWith, *args)
+            end
           else
-            process S(:send, S(:send, target, :slice, 
-              S(:send, length, :-@)), :==, *args)
+	    if args.first.type == :str
+	      length = S(:int, args.first.children.first.length)
+	    else
+	      length = S(:attr, *args, :length)
+	    end
+
+	    if method == :start_with?
+	      process S(:send, S(:send, target, :substring, s(:int, 0), 
+		length), :==, *args)
+	    else
+	      process S(:send, S(:send, target, :slice, 
+		S(:send, length, :-@)), :==, *args)
+	    end
           end
 
         elsif method == :clear and args.length == 0 and node.is_method?

data/lib/ruby2js/version.rb

@@ -2,7 +2,7 @@ module Ruby2JS
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
 
     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.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-24 00:00:00.000000000 Z
+date: 2018-03-06 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.4
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Minimal yet extensible Ruby to JavaScript conversion.