ruby2js 1.2.0 → 1.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2MxNDBkNGRmOTUxZmM0NjRlYWQ5N2RmODgzMTgxZTNiNDU2MDU4NA==
+    ZGIyMDBkZWFkNDE5ZDFlOTliNDE0MDMwMjgwMmNlYWZkZDcxOWNiMg==
   data.tar.gz: !binary |-
-    ZmFiMGY3NTM1MmViNTY4YjQ5OWQyYmMzMDQzZGYwZmFhOTY2ZDZiYg==
+    NzIxOTk3NjM1YzRkMDA1NTI3ZThiMTI0MzE3NzIyYWFhNmE3MmIwMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MGMwY2ZlNWIzZWY5ZDdlOTQ1ZjUxMWNiMDZmMTczMjBiNmU0YTNjYWQ4ZDZm
-    MDBmZTcyZDkyNzJjMDIwNjQyN2E4ZWE3MTRhMzAwZDRhODFhY2IxNjgzYTY2
-    ZDUwNTg5MWJhNzRiMjlkNzE4MzEyYWJkOTc4YTQwZjFhOTNiMWY=
+    MjRmNDE4NWQxN2MxNTAxOThkZTUzYzFiMGU0ZDZiM2EwNTI3ZDZlYmQyY2Fh
+    MDg4MGM3YjVlMWI4NGQwMWY0ODhmMjQ5YTE1ZjdmN2JmOWRiYWI5ZDdjNzM0
+    ZDM0NWExNWFjZjg1NzQ1MTNhNWNkMGMwYjg1MjIxMDdkYjI3NDU=
   data.tar.gz: !binary |-
-    OTc3MjViYjAyY2Q3ZWIwMzA2ZGNjMjdkMDQ0OTc2YjVkYzk0ZDc3ZmEwODcw
-    YThkMGVlMmViNjFkZTNmYWJjMWNhZDg2ZDI5MDQ5NzU2ODZmZjBiMzQzZTdl
-    Yzg1Y2FkYTI5MzM1NmY1ZTViYjJmOTRmZTgyZWQyM2JmODZiNjc=
+    OGYxYTNmNjNjNWY5OTkxYmQ0YTljNDhkM2JmZmU0NmY5ZTMzNTZhZjc3OWVi
+    NjcxZDQ3NmQ2N2Y1M2QzNTNmYjE5ODZjNTNmZDc2YTM0MGVhOTAzZWE4YTc0
+    NDFiOGU4NjU2YjA1MGYzOGE3Mjk2ODM5Y2IzNTc2MjdjNDFkMGY=

data/README.md

@@ -61,7 +61,7 @@ quite different if `a` is a Hash.
 
 One way to resolve this is to change the way indexing operators are evaluated,
 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/)
+objects to handle this.  This is 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])
@@ -76,11 +76,11 @@ A third approach would be to do static transformations on the source in order
 to address common usage patterns or idioms.  These transformations can even be
 occasionally unsafe, as long as the transformations themselves are opt-in.
 ruby2js provides a number of such filters, including one that handles negative
-indexes when passes as a literal.  As indicated above, this is unsafe in that
+indexes when passed as a literal.  As indicated above, this is unsafe in that
 it will do the wrong thing when it encounters a hash index which is expressed
 as a literal constant negative one.  My experience is that such is rare enough
 to be safely ignored, but YMMV.  More troublesome, this also won’t work when
-the index is not a literal (e.g., `a[n]`) where the index happens to be
+the index is not a literal (e.g., `a[n]`) and the index happens to be
 negative at runtime.
 
 This quickly gets into gray areas.  `each` in Ruby is a common method that
@@ -104,9 +104,9 @@ includes three such integrations:
 *  [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 are quite
-speedy as the bulk of the time is spend on the initial load of the required
-libraries.
+As you might expect, CGI is a bit sluggish.  By constrast, Sinatra and Rails
+are quite speedy as the bulk of the time is spend on the initial load of the
+required libraries.
 
 Filters
 ---
@@ -123,24 +123,29 @@ the script.
 
 * [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]`
+    * `.to_s` becomes `to_String`
+    * `.to_a` becomes `to_Array`
+    * `.to_i` becomes `parseInt`
+    * `.to_f` becomes `parseFloat`
+    * `.sub` becomes `replace`
+    * `.ord` becomes `charCodeAt(0)`
+    * `.chr` becomes `fromCharCode`
+    * `.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)`
+    * `[n..m]` becomes `.slice(n,m+1)`
+    * `[n...m]` becomes `.slice(n,m)`
+    * `[/r/, n]` becomes `.match(/r/)[n]`
     * `.empty?` becomes `.length == 0`
     * `.clear!` becomes `.length = 0`
+    * `.replace!` becomes `.length = 0; ...push.apply(*)`
     * `.include?` becomes `.indexOf() != -1`
     * `.any?` becomes `.some`
     * `.all?` becomes `.every`
     * `puts` becomes `console.log`
-    * `each` becomes `forEach` unless jquery is included
-    * `each_with_index` becomes `forEach`
+    * `.each` becomes `forEach` unless jquery is included
+    * `.each_with_index` becomes `forEach`
     * `setInterval` and `setTimeout` allow block to be treated as the
        first parameter on the call
 
@@ -149,7 +154,7 @@ the script.
     * maps Ruby unary operator `~` to jQuery `$` function
     * maps Ruby attribute syntax to jquery attribute syntax
     * maps `$$` to jQuery `$` function
-    * defaults fourth parameter of $$.post to :jquery, allowing Ruby block
+    * defaults the fourth parameter of $$.post to :jquery, allowing Ruby block
       syntax to be used for the success function.
 
 * [angularrb](https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/angularrb.rb)
@@ -159,6 +164,7 @@ the script.
       angular module functions.
     * maps `use` statements to formal arguments or array values (as
       appropriate) depending on the module function.
+    * maps `watch` statments to calls to `$scope.$watch`.
     * tracks globals variable and constant references and adds additional
       implicit `use` statements
     * maps constant assignments in an angular module to a filter
@@ -178,7 +184,9 @@ the script.
 
 [Wunderbar](https://github.com/rubys/wunderbar) includes additional demos:
 
-* [wiki](https://github.com/rubys/wunderbar/blob/master/demo/wiki.rb) makes
+* [chat](https://github.com/rubys/wunderbar/blob/master/demo/chat.rb),
+  [diskusage](https://github.com/rubys/wunderbar/blob/master/demo/diskusage.rb),
+  and [wiki](https://github.com/rubys/wunderbar/blob/master/demo/wiki.rb) make
   use of the jquery filter.
 
 * [angularjs](https://github.com/rubys/wunderbar/blob/master/demo/angularjs.rb)
@@ -197,7 +205,7 @@ framework, and only use one of the many integrations that
 [Opal](http://opalrb.org/) provides, then Opal is the way to go right now.
 
 ruby2js is for those that want to produce JavaScript that looks like it
-wasn’t machine generated, and with the absolute bare minimum in terms of
+wasn’t machine generated, and want the absolute bare minimum in terms of
 limitations as to what JavaScript can be produced.
 
 [Try](http://intertwingly.net/projects/ruby2js/all) for yourself.

data/lib/ruby2js.rb

@@ -11,6 +11,12 @@ module Ruby2JS
         Parser::AST::Node.new type, args
       end
     end
+
+    class Processor < Parser::AST::Processor
+      def on_attr(node)
+        node.updated nil, [process(node.children.first), node.children.last]
+      end
+    end
   end
 
   def self.convert(source, options={})
@@ -29,7 +35,7 @@ module Ruby2JS
     filters = options[:filters] || Filter::DEFAULTS
 
     unless filters.empty?
-      filter = Parser::AST::Processor
+      filter = Filter::Processor
       filters.reverse.each do |mod|
         filter = Class.new(filter) {include mod} 
       end

data/lib/ruby2js/converter.rb

@@ -15,6 +15,7 @@ module Ruby2JS
       @ws = ' '
       @varstack = []
       @width = 80
+      @next_token = :return
 
       @handlers = {}
       @@handlers.each do |name|
@@ -94,7 +95,6 @@ end
 
 # see https://github.com/whitequark/parser/blob/master/doc/AST_FORMAT.md
 
-require 'ruby2js/converter/andasgn'
 require 'ruby2js/converter/arg'
 require 'ruby2js/converter/args'
 require 'ruby2js/converter/array'
@@ -126,7 +126,6 @@ require 'ruby2js/converter/module'
 require 'ruby2js/converter/next'
 require 'ruby2js/converter/nil'
 require 'ruby2js/converter/opasgn'
-require 'ruby2js/converter/orasgn'
 require 'ruby2js/converter/prototype'
 require 'ruby2js/converter/regexp'
 require 'ruby2js/converter/return'

data/lib/ruby2js/converter/break.rb

@@ -6,6 +6,7 @@ module Ruby2JS
 
     handle :break do |n=nil|
       raise NotImplementedError, "break argument #{ n.inspect }" if n
+      raise NotImplementedError, "break outside of loop" if @next_token == :return
       'break'
     end
   end

data/lib/ruby2js/converter/class.rb

@@ -38,6 +38,9 @@ module Ruby2JS
         elsif m.type == :cvasgn
           # class variable
           s(:send, name, "_#{m.children[0][2..-1]}=", *m.children[1..-1])
+        elsif m.type == :send and m.children[0].type == :cvar
+          s(:send, s(:attr, name, "_#{m.children[0].children[0][2..-1]}"),
+            *m.children[1..-1])
         elsif m.type == :casgn and m.children[0] == nil
           # class constant
           s(:send, name, "#{m.children[1]}=", *m.children[2..-1])

data/lib/ruby2js/converter/def.rb

@@ -83,9 +83,14 @@ module Ruby2JS
         end
       end
 
-       nl = @nl unless body == s(:begin)
-      "function#{ " #{name}" if name }(#{ parse args }) " +
-        "{#{nl}#{ scope body, vars}#{nl}}"
+      nl = @nl unless body == s(:begin)
+      begin
+        next_token, @next_token = @next_token, :return
+        "function#{ " #{name}" if name }(#{ parse args }) " +
+          "{#{nl}#{ scope body, vars}#{nl}}"
+      ensure
+        @next_token = next_token
+      end
     end
   end
 end

data/lib/ruby2js/converter/for.rb

@@ -10,17 +10,22 @@ module Ruby2JS
     #   (...)
 
     handle :for do |var, expression, block|
-      if expression.type == :irange
-        "for (var #{parse var} = #{ parse expression.children.first }; " +
-          "#{ parse var } <= #{ parse expression.children.last }; " +
-          "#{ parse var }++) {#@nl#{ scope block }#@nl}"
-      elsif expression.type == :erange
-        "for (var #{parse var} = #{ parse expression.children.first }; " +
-          "#{ parse var } < #{ parse expression.children.last }; " +
-          "#{ parse var }++) {#@nl#{ scope block }#@nl}"
-      else
-        "for (var #{parse var} in #{ parse expression }) " +
-          "{#@nl#{ scope block }#@nl}"
+      begin
+        next_token, @next_token = @next_token, :continue
+        if expression.type == :irange
+          "for (var #{parse var} = #{ parse expression.children.first }; " +
+            "#{ parse var } <= #{ parse expression.children.last }; " +
+            "#{ parse var }++) {#@nl#{ scope block }#@nl}"
+        elsif expression.type == :erange
+          "for (var #{parse var} = #{ parse expression.children.first }; " +
+            "#{ parse var } < #{ parse expression.children.last }; " +
+            "#{ parse var }++) {#@nl#{ scope block }#@nl}"
+        else
+          "for (var #{parse var} in #{ parse expression }) " +
+            "{#@nl#{ scope block }#@nl}"
+        end
+      ensure
+        @next_token = next_token
       end
     end
   end

data/lib/ruby2js/converter/if.rb

@@ -6,10 +6,25 @@ module Ruby2JS
     #   (...)
     #   (...))
 
+    INVERT_OP = {
+      :<  => :>=,
+      :<= => :>,
+      :== => :!=,
+      :!= => :==,
+      :>  => :<=,
+      :>= => :<
+    }
+
     handle :if do |condition, then_block, else_block|
       # return parse condition if not else_block and not then_block
       if else_block and not then_block
-        return parse(s(:if, s(:send, condition, :!), else_block, nil), @state) 
+        if condition.type == :send and INVERT_OP.include? condition.children[1]
+          return parse(s(:if, s(:send, condition.children[0],
+            INVERT_OP[condition.children[1]], condition.children[2]),
+            else_block,nil), @state) 
+        else
+          return parse(s(:if, s(:send, condition, :!), else_block, nil), @state) 
+        end
       end
 
       then_block ||= s(:nil)

data/lib/ruby2js/converter/logical.rb

@@ -16,16 +16,16 @@ module Ruby2JS
       type = @ast.type
       op_index = operator_index type
 
-      left = left.children.first if left and left.type == :begin
       lgroup   = LOGICAL.include?( left.type ) && 
-        op_index <= operator_index( left.type )
+        op_index < operator_index( left.type )
+      lgroup = true if left and left.type == :begin
       left     = parse left
       left     = "(#{ left })" if lgroup
 
       if right
-        right = right.children.first if right.type == :begin
         rgroup = LOGICAL.include?( right.type ) && 
-          op_index <= operator_index( right.type )
+          op_index < operator_index( right.type )
+        rgroup = true if right.type == :begin
         right    = parse right
         right    = "(#{ right })" if rgroup
       end

data/lib/ruby2js/converter/next.rb

@@ -6,7 +6,7 @@ module Ruby2JS
 
     handle :next do |n=nil|
       raise NotImplementedError, "next argument #{ n.inspect }" if n
-      'continue'
+      @next_token.to_s
     end
   end
 end

data/lib/ruby2js/converter/opasgn.rb

@@ -5,7 +5,13 @@ module Ruby2JS
     #   (lvasgn :a) :+
     #   (int 1))
 
+    # NOTE: and-asgn and or_asgn handled below
+
     handle :op_asgn do |var, op, value|
+      var = s(:ivar, var.children.first) if var.type == :ivasgn
+      var = s(:lvar, var.children.first) if var.type == :lvasgn
+      var = s(:cvar, var.children.first) if var.type == :cvasgn
+
       if [:+, :-].include?(op) and value.type==:int and value.children==[1]
         if @state == :statement
           "#{ parse var }#{ op }#{ op }"
@@ -16,5 +22,30 @@ module Ruby2JS
         "#{ parse var } #{ op }= #{ parse value }"
       end
     end
+
+    # (or-asgn
+    #   (lvasgn :a)
+    #   (int 1))
+
+    # (and-asgn
+    #   (lvasgn :a)
+    #   (int 1))
+
+    handle :or_asgn, :and_asgn do |asgn, value|
+      type = (@ast.type == :and_asgn ? :and : :or)
+
+      vtype = nil
+      vtype = :lvar if asgn.type == :lvasgn
+      vtype = :ivar if asgn.type == :ivasgn
+      vtype = :cvar if asgn.type == :cvasgn
+      
+      if vtype
+        parse s(asgn.type, asgn.children.first, s(type, 
+          s(vtype, asgn.children.first), value))
+      else
+        parse s(:send, asgn.children.first, "#{asgn.children[1]}=",
+          s(type, asgn, value))
+      end
+    end
   end
 end

data/lib/ruby2js/converter/send.rb

@@ -4,12 +4,20 @@ module Ruby2JS
     # (send nil :puts
     #   (int 1))
 
-    # (attr nil :puts
+    # (attr nil :puts)
+
+    # (sendw nil :puts
     #   (int 1))
 
-    handle :send, :attr do |receiver, method, *args|
+    # Note: attr and sendw are only generated by filters.  Attr forces
+    # interpretation as an attribute vs a function call with zero parameters.
+    # Sendw forces parameters to be placed on separate lines.
+
+    handle :send, :sendw, :attr do |receiver, method, *args|
       ast = @ast
 
+      width = ((ast.type == :sendw && !@nl.empty?) ? 0 : @width)
+
       if method =~ /\w[!?]$/
         raise NotImplementedError, "invalid method name #{ method }"
       end
@@ -30,15 +38,22 @@ module Ruby2JS
         end
       end
 
-      op_index   = operator_index method
+      op_index = operator_index method
       if op_index != -1
         target = args.first 
-        target = target.children.first if target and target.type == :begin
-        receiver = receiver.children.first if receiver.type == :begin
       end
 
-      group_receiver = receiver.type == :send && op_index <= operator_index( receiver.children[1] ) if receiver
-      group_target = target.type == :send && op_index <= operator_index( target.children[1] ) if target
+      if receiver
+        group_receiver = receiver.type == :send &&
+          op_index < operator_index( receiver.children[1] ) if receiver
+        group_receiver ||= (receiver.type == :begin)
+      end
+
+      if target
+        group_target = target.type == :send && 
+          op_index < operator_index( target.children[1] )
+        group_target ||= (target.type == :begin)
+      end
 
       if method == :!
         if receiver.type == :defined?
@@ -129,7 +144,7 @@ module Ruby2JS
           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 < @width-10
+          elsif args.map {|arg| arg.length+2}.reduce(&:+).to_i < width-10
             "#{ call }(#{ args.join(', ') })"
           else
             "#{ call }(#@nl#{ args.join(",#@ws") }#@nl)"

data/lib/ruby2js/converter/while.rb

@@ -6,7 +6,12 @@ module Ruby2JS
     #   (...))
 
     handle :while do |condition, block|
-      "while (#{ parse condition }) {#@nl#{ scope block }#@nl}"
+      begin
+        next_token, @next_token = @next_token, :continue
+        "while (#{ parse condition }) {#@nl#{ scope block }#@nl}"
+      ensure
+        @next_token = next_token
+      end
     end
   end
 end

data/lib/ruby2js/converter/whilepost.rb

@@ -8,7 +8,12 @@ module Ruby2JS
 
     handle :while_post do |condition, block|
       block = block.updated(:begin) if block.type == :kwbegin
-      "do {#@nl#{ scope block }#@nl} while (#{ parse condition })"
+      begin
+        next_token, @next_token = @next_token, :continue
+        "do {#@nl#{ scope block }#@nl} while (#{ parse condition })"
+      ensure
+        @next_token = next_token
+      end
     end
   end
 end

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

@@ -25,31 +25,17 @@ module Ruby2JS
         @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]])
+          code = s(:sendw, code, :when, child.children.first,
+            AngularRB.hash(child.children[1..-1]))
         end
 
         if node.children.last
-          code = s(:send, code, :otherwise, 
-            hash[node.children[-1..-1]])
+          code = s(:sendw, code, :otherwise, 
+            AngularRB.hash(node.children[-1..-1]))
         end
 
-        s(:send, s(:lvar, @ngApp), :config, s(:array, s(:str, rp.to_s),
-          s(:block, 
+        s(:send, @ngApp, :config, s(:array, s(:str, rp.to_s), s(:block, 
             s(:send, nil, :proc), s(:args, s(:arg, rp)), code)))
       end
     end

data/lib/ruby2js/filter/angularrb.rb

@@ -6,8 +6,36 @@ module Ruby2JS
     module AngularRB
       include SEXP
 
+      def self.s(type, *args)
+        Parser::AST::Node.new type, args
+      end
+
+      Angular = s(:const, nil, :Angular)
+
+      # convert simple assignments, simple method calls, and simple method
+      # definitions into a hash when possible; return false otherwise
+      def self.hash(pairs)
+        if pairs.length == 1 and pairs.first.type == :begin
+          pairs = pairs.first.children
+        end
+
+        s(:hash, *pairs.map {|pair| 
+          if pair.type == :send and pair.children[0] == nil
+            s(:pair, s(:sym, pair.children[1]), pair.children[2])
+          elsif pair.type == :lvasgn
+            s(:pair, s(:sym, pair.children[0]), pair.children[1])
+          elsif pair.type == :def
+            s(:pair, s(:sym, pair.children[0]), s(:block, s(:send, nil, :proc),
+              *pair.children[1..-1]))
+          else
+            return false
+          end
+        })
+      end
+
       def initialize(*args)
         @ngApp = nil
+        @ngContext = nil
         @ngAppUses = []
         @ngClassUses = []
         @ngClassOmit = []
@@ -28,10 +56,9 @@ module Ruby2JS
         module_name = node.children[0]
         parent_name = module_name.children[0]
 
-        return super unless parent_name and parent_name.type == :const
-        return super unless parent_name.children == [nil, :Angular]
+        return super unless parent_name == Angular
 
-        @ngApp = module_name.children[1]
+        @ngApp = s(:lvar, module_name.children[1])
         @ngChildren = node.children[1..-1]
         while @ngChildren.length == 1 and @ngChildren.first and @ngChildren.first.type == :begin
           @ngChildren = @ngChildren.first.children.dup
@@ -45,11 +72,12 @@ module Ruby2JS
         depends = depends.map {|node| node.children.first.to_s}.uniq.
           map {|sym| s(:str, sym)}
 
-        name, @ngApp, @ngChildren = @ngApp, nil, nil
+        ngApp, @ngApp, @ngChildren = @ngApp, nil, nil
+        name = module_name.children[1].to_s
 
         # construct app
-        app = s(:send, s(:lvar, :angular), :module, s(:str, name.to_s), 
-          s(:array, *depends.uniq))
+        app = s(:send, s(:lvar, :angular), :module, 
+          s(:str, name), s(:array, *depends.uniq))
 
         # return a single chained statement when there is only one call
         block.compact!
@@ -57,9 +85,9 @@ module Ruby2JS
           return app
         elsif block.length == 1
           call = block.first.children.first
-          if block.first.type == :send and call == s(:lvar, name)
+          if block.first.type == :send and call == ngApp
             return block.first.updated nil, [app, *block.first.children[1..-1]]
-          elsif block.first.type == :block and call.children.first == s(:lvar, name)
+          elsif block.first.type == :block and call.children.first == ngApp
             call = call.updated nil, [app, *call.children[1..-1]]
             return block.first.updated nil, [call, *block.first.children[1..-1]]
           end
@@ -82,6 +110,7 @@ module Ruby2JS
         return super unless @ngApp and @ngChildren.include? node
         name = node.children.first
         if name.children.first == nil
+          @ngClassUses, @ngClassOmit = [], []
           block = [node.children.last]
           uses = extract_uses(block)
           node = s(:class, name, node.children[1], 
@@ -93,7 +122,7 @@ module Ruby2JS
             map {|sym| s(:arg, sym)}
           @ngClassUses, @ngClassOmit = [], []
 
-         s(:block, s(:send, s(:lvar, @ngApp), :factory,
+         s(:block, s(:send, @ngApp, :factory,
             s(:sym, name.children.last)), s(:args, *args), 
             s(:begin, node, s(:return, s(:const, nil, name.children.last))))
         else
@@ -108,21 +137,38 @@ module Ruby2JS
       #   directive :name { ... }
 
       def on_block(node)
-        return super unless @ngApp
+        ngApp = @ngApp
         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
+        target = call.children.first
+        if target and target.type == :const and target.children.first == Angular
+          @ngApp = s(:send, s(:lvar, :angular), :module, s(:str,
+            target.children.last.to_s))
         else
-          super
+          return super if target
+          return super unless @ngApp
+        end
+
+        begin
+          case call.children[1]
+          when :controller
+            ng_controller(node, :controller)
+          when :factory
+            ng_factory(node)
+          when :filter
+            ng_filter(node)
+          when :directive
+            hash = AngularRB.hash(node.children[2..-1])
+            if hash
+              node = node.updated nil, [*node.children[0..1], s(:return, hash)]
+            end
+            ng_controller(node, :directive)
+          when :watch
+            ng_watch(node)
+          else
+            super
+          end
+        ensure
+          @ngApp = ngApp
         end
       end
 
@@ -131,10 +177,15 @@ module Ruby2JS
       #    ...
       #  end
       #
-      def ng_controller(node)
+      # output:
+      #  AppName.controller("name", do |uses|
+      #    ...
+      #  end
+      def ng_controller(node, scope)
+        ngContext, @ngContext = @ngContext, scope
+        @ngClassUses, @ngClassOmit = [], []
         target = node.children.first
-        target = target.updated(nil, [s(:lvar, @ngApp), 
-          *target.children[1..-1]])
+        target = target.updated(nil, [@ngApp, *target.children[1..-1]])
 
         block = process_all(node.children[2..-1])
 
@@ -144,9 +195,11 @@ module Ruby2JS
         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)]
+      ensure
+        @ngClassUses, @ngClassOmit = [], []
+        @ngContext = ngContext
       end
 
       # input: 
@@ -163,12 +216,13 @@ module Ruby2JS
         :or, :regexp, :self, :send, :str, :sym, :true, :undefined?, :xstr ]
 
       def ng_filter(node)
+        @ngClassUses, @ngClassOmit = [], []
         call = node.children.first
 
         # insert return
         args = process_all(node.children[1].children)
         block = process_all(node.children[2..-1])
-        uses = @ngClassUses.uniq.map {|sym| s(:arg, sym)}
+        uses = (@ngClassUses - @ngClassOmit).uniq.map {|sym| s(:arg, sym)}
         tail = [block.pop || s(:nil)]
         while tail.length == 1 and tail.first.type == :begin
           tail = tail.first.children.dup
@@ -178,7 +232,7 @@ module Ruby2JS
 
         # construct a function returning a function
         inner = s(:block, s(:send, nil, :lambda), s(:args, *args), *block)
-        outer = s(:send, s(:lvar, @ngApp), :filter, *call.children[2..-1])
+        outer = s(:send, @ngApp, :filter, *call.children[2..-1])
 
         node.updated nil, [outer, s(:args, *uses), s(:return, inner)]
       end
@@ -192,7 +246,7 @@ module Ruby2JS
       #   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]])
+        call = call.updated(nil, [@ngApp, *call.children[1..-1]])
 
         # insert return
         block = process_all(node.children[2..-1])
@@ -230,6 +284,57 @@ module Ruby2JS
           s(:args), process(node.children[2]))
       end
 
+      # convert ivar referencess in controllers to $scope
+      def on_ivar(node)
+        if @ngContext == :controller
+          process s(:attr, s(:gvar, :$scope), node.children.first.to_s[1..-1])
+        else
+          super
+        end
+      end
+
+      # input:
+      #  watch 'expression' do |oldvalue, newvalue|
+      #    ...
+      #  end
+      #
+      # output:
+      #  $scope.$watch 'expression' do |oldvalue, newvalue|
+      #    ...
+      #  end
+      def ng_watch(node)
+        call = node.children.first
+        if @ngContext == :controller and call.children.first == nil
+          call = s(:send, s(:gvar, :$scope), :$watch, *call.children[2..-1])
+          node = node.updated nil, [call, *node.children[1..-1]]
+        end
+        return process node
+      end
+
+      # convert ivar assignments in controllers to $scope
+      def on_ivasgn(node)
+        if @ngContext == :controller
+          if node.children.length == 1
+            process s(:attr, s(:gvar, :$scope),
+              "#{node.children.first.to_s[1..-1]}")
+          else
+            process s(:send, s(:gvar, :$scope),
+              "#{node.children.first.to_s[1..-1]}=", node.children.last)
+          end
+        else
+          super
+        end
+      end
+
+      # convert instance method definitions in controllers to $scope
+      def on_def(node)
+        if @ngContext == :controller
+          process s(:defs, s(:gvar, :$scope), *node.children)
+        else
+          super
+        end
+      end
+
       def on_gvar(node)
         if @ngClassUses
           @ngClassUses << node.children.first

data/lib/ruby2js/filter/functions.rb

@@ -12,36 +12,56 @@ module Ruby2JS
         if node.children[1] == :to_s
           s(:send, target, :toString, *args)
 
+        elsif node.children[1] == :to_a
+          s(:send, target, :toArray, *args)
+
         elsif node.children[1] == :to_i
           node.updated nil, [nil, :parseInt, target, *args]
 
         elsif node.children[1] == :to_f
-          node.updated nil, [nil, :parseFloat, target, *args]
+          process node.updated nil, [nil, :parseFloat, target, *args]
 
         elsif node.children[1] == :sub and node.children.length == 4
           source, method, before, after = node.children
-          node.updated nil, [source, :replace, before, after]
+          process node.updated nil, [source, :replace, before, after]
 
         elsif node.children[1] == :gsub and node.children.length == 4
           source, method, before, after = node.children
           if before.type == :regexp
-            before = s(:regexp, before.children.first,
-              s(:regopt, :g, *before.children[1]))
+            before = s(:regexp, *before.children[0...-1],
+              s(:regopt, :g, *before.children.last))
           elsif before.type == :str
             before = s(:regexp, s(:str, Regexp.escape(before.children.first)),
               s(:regopt, :g))
           end
-          node.updated nil, [source, :replace, before, after]
+          process node.updated nil, [source, :replace, before, after]
+
+        elsif node.children[1] == :ord and node.children.length == 2
+          if target.type == :str
+            s(:int, target.children.last.ord)
+          else
+            node.updated nil, [target, :charCodeAt, s(:int, 0)]
+          end
+
+        elsif node.children[1] == :chr and node.children.length == 2
+          if target.type == :int
+            s(:str, target.children.last.chr)
+          else
+            node.updated nil, [s(:const, nil, :String), :fromCharCode, target]
+          end
 
         elsif node.children[1] == :empty? and node.children.length == 2
-          s(:send, s(:attr, node.children[0], :length), :==, s(:int, 0))
+          s(:send, s(:attr, target, :length), :==, s(:int, 0))
 
         elsif node.children[1] == :clear! and node.children.length == 2
-          s(:send, node.children[0], :length=, s(:int, 0))
+          s(:send, target, :length=, s(:int, 0))
+
+        elsif node.children[1] == :replace! and node.children.length == 3
+          s(:begin, s(:send, target, :length=, s(:int, 0)),
+             s(:send, target, :push, s(:splat, node.children[2])))
 
         elsif node.children[1] == :include? and node.children.length == 3
-          s(:send, s(:send, node.children[0], :indexOf, node.children[2]),
-            :!=, s(:int, -1))
+          s(:send, s(:send, target, :indexOf, args.first), :!=, s(:int, -1))
 
         elsif node.children[1] == :each
           if @each # disable `each` mapping, see jquery filter for an example
@@ -51,48 +71,54 @@ module Ruby2JS
           end
 
         elsif node.children[0..1] == [nil, :puts]
-          s(:send, s(:attr, nil, :console), :log, *node.children[2..-1])
+          s(:send, s(:attr, nil, :console), :log, *args)
 
         elsif node.children[1..-1] == [:first]
-          node.updated nil, [node.children[0], :[], s(:int, 0)]
+          node.updated nil, [target, :[], s(:int, 0)]
 
         elsif node.children[1..-1] == [:last]
-          on_send node.updated nil, [node.children[0], :[], s(:int, -1)]
+          on_send node.updated nil, [target, :[], s(:int, -1)]
 
-        elsif node.children[1] == :[] and node.children.length == 3
-          source = node.children[0]
-          index = node.children[2]
+        elsif node.children[1] == :[]
+          index = args.first
 
           # resolve negative literal indexes
           i = proc do |index|
             if index.type == :int and index.children.first < 0
-              s(:send, s(:attr, source, :length), :-, 
+              s(:send, s(:attr, target, :length), :-, 
                 s(:int, -index.children.first))
             else
               index
             end
           end
 
-          if index.type == :int and index.children.first < 0
-            node.updated nil, [source, :[], i.(index)]
+          if index.type == :regexp
+            s(:send, s(:send, target, :match, index), :[], 
+              args[1] || s(:int, 0))
+
+          elsif node.children.length != 3
+            super
+
+          elsif index.type == :int and index.children.first < 0
+            node.updated nil, [target, :[], i.(index)]
 
           elsif index.type == :erange
             start, finish = index.children
-            node.updated nil, [source, :slice, i.(start), i.(finish)]
+            node.updated nil, [target, :slice, i.(start), i.(finish)]
 
           elsif index.type == :irange
             start, finish = index.children
             start = i.(start)
             if finish.type == :int
               if finish.children.first == -1
-                finish = s(:attr, source, :length)
+                finish = s(:attr, target, :length)
               else
                 finish = i.(s(:int, finish.children.first+1))
               end
             else
               finish = s(:send, finish, :+, s(:int, 1))
             end
-            node.updated nil, [source, :slice, start, finish]
+            node.updated nil, [target, :slice, start, finish]
 
           else
             super
@@ -113,11 +139,16 @@ module Ruby2JS
           block = process s(:block, s(:send, nil, :proc), *node.children[1..-1])
           call.updated nil, [*call.children[0..1], block, *call.children[2..-1]]
 
-        elsif [:any?].include? call.children[1] and call.children.length == 2
+        elsif [:sub, :gsub].include? call.children[1]
+          return super if call.children.first == nil
+          block = s(:block, s(:send, nil, :proc), *node.children[1..-1])
+          process call.updated(nil, [*call.children, block])
+
+        elsif call.children[1] == :any? and call.children.length == 2
           call = call.updated nil, [call.children.first, :some]
           node.updated nil, [call, *node.children[1..-1]]
 
-        elsif [:all?].include? call.children[1] and call.children.length == 2
+        elsif call.children[1] == :all? and call.children.length == 2
           call = call.updated nil, [call.children.first, :every]
           node.updated nil, [call, *node.children[1..-1]]
 

data/lib/ruby2js/filter/jquery.rb

@@ -119,17 +119,17 @@ module Ruby2JS
               if node.children[1] == :~ and node.children[0].children[1] == :~
                 # consecutive tildes
                 if node.children[0].children[0].children[1] == :~
-                  result = process(node.children[0].children[0].children[0])
+                  result = node.children[0].children[0].children[0]
                 else
-                  result = s(:send, process(node.children[0].children[0]), :~)
+                  result = s(:attr, node.children[0].children[0], :~)
                 end
-                s(:send, s(:send, result, :~), :~)
+                s(:attr, s(:attr, process(result), :~), :~)
               else
                 # possible getter/setter
                 method = node.children[1]
                 method = method.to_s.chomp('=') if method =~ /=$/
                 rewrite = [rewrite_tilda[node.children[0]], 
-                  method, *process_all(node.children[2..-1])]
+                  method, *node.children[2..-1]]
                 if props.include? node.children[1]
                   node.updated nil, rewrite
                 elsif domprops.include? method.to_s
@@ -142,17 +142,17 @@ module Ruby2JS
             elsif node.type == :block
               # method call with a block parameter
               node.updated nil, [rewrite_tilda[node.children[0]],
-                *process_all(node.children[1..-1])]
+                *node.children[1..-1]]
             elsif node.type == :array
               # innermost expression is an array
-              s(:send, nil, '$', *process(node))
+              s(:send, nil, '$', *node)
             else
               # innermost expression is a scalar
-              s(:send, nil, '$', process(node))
+              s(:send, nil, '$', node)
             end
           end
 
-          rewrite_tilda[node].children[0]
+          process rewrite_tilda[node].children[0]
         else
           super
         end

data/lib/ruby2js/version.rb

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

data/ruby2js.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby2js"
-  s.version = "1.2.0"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2013-12-18"
+  s.date = "2014-01-07"
   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/rails.rb", "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/prototype.rb", "lib/ruby2js/converter/opasgn.rb", "lib/ruby2js/converter/xstr.rb", "lib/ruby2js/converter/args.rb", "lib/ruby2js/converter/defs.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/module.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/cvasgn.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/cvar.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/cgi.rb", "lib/ruby2js/converter.rb", "lib/ruby2js/filter", "lib/ruby2js/filter/return.rb", "lib/ruby2js/filter/strict.rb", "lib/ruby2js/filter/angularrb.rb", "lib/ruby2js/filter/angular-resource.rb", "lib/ruby2js/filter/functions.rb", "lib/ruby2js/filter/jquery.rb", "lib/ruby2js/filter/angular-route.rb", "lib/ruby2js/sinatra.rb", "lib/ruby2js.rb"]
+  s.files = ["ruby2js.gemspec", "README.md", "lib/ruby2js", "lib/ruby2js/rails.rb", "lib/ruby2js/version.rb", "lib/ruby2js/converter", "lib/ruby2js/converter/kwbegin.rb", "lib/ruby2js/converter/const.rb", "lib/ruby2js/converter/return.rb", "lib/ruby2js/converter/prototype.rb", "lib/ruby2js/converter/opasgn.rb", "lib/ruby2js/converter/xstr.rb", "lib/ruby2js/converter/args.rb", "lib/ruby2js/converter/defs.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/module.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/cvasgn.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/cvar.rb", "lib/ruby2js/converter/ivasgn.rb", "lib/ruby2js/converter/casgn.rb", "lib/ruby2js/converter/self.rb", "lib/ruby2js/converter/begin.rb", "lib/ruby2js/converter/dstr.rb", "lib/ruby2js/converter/class.rb", "lib/ruby2js/cgi.rb", "lib/ruby2js/converter.rb", "lib/ruby2js/filter", "lib/ruby2js/filter/return.rb", "lib/ruby2js/filter/strict.rb", "lib/ruby2js/filter/angularrb.rb", "lib/ruby2js/filter/angular-resource.rb", "lib/ruby2js/filter/functions.rb", "lib/ruby2js/filter/jquery.rb", "lib/ruby2js/filter/angular-route.rb", "lib/ruby2js/sinatra.rb", "lib/ruby2js.rb"]
   s.homepage = "http://github.com/rubys/ruby2js"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -35,7 +35,6 @@ files:
 - README.md
 - lib/ruby2js/rails.rb
 - lib/ruby2js/version.rb
-- lib/ruby2js/converter/orasgn.rb
 - lib/ruby2js/converter/kwbegin.rb
 - lib/ruby2js/converter/const.rb
 - lib/ruby2js/converter/return.rb
@@ -78,7 +77,6 @@ files:
 - 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

data/lib/ruby2js/converter/andasgn.rb

@@ -1,12 +0,0 @@
-module Ruby2JS
-  class Converter
-
-    # (and-asgn
-    #   (lvasgn :a
-    #   (int 1))
-
-    handle :and_asgn do |var, value|
-      "#{ parse var } = #{parse var} && #{ parse value }"
-    end
-  end
-end

data/lib/ruby2js/converter/orasgn.rb

@@ -1,12 +0,0 @@
-module Ruby2JS
-  class Converter
-
-    # (or-asgn
-    #   (lvasgn :a
-    #   (int 1))
-
-    handle :or_asgn do |var, value|
-      "#{ parse var } = #{parse var} || #{ parse value }"
-    end
-  end
-end