ruby2js 1.3.0 → 1.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGIyMDBkZWFkNDE5ZDFlOTliNDE0MDMwMjgwMmNlYWZkZDcxOWNiMg==
+    YTU0NmY4ZDc4NDJiMGVjZGNiMmJjOWJhZmZkYzk3ODUwNjQ4YjVjMw==
   data.tar.gz: !binary |-
-    NzIxOTk3NjM1YzRkMDA1NTI3ZThiMTI0MzE3NzIyYWFhNmE3MmIwMA==
+    NzRlMTE2ZWY5NTRjYjQ1ODBhMDUzMzZjMzFkNjY3M2IxNDVjY2VkNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjRmNDE4NWQxN2MxNTAxOThkZTUzYzFiMGU0ZDZiM2EwNTI3ZDZlYmQyY2Fh
-    MDg4MGM3YjVlMWI4NGQwMWY0ODhmMjQ5YTE1ZjdmN2JmOWRiYWI5ZDdjNzM0
-    ZDM0NWExNWFjZjg1NzQ1MTNhNWNkMGMwYjg1MjIxMDdkYjI3NDU=
+    ZDk5MGVjOTdmNWRiNWY1ODhmMTMxMjdhOWMwNWEzNTUxYThiMGVlYWRjOTY4
+    YjU4MDM2OWI1ZmFhMjZhOTM3NzIwYjgyZWI4ZjA5ODE1MmFhMWU5YmZlYmYw
+    OTcyMmNhYzE0NDMyZDNlMTAxODdjYzEyNjBjOTY0ZmI0OGNmMzA=
   data.tar.gz: !binary |-
-    OGYxYTNmNjNjNWY5OTkxYmQ0YTljNDhkM2JmZmU0NmY5ZTMzNTZhZjc3OWVi
-    NjcxZDQ3NmQ2N2Y1M2QzNTNmYjE5ODZjNTNmZDc2YTM0MGVhOTAzZWE4YTc0
-    NDFiOGU4NjU2YjA1MGYzOGE3Mjk2ODM5Y2IzNTc2MjdjNDFkMGY=
+    NDhmNTY1OGNhNWVmYmRmMGVkZTMwMTg4ZTMzMGY0YjE0YjFiY2UwNmYzYjNi
+    YTc4ZmViYWFjZWFjOGIyY2FhOThjNWM1M2E1M2MzZDZmYjI3NDQ5YjE5MjU5
+    MjA0ZTk3NzkzYjA2ZTIzNGY2MWU4NzNmZjE3NjFmM2FmYzM3N2U=

data/README.md

@@ -13,6 +13,14 @@ calls IF there are either one or more arguments passed OR parenthesis are
 used, otherwise Ruby method calls become JavaScript property accesses.
 By default, methods, lambdas, and procs return `undefined`.
 
+Ruby attribute accessors, as well as getter and setter method definitions, are
+mapped to
+[Object.defineProperty](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/defineProperty?redirectlocale=en-US&redirectslug=JavaScript%2FReference%2FGlobal_Objects%2FObject%2FdefineProperty),
+so avoid these if you wish to target users running IE8 or lower.  Instance
+methods defined with no arguments are presumed to be defining a property
+accessor; if you want a method with no arguments append a `!` to the method
+name.
+
 Filters may be provided to add Ruby-specific or framework specific
 behavior.  Filters are essentially macro facilities that operate on
 an AST representation of the code.
@@ -127,10 +135,11 @@ the script.
     * `.to_a` becomes `to_Array`
     * `.to_i` becomes `parseInt`
     * `.to_f` becomes `parseFloat`
-    * `.sub` becomes `replace`
     * `.ord` becomes `charCodeAt(0)`
     * `.chr` becomes `fromCharCode`
+    * `.sub` becomes `replace`
     * `.gsub` becomes `replace //g`
+    * `x.sub!` and `x.gsub!` become equivalent `x = x.replace` statements
     * `.first` becomes `[0]`
     * `.last` becomes `[*.length-1]`
     * `[-n]` becomes `[*.length-n]` for literal values of `n`
@@ -148,6 +157,9 @@ the script.
     * `.each_with_index` becomes `forEach`
     * `setInterval` and `setTimeout` allow block to be treated as the
        first parameter on the call
+    * for the following methods, if the block consists entirely of a simple
+      expression (or ends with one), a `return` is added prior to the
+      expression: `sub`, `gsub`, `any?`, `all?`, `map`.
 
 * [jquery](https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/jquery.rb)
 

data/lib/ruby2js/converter.rb

@@ -6,6 +6,16 @@ module Ruby2JS
     OPERATORS = [:[], :[]=], [:not, :!], [:*, :/, :%], [:+, :-], [:>>, :<<], 
       [:<=, :<, :>, :>=], [:==, :!=, :===, :"!=="], [:and, :or]
     
+    INVERT_OP = {
+      :<  => :>=,
+      :<= => :>,
+      :== => :!=,
+      :!= => :==,
+      :>  => :<=,
+      :>= => :<,
+      :=== => :'!=='
+    }
+
     attr_accessor :binding, :ivars
 
     def initialize( ast, vars = {} )

data/lib/ruby2js/converter/class.rb

@@ -6,6 +6,8 @@ module Ruby2JS
     #   (const nil :B)
     #   (...)
 
+    # NOTE: macro :prop is defined at the bottom of this file
+
     handle :class do |name, inheritance, *body|
       init = s(:def, :initialize, s(:args))
       body.compact!
@@ -20,9 +22,22 @@ module Ruby2JS
             # constructor: remove from body and overwrite init function
             init = m
             nil
+          elsif m.children.first =~ /=/
+            # property setter
+            sym = :"#{m.children.first.to_s[0..-2]}"
+            s(:prop, s(:attr, name, :prototype), sym,
+                enumerable: s(:true), configurable: s(:true),
+                set: s(:block, s(:send, nil, :proc), *m.children[1..-1]))
+          elsif m.children[1].children.length == 0 and m.children.first !~ /!/
+            # property getter
+            s(:prop, s(:attr, name, :prototype), m.children.first, 
+                enumerable: s(:true), configurable: s(:true),
+                get: s(:block, s(:send, nil, :proc), m.children[1],
+                  s(:autoreturn, *m.children[2..-1])))
           else
             # method: add to prototype
-            s(:send, s(:attr, name, :prototype), "#{m.children[0]}=",
+            s(:send, s(:attr, name, :prototype),
+              :"#{m.children[0].to_s.chomp('!')}=",
               s(:block, s(:send, nil, :proc), *m.children[1..-1]))
           end
         elsif m.type == :defs and m.children.first == s(:self)
@@ -30,8 +45,38 @@ module Ruby2JS
           s(:prototype, s(:send, name, "#{m.children[1]}=",
             s(:block, s(:send, nil, :proc), *m.children[2..-1])))
         elsif m.type == :send and m.children.first == nil
-          # class method call
-          s(:send, name, *m.children[1..-1])
+          if m.children[1] == :attr_accessor
+            m.children[2..-1].map do |sym|
+              var = sym.children.first
+              s(:prop, s(:attr, name, :prototype), var, 
+                  enumerable: s(:true), configurable: s(:true),
+                  get: s(:block, s(:send, nil, :proc), s(:args), 
+                    s(:return, s(:ivar, :"@#{var}"))),
+                  set: s(:block, s(:send, nil, :proc), s(:args, s(:arg, var)), 
+                    s(:ivasgn, :"@#{var}", s(:lvar, var))))
+            end
+          elsif m.children[1] == :attr_reader
+            m.children[2..-1].map do |sym|
+              var = sym.children.first
+              s(:prop, s(:attr, name, :prototype), var,
+                  get: s(:block, s(:send, nil, :proc), s(:args), 
+                    s(:return, s(:ivar, :"@#{var}"))),
+                  enumerable: s(:true),
+                  configurable: s(:true))
+            end
+          elsif m.children[1] == :attr_writer
+            m.children[2..-1].map do |sym|
+              var = sym.children.first
+              s(:prop, s(:attr, name, :prototype), var,
+                  set: s(:block, s(:send, nil, :proc), s(:args, s(:arg, var)), 
+                    s(:ivasgn, :"@#{var}", s(:lvar, var))),
+                  enumerable: s(:true),
+                  configurable: s(:true))
+            end
+          else
+            # class method call
+            s(:send, name, *m.children[1..-1])
+          end
         elsif m.type == :lvasgn
           # class variable
           s(:send, name, "#{m.children[0]}=", *m.children[1..-1])
@@ -49,24 +94,49 @@ module Ruby2JS
         end
       end
 
+      body.flatten!
+
+      # merge nearby property definitions
+      for i in 0...body.length-1
+        next unless body[i] and body[i].type == :prop
+        for j in i+1...body.length
+          break unless body[j] and body[j].type == :prop
+          if body[i].children[0..1] == body[j].children[0..1]
+            merge = body[i].children[2].merge(body[j].children[2])
+            body[j] = s(:prop, *body[j].children[0..1], merge)
+            body[i] = nil
+          end
+        end
+      end
+
       if inheritance
         body.unshift s(:send, name, :prototype=, s(:send, inheritance, :new))
       else
+        body.compact!
+
         # look for a sequence of methods
         methods = 0
-        body.compact.each do |node|
-          break unless node and node.type == :send and node.children[0]
-          break unless node.children[0].type == :attr
-          break unless node.children[0].children[0..1] == [name, :prototype]
-          break unless node.children[1] =~ /=$/
+        body.each do |node|
+          break unless node
+          if node.type == :send
+            break unless node.children[0] and node.children[0].type == :attr
+            break unless node.children[0].children[0..1] == [name, :prototype]
+            break unless node.children[1] =~ /=$/
+          elsif node.type != :prop
+            break
+          end
           methods += 1
         end
 
         # collapse sequence of methods to a single assignment
-        if methods > 1
-          body.compact!
+        if methods > 1 or (methods == 1 and body[0].type == :prop)
           pairs = body[0...methods].map do |node|
-            s(:pair, s(:str, node.children[1].chomp('=')), node.children[2])
+            if node.type == :send
+              s(:pair, s(:str, node.children[1].to_s.chomp('=')), 
+                node.children[2])
+            else
+              s(:pair, s(:prop, node.children[1]), node.children[2])
+            end
           end
           body.shift(methods)
           body.unshift s(:send, name, :prototype=, s(:hash, *pairs))
@@ -87,5 +157,12 @@ module Ruby2JS
         @class_name = class_name
       end
     end
+
+    # macro that expands into Object.defineProperty(obj, prop, descriptor)
+    handle :prop do |obj, prop, descriptor|
+      parse s(:send, s(:const, nil, :Object), :defineProperty,
+        obj, s(:sym, prop), s(:hash,
+        *descriptor.map { |key, value| s(:pair, s(:sym, key), value) }))
+    end
   end
 end

data/lib/ruby2js/converter/defined.rb

@@ -8,7 +8,7 @@ module Ruby2JS
     # NOTE: undefined is not produced directly by Parser
 
     handle :defined?, :undefined? do |var|
-      op = (@ast.type == :defined? ? "!==" : "===")
+      op = (@ast.type == :defined? ? :"!==" : :===)
       "typeof #{ parse var } #{ op } 'undefined'"
     end
   end

data/lib/ruby2js/converter/hash.rb

@@ -9,11 +9,26 @@ module Ruby2JS
     handle :hash do |*pairs|
       pairs.map! do |node|
         left, right = node.children
-        key = parse left
-        key = $1 if key =~ /\A"([a-zA-Z_$][a-zA-Z_$0-9]*)"\Z/
-        "#{key}: #{parse right}"
+        if left.type == :prop
+          result = []
+          if right[:get]
+            result << "get #{left.children[0]}#{
+              parse(right[:get]).sub(/^function/,'')}"
+          end
+          if right[:set]
+            result << "set #{left.children[0]}#{
+              parse(right[:set]).sub(/^function/,'')}"
+          end
+          result
+        else
+          key = parse left
+          key = $1 if key =~ /\A"([a-zA-Z_$][a-zA-Z_$0-9]*)"\Z/
+          "#{key}: #{parse right}"
+        end
       end
 
+      pairs.flatten!
+
       if pairs.map {|item| item.length+2}.reduce(&:+).to_i < @width-10
         "{#{ pairs.join(', ') }}"
       else

data/lib/ruby2js/converter/if.rb

@@ -6,25 +6,10 @@ module Ruby2JS
     #   (...)
     #   (...))
 
-    INVERT_OP = {
-      :<  => :>=,
-      :<= => :>,
-      :== => :!=,
-      :!= => :==,
-      :>  => :<=,
-      :>= => :<
-    }
-
     handle :if do |condition, then_block, else_block|
-      # return parse condition if not else_block and not then_block
+      # return parse not condition if else_block and no then_block
       if else_block and not then_block
-        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
+        return parse(s(:if, s(:not, condition), else_block, nil), @state) 
       end
 
       then_block ||= s(:nil)
@@ -45,6 +30,7 @@ module Ruby2JS
 
         output
       else
+        else_block ||= s(:nil)
         "(#{ parse condition } ? #{ parse then_block } : #{ parse else_block })"
       end
     end

data/lib/ruby2js/converter/logical.rb

@@ -9,10 +9,10 @@ module Ruby2JS
     #   (...)
     #   (...))
 
-    # (not
+    # Note: not handled below
     #   (...))
 
-    handle :and, :or, :not do |left, right=nil|
+    handle :and, :or do |left, right|
       type = @ast.type
       op_index = operator_index type
 
@@ -22,21 +22,37 @@ module Ruby2JS
       left     = parse left
       left     = "(#{ left })" if lgroup
 
-      if right
-        rgroup = LOGICAL.include?( right.type ) && 
-          op_index < operator_index( right.type )
-        rgroup = true if right.type == :begin
-        right    = parse right
-        right    = "(#{ right })" if rgroup
-      end
+      rgroup = LOGICAL.include?( right.type ) && 
+        op_index < operator_index( right.type )
+      rgroup = true if right.type == :begin
+      right    = parse right
+      right    = "(#{ right })" if rgroup
 
-      case type
-      when :and
-        "#{ left } && #{ right }"
-      when :or
-        "#{ left } || #{ right }"
+      "#{ left } #{ type==:and ? '&&' : '||' } #{ right }"
+    end
+
+    # (not
+    #   (...))
+
+    handle :not do |expr|
+
+      if expr.type == :send and INVERT_OP.include? expr.children[1]
+        parse(s(:send, expr.children[0], INVERT_OP[expr.children[1]],
+          expr.children[2]))
+      elsif expr.type == :defined?
+        parse s(:undefined?, *expr.children)
+      elsif expr.type == :or
+        parse s(:and, s(:not, expr.children[0]), s(:not, expr.children[1]))
+      elsif expr.type == :and
+        parse s(:or, s(:not, expr.children[0]), s(:not, expr.children[1]))
       else
-        "!#{ left }"
+        group   = LOGICAL.include?( expr.type ) && 
+          operator_index( :not ) < operator_index( expr.type )
+        group = true if expr and expr.type == :begin
+        expr     = parse expr
+        expr     = "(#{ expr })" if group
+
+        "!#{ expr }"
       end
     end
   end

data/lib/ruby2js/converter/return.rb

@@ -11,5 +11,26 @@ module Ruby2JS
         "return"
       end
     end
+
+    EXPRESSIONS = [ :array, :float, :hash, :int, :lvar, :nil, :send,
+      :str, :sym, :dstr, :dsym ]
+
+    handle :autoreturn do |*statements|
+      return if statements == [nil]
+      block = statements.dup
+      while block.length == 1 and block.first.type == :begin
+        block = block.first.children.dup
+      end
+
+      if EXPRESSIONS.include? block.last.type 
+        block.push s(:return, block.pop)
+      end
+
+      if block.length == 1
+        parse block.first, @state
+      else
+        parse s(:begin, *block), @state
+      end
+    end
   end
 end

data/lib/ruby2js/converter/send.rb

@@ -56,12 +56,7 @@ module Ruby2JS
       end
 
       if method == :!
-        if receiver.type == :defined?
-          parse s(:undefined?, *receiver.children)
-        else
-          group_receiver ||= (receiver.type != :send && receiver.children.length > 1)
-          "!#{ group_receiver ? group(receiver) : parse(receiver) }"
-        end
+        parse s(:not, receiver)
 
       elsif method == :[]
         "#{ parse receiver }[#{ args.map {|arg| parse arg}.join(', ') }]"
@@ -140,7 +135,7 @@ module Ruby2JS
             s(:send, s(:array, *args[0..-2]), :concat,
               args[-1].children.first))
         else
-          call = "#{ parse receiver }#{ '.' if receiver }#{ method }"
+          call = "#{ parse receiver }#{ '.' if receiver && method}#{ method }"
           args = args.map {|a| parse a}
           if args.any? {|arg| arg.to_s.include? "\n"}
             "#{ call }(#{ args.join(', ') })"

data/lib/ruby2js/filter/angularrb.rb

@@ -53,6 +53,11 @@ module Ruby2JS
       #   ...
 
       def on_module(node)
+        ngContext, @ngContext = @ngContext, :module
+        @ngModule = node.children
+        if @ngModule.last and @ngModule.last.type == :begin
+          @ngModule = @ngModule.last.children
+        end
         module_name = node.children[0]
         parent_name = module_name.children[0]
 
@@ -97,6 +102,8 @@ module Ruby2JS
         # 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)), :[])
+      ensure
+        @ngContext = ngContext
       end
 
       # input: 
@@ -107,7 +114,9 @@ module Ruby2JS
       #    ...
       #  end
       def on_class(node)
+        ngContext, @ngContext = @ngContext, :class
         return super unless @ngApp and @ngChildren.include? node
+
         name = node.children.first
         if name.children.first == nil
           @ngClassUses, @ngClassOmit = [], []
@@ -128,6 +137,9 @@ module Ruby2JS
         else
           super
         end
+      ensure
+        @ngClassUses, @ngClassOmit = [], []
+        @ngContext = ngContext
       end
 
       # input: 
@@ -156,6 +168,8 @@ module Ruby2JS
             ng_factory(node)
           when :filter
             ng_filter(node)
+          when :config
+            ng_config(node)
           when :directive
             hash = AngularRB.hash(node.children[2..-1])
             if hash
@@ -163,7 +177,11 @@ module Ruby2JS
             end
             ng_controller(node, :directive)
           when :watch
-            ng_watch(node)
+            ng_watch(node, :$watch)
+          when :on
+            ng_watch(node, :$on)
+          when :observe
+            ng_observe(node)
           else
             super
           end
@@ -172,13 +190,44 @@ module Ruby2JS
         end
       end
 
+      # input:
+      #  config :service do
+      #    name = value
+      #  end
+      #
+      # output:
+      #  AppName.config("service") do |service|
+      #    service.name = value
+      #  end
+      def ng_config(node)
+        call = node.children.first
+        services = call.children[2..-1].map {|sym| sym.children[0]}
+        list = node.children[2..-1]
+
+        if services.length == 1
+          hash = AngularRB.hash(node.children[2..-1])
+          if hash
+            service = call.children[2].children[0]
+            list = hash.children.map do |pair|
+              s(:send, s(:gvar, service), "#{pair.children[0].children[0]}=",
+                pair.children[1])
+            end
+          end
+        end
+
+        s(:send, @ngApp, :config, 
+          s(:array, *services.map {|sym| s(:str, sym.to_s)}, 
+            s(:block, s(:send, nil, :proc), 
+              s(:args, *services.map {|sym| s(:arg, sym)}), s(:begin, *list))))
+      end
+
       # input:
       #  controller :name do
       #    ...
       #  end
       #
       # output:
-      #  AppName.controller("name", do |uses|
+      #  AppName.controller("name") do |uses|
       #    ...
       #  end
       def ng_controller(node, scope)
@@ -216,6 +265,7 @@ module Ruby2JS
         :or, :regexp, :self, :send, :str, :sym, :true, :undefined?, :xstr ]
 
       def ng_filter(node)
+        ngContext, @ngContext = @ngContext, :filter
         @ngClassUses, @ngClassOmit = [], []
         call = node.children.first
 
@@ -235,6 +285,9 @@ module Ruby2JS
         outer = s(:send, @ngApp, :filter, *call.children[2..-1])
 
         node.updated nil, [outer, s(:args, *uses), s(:return, inner)]
+      ensure
+        @ngClassUses, @ngClassOmit = [], []
+        @ngContext = ngContext
       end
 
       # input: 
@@ -245,6 +298,7 @@ module Ruby2JS
       # output: 
       #   AppName.factory :name, [uses, lambda {|uses| ...}]
       def ng_factory(node)
+        ngContext, @ngContext = @ngContext, :factory
         call = node.children.first
         call = call.updated(nil, [@ngApp, *call.children[1..-1]])
 
@@ -269,6 +323,9 @@ module Ruby2JS
         array = args.map {|arg| s(:str, arg.children.first.to_s)}
 
         s(:send, *call.children, s(:array, *array, function))
+      ensure
+        @ngClassUses, @ngClassOmit = [], []
+        @ngContext = ngContext
       end
 
       # input: 
@@ -302,13 +359,47 @@ module Ruby2JS
       #  $scope.$watch 'expression' do |oldvalue, newvalue|
       #    ...
       #  end
-      def ng_watch(node)
+      #
+      # also handles 'on'
+      #
+      def ng_watch(node, method)
         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]]
+          target = s(:gvar, :$scope)
+          expression = call.children[2]
+          if not [:str, :dstr, :sym, :dsym].include? expression.type
+            expression = s(:block, s(:send, nil, :proc), s(:args), 
+              s(:return, expression))
+          end
+        else
+          target = nil
+          method = call.children[1]
+          expression = call.children[2]
+        end
+        call = s(:send, target, method, process(expression), 
+          *process_all(call.children[3..-1]))
+        node = node.updated nil, [call, *process_all(node.children[1..-1])]
+      end
+
+      # input:
+      #  observe attr.name do |value|
+      #    ...
+      #  end
+      #
+      # output:
+      #  attr.$observe('name') do |value|
+      #    ...
+      #  end
+      def ng_observe(node)
+        if @ngContext == :directive
+          call = node.children[0]
+          expression = call.children[2]
+          call = s(:send, expression.children[0], :$observe, 
+            s(:sym, expression.children[1]))
+          process node.updated nil, [call, *node.children[1..-1]]
+        else
+          node.updated nil, process_all(node.children) 
         end
-        return process node
       end
 
       # convert ivar assignments in controllers to $scope
@@ -326,6 +417,80 @@ module Ruby2JS
         end
       end
 
+      NG_METHOD_MAP = {
+        :apply! => [:$rootScope, :$apply],
+        :apply => [:$scope, :$apply],
+        :broadcast! => [:$rootScope, :$broadcast],
+        :broadcast => [:$scope, :$broadcast],
+        :digest! => [:$rootScope, :$digest],
+        :digest => [:$scope, :$digest],
+        :emit => [:$scope, :$emit],
+        :evalAsync! => [:$rootScope, :$evalAsync],
+        :evalAsync => [:$scope, :$evalAsync],
+        :eval! => [:$rootScope, :$eval],
+        :eval => [:$scope, :$eval],
+        :filter => [nil, :$filter],
+        :parent => [:$scope, :$parent],
+      }
+
+      def on_send(node)
+        if @ngContext == :controller
+          # map well known method names to the appropriate service
+          scope, method = NG_METHOD_MAP[node.children[1]]
+
+          return super unless node.children.first == nil and method
+
+          scope = s(:gvar, scope) if scope
+          process s(:gvar, method) unless scope
+
+          process node.updated nil, [scope, method, *node.children[2..-1]]
+
+        elsif @ngContext == :module and node.children[0]
+          return super unless @ngModule.include? node
+          child = node
+          while child and child.type == :send
+            child = child.children[0]
+          end
+
+          # singleton configuration syntax
+          return super unless child and (child.type == :gvar or 
+            (child.type == :const and child.children[0] == nil))
+
+          service = child.children.last
+          s(:send, @ngApp, :config, s(:array, s(:str, service.to_s), s(:block, 
+            s(:send, nil, :proc), s(:args, s(:arg, service)), node)))
+
+        elsif @ngContext == :directive
+          if node.children[0..1] == [nil, :interpolate]
+
+            @ngClassUses << :$interpolate
+            if node.children.length == 3
+              process node.updated nil, [nil, :$interpolate, node.children[2]]
+            else
+              process s(:send, s(:send, nil, :$interpolate, node.children[2]), 
+                nil, node.children[3])
+            end
+
+          elsif node.children[0..1] == [nil, :compile]
+
+            @ngClassUses << :$compile
+            if node.children.length == 3
+              process node.updated nil, [nil, :$compile, node.children[2]]
+            else
+              process s(:send, s(:send, nil, :$compile, node.children[2]), 
+                nil, node.children[3])
+            end
+
+
+          else
+            super
+          end
+
+        else
+          super
+        end
+      end
+
       # convert instance method definitions in controllers to $scope
       def on_def(node)
         if @ngContext == :controller

data/lib/ruby2js/filter/functions.rb

@@ -25,6 +25,24 @@ module Ruby2JS
           source, method, before, after = node.children
           process node.updated nil, [source, :replace, before, after]
 
+        elsif [:sub!, :gsub!].include? node.children[1]
+          method = :"#{node.children[1].to_s[0..-2]}"
+          target = node.children[0]
+          if target.type == :lvar
+            process s(:lvasgn, target.children[0], s(:send,
+              s(:lvar, target.children[0]), method, *node.children[2..-1]))
+          elsif target.type == :send
+            if target.children[0] == nil
+              process s(:lvasgn, target.children[1], s(:send,
+                s(:lvar, target.children[1]), method, *node.children[2..-1]))
+            else
+              process s(:send, target.children[0], :"#{target.children[1]}=", 
+                s(:send, target, method, *node.children[2..-1]))
+            end
+          else
+            super
+          end
+
         elsif node.children[1] == :gsub and node.children.length == 4
           source, method, before, after = node.children
           if before.type == :regexp
@@ -139,18 +157,25 @@ 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 [:sub, :gsub].include? call.children[1]
+        elsif [:sub, :gsub, :sub!, :gsub!].include? call.children[1]
           return super if call.children.first == nil
-          block = s(:block, s(:send, nil, :proc), *node.children[1..-1])
+          block = s(:block, s(:send, nil, :proc), node.children[1],
+            s(:autoreturn, *node.children[2..-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]]
+          process node.updated nil, [call, node.children[1],
+            s(:autoreturn, *node.children[2..-1])]
 
         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]]
+          process node.updated nil, [call, node.children[1],
+            s(:autoreturn, *node.children[2..-1])]
+
+        elsif call.children[1] == :map and call.children.length == 2
+          node.updated nil, [process(call), process(node.children[1]),
+            s(:autoreturn, *process_all(node.children[2..-1]))]
 
         else
           super

data/lib/ruby2js/filter/return.rb

@@ -10,46 +10,19 @@ module Ruby2JS
       def on_block(node)
         children = process_all(node.children)
 
-        # find the block
-        block = [children.pop || s(:nil)]
-        while block.length == 1 and block.first.type == :begin
-          block = block.first.children.dup
-        end
-
-        if EXPRESSIONS.include? block.last.type 
-          block.push s(:return, block.pop)
-        end
-
-        if block.length == 1
-          children.push block.first
-        else
-          children.push s(:begin, *block)
-        end
-
-        node.updated nil, children
+        children[-1] = s(:nil) if children.last == nil
+
+        node.updated nil, [*node.children[0..1],
+          s(:autoreturn, *children[2..-1])]
       end
 
       def on_def(node)
         children = process_all(node.children[1..-1])
-        children.unshift node.children.first
-
-        # find the block
-        block = [children.pop || s(:nil)]
-        while block.length == 1 and block.first.type == :begin
-          block = block.first.children.dup
-        end
-
-        if EXPRESSIONS.include? block.last.type 
-          block.push s(:return, block.pop)
-        end
 
-        if block.length == 1
-          children.push block.first
-        else
-          children.push s(:begin, *block)
-        end
+        children[-1] = s(:nil) if children.last == nil
 
-        node.updated nil, children
+        node.updated nil, [node.children[0], children.first,
+          s(:autoreturn, *children[1..-1])]
       end
     end
 

data/lib/ruby2js/version.rb

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

data/ruby2js.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby2js"
-  s.version = "1.3.0"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2014-01-07"
+  s.date = "2014-01-18"
   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/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"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser