ruby2js 2.0.14 → 2.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a58359aafe69400f4a0599274386d49db846339
-  data.tar.gz: 469e9be4d6e16149c1d81e58871e8b5defb61bae
+  metadata.gz: 656fbf21438b096f37a606de1a6d3bf19a55bb5b
+  data.tar.gz: 1251eeab90080384e8d97257184129a77859a69e
 SHA512:
-  metadata.gz: 69fb77fe3d91e70e0d4123b4533f5511f084c611a5988acb8c3da3af8bc7db8d799d81e7dce16794a6dad612c48d86dfebac80879b4cfccf5c1c51eb0654e1c9
-  data.tar.gz: fe23482038f5e51739a493474ebb3a60d68a4ff2514e41b3d4fc6dc0895924a77bbf29f48f7f0668c1229065e5fe81074048eb00a2ca78d1f6cfbdd7f51d2cde
+  metadata.gz: ddfbded6bfafa9e257f1ab8dc3a309f12381e2a0edf7e76cca328d7d0ebf279f3a02775cac1c22ad5762094efa30cc3a49be03620e8aa8cf79ffccfe4ae54d6e
+  data.tar.gz: 45116a4d10458125e78b3589ca25e51c5e1b115ffe6202b649d70fbd59bac5a6bf06cee8b155f7a41c8d05d6c3f85d4174ec360ede27ecaae9c2658664458bde

data/lib/ruby2js/converter/args.rb

@@ -7,7 +7,7 @@ module Ruby2JS
    #   (blockarg :c))
 
     handle :args do |*args|
-      parse_all *args, join: ', '
+      parse_all(*args, join: ', ')
     end
   end
 end

data/lib/ruby2js/converter/array.rb

@@ -22,9 +22,9 @@ module Ruby2JS
         end
       else
         if items.length <= 1
-          put '['; parse_all *items, join: ', '; put ']'
+          put '['; parse_all(*items, join: ', '); put ']'
         else
-          compact { puts '['; parse_all *items, join: ",#{@ws}"; sput ']' }
+          compact { puts '['; parse_all(*items, join: ",#{@ws}"); sput ']' }
         end
       end
     end

data/lib/ruby2js/converter/begin.rb

@@ -28,7 +28,7 @@ module Ruby2JS
         statements.compact!
       end
 
-      parse_all *statements, state: state, join: @sep
+      parse_all(*statements, state: state, join: @sep)
     end
 
     def combine_properties(body)

data/lib/ruby2js/converter/class.rb

@@ -75,8 +75,8 @@ module Ruby2JS
 
         elsif m.type == :send and m.children.first == nil
           if m.children[1] == :attr_accessor
-            m.children[2..-1].map do |sym|
-              var = sym.children.first
+            m.children[2..-1].map do |child_sym|
+              var = child_sym.children.first
               s(:prop, s(:attr, name, :prototype), var =>
                   {enumerable: s(:true), configurable: s(:true),
                   get: s(:block, s(:send, nil, :proc), s(:args), 
@@ -85,8 +85,8 @@ module Ruby2JS
                     s(:ivasgn, :"@#{var}", s(:lvar, var)))})
             end
           elsif m.children[1] == :attr_reader
-            m.children[2..-1].map do |sym|
-              var = sym.children.first
+            m.children[2..-1].map do |child_sym|
+              var = child_sym.children.first
               s(:prop, s(:attr, name, :prototype), var =>
                   {get: s(:block, s(:send, nil, :proc), s(:args), 
                     s(:return, s(:ivar, :"@#{var}"))),
@@ -94,8 +94,8 @@ module Ruby2JS
                   configurable: s(:true)})
             end
           elsif m.children[1] == :attr_writer
-            m.children[2..-1].map do |sym|
-              var = sym.children.first
+            m.children[2..-1].map do |child_sym|
+              var = child_sym.children.first
               s(:prop, s(:attr, name, :prototype), var =>
                   {set: s(:block, s(:send, nil, :proc), s(:args, s(:arg, var)), 
                     s(:ivasgn, :"@#{var}", s(:lvar, var))),
@@ -244,9 +244,10 @@ module Ruby2JS
               *descriptor.map { |key, value| s(:pair, s(:sym, key), value) }))
           else
             parse s(:send, s(:const, nil, :Object), :defineProperties,
-              obj, s(:hash, *props.map {|prop, descriptor|
-                s(:pair, s(:sym, prop), s(:hash, *descriptor.map {|key, value| 
-                s(:pair, s(:sym, key), value) }))}))
+              obj, s(:hash, *props.map {|hprop, hdescriptor|
+                s(:pair, s(:sym, hprop), 
+                s(:hash, *hdescriptor.map {|key, value| 
+                  s(:pair, s(:sym, key), value) }))}))
           end
         elsif @ast.type == :method
           parse s(:send, *args)

data/lib/ruby2js/converter/cvar.rb

@@ -4,6 +4,7 @@ module Ruby2JS
     # (cvar :@@a)
 
     handle :cvar do |var|
+      @class_name ||= nil
       if @class_name
         parse @class_name
         put var.to_s.sub('@@', "._")

data/lib/ruby2js/converter/ivar.rb

@@ -14,10 +14,10 @@ module Ruby2JS
     handle :hostvalue do |value|
       case value
       when Hash
-        parse s(:hash, *value.map {|key, value| s(:pair, s(:hostvalue, key), 
-          s(:hostvalue, value))})
+        parse s(:hash, *value.map {|key, hvalue| s(:pair, s(:hostvalue, key), 
+          s(:hostvalue, hvalue))})
       when Array
-        parse s(:array, *value.map {|value| s(:hostvalue, value)})
+        parse s(:array, *value.map {|hvalue| s(:hostvalue, hvalue)})
       when String
         parse s(:str, value)
       when Integer

data/lib/ruby2js/converter/return.rb

@@ -44,8 +44,8 @@ module Ruby2JS
 
           node = node.children[2] ? s(:autoreturn, node.children[2]) : nil
 
-          conditions.each do |condition, statements| 
-            node = s(:if, condition, statements, node)
+          conditions.each do |condition, cstatements| 
+            node = s(:if, condition, cstatements, node)
           end
         end
         block.push node

data/lib/ruby2js/converter/send.rb

@@ -16,8 +16,6 @@ module Ruby2JS
     handle :send, :sendw, :attr, :call do |receiver, method, *args|
       ast = @ast
 
-      width = ((ast.type == :sendw && !@nl.empty?) ? 0 : @width)
-
       # strip '!' and '?' decorations
       method = method.to_s[0..-2] if method =~ /\w[!?]$/
 
@@ -38,7 +36,7 @@ module Ruby2JS
         t2,m2,*args2 = receiver.children.first.children
         if not t2 and [:lambda, :proc].include? m2 and args2.length == 0
           (@state == :statement ? group(receiver) : parse(receiver))
-          put '('; parse_all *args, join: ', '; put ')'
+          put '('; parse_all(*args, join: ', '); put ')'
           return
         end
       end
@@ -68,10 +66,10 @@ module Ruby2JS
         parse s(:not, receiver)
 
       elsif method == :[]
-        parse receiver; put '['; parse_all *args, join: ', '; put ']'
+        parse receiver; put '['; parse_all(*args, join: ', '); put ']'
 
       elsif method == :[]=
-        parse receiver; put '['; parse_all *args[0..-2], join: ', '; put '] = '
+        parse receiver; put '['; parse_all(*args[0..-2], join: ', '); put '] = '
         parse args[-1]
 
       elsif [:-@, :+@, :~, '~'].include? method
@@ -133,7 +131,7 @@ module Ruby2JS
 
           put "new "; parse receiver
           if ast.is_method?
-            put '('; parse_all *args, join: ', '; put ')'
+            put '('; parse_all(*args, join: ', '); put ')'
           end
         elsif args.length == 1 and args.first.type == :send
           # accommodation for JavaScript like new syntax w/argument list
@@ -179,9 +177,9 @@ module Ruby2JS
           put "#{ '.' if receiver && method}#{ method }"
 
           if args.length <= 1
-            put "("; parse_all *args, join: ', '; put ')'
+            put "("; parse_all(*args, join: ', '); put ')'
           else
-            compact { puts "("; parse_all *args, join: ",#@ws"; sput ')' }
+            compact { puts "("; parse_all(*args, join: ",#@ws"); sput ')' }
           end
         end
       end

data/lib/ruby2js/converter/vasgn.rb

@@ -22,7 +22,7 @@ module Ruby2JS
 
           unless undecls.empty?
             return parse s(:begin, 
-              *undecls.map {|name| s(:lvasgn, name)}, @ast), @state
+              *undecls.map {|uname| s(:lvasgn, uname)}, @ast), @state
           end
         end
 

data/lib/ruby2js/converter/xstr.rb

@@ -5,7 +5,7 @@ module Ruby2JS
     #   (str 'a'))
 
     handle :xstr do |*children|
-      str = eval capture { parse_all *children }
+      str = eval capture { parse_all(*children) }
 
       if @binding
         puts @binding.eval(str).to_s

data/lib/ruby2js/converter.rb

@@ -37,10 +37,15 @@ module Ruby2JS
       @@handlers.each do |name|
         @handlers[name] = method("on_#{name}")
       end
-    end
 
-    def binding=(binding)
-      @binding = binding
+      @state = nil
+      @block_this = nil
+      @block_depth = nil
+      @prop = nil
+      @instance_method = nil
+      @prototype = nil
+      @class_parent = nil
+      @class_name = nil
     end
 
     def width=(width)
@@ -117,6 +122,7 @@ module Ruby2JS
       handler.call(*ast.children)
     ensure
       @ast = oldast
+      @state = oldstate
     end
 
     def parse_all(*args)

data/lib/ruby2js/filter/angularrb.rb

@@ -39,6 +39,7 @@ module Ruby2JS
         @ngAppUses = []
         @ngClassUses = []
         @ngClassOmit = []
+        @ngScope = nil
         super
       end
 
@@ -74,7 +75,7 @@ module Ruby2JS
 
         # convert use calls into dependencies
         depends = @ngAppUses.map {|sym| s(:sym, sym)} + extract_uses(block)
-        depends = depends.map {|node| node.children.first.to_s}.uniq.sort.
+        depends = depends.map {|dnode| dnode.children.first.to_s}.uniq.sort.
           map {|sym| s(:str, sym)}
 
         ngApp, @ngApp, @ngChildren = @ngApp, nil, nil
@@ -129,7 +130,7 @@ module Ruby2JS
 
           @ngClassUses -= @ngClassOmit + [name.children.last]
           args = @ngClassUses.map {|sym| s(:arg, sym)} + uses
-          args = args.map {|node| node.children.first.to_sym}.uniq.sort.
+          args = args.map {|anode| anode.children.first.to_sym}.uniq.sort.
             map {|sym| s(:arg, sym)}
           @ngClassUses, @ngClassOmit = [], []
 
@@ -249,7 +250,7 @@ module Ruby2JS
         @ngClassUses -= @ngClassOmit
         args = node.children[1].children
         args += @ngClassUses.map {|sym| s(:arg, sym)} + extract_uses(block)
-        args = args.map {|node| node.children.first.to_sym}.uniq.sort.
+        args = args.map {|anode| anode.children.first.to_sym}.uniq.sort.
           map {|sym| s(:arg, sym)}
 
         node.updated :block, [target, s(:args, *args), s(:begin, *block)]
@@ -322,7 +323,7 @@ module Ruby2JS
         @ngClassUses.delete call.children[2].children[0]
         args = process_all(node.children[1].children)
         args += @ngClassUses.map {|sym| s(:arg, sym)} + extract_uses(block)
-        args = args.map {|node| node.children.first.to_sym}.uniq.sort.
+        args = args.map {|anode| anode.children.first.to_sym}.uniq.sort.
           map {|sym| s(:arg, sym)}
 
         # construct a function
@@ -578,7 +579,7 @@ module Ruby2JS
       def extract_uses(block)
         # find the block
         while block.length == 1 and block.first and block.first.type == :begin
-          block.push *block.shift.children
+          block.push(*block.shift.children)
         end
 
         # find use class method calls

data/lib/ruby2js/filter/functions.rb

@@ -174,8 +174,6 @@ module Ruby2JS
 
 
         elsif method == :[]
-          index = args.first
-
           # resolve negative literal indexes
           i = proc do |index|
             if index.type == :int and index.children.first < 0
@@ -186,6 +184,8 @@ module Ruby2JS
             end
           end
 
+          index = args.first
+
           if not index
             super
 

data/lib/ruby2js/filter/jquery.rb

@@ -65,6 +65,11 @@ module Ruby2JS
     module JQuery
       include SEXP
 
+      def initialize(*args)
+        @react = nil
+        super
+      end
+
       # map $$ to $
       def on_gvar(node)
         if node.children[0] == :$$
@@ -109,32 +114,32 @@ module Ruby2JS
           domprops = %w(checked disabled readonly readOnly required)
 
           stopProps = false
-          rewrite_tilda = proc do |node|
+          rewrite_tilda = proc do |tnode|
             # Example conversion:
             #   before:
             #    (send (send (send (send nil :a) :b) :c) :~)
             #   after:
             #    (send (send (send nil "$" (send nil :a)) :b) :c)
-            if node.type == :send and node.children[0]
-              stopProps = true if node.children[1] == :[]
-              if node.children[1] == :~ and node.children[0].children[1] == :~
+            if tnode.type == :send and tnode.children[0]
+              stopProps = true if tnode.children[1] == :[]
+              if tnode.children[1] == :~ and tnode.children[0].children[1] == :~
                 # consecutive tildes
-                if node.children[0].children[0].children[1] == :~
-                  result = node.children[0].children[0].children[0]
+                if tnode.children[0].children[0].children[1] == :~
+                  result = tnode.children[0].children[0].children[0]
                 else
-                  result = s(:attr, node.children[0].children[0], :~)
+                  result = s(:attr, tnode.children[0].children[0], :~)
                 end
                 s(:attr, s(:attr, process(result), :~), :~)
               else
                 # possible getter/setter
-                method = node.children[1]
+                method = tnode.children[1]
                 method = method.to_s.chomp('=') if method =~ /=$/
                 method = :each! if method == :each
-                rewrite = [rewrite_tilda[node.children[0]], 
-                  method, *node.children[2..-1]]
-                if stopProps or props.include? node.children[1]
-                  rewrite[1] = node.children[1]
-                  node.updated nil, rewrite
+                rewrite = [rewrite_tilda[tnode.children[0]], 
+                  method, *tnode.children[2..-1]]
+                if stopProps or props.include? tnode.children[1]
+                  rewrite[1] = tnode.children[1]
+                  tnode.updated nil, rewrite
                 elsif domprops.include? method.to_s
                   method = :readOnly if method.to_s == 'readonly'
                   s(:send, rewrite[0], :prop, s(:sym, method), *rewrite[2..-1]) 
@@ -142,16 +147,16 @@ module Ruby2JS
                   s(:send, *rewrite)
                 end
               end
-            elsif node.type == :block
+            elsif tnode.type == :block
               # method call with a block parameter
-              node.updated nil, [rewrite_tilda[node.children[0]],
-                *node.children[1..-1]]
-            elsif node.type == :array
+              tnode.updated nil, [rewrite_tilda[tnode.children[0]],
+                *tnode.children[1..-1]]
+            elsif tnode.type == :array
               # innermost expression is an array
-              s(:send, nil, '$', *node)
+              s(:send, nil, '$', *tnode)
             else
               # innermost expression is a scalar
-              s(:send, nil, '$', node)
+              s(:send, nil, '$', tnode)
             end
           end
 

data/lib/ruby2js/filter/minitest-jasmine.rb

@@ -5,6 +5,11 @@ module Ruby2JS
     module MiniTestJasmine
       include SEXP
 
+      def initialize(*args)
+        @jasmine_describe = nil
+        super
+      end
+
       RELOPS = [:<, :<=, :==, :>=, :>].
         map {|sym| Parser::AST::Node.new :sym, [sym]}
 
@@ -17,17 +22,17 @@ module Ruby2JS
           body = body.first.children
         end
 
-        body = body.map do |node|
-          if node.type == :def and node.children.first =~ /^test_/
+        body = body.map do |bnode|
+          if bnode.type == :def and bnode.children.first =~ /^test_/
             s(:block, s(:send, nil, :it, s(:str, 
-              node.children.first.to_s.sub(/^test_/, '').gsub('_', ' '))),
-              s(:args), node.children.last)
-          elsif node.type == :def and node.children.first == :setup
-            s(:block, s(:send, nil, :before), s(:args), node.children.last)
-          elsif node.type == :def and node.children.first == :teardown
-            s(:block, s(:send, nil, :after), s(:args), node.children.last)
+              bnode.children.first.to_s.sub(/^test_/, '').gsub('_', ' '))),
+              s(:args), bnode.children.last)
+          elsif bnode.type == :def and bnode.children.first == :setup
+            s(:block, s(:send, nil, :before), s(:args), bnode.children.last)
+          elsif bnode.type == :def and bnode.children.first == :teardown
+            s(:block, s(:send, nil, :after), s(:args), bnode.children.last)
           else
-            node
+            bnode
           end
         end
 

data/lib/ruby2js/filter/react.rb

@@ -63,6 +63,14 @@ module Ruby2JS
       ReactAttrMap = Hash[ReactAttrs.map {|name| [name.downcase, name]}]
       ReactAttrMap['for'] = 'htmlFor'
 
+      def initialize(*args)
+        @react = nil
+        @reactApply = nil
+        @reactBlock = nil
+        @reactClass = nil
+        super
+      end
+
       def options=(options)
         super
         @react = true if options[:react]
@@ -105,7 +113,7 @@ module Ruby2JS
           # collect static properties/functions
           statics = []
           body.select {|child| child.type == :defs}.each do |child|
-            parent, mname, args, *block = child.children
+            _parent, mname, args, *block = child.children
             if child.is_method?
               statics << s(:pair, s(:sym, mname), process(child.updated(:block,
                 [s(:send, nil, :proc), args, s(:autoreturn, *block)])))
@@ -181,8 +189,8 @@ module Ruby2JS
               end
 
               # build a hash for state
-              state = s(:hash, *assigns.map {|node| s(:pair, s(:str,
-                node.children.first.to_s[1..-1]), node.children.last)})
+              state = s(:hash, *assigns.map {|anode| s(:pair, s(:str,
+                anode.children.first.to_s[1..-1]), anode.children.last)})
 
               # modify block to build and/or return state
               if block.empty?
@@ -567,53 +575,53 @@ module Ruby2JS
             end
           end
 
-          rewrite_tilda = proc do |node|
+          rewrite_tilda = proc do |tnode|
             # Example conversion:
             #   before:
             #    (send (send nil :a) :text) :~)
             #   after:
             #    (send (gvar :$a))), :text)
-            if node.type == :send and node.children[0]
-              if node.children[1] == :~ and node.children[0].children[1] == :~
+            if tnode.type == :send and tnode.children[0]
+              if tnode.children[1] == :~ and tnode.children[0].children[1] == :~
                 # consecutive tildes
-                if node.children[0].children[0].children[1] == :~
-                  result = node.children[0].children[0].children[0]
+                if tnode.children[0].children[0].children[1] == :~
+                  result = tnode.children[0].children[0].children[0]
                 else
-                  result = s(:attr, node.children[0].children[0], '~')
+                  result = s(:attr, tnode.children[0].children[0], '~')
                 end
                 s(:attr, s(:attr, process(result), '~'), '~')
               else
                 # possible getter/setter
-                method = node.children[1]
+                method = tnode.children[1]
                 method = method.to_s.chomp('=') if method =~ /=$/
-                rewrite = [rewrite_tilda[node.children[0]],
-                  method, *node.children[2..-1]]
-                rewrite[1] = node.children[1]
-                node.updated nil, rewrite
+                rewrite = [rewrite_tilda[tnode.children[0]],
+                  method, *tnode.children[2..-1]]
+                rewrite[1] = tnode.children[1]
+                tnode.updated nil, rewrite
               end
-            elsif node.children.first == nil and Symbol === node.children[1]
+            elsif tnode.children.first == nil and Symbol === tnode.children[1]
               # innermost expression is a scalar
-              s(:gvar, "$#{node.children[1]}")
-            elsif node.type == :lvar
-              s(:gvar, "$#{node.children[0]}")
-            elsif node.type == :str
-              if node.children.first =~ /^#[-\w]+$/
+              s(:gvar, "$#{tnode.children[1]}")
+            elsif tnode.type == :lvar
+              s(:gvar, "$#{tnode.children[0]}")
+            elsif tnode.type == :str
+              if tnode.children.first =~ /^#[-\w]+$/
                 s(:send, s(:attr, nil, :document), :getElementById,
-                  s(:str, node.children.first[1..-1].gsub('_', '-')))
-              elsif node.children.first =~ /^(\.[-\w]+)+$/
+                  s(:str, tnode.children.first[1..-1].gsub('_', '-')))
+              elsif tnode.children.first =~ /^(\.[-\w]+)+$/
                 s(:send, s(:send, s(:attr, nil, :document),
                   :getElementsByClassName, s(:str,
-                  node.children.first[1..-1].gsub('.', ' ').gsub('_', '-'))),
+                  tnode.children.first[1..-1].gsub('.', ' ').gsub('_', '-'))),
                   :[], s(:int, 0))
-              elsif node.children.first =~ /^[-\w]+$/
+              elsif tnode.children.first =~ /^[-\w]+$/
                 s(:send, s(:send, s(:attr, nil, :document),
                   :getElementsByTagName, s(:str,
-                  node.children.first.gsub('_', '-'))), :[], s(:int, 0))
+                  tnode.children.first.gsub('_', '-'))), :[], s(:int, 0))
               else
-                s(:send, s(:attr, nil, :document), :querySelector, node)
+                s(:send, s(:attr, nil, :document), :querySelector, tnode)
               end
             else
-              s(:send, s(:attr, nil, :document), :querySelector, node)
+              s(:send, s(:attr, nil, :document), :querySelector, tnode)
             end
           end
 
@@ -644,7 +652,7 @@ module Ruby2JS
               end
 
               # if a hash argument is already passed, merge in id value
-              hash = children.find_index {|node| node.type == :hash}
+              hash = children.find_index {|cnode| cnode.type == :hash}
               if hash
                 children[hash] = s(:hash, pair, *children[hash].children)
               else
@@ -882,14 +890,14 @@ module Ruby2JS
           node.children[1].type == :block
         return if node.type == :defs
 
-        child = node.children.first
-
         base = @reactIvars[:asgn].dup if [:if, :case].include? node.type
 
         node.children.each do |child|
           react_walk(child) if Parser::AST::Node === child
         end
 
+        child = node.children.first
+
         case node.type
         when :if, :case
           @reactIvars[:cond] += @reactIvars[:asgn] - base

data/lib/ruby2js/filter/require.rb

@@ -5,12 +5,17 @@ module Ruby2JS
     module Require
       include SEXP
 
-      @@valid_path = /\A[-\w_.]+\Z/
+      @@valid_path = /\A[-\w.]+\Z/
 
       def self.valid_path=(valid_path)
         @@valid_path = valid_path
       end
 
+      def initialize(*args)
+        @require_expr = nil
+        super
+      end
+
       def on_send(node)
         if
           not @require_expr and # only statements

data/lib/ruby2js/serializer.rb

@@ -52,6 +52,8 @@ module Ruby2JS
       @lines = [Line.new]
       @line = @lines.last
       @timestamps = {}
+
+      @ast = nil
     end
 
     def timestamp(file)
@@ -222,7 +224,7 @@ module Ruby2JS
       # survey what we have to work with, keeping track of a possible
       # split of the last argument or value
       work = []
-      indent = len = 0
+      len = 0
       trail = split = nil
       slice = @lines[mark.first..-1]
       reindent(slice)
@@ -250,7 +252,7 @@ module Ruby2JS
         if slice[split[2]].indent < slice[split[2]+1].indent
           # collapse all but the last argument (typically a hash or function)
           close = slice.pop
-          slice[-1].push *close
+          slice[-1].push(*close)
           @lines[mark.first] = Line.new(*work[0..split[1]-1])
           @lines[mark.first+1..-1] = slice[split[2]+1..-1]
           @line = @lines.last
@@ -260,7 +262,7 @@ module Ruby2JS
 
     # return the output as a string
     def to_s
-      return @str if @str
+      return @str if (@str ||= nil)
       respace
       @lines.map(&:to_s).join(@nl)
     end

data/lib/ruby2js/version.rb

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

data/lib/ruby2js.rb

@@ -24,6 +24,7 @@ module Ruby2JS
 
       def initialize(comments)
         @comments = comments
+        @ast = nil
       end
 
       def options=(options)
@@ -130,10 +131,7 @@ module Ruby2JS
   end
   
   def self.parse(source, file=nil)
-    # workaround for https://github.com/whitequark/parser/issues/112
-    buffer = Parser::Source::Buffer.new(file || '__SOURCE__')
-    buffer.raw_source = source.encode('utf-8')
-    Parser::CurrentRuby.new.parse_with_comments(buffer)
+    Parser::CurrentRuby.parse_with_comments(source.encode('utf-8'))
   rescue Parser::SyntaxError => e
     split = source[0..e.diagnostic.location.begin_pos].split("\n")
     line, col = split.length, split.last.length

data/ruby2js.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: ruby2js 2.0.14 ruby lib
+# stub: ruby2js 2.0.15 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ruby2js"
-  s.version = "2.0.14"
+  s.version = "2.0.15"
 
   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 = "2016-01-28"
+  s.date = "2016-07-30"
   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.14
+  version: 2.0.15
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2016-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser