ruby2js 2.0.11 → 2.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59d4516cb826cddf572184ad24726edede34d3a0
-  data.tar.gz: 2e04bc01f75f93290e4c355f86d526d0a7f3cb90
+  metadata.gz: 6c1a1b51c2433b2fe65efe814eb0e5b2e0e299a9
+  data.tar.gz: 6caa0926d512f05819c720a19015de7a37ba5a12
 SHA512:
-  metadata.gz: 0e1a1726da1fa6d7dbf53436e72890163b05a374a9ff243738d139b6c6633af719d92cba7d4bc417f5eaa6caec3d8ea819204f241d43176bf08d2be6b4caf378
-  data.tar.gz: d52b7d7b0170ea25de5605b691425479aba8210459d3ef8c8e9da3faddc2c34769b05bf8183bcd58ebc8dc4f18dcd84d261d18e2686068937b1d785afd4dcc6f
+  metadata.gz: 677c0dc3e1e87b4a0081a0e6acda2a6340435096c6d1609080abf3e996189ec487c8d545743337198d54e33d77f0def6fc446e06390dd261d586e361b0704055
+  data.tar.gz: a3d8b254ce2031faf24f2d24cd7affcc7d0a6de58f211a88b4187d642196507d6379dbac92746304f235a1cb8f47404b6459c658d6d3f64de377b86b0c55051a

data/README.md

@@ -4,6 +4,7 @@ Ruby2js
 Minimal yet extensible Ruby to JavaScript conversion.  
 
 [![Build Status](https://travis-ci.org/rubys/ruby2js.svg)](https://travis-ci.org/rubys/ruby2js) 
+[![Gem Version](https://badge.fury.io/rb/ruby2js.svg)](https://badge.fury.io/rb/ruby2js)
 
 Description
 ---
@@ -166,6 +167,7 @@ the script.
     * `.each_with_index` becomes `.forEach`
     * `.end_with?` becomes `.slice(-arg.length) == arg`
     * `.empty?` becomes `.length == 0`
+    * `.find_index` becomes `findIndex`
     * `.first` becomes `[0]`
     * `.first(n)` becomes `.slice(0, n)`
     * `.gsub` becomes `replace //g`
@@ -175,6 +177,7 @@ the script.
     * `.last` becomes `[*.length-1]`
     * `.last(n)` becomes `.slice(*.length-1, *.length)`
     * `.max` becomes `Math.max.apply(Math)`
+    * `.merge!` becomes `Object.assign()`
     * `.min` becomes `Math.min.apply(Math)`
     * `.nil?` becomes `== null`
     * `.ord` becomes `charCodeAt(0)`
@@ -182,6 +185,10 @@ the script.
     * `.replace` becomes `.length = 0; ...push.apply(*)`
     * `.respond_to?` becomes `right in left`
     * `.start_with?` becomes `.substring(0, arg.length) == arg`
+    * `.upto(lim)` becomes `for (var i=num; i<=lim; i+=1)`
+    * `.downto(lim)` becomes `for (var i=num; i>=lim; i-=1)`
+    * `.step(lim, n).each` becomes `for (var i=num; i<=lim; i+=n)`
+    * `.step(lim, -n).each` becomes `for (var i=num; i>=lim; i-=n)`
     * `.strip` becomes `.trim`
     * `.sub` becomes `.replace`
     * `.to_f` becomes `parseFloat`
@@ -204,7 +211,7 @@ the script.
        first parameter on the call
     * for the following methods, if the block consists entirely of a simple
       expression (or ends with one), a `return` is added prior to the
-      expression: `sub`, `gsub`, `any?`, `all?`, `map`.
+      expression: `sub`, `gsub`, `any?`, `all?`, `map`, `find`, `find_index`.
     * New classes subclassed off of `Exception` will become subclassed off
       of `Error` instead; and default constructors will be provided
     * `loop do...end` will be replaced with `while (true) {...}`
@@ -308,6 +315,12 @@ the script.
       expression (or ends with one), a `return` is added prior to the
       expression: `reduce`, `sort_by`, `group_by`, `index_by`, `count_by`,
       `find`, `select`, `reject`.
+    * `is_a?` and `kind_of?` map to `Object.prototype.toString.call() ===
+      "[object #{type}]" for the following types: `Arguments`, `Boolean`,
+      `Date`, `Error`, `Function`, `Number`, `Object`, `RegExp`, `String`; and
+      maps Ruby names to JavaScript equivalents for `Exception`, `Float`,
+      `Hash`, `Proc`, and `Regexp`.  Additionally, `is_a?` and `kind_of?` map
+      to `Array.isArray()` for `Array`.
 
 * <a id="jquery" href="https://github.com/rubys/ruby2js/blob/master/spec/jquery.rb">jquery</a>
 

data/lib/ruby2js/converter/block.rb

@@ -20,8 +20,16 @@ module Ruby2JS
         expression = call.children.first.children.first
         comp = (expression.type == :irange ? '<=' : '<')
         put "for (var "; parse var; put " = "; parse expression.children.first
-        put "; "; parse var; put " #{comp} "; parse expression.children.last
-        put "; "; parse var; put " += "; parse call.children[2]; puts ") {"
+        put "; "; parse var; 
+        if call.children[2].type == :int and call.children[2].children[0] < 0
+          put " #{comp.sub('<', '>')} "; parse expression.children.last
+          put "; "; parse var; put " -= "
+          parse s(:int, -call.children[2].children[0])
+        else
+          put " #{comp} "; parse expression.children.last
+          put "; "; parse var; put " += "; parse call.children[2]
+        end
+        puts ") {"
         scope block
         sput "}"
 

data/lib/ruby2js/converter/kwbegin.rb

@@ -1,12 +1,20 @@
 module Ruby2JS
   class Converter
 
+    # (rescue
+    #   (send nil :a)
+    #     (resbody nil nil
+    #       (send nil :b)) nil)
+    handle :rescue do |*statements|
+      parse_all s(:kwbegin, s(:rescue, *statements))
+    end
+
     # (kwbegin
     #   (ensure
     #     (rescue
-    #      (send nil :a)
-    #      (resbody nil nil
-    #        (send nil :b)) nil)
+    #       (send nil :a)
+    #       (resbody nil nil
+    #         (send nil :b)) nil)
     #    (send nil :c)))
 
     handle :kwbegin do |*children|

data/lib/ruby2js/converter/send.rb

@@ -142,6 +142,13 @@ module Ruby2JS
         elsif args.length == 1 and args.first.type == :const
           # accommodation for JavaScript like new syntax w/o argument list
           parse s(:attr, args.first, :new), @state
+        elsif 
+          args.length == 2 and [:send, :const].include? args.first.type and
+          args.last.type == :def and args.last.children.first == nil
+        then
+          # accommodation for JavaScript like new syntax with block
+          parse s(:send, s(:const, nil, args.first.children[1]), :new,
+            *args.first.children[2..-1], args.last), @state
         else
           raise NotImplementedError, "use of JavaScript keyword new"
         end
@@ -179,5 +186,29 @@ module Ruby2JS
         end
       end
     end
+
+    handle :csend do |receiver, method, *args|
+      node = @ast
+
+      # collect up chain of conditional sends
+      stack = []
+      while node.children.first.type == :csend
+        stack << node
+        node = node.children.first
+      end
+
+      # conditionally evaluate most nested expression
+      expr = node.updated(:send)
+      result = s(:and, node.children.first, expr)
+
+      # build up chain of conditional evaluations
+      until stack.empty?
+        node = stack.pop
+	expr = node.updated(:send, [expr, *node.children[1..-1]])
+	result = s(:and, result, expr)
+      end
+
+      parse result
+    end
   end
 end

data/lib/ruby2js/filter/functions.rb

@@ -31,6 +31,9 @@ module Ruby2JS
         elsif method == :keys and args.length == 0 and node.is_method?
           process S(:send, s(:const, nil, :Object), :keys, target)
 
+        elsif method == :merge!
+          process S(:send, s(:const, nil, :Object), :assign, target, *args)
+
         elsif method == :delete and args.length == 1
           if not target
             process S(:undef, args.first)
@@ -235,6 +238,32 @@ module Ruby2JS
           process S(:send, s(:send, s(:const, nil, :Array), :new,
             s(:send, args.first, :+, s(:int, 1))), :join, target)
 
+        elsif [:is_a?, :kind_of?].include? method and args.length == 1
+          if args[0].type == :const
+            parent = args[0].children.last
+            parent = :Number if parent == :Float
+            parent = :Object if parent == :Hash
+            parent = :Function if parent == :Proc
+            parent = :Error if parent == :Exception
+            parent = :RegExp if parent == :Regexp
+            if parent == :Array
+              S(:send, s(:const, nil, :Array), :isArray, target)
+            elsif [:Arguments, :Boolean, :Date, :Error, :Function, :Number,
+                :Object, :RegExp, :String].include? parent
+              S(:send, s(:send, s(:attr, s(:attr, s(:const, nil, Object), 
+                :prototype), :toString), :call, target), :===,
+                s(:str, "[object #{parent.to_s}]"))
+            else
+              super
+            end
+          else
+            super
+          end
+
+        elsif target && target.type == :send and target.children[1] == :delete
+          # prevent chained delete methods from being converted to undef
+          S(:send, target.updated(:sendw), *node.children[1..-1])
+
         else
           super
         end
@@ -269,6 +298,15 @@ module Ruby2JS
           node.updated nil, [process(call), process(node.children[1]),
             s(:autoreturn, *process_all(node.children[2..-1]))]
 
+        elsif call.children[1] == :find and call.children.length == 2
+          node.updated nil, [process(call), process(node.children[1]),
+            s(:autoreturn, *process_all(node.children[2..-1]))]
+
+        elsif call.children[1] == :find_index and call.children.length == 2
+          call = call.updated nil, [call.children.first, :findIndex]
+          node.updated nil, [process(call), process(node.children[1]),
+            s(:autoreturn, *process_all(node.children[2..-1]))]
+
         elsif call.children[1] == :map and call.children.length == 2
           node.updated nil, [process(call), process(node.children[1]),
             s(:autoreturn, *process_all(node.children[2..-1]))]
@@ -288,7 +326,7 @@ module Ruby2JS
           # output: while(true) {statements}
           S(:while, s(:true), node.children[2])
 
-        elsif [:delete].include? call.children[1]
+        elsif call.children[1] == :delete
           # restore delete methods that are prematurely mapped to undef
           result = super
 
@@ -307,6 +345,28 @@ module Ruby2JS
 
           result
 
+        elsif call.children[1] == :downto
+          range = s(:irange, call.children[0], call.children[2])
+          call = call.updated(nil, [s(:begin, range), :step, s(:int, -1)])
+          process node.updated(nil, [call, *node.children[1..-1]])
+
+        elsif call.children[1] == :upto
+          range = s(:irange, call.children[0], call.children[2])
+          call = call.updated(nil, [s(:begin, range), :step, s(:int, 1)])
+          process node.updated(nil, [call, *node.children[1..-1]])
+
+        elsif 
+          call.children[1] == :each and call.children[0].type == :send and
+          call.children[0].children[1] == :step
+        then
+          # i.step(j, n).each {|v| ...}
+          range = call.children[0]
+          step = range.children[3] || s(:int, 1)
+          call = call.updated(nil, [s(:begin, 
+            s(:irange, range.children[0], range.children[2])),
+            :step, step])
+          process node.updated(nil, [call, *node.children[1..-1]])
+
         else
           super
         end

data/lib/ruby2js/filter/react.rb

@@ -394,6 +394,7 @@ module Ruby2JS
 
           # replace attribute names with case-sensitive javascript properties
           pairs.each_with_index do |pair, index|
+            next if pair.type == :kwsplat
             name = pair.children.first.children.first.downcase
             if ReactAttrMap[name] and name.to_s != ReactAttrMap[name]
               pairs[index] = pairs[index].updated(nil, 
@@ -426,7 +427,11 @@ module Ruby2JS
           end
 
           # construct hash (or nil) from pairs
-          hash = (pairs.length > 0 ? process(s(:hash, *pairs)) : s(:nil))
+          if pairs.length == 1 and pairs.first.type == :kwsplat
+            hash = pairs.first.children.first
+          else
+            hash = (pairs.length > 0 ? process(s(:hash, *pairs)) : s(:nil))
+          end
 
           # based on case of tag name, build a HTML tag or React component
           if tag =~ /^[A-Z]/

data/lib/ruby2js/version.rb

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

data/ruby2js.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: ruby2js 2.0.11 ruby lib
+# stub: ruby2js 2.0.12 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ruby2js"
-  s.version = "2.0.11"
+  s.version = "2.0.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Sam Ruby"]
-  s.date = "2015-12-14"
+  s.date = "2015-12-26"
   s.description = "    The base package maps Ruby syntax to JavaScript semantics.\n    Filters may be provided to add Ruby-specific or framework specific\n    behavior.\n"
   s.email = "rubys@intertwingly.net"
   s.files = ["README.md", "lib/ruby2js", "lib/ruby2js.rb", "lib/ruby2js/cgi.rb", "lib/ruby2js/converter", "lib/ruby2js/converter.rb", "lib/ruby2js/converter/arg.rb", "lib/ruby2js/converter/args.rb", "lib/ruby2js/converter/array.rb", "lib/ruby2js/converter/begin.rb", "lib/ruby2js/converter/block.rb", "lib/ruby2js/converter/blockpass.rb", "lib/ruby2js/converter/boolean.rb", "lib/ruby2js/converter/break.rb", "lib/ruby2js/converter/case.rb", "lib/ruby2js/converter/casgn.rb", "lib/ruby2js/converter/class.rb", "lib/ruby2js/converter/const.rb", "lib/ruby2js/converter/cvar.rb", "lib/ruby2js/converter/cvasgn.rb", "lib/ruby2js/converter/def.rb", "lib/ruby2js/converter/defined.rb", "lib/ruby2js/converter/defs.rb", "lib/ruby2js/converter/dstr.rb", "lib/ruby2js/converter/for.rb", "lib/ruby2js/converter/hash.rb", "lib/ruby2js/converter/if.rb", "lib/ruby2js/converter/in.rb", "lib/ruby2js/converter/ivar.rb", "lib/ruby2js/converter/ivasgn.rb", "lib/ruby2js/converter/kwbegin.rb", "lib/ruby2js/converter/literal.rb", "lib/ruby2js/converter/logical.rb", "lib/ruby2js/converter/masgn.rb", "lib/ruby2js/converter/module.rb", "lib/ruby2js/converter/next.rb", "lib/ruby2js/converter/nil.rb", "lib/ruby2js/converter/nthref.rb", "lib/ruby2js/converter/opasgn.rb", "lib/ruby2js/converter/prototype.rb", "lib/ruby2js/converter/regexp.rb", "lib/ruby2js/converter/return.rb", "lib/ruby2js/converter/self.rb", "lib/ruby2js/converter/send.rb", "lib/ruby2js/converter/super.rb", "lib/ruby2js/converter/sym.rb", "lib/ruby2js/converter/undef.rb", "lib/ruby2js/converter/until.rb", "lib/ruby2js/converter/untilpost.rb", "lib/ruby2js/converter/var.rb", "lib/ruby2js/converter/vasgn.rb", "lib/ruby2js/converter/while.rb", "lib/ruby2js/converter/whilepost.rb", "lib/ruby2js/converter/xstr.rb", "lib/ruby2js/execjs.rb", "lib/ruby2js/filter", "lib/ruby2js/filter/angular-resource.rb", "lib/ruby2js/filter/angular-route.rb", "lib/ruby2js/filter/angularrb.rb", "lib/ruby2js/filter/camelCase.rb", "lib/ruby2js/filter/functions.rb", "lib/ruby2js/filter/jquery.rb", "lib/ruby2js/filter/minitest-jasmine.rb", "lib/ruby2js/filter/react.rb", "lib/ruby2js/filter/require.rb", "lib/ruby2js/filter/return.rb", "lib/ruby2js/filter/rubyjs.rb", "lib/ruby2js/filter/strict.rb", "lib/ruby2js/filter/underscore.rb", "lib/ruby2js/rails.rb", "lib/ruby2js/serializer.rb", "lib/ruby2js/sinatra.rb", "lib/ruby2js/version.rb", "ruby2js.gemspec"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 2.0.11
+  version: 2.0.12
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2015-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser