ruby2js 1.15.0 → 1.15.1

data/lib/ruby2js/converter.rb

@@ -16,6 +16,8 @@ module Ruby2JS
       :=== => :'!=='
     }
 
+    GROUP_OPERATORS = [:begin, :dstr, :dsym, :and, :or]
+
     attr_accessor :binding, :ivars
 
     def initialize( ast, vars = {} )

data/lib/ruby2js/converter/send.rb

@@ -48,14 +48,14 @@ module Ruby2JS
       if receiver
         group_receiver = receiver.type == :send &&
           op_index < operator_index( receiver.children[1] ) if receiver
-        group_receiver ||= [:begin, :dstr, :dsym].include? receiver.type
+        group_receiver ||= GROUP_OPERATORS.include? receiver.type
         group_receiver = false if receiver.children[1] == :[]
       end
 
       if target
         group_target = target.type == :send && 
           op_index < operator_index( target.children[1] )
-        group_target ||= (target.type == :begin)
+        group_target ||= GROUP_OPERATORS.include? target.type
       end
 
       if method == :!

data/lib/ruby2js/filter/react.rb

@@ -13,6 +13,7 @@
 #  *  @x becomes this.state.x
 #  * @@x becomes this.props.x
 #  *  ~x becomes this.refs.x.getDOMNode()
+#  * ~"x" becomes document.querySelector("x")
 #
 require 'ruby2js'
 
@@ -87,6 +88,13 @@ module Ruby2JS
           body.select {|child| child.type == :def}.each do |child|
             mname, args, *block = child.children
             @reactMethod = mname
+            @reactProps = s(:attr, s(:self), :props)
+
+            # analyze ivar usage
+            @reactIvars = {pre: [], post: [], asgn: [], ref: []}
+            react_walk(child) unless mname == :initialize
+            @reactIvars[:capture] = 
+              (@reactIvars[:pre] + @reactIvars[:post]).uniq
 
             if mname == :initialize
               mname = :getInitialState
@@ -133,6 +141,41 @@ module Ruby2JS
                 block = [s(:return, 
                   s(:block, s(:send, nil, :_span), s(:args), *block))]
               end
+
+            elsif mname == :componentWillReceiveProps
+              if args.children.length == 0
+                args = s(:args, s(:arg, :"$$props"))
+                child = s(:def, mname, args, *block)
+                @reactProps = s(:lvar, :"$$props")
+              else
+                @reactProps = s(:lvar, args.children.first.children.last)
+              end
+            end
+
+            # drill down if necessary to find the block
+            while block.length==1 and block.first and block.first.type==:begin
+              block = block.first.children.dup
+            end
+
+            # capture ivars that are both set and referenced
+            @reactIvars[:pre].uniq.sort.reverse.each do |ivar|
+              block.unshift(s(:lvasgn, "$#{ivar.to_s[1..-1]}", 
+                s(:attr, s(:attr, s(:self), :state), ivar.to_s[1..-1])))
+            end
+
+            # update ivars that are set and later referenced
+            unless @reactIvars[:post].empty?
+              updates = @reactIvars[:post].uniq.sort.reverse.map do |ivar|
+                s(:pair, s(:lvar, ivar.to_s[1..-1]), 
+                  s(:lvar, "$#{ivar.to_s[1..-1]}"))
+              end
+              update = s(:send, s(:self), :setState, s(:hash, *updates))
+
+              if block.last.type == :return
+                block.insert(block.length-1, update)
+              else
+                block.push(update)
+              end
             end
 
             # add method to class
@@ -240,9 +283,12 @@ module Ruby2JS
             end
             pairs -= classes
             if expr
-              value = s(:if, expr, 
-                s(:send, s(:str, values.join(' ')), :+, expr), 
-                s(:str, values.join(' ').strip))
+              if values.length > 1
+                value = s(:send, s(:str, values.join(' ')), :+, 
+                  s(:or, expr, s(:str, '')))
+              else
+                value = s(:or, expr, s(:str, ''))
+              end
             else
               value = s(:str, values.join(' '))
             end
@@ -487,6 +533,13 @@ module Ruby2JS
             super
           end
 
+        elsif 
+          node.children[0] and node.children[0].type == :self and
+          node.children.length == 2 and
+          node.children[1] == :componentWillReceiveProps
+        then
+          s(:send, *node.children, s(:attr, s(:self), :props))
+
         else
           super
         end
@@ -550,16 +603,25 @@ module Ruby2JS
       # convert instance variables to state
       def on_ivar(node)
         return super unless @reactClass
-        s(:attr, s(:attr, s(:self), :state), node.children.first.to_s[1..-1])
+        if @reactMethod and @reactIvars[:capture].include? node.children.first
+          s(:lvar, "$#{node.children.first[1..-1]}")
+        else
+          s(:attr, s(:attr, s(:self), :state), node.children.first.to_s[1..-1])
+        end
       end
 
       # convert instance variable assignments to setState calls
       def on_ivasgn(node)
         return super unless @react
 
+        if @reactMethod and @reactIvars[:capture].include? node.children.first
+          return s(:lvasgn, "$#{node.children.first[1..-1]}",
+            *process_all(node.children[1..-1]))
+        end
+
         vars = [node.children.first]
 
-        while node.children[1].type == :ivasgn
+        while node.children.length > 1 and node.children[1].type == :ivasgn
           node = node.children[1]
           vars << node.children.first
         end
@@ -574,10 +636,73 @@ module Ruby2JS
         end
       end
 
+      # prevent attempts to assign to React properties
+      def on_cvasgn(node)
+        return super unless @reactMethod
+        raise NotImplementedError, "setting a React property"
+      end
+
       # convert class variables to props
-      def on_cvar(node)
+      def on_op_asgn(node)
         return super unless @react
-        s(:attr, s(:attr, s(:self), :props), node.children.first.to_s[2..-1])
+        return super unless node.children.first.type == :ivasgn
+        var = node.children.first.children.first
+        if @reactMethod and @reactIvars[:capture].include? var
+          process s(:op_asgn, s(:lvasgn, "$#{var[1..-1]}"),
+            *node.children[1..-1])
+        elsif @reactMethod == :initialize
+          process s(:op_asgn, s(:attr, s(:attr, s(:self), :state),
+            var[1..-1]), *node.children[1..-1])
+        else
+          process s(:ivasgn, var, s(:send, s(:ivar, var), 
+            *node.children[1..-1]))
+        end
+      end
+
+      # convert class variables to props
+      def on_cvar(node)
+        return super unless @reactMethod
+        s(:attr, @reactProps, node.children.first.to_s[2..-1])
+      end
+
+      # analyze ivar usage
+      def react_walk(node)
+        child = node.children.first
+
+        node.children.each do |child|
+          react_walk(child) if Parser::AST::Node === child
+        end
+
+        case node.type
+        when :ivar
+          if @reactIvars[:asgn].include? child
+            @reactIvars[:post] << child
+            @reactIvars[:pre] << child if @reactIvars[:ref].include? child
+          end
+          @reactIvars[:ref] << child
+          
+        when :ivasgn
+          @reactIvars[:asgn] << child
+
+        when :op_asgn 
+          if child.type == :ivasgn
+            gchild = child.children.first
+            if @reactIvars[:ref].include? gchild
+              @reactIvars[:pre] << gchild 
+              @reactIvars[:post] << gchild 
+            end
+            @reactIvars[:ref] << gchild
+            @reactIvars[:asgn] << gchild
+          end
+
+        when :send 
+          if 
+            child and child.type == :self and node.children.length == 2 and
+            node.children[1] == :componentWillReceiveProps
+          then
+            @reactIvars[:post] += @reactIvars[:asgn]
+          end
+        end
       end
     end
 

data/lib/ruby2js/version.rb

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

data/ruby2js.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby2js"
-  s.version = "1.15.0"
+  s.version = "1.15.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2015-03-07"
+  s.date = "2015-03-09"
   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/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: 1.15.0
+  version: 1.15.1
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-07 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement