ruby2js 1.13.0 → 1.13.1

data/README.md

@@ -144,6 +144,11 @@ the script.
 * [return](https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/return.rb)
   adds `return` to the last expression in functions.
 
+* [require](https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/require.rb)
+  supports `require` and `require_relative` statements.  Contents of files
+  that are required are converted to JavaScript and expanded inline.
+  `require` function calls in expressions are left alone.
+
 * [camelCase](https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/camelCase.rb)
   converts `underscore_case` to `camelCase`.  See
   [camelCase_spec](https://github.com/rubys/ruby2js/blob/master/spec/camelCase_spec.rb)

data/lib/ruby2js.rb

@@ -15,6 +15,10 @@ module Ruby2JS
     class Processor < Parser::AST::Processor
       BINARY_OPERATORS = Converter::OPERATORS[2..-1].flatten
 
+      def options=(options)
+        @options = options
+      end
+
       # handle all of the 'invented' ast types
       def on_attr(node); on_send(node); end
       def on_autoreturn(node); on_return(node); end
@@ -54,6 +58,7 @@ module Ruby2JS
       file,line = source.source_location
       source = File.read(file.dup.untaint).untaint
       ast = find_block( parse(source), line )
+      options[:file] = file
     elsif Parser::AST::Node === source
       ast = source
       source = ast.loc.expression.source_buffer.source
@@ -68,7 +73,9 @@ module Ruby2JS
       filters.reverse.each do |mod|
         filter = Class.new(filter) {include mod} 
       end
-      ast = filter.new.process(ast)
+      filter = filter.new
+      filter.options = options
+      ast = filter.process(ast)
     end
 
     ruby2js = Ruby2JS::Converter.new( ast )
@@ -78,6 +85,10 @@ module Ruby2JS
     if ruby2js.binding and not ruby2js.ivars
       ruby2js.ivars = ruby2js.binding.eval \
         'Hash[instance_variables.map {|var| [var, instance_variable_get(var)]}]'
+    elsif options[:scope] and not ruby2js.ivars
+      scope = options.delete(:scope)
+      ruby2js.ivars = Hash[scope.instance_variables.map {|var|
+        [var, scope.instance_variable_get(var)]}]
     end
 
     ruby2js.width = options[:width] if options[:width]

data/lib/ruby2js/filter/react.rb

@@ -46,6 +46,7 @@ module Ruby2JS
 
         begin
           react, @react = @react, true
+          reactClass, @reactClass = @reactClass, true
 
           # automatically capture the displayName for the class
           pairs = [s(:pair, s(:sym, :displayName), 
@@ -60,6 +61,7 @@ module Ruby2JS
           end
         ensure
           @react = react
+          @reactClass = reactClass
         end
 
         # emit a createClass statement
@@ -370,11 +372,17 @@ module Ruby2JS
 
         return super unless @react
 
+        # traverse through potential "css proxy" style method calls
+        child = node.children.first
+        test = child.children.first
+        while test and test.type == :send and not test.is_method?
+          child, test = test, test.children.first
+        end
+
         # 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
+          child.children[0] == nil and child.children[1] =~ /^_/ and
           not node.children[1].children.empty?
         then
           send = node.children.first.children
@@ -384,13 +392,6 @@ module Ruby2JS
             *node.children[1..-1]))
         end
 
-        # traverse through potential "css proxy" style method calls
-        child = node.children.first
-        test = child.children.first
-        while test and test.type == :send and not test.is_method?
-          child, test = test, test.children.first
-        end
-
         # 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),
@@ -403,13 +404,13 @@ module Ruby2JS
 
       # convert global variables to refs
       def on_gvar(node)
-        return super unless @react
+        return super unless @reactClass
         s(:attr, s(:attr, s(:self), :refs), node.children.first.to_s[1..-1])
       end
 
       # convert instance variables to state
       def on_ivar(node)
-        return super unless @react
+        return super unless @reactClass
         s(:attr, s(:attr, s(:self), :state), node.children.first.to_s[1..-1])
       end
 

data/lib/ruby2js/filter/require.rb

@@ -0,0 +1,70 @@
+require 'ruby2js'
+
+module Ruby2JS
+  module Filter
+    module Require
+      include SEXP
+
+      @@valid_path = /\A[-\w_.]+\Z/
+
+      def self.valid_path=(valid_path)
+        @@valid_path = valid_path
+      end
+
+      def on_send(node)
+        if
+          not @require_expr and # only statements
+          node.children.length == 3 and
+          node.children[0] == nil and
+          [:require, :require_relative].include? node.children[1] and
+          node.children[2].type == :str and
+          @options[:file]
+        then
+
+          begin
+            file2 = @options[:file2]  
+
+            basename = node.children[2].children.first
+            dirname = File.dirname(File.expand_path(@options[:file]))
+
+            if file2 and node.children[1] == :require_relative
+              dirname = File.dirname(File.expand_path(file2))
+            end
+
+            filename = File.join(dirname, basename)
+
+            segments = basename.split(/[\/\\]/)
+            if segments.all? {|path| path =~ @@valid_path and path != '..'}
+              filename.untaint 
+            end
+
+            @options[:file2] = filename
+            process Ruby2JS.parse(File.read(filename))
+          ensure
+            if file2
+              @options[:file2] = file2
+            else
+              @options.delete(:file2)
+            end
+          end
+        else
+          begin
+            require_expr, @require_expr = @require_expr, true
+            super
+          ensure
+            @require_expr = require_expr
+          end
+        end
+      end
+
+      def on_lvasgn(node)
+        require_expr, @require_expr = @require_expr, true
+        super
+      ensure
+        @require_expr = require_expr
+      end
+    end
+
+    DEFAULTS.push Require
+  end
+end

data/lib/ruby2js/version.rb

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

data/ruby2js.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby2js"
-  s.version = "1.13.0"
+  s.version = "1.13.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2015-02-02"
+  s.date = "2015-02-11"
   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/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/require.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.13.0
+  version: 1.13.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -42,6 +42,7 @@ files:
 - 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