ruby2js 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1f6b8ccdda1317ddb72ca731897a87304b28925ed71647ce4904b05fc18daeb
-  data.tar.gz: 4a71dd298b6c4f202036b4232b0d230617c75cea380e1f225e3869040daade3d
+  metadata.gz: 2990f20dc46745e6e632c5cf672ce516f3ca64819a9129024efd7cc333714638
+  data.tar.gz: 77df7775a4146e1e45278002737c24304b4d4f0ccdb49825c372286cfbb2a44b
 SHA512:
-  metadata.gz: 10dd9756d3f8349b0fdb944d7a3dc2202c3cd57f23782aba500a68c02f8a5cc70a2a2c9f4dc9e5725a4bba06a45fb326ab6cdb5604aefb5ec6a397a34b10bc99
-  data.tar.gz: 1fbb8a1e87b2215f4303718b39de422584af3e10134ae85260db649a8ddbb094edcfe7585667fc4a9cadcbf6e74939861f492bfccdce1c44c39746275f7369b4
+  metadata.gz: 3e0fd19ebc555112ea283f6d112cac30c47c16c3701568acd725d70115c2fe3aa9ba5870145d1ec002f8d7c7f463f26a0fe5fce9f61eb4492539638b938a8219
+  data.tar.gz: 8423b871acb6c37b44b4d5e2878fc8b8eba3c3114768b37a8003cccafabf137253b02f4e55c13aea447521a944662b1554d848834fe5ec61e07381dfc967d3de

data/lib/ruby2js/filter/vue.rb

@@ -335,10 +335,8 @@ module Ruby2JS
           statement.type == :defs  and statement.children[0] == s(:self)
         end
 
-        if class_methods.empty? and @vue_reactive.empty?
-          defn
-        else
-          s(:begin, defn, *process_all(class_methods.map {|method|
+        unless class_methods.empty? and @vue_reactive.empty?
+          defn = s(:begin, defn, *process_all(class_methods.map {|method|
             fn = if method.is_method?
               if not method.children[1].to_s.end_with? '='
                 # class method
@@ -397,6 +395,8 @@ module Ruby2JS
             fn
           }).compact, *@vue_reactive)
         end
+
+        vue_collapse_pushes(defn)
       end
 
       # expand 'wunderbar' like method calls
@@ -889,6 +889,46 @@ module Ruby2JS
         end
       end
 
+      # collapse consecutive pushes into a single call to push
+      def vue_collapse_pushes(node)
+        if node.type == :begin
+          prev = nil
+          (node.children.length-1).downto(0) do |i|
+            child = node.children[i]
+            if 
+              child.type == :send and child.children[0] == s(:gvar, :$_) and
+              child.children[1] == :push
+            then
+              if prev
+                node = node.updated(nil, [*node.children[0...i],
+                  node.children[i].updated(nil, node.children[i].children +
+                    node.children[i+1].children[2..-1]),
+                  *node.children[prev+1..-1]])
+              end
+              prev = i
+            else
+              prev = nil
+            end
+          end
+        end
+
+        # recurse
+        children = node.children
+        children.each_with_index do |child, index|
+          if Parser::AST::Node === child
+            replacement = vue_collapse_pushes(child) 
+            unless replacement.equal? child
+              children = children.dup if children.frozen?
+              children[index] = replacement 
+            end
+          end
+        end
+
+        node = node.updated(nil, children) unless children.frozen?
+
+        node
+      end
+
       # convert blocks to proc arguments
       def on_block(node)
         child = node.children.first

data/lib/ruby2js/version.rb

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