ruby2js 1.13.1 → 1.14.0

data/README.md

@@ -138,23 +138,23 @@ In general, making use of a filter is as simple as requiring it.  If multiple
 filters are selected, they will all be applied in parallel in one pass through
 the script.
 
-* [strict](https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/strict.rb)
+* <a id="strict" href="https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/strict.rb">strict</a>
   adds `'use strict';` to the output.
 
-* [return](https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/return.rb)
+* <a id="return" href="https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/return.rb">return</a>
   adds `return` to the last expression in functions.
 
-* [require](https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/require.rb)
+* <a id="require" href="https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/require.rb">require</a>
   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)
+* <a id="camelCase" href="https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/camelCase.rb">camelCase</a>
   converts `underscore_case` to `camelCase`.  See
   [camelCase_spec](https://github.com/rubys/ruby2js/blob/master/spec/camelCase_spec.rb)
   for examples.
 
-* [functions](https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/functions.rb)
+* <a id="functions" href="https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/functions.rb">functions</a>
 
     * `.all?` becomes `.every`
     * `.any?` becomes `.some`
@@ -170,6 +170,7 @@ the script.
     * `.first(n)` becomes `.slice(0, n)`
     * `.gsub` becomes `replace //g`
     * `.include?` becomes `.indexOf() != -1`
+    * `.inspect` becomes `JSON.stringify()`
     * `.keys` becomes `Object.keys()`
     * `.last` becomes `[*.length-1]`
     * `.last(n)` becomes `.slice(*.length-1, *.length)`
@@ -202,7 +203,69 @@ the script.
       of `Error` instead; and default constructors will be provided
     * `loop do...end` will be replaced with `while (true) {...}`
 
-* [underscore](https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/underscore.rb)
+* <a id="rubyjs" href="https://github.com/rubys/ruby2js/blob/master/spec/rubyjs_spec.rb">rubyjs</a>
+    * `.at()` becomes `_a.at()`
+    * `.between?()` becomes `R().between()`
+    * `.capitalize()` becomes `_s.capitalize()`
+    * `.center()` becomes `_s.center()`
+    * `.chomp()` becomes `_s.chomp()`
+    * `.collect_concat()` becomes `_e.collect_concat()`
+    * `.compact()` becomes `_a.compact()`
+    * `.compact!()` becomes `_a.compact_bang()`
+    * `.count()` becomes `_e.count()`
+    * `.cycle()` becomes `_e.cycle()`
+    * `.delete_at()` becomes `_a.delete_at()`
+    * `.delete_if()` becomes `_a.delete_if()`
+    * `.drop_while()` becomes `_e.drop_while()`
+    * `.each_index()` becomes `_e.each_index()`
+    * `.each_slice()` becomes `_e.each_slice()`
+    * `.each_with_index()` becomes `_e.each_with_index()`
+    * `.each_with_object()` becomes `_e.each_with_object()`
+    * `.find_all()` becomes `_e.find_all()`
+    * `.find()` becomes `_e.find()`
+    * `.flat_map()` becomes `_e.flat_map()`
+    * `.flatten()` becomes `_a.flatten()`
+    * `.grep()` becomes `_e.grep()`
+    * `.group_by()` becomes `_e.group_by()`
+    * `.inject()` becomes `_e.inject()`
+    * `.insert()` becomes `_a.insert()`
+    * `.keep_if()` becomes `_a.keep_if()`
+    * `.ljust()` becomes `_s.ljust()`
+    * `.lstrip()` becomes `_s.lstrip()`
+    * `.map()` becomes `_e.map()`
+    * `.max_by()` becomes `_e.max_by()`
+    * `.min_by()` becomes `_e.min_by()`
+    * `.one?()` becomes `_e.one()`
+    * `.partition()` becomes `_e.partition()`
+    * `.reject()` becomes `_e.reject()`
+    * `.reverse()` becomes `_a.reverse()`
+    * `.reverse!()` becomes `_a.reverse_bang()`
+    * `.reverse_each()` becomes `_e.reverse_each()`
+    * `.rindex()` becomes `_s.rindex()`
+    * `.rjust()` becomes `_s.rjust()`
+    * `.rotate()` becomes `_a.rotate()`
+    * `.rotate!()` becomes `_a.rotate_bang()`
+    * `.rstrip()` becomes `_s.rstrip()`
+    * `.scan()` becomes `_s.scan()`
+    * `.select()` becomes `_a.select()`
+    * `.shift()` becomes `_a.shift()`
+    * `.shuffle()` becomes `_a.shuffle()`
+    * `.shuffle!()` becomes `_a.shuffle_bang()`
+    * `.slice()` becomes `_a.slice()`
+    * `.slice!()` becomes `_a.slice_bang()`
+    * `.sort_by()` becomes `_e.sort_by()`
+    * `.strftime()` becomes `_t.strftime()`
+    * `.swapcase()` becomes `_s.swapcase()`
+    * `.take_while()` becomes `_e.take_while(`)
+    * `.transpose()` becomes `_a.transpose()`
+    * `.tr()` becomes `_s.tr()`
+    * `.union()` becomes `_a.union()`
+    * `.uniq()` becomes `_a.uniq()`
+    * `.uniq!()` becomes `_a.uniq_bang()`
+    * `<=>` becomes `R.Comparable.cmp()`
+    * `(n..m)` becomes `R.Range.new()`
+
+* <a id="underscore" href="https://github.com/rubys/ruby2js/blob/master/spec/underscore.rb">underscore</a>
 
     * `.clone()` becomes `_.clone()`
     * `.compact()` becomes `_.compact()`
@@ -240,7 +303,7 @@ the script.
       expression: `reduce`, `sort_by`, `group_by`, `index_by`, `count_by`,
       `find`, `select`, `reject`.
 
-* [jquery](https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/jquery.rb)
+* <a id="jquery" href="https://github.com/rubys/ruby2js/blob/master/spec/jquery.rb">jquery</a>
 
     * maps Ruby unary operator `~` to jQuery `$` function
     * maps Ruby attribute syntax to jquery attribute syntax
@@ -248,7 +311,7 @@ the script.
     * defaults the fourth parameter of $$.post to `"json"`, allowing Ruby block
       syntax to be used for the success function.
 
-* [angularrb](https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/angularrb.rb)
+* <a id="angularrb" href="https://github.com/rubys/ruby2js/blob/master/spec/angularrb.rb">angularrb</a>
 
     * maps Ruby `module` to `angular.module`
     * maps `filter`, `controller`, `factory`, and `directive` to calls to
@@ -269,19 +332,19 @@ the script.
         * maps `timeout` and `interval` calls with a block to `$timeout` and
           `$interval` calls where the block is passed as the first parameter.
 
-* [angular-route](https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/angular-routerb.rb)
+* <a id="angular-route" href="https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/angular-routerb.rb">angular-route</a>
 
     * maps `case` statements on `$routeProvider` to angular.js module
       configuration.
     * adds implicit module `use` of `ngRoute` when such a `case` statement
       is encountered
 
-* [angular-resource](https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/angular-resource.rb)
+* <a id="angular-resource" href="https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/angular-resource.rb">angular-resource</a>
     * maps `$resource.new` statements on `$resource` function calls.
     * adds implicit module `use` of `ngResource` when `$resource.new` calls
       are encountered
 
-* [minitest-jasmine](https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/minitest-jasmine.rb)
+* <a id="minitest-jasmine" href="https://github.com/rubys/ruby2js/blob/master/spec/minitest-jasmine.rb">minitest-jasmine</a>
     * maps subclasses of `Minitest::Test` to `describe` calls
     * maps `test_` methods inside subclasses of `Minitest::Test` to `it` calls
     * maps `setup`, `teardown`, `before`, and `after` calls to `beforeEach`

data/lib/ruby2js/converter/send.rb

@@ -79,6 +79,9 @@ module Ruby2JS
       elsif method == :<< and args.length == 1 and @state == :statement
         "#{ parse receiver }.push(#{ parse args.first })"
 
+      elsif method == :<=>
+        raise NotImplementedError, "use of <=>"
+
       elsif OPERATORS.flatten.include?(method) and not LOGICAL.include?(method)
         "#{ group_receiver ? group(receiver) : parse(receiver) } #{ method } #{ group_target ? group(target) : parse(target) }"  
 

data/lib/ruby2js/filter/functions.rb

@@ -198,7 +198,6 @@ module Ruby2JS
         elsif method == :reverse! and node.is_method? 
           # input: a.reverse!
           # output: a.splice(0, a.length, *a.reverse)
-          target = node.children.first
           process s(:send, target, :splice, s(:int, 0), 
             s(:attr, target, :length), s(:splat, s(:send, target, 
             :"#{node.children[1].to_s[0..-2]}", *node.children[2..-1])))
@@ -206,6 +205,9 @@ module Ruby2JS
         elsif method == :each_with_index
           process node.updated nil, [target, :forEach, *args]
 
+        elsif method == :inspect and args.length == 0
+          s(:send, s(:const, nil, :JSON), :stringify, process(target))
+
         else
           super
         end

data/lib/ruby2js/filter/react.rb

@@ -90,7 +90,13 @@ module Ruby2JS
 
         if node.children[0] == nil and node.children[1] == :_
           # text nodes
-          node.children[2]
+          if @reactApply
+            # if apply is set, emit code that pushes text
+            s(:send, s(:gvar, :$_), :push, node.children[2])
+          else
+            # simple/normal case: simply return the text
+            node.children[2]
+          end
 
         elsif node.children[0] == nil and node.children[1] =~ /^_\w/
           # map method calls starting with an underscore to React calls

data/lib/ruby2js/filter/require.rb

@@ -38,6 +38,10 @@ module Ruby2JS
               filename.untaint 
             end
 
+            if not File.exist? filename and File.exist? filename+".rb"
+              filename += '.rb'
+            end
+
             @options[:file2] = filename
             process Ruby2JS.parse(File.read(filename))
           ensure

data/lib/ruby2js/filter/rubyjs.rb

@@ -0,0 +1,108 @@
+require 'ruby2js'
+
+module Ruby2JS
+  module Filter
+    module RubyJS
+      include SEXP
+
+      def on_send(node)
+        # leave functional style calls alone
+        target = node.children.first
+        return super if target and [:_s, :_a, :_h, :_n, :_i, :_t].
+          include? target.children[1]
+
+        # leave classic ("OO") style call chains alone
+        while target and target.type == :send
+          return super if target.children[1] == :R
+          target = target.children.first
+        end
+
+        if 
+          [:capitalize, :center, :chomp, :ljust, :lstrip, :rindex, :rjust,
+            :rstrip, :scan, :swapcase, :tr].include? node.children[1]
+        then
+          # map selected string functions
+          s(:send, s(:lvar, :_s), node.children[1],
+            *process_all([node.children[0], *node.children[2..-1]]))
+
+        elsif 
+          [:at, :compact, :compact!, :delete_at, :delete_at, :flatten, :insert,
+          :reverse, :reverse!, :rotate, :rotate, :rotate!, :shift, :shuffle,
+          :shuffle!, :slice, :slice!, :transpose, :union, :uniq, :uniq!]
+          .include? node.children[1]
+        then
+          # map selected array functions
+          s(:send, s(:lvar, :_a), node.children[1].to_s.sub("!", '_bang'),
+            *process_all([node.children[0], *node.children[2..-1]]))
+
+
+        elsif [:strftime].include? node.children[1]
+          # map selected time functions
+          s(:send, s(:lvar, :_t), node.children[1],
+            *process_all([node.children[0], *node.children[2..-1]]))
+
+        elsif node.children[1] == :<=>
+          s(:send, s(:attr, s(:const, nil, :R), :Comparable), :cmp,
+            node.children[0], *node.children[2..-1])
+
+        elsif node.children[1] == :between?
+          s(:send, s(:send, nil, :R, node.children[0]), :between,
+            *node.children[2..-1])
+
+        else
+          super
+        end
+      end
+
+      def on_block(node)
+        call, args, *block = node.children
+
+        if 
+          [:collect_concat, :count, :cycle, :delete_if, :drop_while,
+          :each_index, :each_slice, :each_with_index, :each_with_object,
+          :find, :find_all, :flat_map, :inject, :grep, :group_by, :keep_if,
+          :map, :max_by, :min_by, :one?, :partition, :reject, :reverse_each,
+          :select!, :sort_by, :take_while].include? call.children[1]
+        then
+          if 
+            [:collect_concat, :count, :delete_if, :drop_while, :find,
+            :find_all, :flat_map, :grep, :group_by, :keep_if, :map, :max_by,
+            :min_by, :one?, :partition, :reject, :select!, :sort_by,
+            :take_while].include? call.children[1]
+          then
+            block = [ s(:autoreturn, *block) ]
+          end
+
+          lvar = [:each_index, :keep_if, :select!].
+            include?(call.children[1]) ? :_a : :_e
+
+          if call.children[1] == :find and call.children.length == 2
+            call = s(:send, *call.children, s(:nil))
+          elsif call.children[1] == :inject and call.children.length == 3
+            call = s(:send, *call.children, s(:nil))
+          elsif call.children[1] == :select!
+            call = s(:send, call.children.first, :select_bang,
+              *call.children[2..-1])
+          end
+
+          s(:block, s(:send, s(:lvar, lvar), call.children[1],
+            *process_all([call.children[0], *call.children[2..-1]])),
+            args, *block)
+        else
+          super
+        end
+      end
+
+      def on_irange(node)
+        s(:send, s(:attr, s(:const, nil, :R), :Range), :new, *node.children)
+      end
+
+      def on_erange(node)
+        s(:send, s(:attr, s(:const, nil, :R), :Range), :new, *node.children,
+          s(:true))
+      end
+    end
+
+    DEFAULTS.push RubyJS
+  end
+end

data/lib/ruby2js/version.rb

@@ -1,8 +1,8 @@
 module Ruby2JS
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 13
-    TINY  = 1
+    MINOR = 14
+    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.13.1"
+  s.version = "1.14.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2015-02-11"
+  s.date = "2015-02-17"
   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/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.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/rubyjs.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.1
+  version: 1.14.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -46,6 +46,7 @@ files:
 - lib/ruby2js/filter/angularrb.rb
 - lib/ruby2js/filter/minitest-jasmine.rb
 - lib/ruby2js/filter/camelCase.rb
+- lib/ruby2js/filter/rubyjs.rb
 - lib/ruby2js/filter/strict.rb
 - lib/ruby2js/filter/functions.rb
 - lib/ruby2js/filter/angular-resource.rb