ruby2js 2.0.1 → 2.0.2

data/lib/ruby2js/filter/react.rb

@@ -152,7 +152,10 @@ module Ruby2JS
               end
 
             elsif mname == :render
-              if block.length!=1 or not block.last or block.last.type==:begin
+              if 
+                block.length != 1 or not block.last or 
+                not [:send, :block].include? block.last.type
+              then
                 # wrap multi-line blocks with a 'span' element
                 block = [s(:return, 
                   s(:block, s(:send, nil, :_span), s(:args), *block))]
@@ -161,7 +164,9 @@ module Ruby2JS
             elsif mname == :componentWillReceiveProps
               if args.children.length == 0
                 args = s(:args, s(:arg, :"$$props"))
+                comments = @comments[child]
                 child = child.updated(:def, [mname, args, *block])
+                @comments[child] = comments unless comments.empty?
                 @reactProps = s(:lvar, :"$$props")
               else
                 @reactProps = s(:lvar, args.children.first.children.last)
@@ -732,6 +737,36 @@ module Ruby2JS
           end
         end
       end
+
+      # collapse consecutive setState calls into a single call
+      def on_begin(node)
+        node = super
+        (node.children.length-2).downto(0) do |i|
+          if 
+            node.children[i].type == :send and
+            node.children[i].children[0] and
+            node.children[i].children[0].type == :self and
+            node.children[i].children[1] == :setState and
+            node.children[i].children[2].type == :hash and
+            node.children[i+1].type == :send and
+            node.children[i+1].children[0] and
+            node.children[i+1].children[0].type == :self and
+            node.children[i+1].children[1] == :setState and
+            node.children[i+1].children[2].type == :hash and
+            @comments[node.children[i+1]].empty?
+          then
+            pairs = node.children[i].children[2].children +
+                   node.children[i+1].children[2].children
+            children = node.children.dup
+            children.delete_at(i)
+            children[i] = children[i].updated(nil, [
+              *children[i].children[0..1],
+              children[i].children[2].updated(nil, pairs)])
+            node = node.updated(nil, children)
+          end
+        end
+        node
+      end
     end
 
     DEFAULTS.push React

data/lib/ruby2js/version.rb

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

data/ruby2js.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby2js"
-  s.version = "2.0.1"
+  s.version = "2.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2015-04-02"
+  s.date = "2015-04-10"
   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 = ["ruby2js.gemspec", "README.md", "lib/ruby2js", "lib/ruby2js/execjs.rb", "lib/ruby2js/converter.rb", "lib/ruby2js/version.rb", "lib/ruby2js/filter", "lib/ruby2js/filter/jquery.rb", "lib/ruby2js/filter/return.rb", "lib/ruby2js/filter/underscore.rb", "lib/ruby2js/filter/require.rb", "lib/ruby2js/filter/angularrb.rb", "lib/ruby2js/filter/minitest-jasmine.rb", "lib/ruby2js/filter/camelCase.rb", "lib/ruby2js/filter/rubyjs.rb", "lib/ruby2js/filter/strict.rb", "lib/ruby2js/filter/functions.rb", "lib/ruby2js/filter/angular-resource.rb", "lib/ruby2js/filter/react.rb", "lib/ruby2js/filter/angular-route.rb", "lib/ruby2js/sinatra.rb", "lib/ruby2js/rails.rb", "lib/ruby2js/serializer.rb", "lib/ruby2js/cgi.rb", "lib/ruby2js/converter", "lib/ruby2js/converter/self.rb", "lib/ruby2js/converter/arg.rb", "lib/ruby2js/converter/dstr.rb", "lib/ruby2js/converter/xstr.rb", "lib/ruby2js/converter/sym.rb", "lib/ruby2js/converter/return.rb", "lib/ruby2js/converter/break.rb", "lib/ruby2js/converter/for.rb", "lib/ruby2js/converter/defined.rb", "lib/ruby2js/converter/cvasgn.rb", "lib/ruby2js/converter/whilepost.rb", "lib/ruby2js/converter/logical.rb", "lib/ruby2js/converter/in.rb", "lib/ruby2js/converter/args.rb", "lib/ruby2js/converter/def.rb", "lib/ruby2js/converter/prototype.rb", "lib/ruby2js/converter/class.rb", "lib/ruby2js/converter/nthref.rb", "lib/ruby2js/converter/opasgn.rb", "lib/ruby2js/converter/module.rb", "lib/ruby2js/converter/kwbegin.rb", "lib/ruby2js/converter/send.rb", "lib/ruby2js/converter/boolean.rb", "lib/ruby2js/converter/masgn.rb", "lib/ruby2js/converter/hash.rb", "lib/ruby2js/converter/cvar.rb", "lib/ruby2js/converter/ivasgn.rb", "lib/ruby2js/converter/case.rb", "lib/ruby2js/converter/const.rb", "lib/ruby2js/converter/vasgn.rb", "lib/ruby2js/converter/untilpost.rb", "lib/ruby2js/converter/begin.rb", "lib/ruby2js/converter/ivar.rb", "lib/ruby2js/converter/while.rb", "lib/ruby2js/converter/next.rb", "lib/ruby2js/converter/nil.rb", "lib/ruby2js/converter/blockpass.rb", "lib/ruby2js/converter/super.rb", "lib/ruby2js/converter/defs.rb", "lib/ruby2js/converter/array.rb", "lib/ruby2js/converter/block.rb", "lib/ruby2js/converter/if.rb", "lib/ruby2js/converter/until.rb", "lib/ruby2js/converter/regexp.rb", "lib/ruby2js/converter/casgn.rb", "lib/ruby2js/converter/undef.rb", "lib/ruby2js/converter/literal.rb", "lib/ruby2js/converter/var.rb", "lib/ruby2js.rb"]

metadata

@@ -2,14 +2,14 @@
 name: ruby2js
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement