ruby2js 1.1.1 → 1.1.2

data/README.md

@@ -1,4 +1,4 @@
-ruby2js
+Ruby2js
 =======
 
 Minimal yet extensible Ruby to JavaScript conversion.  
@@ -64,7 +64,7 @@ and to provide a runtime library that adds properties to global JavaScript
 objects to handle this.  It’s the approach that [Opal](http://opalrb.org/)
 takes.  It is a fine approach, with a number of benefits.  It also has some
 notable drawbacks.  For example,
-[Readability](http://opalrb.org/try/#code:a%20%3D%20%22abc%22%3B%20puts%20a[-1])
+[readability](http://opalrb.org/try/#code:a%20%3D%20%22abc%22%3B%20puts%20a[-1])
 and 
 [compatibility with other frameworks](https://github.com/opal/opal/issues/400).
 
@@ -93,6 +93,93 @@ and runtime libraries, one could reproduce any functionality desired.  Just be
 forewarned, that implementing a function like `method_missing` would require a
 _lot_ of work.
 
+Integrations
+---
+
+While this is a low level library suitable for DIY integration, one of the
+obvious uses of a tool that produces JavaScript is by web servers.  Ruby2JS
+includes three such integrations:
+
+*  [CGI](https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/cgi.rb)
+*  [Sinatra](https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/sinatra.rb)
+*  [Rails](https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/rails.rb)
+
+As you might expect, CGI is a bit sluggish.  By constrast, Sinatra is speedy.
+Rails is not only equally speedy on the first call, after that it will
+avoid the coversion entirely and serve cached results instead.
+
+Filters
+---
+
+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)
+  adds `'use strict';` to the output
+
+* [return](https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/return.rb)
+  adds `return` to the last expression in functions
+
+* [functions](https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/functions.rb)
+
+    * `to_s` becomes `to_String`
+    * `to_i` becomes `parseInt`
+    * `to_f` becomes `parseFloat`
+    * `sub` becomes `replace`
+    * `gsub` becomes `replace //g`
+    * `first` becomes `[0]`
+    * `last` becomes `[*.length-1]`
+    * `[-n]` becomes `[*.length-n]` for literal values of `n`
+    * `[n..m]` becomes `slice(n,m+1)`
+    * `[n...m]` becomes `slice(n,m)`
+    * `puts` becomes `console.log`
+    * `each` becomes `forEach` unless jquery is included
+    * `each_with_index` becomes `forEach`
+
+* [jquery](https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/jquery.rb)
+
+    * maps Ruby unary operator `~` to jQuery `$` function
+    * maps Ruby attribute syntax to jquery attribute syntax
+    * maps `$$` to jQuery `$` function
+
+* [angularrb](https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/angularrb.rb)
+
+    * maps Ruby `module` to `angular.module`
+    * maps `filter`, `controller`, `factory`, and `directive` to calls to
+      angular module functions.
+    * maps `use` statements to formal arguments or array values (as
+      appropriate) depending on the module function.
+    * tracks globals variable and constant references and adds additional
+      implicit `use` statements
+    * maps constant assignments in an angular module to a filter
+    * maps class definitions in an angular module to a filter
+
+* [angular-route](https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/angular-routerb.rb)
+
+    * 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)
+    * maps `$resource.new` statements on `$resource` function calls.
+    * adds implicit module `use` of `ngResource` when `$resource.new` calls
+      are encountered
+
+[Wunderbar](https://github.com/rubys/wunderbar) includes additional demos:
+
+* [wiki](https://github.com/rubys/wunderbar/blob/master/demo/wiki.rb) makes
+  use of the jquery filter.
+
+* [angularjs](https://github.com/rubys/wunderbar/blob/master/demo/angularjs.rb)
+  makes use of the angular filters to implement the 
+  [angular.js tutorial](http://docs.angularjs.org/tutorial).  This demo
+  includes:
+    * [view](https://github.com/rubys/wunderbar/blob/master/demo/views/index._html)
+    * [partials](https://github.com/rubys/wunderbar/tree/master/demo/partials)
+    * [js](https://github.com/rubys/wunderbar/tree/master/demo/js)
+
 Picking a Ruby to JS mapping tool
 ---
 
@@ -107,12 +194,15 @@ limitations as to what JavaScript can be produced.
 [Try](http://intertwingly.net/projects/ruby2js/all) for yourself.
 [Compare](http://opalrb.org/try/#code:).
 
+And, of course, the right solution might be to use
+[CoffeeScript](http://coffeescript.org/) instead.
+
 License
 ---
 
 (The MIT License)
 
-Copyright (c) 2009,2013 Macario Ortega, Sam Ruby
+Copyright (c) 2009, 2013 Macario Ortega, Sam Ruby
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/ruby2js.rb

@@ -47,7 +47,7 @@ module Ruby2JS
       pending = false
       blank = true
       lines.each do |line|
-        if line.start_with? '}' or line.start_with? ']'
+        if ')}]'.include? line[0]
           pre.sub!(/^  /,'')
           line.sub!(/([,;])$/,"\\1\n")
           pending = true
@@ -56,7 +56,7 @@ module Ruby2JS
         end
 
         line.sub! /^/, pre
-        if line.end_with? '{' or line.end_with? '['
+        if '({['.include? line[-1]
           pre += '  ' 
           line.sub!(/^/,"\n") unless blank or pending
           pending = true

data/lib/ruby2js/cgi.rb

@@ -0,0 +1,40 @@
+# Example usage:
+#
+#   hello.cgi:
+#
+#     require 'ruby2js/cgi'
+#     __END__
+#     alert 'Hello World!'
+#
+# Using an optional filter:
+#
+#   require 'ruby2js/filter/functions'
+
+require 'ruby2js'
+
+at_exit do
+  status = 200
+  headers = []
+
+  begin
+    require 'time'
+    modtime = File.stat($0).mtime.rfc2822
+    headers << "Last-Modified: #{modtime}\r\n"
+    status = 304 if ENV['HTTP_IF_MODIFIED_SINCE'] == modtime
+  rescue
+  end
+
+  if status == 200
+    require 'digest/md5'
+    js = Ruby2JS.convert(DATA.read)
+    etag = Digest::MD5.hexdigest(js).inspect
+    headers << "Etag: #{etag}\r\n"
+    status = 304 if ENV['HTTP_IF_NONE_MATCH'] == etag
+  end
+
+  if status == 200
+    print "#{headers.join}\r\n#{js}"
+  else
+    print "Status: 304 Not Modified\r\n\r\n"
+  end
+end

data/lib/ruby2js/converter.rb

@@ -103,6 +103,7 @@ require 'ruby2js/converter/casgn'
 require 'ruby2js/converter/class'
 require 'ruby2js/converter/const'
 require 'ruby2js/converter/def'
+require 'ruby2js/converter/defs'
 require 'ruby2js/converter/defined'
 require 'ruby2js/converter/dstr'
 require 'ruby2js/converter/for'
@@ -114,6 +115,7 @@ require 'ruby2js/converter/kwbegin'
 require 'ruby2js/converter/literal'
 require 'ruby2js/converter/logical'
 require 'ruby2js/converter/masgn'
+require 'ruby2js/converter/module'
 require 'ruby2js/converter/next'
 require 'ruby2js/converter/nil'
 require 'ruby2js/converter/opasgn'

data/lib/ruby2js/converter/defs.rb

@@ -0,0 +1,13 @@
+module Ruby2JS
+  class Converter
+
+    # (def (self) :foo
+    #   (args)
+    #   (...)
+
+    handle :defs do |target, method, args, body|
+      parse s(:send, target, "#{method}=", 
+        s(:block, s(:send, nil, :lambda), args, body))
+    end
+  end
+end

data/lib/ruby2js/converter/hash.rb

@@ -14,7 +14,7 @@ module Ruby2JS
         "#{key}: #{parse right}"
       end
 
-      if pairs.map {|item| item.length+2}.reduce(&:+).to_i < 72
+      if pairs.map {|item| item.length+2}.reduce(&:+).to_i < 70
         "{#{ pairs.join(', ') }}"
       else
         "{#@nl#{ pairs.join(",#@ws") }#@nl}"

data/lib/ruby2js/converter/module.rb

@@ -0,0 +1,56 @@
+module Ruby2JS
+  class Converter
+
+    # (module
+    #   (const nil :A)
+    #   (...)
+
+    handle :module do |name, *body|
+      symbols = [] 
+
+      while body.length == 1 and body.first.type == :begin
+        body = body.first.children
+      end
+
+      visibility = :public
+      omit = []
+
+      body.each do |node|
+        if node.type == :send and node.children.first == nil
+          if [:public, :private, :protected].include? node.children[1]
+            if node.children.length == 2
+              visibility = node.children[1]
+              omit << node
+            elsif node.children[1] == :public
+              omit << node
+              node.children[2..-1].each do |sym|
+                symbols << sym.children.first if sym.type == :sym 
+              end
+            end
+          end
+        end
+
+        next unless visibility == :public
+
+        if node.type == :casgn and node.children.first == nil
+          symbols << node.children[1]
+        elsif node.type == :def
+          symbols << node.children.first
+        elsif node.type == :class and node.children.first.children.first == nil
+          symbols << node.children.first.children.last
+        end
+      end
+
+      body = body - omit + [s(:return, s(:hash, 
+        *symbols.map {|sym| s(:pair, s(:sym, sym), s(:lvar, sym))}))]
+
+      body = s(:send, s(:block, s(:send, nil, :lambda), s(:args),
+        s(:begin, *body)), :[])
+      if name.children.first == nil
+        parse s(:lvasgn, name.children.last, body)
+      else
+        parse s(:send, name.children.first, "#{name.children.last}=", body)
+      end
+    end
+  end
+end

data/lib/ruby2js/converter/send.rb

@@ -14,12 +14,22 @@ module Ruby2JS
         raise NotImplementedError, "invalid method name #{ method }"
       end
 
+      # three ways to define anonymous functions
       if method == :new and receiver and receiver.children == [nil, :Proc]
         return parse args.first
       elsif not receiver and [:lambda, :proc].include? method
         return parse args.first
       end
 
+      # call anonymous function
+      if [:call, :[]].include? method and receiver and receiver.type == :block 
+        t2,m2,*args2 = receiver.children.first.children
+        if not t2 and [:lambda, :proc].include? m2 and args2.length == 0
+          receiver = (@state == :statement ? group(receiver) : parse(receiver))
+          return parse s(:send, nil, receiver, *args)
+        end
+      end
+
       op_index   = operator_index method
       if op_index != -1
         target = args.first 
@@ -89,8 +99,15 @@ module Ruby2JS
             s(:send, s(:array, *args[0..-2]), :concat,
               args[-1].children.first))
         else
-          args = args.map {|a| parse a}.join(', ')
-          "#{ parse receiver }#{ '.' if receiver }#{ method }(#{ args })"
+          call = "#{ parse receiver }#{ '.' if receiver }#{ method }"
+          args = args.map {|a| parse a}
+          if args.any? {|arg| arg.to_s.include? "\n"}
+            "#{ call }(#{ args.join(', ') })"
+          elsif args.map {|arg| arg.length+2}.reduce(&:+).to_i < 70
+            "#{ call }(#{ args.join(', ') })"
+          else
+            "#{ call }(#@nl#{ args.join(",#@ws") }#@nl)"
+          end
         end
       end
     end

data/lib/ruby2js/filter/angular-resource.rb

@@ -0,0 +1,26 @@
+require 'parser/current'
+require 'ruby2js/filter/angularrb'
+
+module Ruby2JS
+  module Filter
+    module AngularResource
+      include SEXP
+
+      # input: 
+      #   $resource.new(args)
+      #
+      # output: 
+      #   $resource(args)
+
+      def on_send(node)
+        return super unless @ngApp and node.children[1] == :new
+        return super unless node.children[0] == s(:gvar, :$resource)
+        node = super(node)
+        @ngAppUses << :ngResource
+        node.updated nil, [nil, :$resource, *node.children[2..-1]]
+      end
+    end
+
+    DEFAULTS.push AngularResource
+  end
+end

data/lib/ruby2js/filter/angular-route.rb

@@ -0,0 +1,59 @@
+require 'parser/current'
+require 'ruby2js/filter/angularrb'
+
+module Ruby2JS
+  module Filter
+    module AngularRoute
+      include SEXP
+
+      # input: 
+      #   case $routeProvider
+      #   when '/path'
+      #     templateUrl = 'partials/path.html'
+      #   else
+      #     redirectTo '/path'
+      #   end
+      #
+      # output: 
+      #   AppName.config(["$routeProvider", function($routeProvider) {
+      #     $routeProvider.when("/path", {templateUrl: 'partials/path.html'}).
+      #     otherwise({redirectTo: "/path"}))
+
+      def on_case(node)
+        rp = :$routeProvider
+        return super unless @ngApp and node.children.first == s(:gvar, rp)
+        @ngAppUses << :ngRoute
+        code = s(:lvar, rp)
+
+        hash = proc do |pairs|
+          if pairs.length == 1 and pairs.first.type == :begin
+            pairs = pairs.first.children
+          end
+          s(:hash, *pairs.map {|pair| 
+            if pair.type == :send
+              s(:pair, s(:sym, pair.children[1]), pair.children[2])
+            else
+              s(:pair, s(:sym, pair.children[0]), pair.children[1])
+            end
+          })
+        end
+
+        node.children[1..-2].each do |child|
+          code = s(:send, code, :when, child.children.first,
+            hash[child.children[1..-1]])
+        end
+
+        if node.children.last
+          code = s(:send, code, :otherwise, 
+            hash[node.children[-1..-1]])
+        end
+
+        s(:send, s(:lvar, @ngApp), :config, s(:array, s(:str, rp.to_s),
+          s(:block, 
+            s(:send, nil, :proc), s(:args, s(:arg, rp)), code)))
+      end
+    end
+
+    DEFAULTS.push AngularRoute
+  end
+end

data/lib/ruby2js/filter/angularrb.rb

@@ -8,6 +8,9 @@ module Ruby2JS
 
       def initialize(*args)
         @ngApp = nil
+        @ngAppUses = []
+        @ngClassUses = []
+        @ngClassOmit = []
         super
       end
 
@@ -29,6 +32,8 @@ module Ruby2JS
         return super unless parent_name.children == [nil, :Angular]
 
         @ngApp = module_name.children[1]
+        @ngChildren = node.children
+        @ngAppUses = []
 
         # find the block
         block = process_all(node.children[1..-1])
@@ -36,62 +41,83 @@ module Ruby2JS
           block = block.first.children.dup
         end
 
-        # find use class method calls
-        uses = block.find_all do |node|
-          node and node.type == :send and node.children[0..1] == [nil, :use]
+        factories = []
+        block.compact.each do |child|
+          if child.type == :class and child.children.first.children.first == nil
+            name = child.children.first
+            if name.children.first == nil
+              name = name.children.last
+              factories << on_block(s(:block, s(:send, nil, :factory,
+                s(:sym, name)), s(:args), s(:return, s(:const, nil, name))))
+            end
+          end
         end
+        block += factories
 
         # convert use calls into dependencies
-        depends = []
-        uses.each do |use|
-          pending = []
-          use.children[2..-1].each do |node|
-            break unless [:str, :sym].include? node.type
-            pending << node
+        depends = @ngAppUses.map {|sym| s(:sym, sym)} + extract_uses(block)
+        depends = depends.map {|node| node.children.first.to_s}.uniq.
+          map {|sym| s(:str, sym)}
+
+        name, @ngApp, @ngChildren = @ngApp, nil, nil
+
+        # construct app
+        app = s(:send, s(:lvar, :angular), :module, s(:str, name.to_s), 
+          s(:array, *depends.uniq))
+
+        # return a single chained statement when there is only one call
+        block.compact!
+        if block.length == 0
+          return app
+        elsif block.length == 1
+          call = block.first.children.first
+          if block.first.type == :send and call == s(:lvar, name)
+            return block.first.updated nil, [app, *block.first.children[1..-1]]
+          elsif block.first.type == :block and call.children.first == s(:lvar, name)
+            call = call.updated nil, [app, *call.children[1..-1]]
+            return block.first.updated nil, [call, *block.first.children[1..-1]]
           end
-          depends += pending
-          block.delete use
         end
 
-        # build constant assignment statement
-        casgn = s(:casgn, nil, @ngApp, s(:send, 
-                  s(:lvar, :angular), 
-                  :module,
-                  s(:str, @ngApp.to_s), 
-                  s(:array, *depends)))
-
-        @ngApp = nil
-
-        # replace module with a constant assign followed by the module contents
-        node.updated :begin, [casgn, *block.compact]
+        # replace module with a constant assign followed by the module
+        # contents all wrapped in an anonymous function
+        s(:send, s(:block, s(:send, nil, :lambda), s(:args),
+          s(:begin, s(:casgn, nil, name, app), *block)), :[])
       end
 
       # input: 
-      #   class Name < Angular::Controller
-      #     use :$service
-      #     ...
-      #   end
-      #
-      # output: 
-      #   AppName.controller :Name do |$service|
-      #     ...
-      #   end
+      #   filter :name { ... }
+      #   controller :name { ... }
+      #   factory :name { ... }
 
-      def on_class(node)
+      def on_block(node)
         return super unless @ngApp
-        return super unless node.children.length == 3
-
-        # (const nil :Name)
-        name = node.children.first
-        return super unless name.type == :const and name.children.first == nil
+        call = node.children.first
+        return super if call.children.first
+
+        case call.children[1]
+        when :controller
+          ng_controller(node)
+        when :factory
+          ng_factory(node)
+        when :filter
+          ng_filter(node)
+        when :directive
+          ng_controller(node) # reuse template
+        else
+          super
+        end
+      end
 
-        # (const (const nil :Angular) :Controller)
-        parent = node.children[1]
-        return super unless parent and parent.children.length == 2
-        return super unless parent.children[0]
-        return super unless parent.children[0].type == :const
-        return super unless parent.children[0].children == [nil, :Angular]
-        return super unless [:Controller].include? parent.children[1]
+      # input:
+      #  controller :name do
+      #    ...
+      #  end
+      #
+      def ng_controller(node)
+        target = node.children.first
+        target = target.updated(nil, [s(:lvar, @ngApp), 
+          *target.children[1..-1]])
 
         # find the block
         block = process_all(node.children[2..-1])
@@ -99,31 +125,15 @@ module Ruby2JS
           block = block.first.children.dup
         end
 
-        # find use class method calls
-        uses = block.find_all do |node|
-          node.type == :send and node.children[0..1] == [nil, :use]
-        end
-
         # convert use calls into args
-        args = []
-        uses.each do |use|
-          pending = []
-          use.children[2..-1].each do |node|
-            break unless [:str, :sym].include? node.type
-            pending << s(:arg, *node.children)
-          end
-          args += pending
-          block.delete use
-        end
-
-        # build Appname.controller call statement
-        call = s(:send,
-                 s(:const, nil, @ngApp),
-                 :controller,
-                 s(:sym, name.children.last))
-
-        # replace class with a block
-        node.updated :block, [call, s(:args, *args), s(:begin, *block)]
+        @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.
+          map {|sym| s(:arg, sym)}
+        @ngClassUses = @ngClassOmit = []
+
+        node.updated :block, [target, s(:args, *args), s(:begin, *block)]
       end
 
       # input: 
@@ -135,27 +145,106 @@ module Ruby2JS
       #   AppName.filter :name do
       #     return lambda {|input| return ... }
       #   end
-      def on_block(node)
-        return super unless @ngApp
-
+      def ng_filter(node)
         call = node.children.first
-        return super unless call.children[0..1] == [nil, :filter]
 
         # insert return
-        children = process_all(node.children[1..-1])
-        block = [children.pop || s(:nil)]
-        while block.length == 1 and block.first.type == :begin
-          block = block.first.children.dup
+        args = process_all(node.children[1].children)
+        block = process_all(node.children[2..-1])
+        tail = [block.pop || s(:nil)]
+        while tail.length == 1 and tail.first.type == :begin
+          tail = tail.first.children.dup
         end
-        block.push s(:return, block.pop) unless block.last.type == :return
-        children.push (block.length == 1 ? block.first : s(:begin, *block))
+        tail.push s(:return, tail.pop) unless tail.last.type == :return
+        block.push (tail.length == 1 ? tail.first : s(:begin, *tail))
 
         # construct a function returning a function
-        inner = s(:block, s(:send, nil, :lambda), *children)
+        inner = s(:block, s(:send, nil, :lambda), s(:args, *args), *block)
         outer = s(:send, s(:lvar, @ngApp), :filter, *call.children[2..-1])
 
         node.updated nil, [outer, s(:args), s(:return, inner)]
       end
+
+      # input: 
+      #   factory :name do |uses|
+      #     ...
+      #   end
+      #
+      # output: 
+      #   AppName.factory :name, [uses, lambda {|uses| ...}]
+      def ng_factory(node)
+        call = node.children.first
+        call = call.updated(nil, [s(:lvar, @ngApp), *call.children[1..-1]])
+
+        # insert return
+        block = process_all(node.children[2..-1])
+        tail = [block.pop || s(:nil)]
+        while tail.length == 1 and tail.first.type == :begin
+          tail = tail.first.children.dup
+        end
+        tail.push s(:return, tail.pop) unless tail.last.type == :return
+        block.push (tail.length == 1 ? tail.first : s(:begin, *tail))
+
+        # extract dependencies
+        @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.
+          map {|sym| s(:arg, sym)}
+
+        # construct a function
+        function = s(:block, s(:send, nil, :lambda), s(:args, *args), *block)
+        array = args.map {|arg| s(:str, arg.children.first.to_s)}
+
+        s(:send, *call.children, s(:array, *array, function))
+      end
+
+      # input: 
+      #   Constant = ...
+      #
+      # output: 
+      #   AppName.factory :name, [uses, lambda {|uses| ...}]
+      def on_casgn(node)
+        return super if node.children[0]
+        @ngClassOmit << node.children[1]
+        return super unless @ngApp and @ngChildren.include? node
+        ng_factory s(:block, s(:send, nil, :factory, s(:sym, node.children[1])),
+          s(:args), process(node.children[2]))
+      end
+
+      def on_gvar(node)
+        if @ngClassUses
+          @ngClassUses << node.children.first
+        end
+
+        super
+      end
+
+      def on_const(node)
+        if @ngClassUses
+          @ngClassUses << node.children.last if not node.children.first
+        end
+
+        super
+      end
+
+      def extract_uses(block)
+        # find use class method calls
+        uses = block.find_all do |node|
+          node and node.type == :send and node.children[0..1] == [nil, :use]
+        end
+
+        # convert use calls into dependencies
+        depends = []
+        uses.each do |use|
+          use.children[2..-1].each do |node|
+            depends << node if [:str, :sym].include? node.type
+          end
+          block.delete use
+        end
+
+        depends
+      end
     end
 
     DEFAULTS.push AngularRB

data/lib/ruby2js/filter/strict.rb

@@ -0,0 +1,20 @@
+require 'ruby2js'
+
+module Ruby2JS
+  module Filter
+    module Strict
+      include SEXP
+
+      def process(node)
+        if @strict
+          super
+        else
+          @strict = true
+          s(:begin, s(:str, 'use strict'), super(node))
+        end
+      end
+    end
+
+    DEFAULTS.push Strict
+  end
+end

data/lib/ruby2js/rails.rb

@@ -0,0 +1,28 @@
+# Example usage:
+#
+#   $ echo gem 'ruby2js', require: 'ruby2js/rails' > Gemfile
+#   $ bundle update
+#   $ rails generate controller Say hello
+#   $ echo 'alert "Hello world!"' > app/views/say/hello.js.rb
+#   $ rails server
+#   $ curl http://localhost:3000/say/hello.js
+#
+# Using an optional filter:
+#
+#   $ echo 'require "ruby2js/filter/functions"' > config/initializers/ruby2js.rb
+
+require 'ruby2js'
+
+module Ruby2JS
+  module Rails
+    class Template
+      cattr_accessor :default_format
+      self.default_format = Mime::JS
+      def self.call(template)
+        "Ruby2JS.convert(#{template.source.inspect})"
+      end
+    end
+
+    ActionView::Template.register_template_handler :rb, Template
+  end
+end

data/lib/ruby2js/sinatra.rb

@@ -0,0 +1,43 @@
+# Example usage:
+#
+#   sinatra.rb:
+#
+#     require 'ruby2js/sinatra'
+#     get '/test.js' do
+#       ruby2js :test
+#     end
+#
+#   views/test.rb:
+#
+#     alert 'Hello World!'
+#
+# Using an optional filter:
+#
+#   require 'ruby2js/filter/functions'
+
+require 'sinatra'
+require 'ruby2js'
+
+class Ruby2JSTemplate < Tilt::Template
+  self.default_mime_type = 'application/javascript'
+
+  def prepare
+  end
+
+  def evaluate(scope, locals, &block)
+    @output ||= Ruby2JS.convert(data)
+  end
+
+  def allows_script?
+    false
+  end
+end
+
+Tilt.register 'rb', Ruby2JSTemplate
+
+helpers do
+  def ruby2js(*args)
+    content_type 'application/javascript'
+    render('rb', *args)
+  end
+end

data/lib/ruby2js/version.rb

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

data/ruby2js.gemspec

@@ -2,22 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby2js"
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2013-11-22"
+  s.date = "2013-12-01"
   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/version.rb", "lib/ruby2js/converter", "lib/ruby2js/converter/orasgn.rb", "lib/ruby2js/converter/kwbegin.rb", "lib/ruby2js/converter/const.rb", "lib/ruby2js/converter/return.rb", "lib/ruby2js/converter/opasgn.rb", "lib/ruby2js/converter/xstr.rb", "lib/ruby2js/converter/args.rb", "lib/ruby2js/converter/literal.rb", "lib/ruby2js/converter/array.rb", "lib/ruby2js/converter/if.rb", "lib/ruby2js/converter/nil.rb", "lib/ruby2js/converter/logical.rb", "lib/ruby2js/converter/next.rb", "lib/ruby2js/converter/while.rb", "lib/ruby2js/converter/whilepost.rb", "lib/ruby2js/converter/arg.rb", "lib/ruby2js/converter/case.rb", "lib/ruby2js/converter/break.rb", "lib/ruby2js/converter/hash.rb", "lib/ruby2js/converter/for.rb", "lib/ruby2js/converter/boolean.rb", "lib/ruby2js/converter/var.rb", "lib/ruby2js/converter/undef.rb", "lib/ruby2js/converter/blockpass.rb", "lib/ruby2js/converter/until.rb", "lib/ruby2js/converter/regexp.rb", "lib/ruby2js/converter/untilpost.rb", "lib/ruby2js/converter/masgn.rb", "lib/ruby2js/converter/block.rb", "lib/ruby2js/converter/ivar.rb", "lib/ruby2js/converter/send.rb", "lib/ruby2js/converter/vasgn.rb", "lib/ruby2js/converter/defined.rb", "lib/ruby2js/converter/def.rb", "lib/ruby2js/converter/sym.rb", "lib/ruby2js/converter/ivasgn.rb", "lib/ruby2js/converter/casgn.rb", "lib/ruby2js/converter/self.rb", "lib/ruby2js/converter/andasgn.rb", "lib/ruby2js/converter/begin.rb", "lib/ruby2js/converter/dstr.rb", "lib/ruby2js/converter/class.rb", "lib/ruby2js/converter.rb", "lib/ruby2js/filter", "lib/ruby2js/filter/return.rb", "lib/ruby2js/filter/angularrb.rb", "lib/ruby2js/filter/functions.rb", "lib/ruby2js/filter/jquery.rb", "lib/ruby2js.rb"]
+  s.files = ["ruby2js.gemspec", "README.md", "lib/ruby2js", "lib/ruby2js/sinatra.rb", "lib/ruby2js/converter.rb", "lib/ruby2js/filter", "lib/ruby2js/filter/angular-route.rb", "lib/ruby2js/filter/jquery.rb", "lib/ruby2js/filter/return.rb", "lib/ruby2js/filter/angularrb.rb", "lib/ruby2js/filter/strict.rb", "lib/ruby2js/filter/functions.rb", "lib/ruby2js/filter/angular-resource.rb", "lib/ruby2js/converter", "lib/ruby2js/converter/ivasgn.rb", "lib/ruby2js/converter/self.rb", "lib/ruby2js/converter/undef.rb", "lib/ruby2js/converter/casgn.rb", "lib/ruby2js/converter/nil.rb", "lib/ruby2js/converter/logical.rb", "lib/ruby2js/converter/ivar.rb", "lib/ruby2js/converter/class.rb", "lib/ruby2js/converter/for.rb", "lib/ruby2js/converter/arg.rb", "lib/ruby2js/converter/literal.rb", "lib/ruby2js/converter/dstr.rb", "lib/ruby2js/converter/return.rb", "lib/ruby2js/converter/defined.rb", "lib/ruby2js/converter/boolean.rb", "lib/ruby2js/converter/next.rb", "lib/ruby2js/converter/array.rb", "lib/ruby2js/converter/def.rb", "lib/ruby2js/converter/args.rb", "lib/ruby2js/converter/regexp.rb", "lib/ruby2js/converter/var.rb", "lib/ruby2js/converter/defs.rb", "lib/ruby2js/converter/if.rb", "lib/ruby2js/converter/orasgn.rb", "lib/ruby2js/converter/masgn.rb", "lib/ruby2js/converter/hash.rb", "lib/ruby2js/converter/whilepost.rb", "lib/ruby2js/converter/break.rb", "lib/ruby2js/converter/opasgn.rb", "lib/ruby2js/converter/begin.rb", "lib/ruby2js/converter/xstr.rb", "lib/ruby2js/converter/vasgn.rb", "lib/ruby2js/converter/block.rb", "lib/ruby2js/converter/send.rb", "lib/ruby2js/converter/sym.rb", "lib/ruby2js/converter/case.rb", "lib/ruby2js/converter/kwbegin.rb", "lib/ruby2js/converter/const.rb", "lib/ruby2js/converter/module.rb", "lib/ruby2js/converter/until.rb", "lib/ruby2js/converter/untilpost.rb", "lib/ruby2js/converter/andasgn.rb", "lib/ruby2js/converter/blockpass.rb", "lib/ruby2js/converter/while.rb", "lib/ruby2js/cgi.rb", "lib/ruby2js/version.rb", "lib/ruby2js/rails.rb", "lib/ruby2js.rb"]
   s.homepage = "http://github.com/rubys/ruby2js"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.7"
+  s.rubygems_version = "1.8.11"
   s.summary = "Minimal yet extensible Ruby to JavaScript conversion."
 
   if s.respond_to? :specification_version then
-    s.specification_version = 4
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<parser>, [">= 0"])

metadata

@@ -1,29 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
+  prerelease: 
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2013-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &8336660 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *8336660
 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"
 email: rubys@intertwingly.net
@@ -33,77 +31,86 @@ extra_rdoc_files: []
 files:
 - ruby2js.gemspec
 - README.md
-- lib/ruby2js/version.rb
-- lib/ruby2js/converter/orasgn.rb
-- lib/ruby2js/converter/kwbegin.rb
-- lib/ruby2js/converter/const.rb
-- lib/ruby2js/converter/return.rb
-- lib/ruby2js/converter/opasgn.rb
-- lib/ruby2js/converter/xstr.rb
-- lib/ruby2js/converter/args.rb
-- lib/ruby2js/converter/literal.rb
-- lib/ruby2js/converter/array.rb
-- lib/ruby2js/converter/if.rb
+- lib/ruby2js/sinatra.rb
+- lib/ruby2js/converter.rb
+- lib/ruby2js/filter/angular-route.rb
+- lib/ruby2js/filter/jquery.rb
+- lib/ruby2js/filter/return.rb
+- lib/ruby2js/filter/angularrb.rb
+- lib/ruby2js/filter/strict.rb
+- lib/ruby2js/filter/functions.rb
+- lib/ruby2js/filter/angular-resource.rb
+- lib/ruby2js/converter/ivasgn.rb
+- lib/ruby2js/converter/self.rb
+- lib/ruby2js/converter/undef.rb
+- lib/ruby2js/converter/casgn.rb
 - lib/ruby2js/converter/nil.rb
 - lib/ruby2js/converter/logical.rb
-- lib/ruby2js/converter/next.rb
-- lib/ruby2js/converter/while.rb
-- lib/ruby2js/converter/whilepost.rb
-- lib/ruby2js/converter/arg.rb
-- lib/ruby2js/converter/case.rb
-- lib/ruby2js/converter/break.rb
-- lib/ruby2js/converter/hash.rb
+- lib/ruby2js/converter/ivar.rb
+- lib/ruby2js/converter/class.rb
 - lib/ruby2js/converter/for.rb
+- lib/ruby2js/converter/arg.rb
+- lib/ruby2js/converter/literal.rb
+- lib/ruby2js/converter/dstr.rb
+- lib/ruby2js/converter/return.rb
+- lib/ruby2js/converter/defined.rb
 - lib/ruby2js/converter/boolean.rb
-- lib/ruby2js/converter/var.rb
-- lib/ruby2js/converter/undef.rb
-- lib/ruby2js/converter/blockpass.rb
-- lib/ruby2js/converter/until.rb
+- lib/ruby2js/converter/next.rb
+- lib/ruby2js/converter/array.rb
+- lib/ruby2js/converter/def.rb
+- lib/ruby2js/converter/args.rb
 - lib/ruby2js/converter/regexp.rb
-- lib/ruby2js/converter/untilpost.rb
+- lib/ruby2js/converter/var.rb
+- lib/ruby2js/converter/defs.rb
+- lib/ruby2js/converter/if.rb
+- lib/ruby2js/converter/orasgn.rb
 - lib/ruby2js/converter/masgn.rb
+- lib/ruby2js/converter/hash.rb
+- lib/ruby2js/converter/whilepost.rb
+- lib/ruby2js/converter/break.rb
+- lib/ruby2js/converter/opasgn.rb
+- lib/ruby2js/converter/begin.rb
+- lib/ruby2js/converter/xstr.rb
+- lib/ruby2js/converter/vasgn.rb
 - lib/ruby2js/converter/block.rb
-- lib/ruby2js/converter/ivar.rb
 - lib/ruby2js/converter/send.rb
-- lib/ruby2js/converter/vasgn.rb
-- lib/ruby2js/converter/defined.rb
-- lib/ruby2js/converter/def.rb
 - lib/ruby2js/converter/sym.rb
-- lib/ruby2js/converter/ivasgn.rb
-- lib/ruby2js/converter/casgn.rb
-- lib/ruby2js/converter/self.rb
+- lib/ruby2js/converter/case.rb
+- lib/ruby2js/converter/kwbegin.rb
+- lib/ruby2js/converter/const.rb
+- lib/ruby2js/converter/module.rb
+- lib/ruby2js/converter/until.rb
+- lib/ruby2js/converter/untilpost.rb
 - lib/ruby2js/converter/andasgn.rb
-- lib/ruby2js/converter/begin.rb
-- lib/ruby2js/converter/dstr.rb
-- lib/ruby2js/converter/class.rb
-- lib/ruby2js/converter.rb
-- lib/ruby2js/filter/return.rb
-- lib/ruby2js/filter/angularrb.rb
-- lib/ruby2js/filter/functions.rb
-- lib/ruby2js/filter/jquery.rb
+- lib/ruby2js/converter/blockpass.rb
+- lib/ruby2js/converter/while.rb
+- lib/ruby2js/cgi.rb
+- lib/ruby2js/version.rb
+- lib/ruby2js/rails.rb
 - lib/ruby2js.rb
 homepage: http://github.com/rubys/ruby2js
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 1.8.11
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Minimal yet extensible Ruby to JavaScript conversion.
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDlkZTE5MGYzYzBlZDc0YzBmZmU5YmE2NWZmNTU1MWQwYWE1ZjVmNw==
-  data.tar.gz: !binary |-
-    ZWM4OGU4OTgzMGU0ZjAxMDc1MGFhOGNmMDU2YWZjOWU0ZmNjYWFjNg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YzNiMmJmNTg5MDBiZmQzMTc1OGQ5ZDNiNTEyYzZjN2FjNjlhNjAwYTA2NGVl
-    ZWYxZjZiNDc0NDFhZjI1YmZlMjU3ZGNkOWVlNjEwNTg0NGFlZDhhZmNlZTBj
-    YzI0OGYyZGRjMmI3NDRlODk0ZTNkYzBjNGQ4MDYxNWUwYzVhOGQ=
-  data.tar.gz: !binary |-
-    NGNiMTlkMGEyYzVjNDg3ODc2OGQ3ZDE1ODcyZTk0YjRiN2Q3MGNlZjlhNWQ1
-    MmNlOGFiYjNlM2RiMjJmZDZjYzUxMzc5NGMzZjg4MmU3NDEwZjM3ZDg0NGNi
-    NGRmOWQ3OWQwNzI3ZjNhZTNkNDA4MzEzY2YwODY2NWE1NTRmNTM=