ruby2js 1.12.1 → 1.12.2

data/lib/ruby2js/converter/arg.rb

@@ -10,5 +10,12 @@ module Ruby2JS
       raise NotImplementedError, "argument #{ unknown.inspect }" if unknown
       arg
     end
+
+    # (shadowarg :a)
+
+    handle :shadowarg do |arg, unknown=nil|
+      raise NotImplementedError, "argument #{ unknown.inspect }" if unknown
+      nil
+    end
   end
 end

data/lib/ruby2js/converter/args.rb

@@ -7,7 +7,7 @@ module Ruby2JS
    #   (blockarg :c))
 
     handle :args do |*args|
-      args.map { |arg| parse arg }.join(', ')
+      args.map { |arg| parse arg }.compact.join(', ')
     end
   end
 end

data/lib/ruby2js/converter/def.rb

@@ -79,7 +79,12 @@ module Ruby2JS
               s(:lvasgn, argname, value), nil)
             body = s(:begin, default, *body.children)
           end
-          vars[arg.children.first] = true
+
+          if arg.type == :shadowarg
+            vars.delete(arg.children.first)
+          else
+            vars[arg.children.first] = true
+          end
         end
       end
 

data/lib/ruby2js/converter/hash.rb

@@ -11,10 +11,11 @@ module Ruby2JS
         raise NotImplementedError, "kwsplat" if node.type == :kwsplat
 
         begin
-          block_this, block_depth = @block_this, @block_depth
-          @block_this, @block_depth = false, 0
-
+          block_depth = @block_depth
           left, right = node.children
+
+          @block_depth = 0 if Hash === right or right.type == :block
+
           if left.type == :prop
             result = []
             if right[:get]
@@ -33,7 +34,7 @@ module Ruby2JS
           end
 
         ensure
-          @block_this, @block_depth = block_this, block_depth
+          @block_depth = block_depth
         end
       end
 

data/lib/ruby2js/converter/send.rb

@@ -85,43 +85,54 @@ module Ruby2JS
       elsif method =~ /=$/
         "#{ parse receiver }#{ '.' if receiver }#{ method.to_s.sub(/=$/, ' =') } #{ parse args.first }"
 
-      elsif method == :new and receiver
-        # map Ruby's "Regexp" to JavaScript's "Regexp"
-        if receiver == s(:const, nil, :Regexp)
-          receiver = s(:const, nil, :RegExp)
-        end
-
-        # allow a RegExp to be constructed from another RegExp
-        if receiver == s(:const, nil, :RegExp)
-          if args.first.type == :regexp
-            opts = ''
-            if args.first.children.last.children.length > 0
-              opts = args.first.children.last.children.join
-            end
-
-            if args.length > 1
-              opts += args.last.children.last
-            end
+      elsif method == :new
+        if receiver
+          # map Ruby's "Regexp" to JavaScript's "Regexp"
+          if receiver == s(:const, nil, :Regexp)
+            receiver = s(:const, nil, :RegExp)
+          end
 
-            return parse s(:regexp, *args.first.children[0...-1],
-              s(:regopt, *opts.split('').map(&:to_sym)))
-          elsif args.first.type == :str
-            if args.length == 2 and args[1].type == :str
-              opts = args[1].children[0]
-            else
+          # allow a RegExp to be constructed from another RegExp
+          if receiver == s(:const, nil, :RegExp)
+            if args.first.type == :regexp
               opts = ''
+              if args.first.children.last.children.length > 0
+                opts = args.first.children.last.children.join
+              end
+
+              if args.length > 1
+                opts += args.last.children.last
+              end
+
+              return parse s(:regexp, *args.first.children[0...-1],
+                s(:regopt, *opts.split('').map(&:to_sym)))
+            elsif args.first.type == :str
+              if args.length == 2 and args[1].type == :str
+                opts = args[1].children[0]
+              else
+                opts = ''
+              end
+              return parse s(:regexp, args.first,
+                s(:regopt, *opts.each_char.map {|c| c}))
             end
-            return parse s(:regexp, args.first,
-              s(:regopt, *opts.each_char.map {|c| c}))
           end
-        end
 
-        args = args.map {|a| parse a}.join(', ')
+          args = args.map {|a| parse a}.join(', ')
 
-        if ast.is_method?
-          "new #{ parse receiver }(#{ args })"
+          if ast.is_method?
+            "new #{ parse receiver }(#{ args })"
+          else
+            "new #{ parse receiver }"
+          end
+        elsif args.length == 1 and args.first.type == :send
+          # accommodation for JavaScript like new syntax w/argument list
+          parse s(:send, s(:const, nil, args.first.children[1]), :new,
+            *args.first.children[2..-1]), @state
+        elsif args.length == 1 and args.first.type == :const
+          # accommodation for JavaScript like new syntax w/o argument list
+          parse s(:attr, args.first, :new), @state
         else
-          "new #{ parse receiver }"
+          raise NotImplementedError, "use of JavaScript keyword new"
         end
 
       elsif method == :raise and receiver == nil

data/lib/ruby2js/filter/react.rb

@@ -186,7 +186,7 @@ module Ruby2JS
 
             begin
               if simple
-                # in the normal case, each process each argument
+                # in the normal case, process each argument
                 reactApply, @reactApply = @reactApply, false
                 params += args.map {|arg| process(arg)}
               else
@@ -196,13 +196,14 @@ module Ruby2JS
                 # will look something like the following:
                 #
                 #   React.createElement(*proc {
-                #     $_ = ['tag', hash]
+                #     var $_ = ['tag', hash]
                 #     $_.push(React.createElement(...))
                 #   }())
                 #
                 # Base Ruby2JS processing will convert the 'splat' to 'apply'
                 params = [s(:splat, s(:send, s(:block, s(:send, nil, :proc), 
-                  s(:args), s(:begin, s(:lvasgn, :$_, s(:array, *params)),
+                  s(:args, s(:shadowarg, :$_)), s(:begin, 
+                  s(:lvasgn, :$_, s(:array, *params)),
                   *args.map {|arg| process arg},
                   s(:return, s(:lvar, :$_)))), :[]))]
               end

data/lib/ruby2js/version.rb

@@ -2,7 +2,7 @@ module Ruby2JS
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 12
-    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 = "1.12.1"
+  s.version = "1.12.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2015-01-23"
+  s.date = "2015-01-25"
   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/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/angularrb.rb", "lib/ruby2js/filter/minitest-jasmine.rb", "lib/ruby2js/filter/camelCase.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/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

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 1.12.1
+  version: 1.12.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser