ruby2js 1.12.2 → 1.13.0

data/README.md

@@ -46,6 +46,15 @@ require 'ruby2js/filter/functions'
 puts Ruby2JS.convert('"2A".to_i(16)')
 ```
 
+With [ExecJS](https://github.com/sstephenson/execjs):
+```ruby
+require 'ruby2js/execjs'
+require 'date'
+
+context = Ruby2JS.compile(Date.today.strftime('d = new Date(%Y, %-m, %-d)'))
+puts context.eval('d.getYear()')+1900
+```
+
 Conversions can be explored interactively using the
 [demo](https://github.com/rubys/ruby2js/blob/master/demo/ruby2js.rb) provided.
 

data/lib/ruby2js/converter/def.rb

@@ -95,6 +95,7 @@ module Ruby2JS
         body = scope body, vars
         if @block_this and @block_depth == 1
           body = "var self = this#{@sep}#{body}"
+          @block_this = false
         end
 
         "function#{ " #{name}" if name }(#{ parse args }) {#{nl}#{ body }#{nl}}"

data/lib/ruby2js/converter/hash.rb

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

data/lib/ruby2js/execjs.rb

@@ -0,0 +1,16 @@
+require 'ruby2js'
+require 'execjs'
+
+module Ruby2JS
+  def self.compile(source, options={})
+    ExecJS.compile(convert(source, options))
+  end
+
+  def self.eval(source, options={})
+    ExecJS.eval(convert(source, options))
+  end
+
+  def self.exec(source, options={})
+    ExecJS.exec(convert(source, options))
+  end
+end

data/lib/ruby2js/filter/react.rb

@@ -68,13 +68,19 @@ module Ruby2JS
       end
 
       def on_send(node)
-        # enable React filtering within React class method calls
-        if node.children.first == s(:const, nil, :React)
-          begin
-            react, @react = @react, true
-            return super
-          ensure
-            @react = react
+        if not @react
+          # enable React filtering within React class method calls or
+          # React component calls
+          if 
+            node.children.first == s(:const, nil, :React) or
+            node.children.first == nil and node.children[1] =~ /^_[A-Z]/
+          then
+            begin
+              @react = true
+              return on_send(node)
+            ensure
+              @react = false
+            end
           end
         end
 
@@ -216,6 +222,9 @@ module Ruby2JS
             params << process(text)
           end
 
+          # trim trailing null if no text or children
+          params.pop if params.last == s(:nil)
+
           # construct element using params
           element = s(:send, s(:const, nil, :React), :createElement, *params)
 
@@ -344,8 +353,36 @@ module Ruby2JS
 
       # convert blocks to proc arguments
       def on_block(node)
+        if not @react
+          # enable React filtering on React component calls
+          if 
+            node.children[0].children[0] == nil and 
+            node.children[0].children[1] =~ /^_[A-Z]/
+          then
+            begin
+              @react = true
+              return on_block(node)
+            ensure
+              @react = false
+            end
+          end
+        end
+
         return super unless @react
-        return super unless node.children[1].children.empty?
+
+        # iterate over Enumerable arguments if (a) node is a createElement
+        # type of call, and (b) there are args present
+        if
+          node.children.first.children[0] == nil and
+          node.children.first.children[1] =~ /^_/ and
+          not node.children[1].children.empty?
+        then
+          send = node.children.first.children
+          return super if send.length < 3
+          return process s(:block, s(:send, *send[0..1], *send[3..-1]),
+            s(:args), s(:block, s(:send, send[2], :forEach),
+            *node.children[1..-1]))
+        end
 
         # traverse through potential "css proxy" style method calls
         child = node.children.first
@@ -356,8 +393,7 @@ module Ruby2JS
 
         # append block as a standalone proc to wunderbar style method call
         if child.children[0] == nil and child.children[1] =~ /^_\w/
-          block = s(:block, s(:send, nil, :proc), 
-            s(:args, s(:arg, :_index), s(:arg, :_parent)),
+          block = s(:block, s(:send, nil, :proc), s(:args),
             *node.children[2..-1])
           return on_send s(:send, *node.children.first.children, block)
         end

data/lib/ruby2js/version.rb

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

data/ruby2js.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby2js"
-  s.version = "1.12.2"
+  s.version = "1.13.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2015-01-25"
+  s.date = "2015-02-02"
   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"]
+  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/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"]
   s.homepage = "http://github.com/rubys/ruby2js"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 1.12.2
+  version: 1.13.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-25 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -36,6 +36,7 @@ extra_rdoc_files: []
 files:
 - ruby2js.gemspec
 - README.md
+- lib/ruby2js/execjs.rb
 - lib/ruby2js/converter.rb
 - lib/ruby2js/version.rb
 - lib/ruby2js/filter/jquery.rb