ruby2js 2.0.9 → 2.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e245926a3e1b1904076667992a1df36b847290c8
-  data.tar.gz: a97f75c7fffc309c239f93b82c07f83ddd659d8f
+  metadata.gz: aaae5d4b63645e55ef04dfd1794a1a75672cf5f6
+  data.tar.gz: ac98b88a02cc47c452d4bd919cdcf5bad553e88a
 SHA512:
-  metadata.gz: 00b8b27362597b9c89450371072363c6468ce572f09f1e0ccacec551ac3a96bf418ba166b60031c73fefe5fdb4770dec6c419af3815f5dce5c61b22b4d0bb876
-  data.tar.gz: 219e208e335a4d642205edb6c07537213d15dd25ba55d249dc1ffd6708a59d06b86e0619e23d722b98dd45f75c10bffdcbc844c5c8e5b26a29b5312cbbc0c077
+  metadata.gz: f4efbd1394b8f329e4208772589ed57ea15603df2f55b8addbf7a045d4872081897a4c18fb5759194da8e86d7facbc620ca6bc2dfbde9372e66d16a4f2edc769
+  data.tar.gz: aaef80bf7d518a15fe01fedfd8ced9c880b9f2027ff5f366d1c53aff2e0720180d176279005f636bad6782f106ffe48451160f095d1d63543aaba6f082072d62

data/README.md

@@ -184,7 +184,6 @@ the script.
     * `.start_with?` becomes `.substring(0, arg.length) == arg`
     * `.strip` becomes `.trim`
     * `.sub` becomes `.replace`
-    * `.to_a` becomes `to_Array`
     * `.to_f` becomes `parseFloat`
     * `.to_i` becomes `parseInt`
     * `.to_s` becomes `.to_String`
@@ -197,7 +196,10 @@ the script.
     * `.sub!` and `.gsub!` become equivalent `x = x.replace` statements
     * `.map!`, `.reverse!`, and `.select` become equivalent 
       `.splice(0, .length, *.method())` statements
+    * `@foo.call(args)` becomes `this._foo(args)`
+    * `@@foo.call(args)` becomes `this.constructor._foo(args)`
     * `Array(x)` becomes `Array.prototype.slice.call(x)`
+    * `delete x` becomes `delete x` (note lack of parenthesis)
     * `setInterval` and `setTimeout` allow block to be treated as the
        first parameter on the call
     * for the following methods, if the block consists entirely of a simple
@@ -311,6 +313,7 @@ the script.
 
     * maps Ruby unary operator `~` to jQuery `$` function
     * maps Ruby attribute syntax to jquery attribute syntax
+    * `.to_a` becomes `toArray`
     * maps `$$` to jQuery `$` function
     * defaults the fourth parameter of $$.post to `"json"`, allowing Ruby block
       syntax to be used for the success function.

data/lib/ruby2js/filter/functions.rb

@@ -20,11 +20,25 @@ module Ruby2JS
           process S(:send, s(:attr, s(:const, nil, :Math), node.children[1]),
             :apply, s(:const, nil, :Math), target)
 
+        elsif method == :call and target and target.type == :ivar
+          process S(:send, s(:self), "_#{target.children.first.to_s[1..-1]}",
+            *args)
+
+        elsif method == :call and target and target.type == :cvar
+          process S(:send, s(:attr, s(:self), :constructor), 
+            "_#{target.children.first.to_s[2..-1]}", *args)
+
         elsif method == :keys and args.length == 0 and node.is_method?
           process S(:send, s(:const, nil, :Object), :keys, target)
 
         elsif method == :delete and args.length == 1
-          process S(:undef, S(:send, target, :[], args.first))
+          if not target
+            process S(:undef, args.first)
+          elsif args.first.type == :str
+            process S(:undef, S(:attr, target, args.first.children.first))
+          else
+            process S(:undef, S(:send, target, :[], args.first))
+          end
 
         elsif method == :to_s
           process S(:call, target, :toString, *args)
@@ -33,9 +47,6 @@ module Ruby2JS
           process S(:send, s(:attr, s(:attr, s(:const, nil, :Array), 
             :prototype), :slice), :call, *args)
 
-        elsif method == :to_a
-          process S(:call, target, :toArray, *args)
-
         elsif method == :to_i
           process node.updated :send, [nil, :parseInt, target, *args]
 
@@ -172,7 +183,10 @@ module Ruby2JS
             end
           end
 
-          if index.type == :regexp
+          if not index
+            super
+
+          elsif index.type == :regexp
             process S(:send, S(:send, target, :match, index), :[], 
               args[1] || s(:int, 0))
 
@@ -274,6 +288,25 @@ module Ruby2JS
           # output: while(true) {statements}
           S(:while, s(:true), node.children[2])
 
+        elsif [:delete].include? call.children[1]
+          # restore delete methods that are prematurely mapped to undef
+          result = super
+
+          if result.children[0].type == :undef
+            call = result.children[0].children[0]
+            if call.type == :attr
+              call = call.updated(:send, 
+                [call.children[0], :delete, s(:str, call.children[1])])
+              result = result.updated(nil, [call, *result.children[1..-1]])
+            else
+              call = call.updated(nil, 
+                [call.children[0], :delete, *call.children[2..-1]])
+              result = result.updated(nil, [call, *result.children[1..-1]])
+            end
+          end
+
+          result
+
         else
           super
         end

data/lib/ruby2js/filter/jquery.rb

@@ -75,7 +75,7 @@ module Ruby2JS
       end
 
       def on_send(node)
-        if [:call, :[]].include? node.children[1]
+        if [:call, :[]].include? node.children[1] and node.children.first
           # map $$.call(..), $$.(..), and $$[...] to $(...)
           target = process(node.children.first)
           if target.type == :gvar and target.children == ['$']
@@ -84,6 +84,9 @@ module Ruby2JS
             super
           end
 
+        elsif node.children[1] == :to_a
+          process S(:call, node.children[0], :toArray, *node.children[2..-1])
+
         elsif node.children[1] == :~ and not @react
           # map ~expression.method to $(expression).method
 

data/lib/ruby2js/filter/react.rb

@@ -8,11 +8,12 @@
 #   spec/react_spec.rb contains a specification
 #   demo/react-tutorial.rb contains a working sample
 #
-# Experimental conversions provided:
+# Conversions provided:
 #  *  $x becomes this.refs.x
 #  *  @x becomes this.state.x
 #  * @@x becomes this.props.x
-#  *  ~x becomes this.refs.x.getDOMNode()
+#  *  ~x becomes this.refs.x
+#  * ~(x) becomes document.querySelector(x)
 #  * ~"x" becomes document.querySelector("x")
 #
 require 'ruby2js'
@@ -22,27 +23,43 @@ module Ruby2JS
     module React
       include SEXP
 
-      # the following code was used to generate ReactAttrs:
+      # the following command can be used to generate ReactAttrs:
+      # 
+      #   ruby -r ruby2js/filter/react -e "Ruby2JS::Filter::React.genAttrs"
       #
-      # require 'nokogumbo'
-      # page = 'https://facebook.github.io/react/docs/tags-and-attributes.html'
-      # attrs = Nokogiri::HTML5.get(page).search('code').map(&:text).join(' ')
-      # attrs = attrs.split(/\s+/).grep(/[A-Z]/).sort.uniq.join(' ')
-      # puts "ReactAttrs = %w(#{attrs})".gsub(/(.{1,74})(\s+|\Z)/, "\\1\n")
+      def self.genAttrs
+        require 'nokogumbo'
+        page = 'https://facebook.github.io/react/docs/tags-and-attributes.html'
+        doc = Nokogiri::HTML5.get(page)
+
+        # delete contents of page prior to the list of supported attributes
+        attrs = doc.at('a[name=supported-attributes]')
+        attrs = attrs.parent while attrs and not attrs.name.start_with? 'h'
+        attrs.previous_sibling.remove while attrs and attrs.previous_sibling
+
+        # extract attribute names with uppercase chars from code and format
+        attrs = doc.search('code').map(&:text).join(' ')
+        attrs = attrs.split(/\s+/).grep(/[A-Z]/).sort.uniq.join(' ')
+        puts "ReactAttrs = %w(#{attrs})".gsub(/(.{1,72})(\s+|\Z)/, "\\1\n")
+      end
 
+      # list of react attributes that require special processing
       ReactAttrs = %w(acceptCharset accessKey allowFullScreen
       allowTransparency autoCapitalize autoComplete autoCorrect autoFocus
-      autoPlay cellPadding cellSpacing charSet classID className clipPath
-      colSpan contentEditable contextMenu crossOrigin dangerouslySetInnerHTML
-      dateTime encType fillOpacity fontFamily fontSize formAction formEncType
-      formMethod formNoValidate formTarget frameBorder gradientTransform
-      gradientUnits hrefLang htmlFor httpEquiv itemID itemProp itemRef
-      itemScope itemType linearGradient marginHeight marginWidth markerEnd
-      markerMid markerStart maxLength mediaGroup noValidate
-      patternContentUnits patternUnits preserveAspectRatio radialGradient
-      radioGroup readOnly rowSpan spellCheck spreadMethod srcDoc srcSet
-      stopColor stopOpacity strokeDasharray strokeLinecap strokeOpacity
-      strokeWidth tabIndex textAnchor useMap viewBox)
+      autoPlay autoSave cellPadding cellSpacing charSet classID className
+      clipPath colSpan contentEditable contextMenu crossOrigin
+      dangerouslySetInnerHTML dateTime encType fillOpacity fontFamily fontSize
+      formAction formEncType formMethod formNoValidate formTarget frameBorder
+      gradientTransform gradientUnits hrefLang htmlFor httpEquiv inputMode
+      itemID itemProp itemRef itemScope itemType keyParams keyType
+      marginHeight marginWidth markerEnd markerMid markerStart maxLength
+      mediaGroup noValidate patternContentUnits patternUnits
+      preserveAspectRatio radioGroup readOnly rowSpan spellCheck spreadMethod
+      srcDoc srcSet stopColor stopOpacity strokeDasharray strokeLinecap
+      strokeOpacity strokeWidth tabIndex textAnchor useMap viewBox
+      xlinkActuate xlinkArcrole xlinkHref xlinkRole xlinkShow xlinkTitle
+      xlinkType xmlBase xmlLang xmlSpace)
+
       ReactAttrMap = Hash[ReactAttrs.map {|name| [name.downcase, name]}]
       ReactAttrMap['for'] = 'htmlFor'
 
@@ -197,31 +214,8 @@ module Ruby2JS
               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
+            # capture and update ivars as required
+            block = react_process_ivars(block)
 
             # add method to class
             type = (child.is_method? ? :begin : :autoreturn)
@@ -544,7 +538,7 @@ module Ruby2JS
         elsif node.children[1] == :~
           # Locate a DOM Node
           #   map ~(expression) to document.querySelector(expression)
-          #   map ~name to this.refs.name.getDOMNode()
+          #   map ~name to this.refs.name
           #   map ~"a b" to document.querySelector("a b")
           #   map ~"#a" to document.getElementById("a")
           #   map ~"a" to document.getElementsByTagName("a")[0]
@@ -571,7 +565,7 @@ module Ruby2JS
             #   before:
             #    (send (send nil :a) :text) :~)
             #   after:
-            #    (send (send (gvar :$a), :getDOMNode)), :text)
+            #    (send (gvar :$a))), :text)
             if node.type == :send and node.children[0]
               if node.children[1] == :~ and node.children[0].children[1] == :~
                 # consecutive tildes
@@ -592,9 +586,9 @@ module Ruby2JS
               end
             elsif node.children.first == nil and Symbol === node.children[1]
               # innermost expression is a scalar
-              s(:send, s(:gvar, "$#{node.children[1]}"), :getDOMNode)
+              s(:gvar, "$#{node.children[1]}")
             elsif node.type == :lvar
-              s(:send, s(:gvar, "$#{node.children[0]}"), :getDOMNode)
+              s(:gvar, "$#{node.children[0]}")
             elsif node.type == :str
               if node.children.first =~ /^#[-\w]+$/
                 s(:send, s(:attr, nil, :document), :getElementById,
@@ -875,6 +869,7 @@ module Ruby2JS
         # as these create their own scopes.
         return if node.type == :pair and node.children[0].type == :sym and
           node.children[1].type == :block
+        return if node.type == :defs
 
         child = node.children.first
 
@@ -967,6 +962,53 @@ module Ruby2JS
         end
         node
       end
+
+      def on_defs(node)
+        return super unless @react
+
+        begin
+          reactIvars = @reactIvars
+          @reactIvars = {pre: [], post: [], asgn: [], ref: [], cond: []}
+          react_walk(node.children.last)
+          @reactIvars[:capture] = (@reactIvars[:pre] + @reactIvars[:post]).uniq
+          node = super
+          block = react_process_ivars([node.children.last.dup])
+          node.updated(nil, [*node.children[0..-2], s(:begin, *block)])
+        ensure
+          @reactIvars = reactIvars
+        end
+      end
+
+      # common logic for inserting code to manage state (ivars)
+      def react_process_ivars(block)
+        # 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
+
+        block
+      end
     end
 
     DEFAULTS.push React

data/lib/ruby2js/version.rb

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

data/ruby2js.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: ruby2js 2.0.9 ruby lib
+# stub: ruby2js 2.0.10 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ruby2js"
-  s.version = "2.0.9"
+  s.version = "2.0.10"
 
   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-09-04"
+  s.date = "2015-12-13"
   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.9
+  version: 2.0.10
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser