ruby2js 1.7.0 → 1.8.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTFjZjRmN2VhMTYwOWUxNTM3ZTZlNjE2NzI2NTUzMGZjMDQ5NTlkNg==
+    ZTQ1ZGU1ZTI0NWQ4ZmMwNzNiMjExYjk1MWY5YWJkNTY1MzYzNTQwYg==
   data.tar.gz: !binary |-
-    NWE4OTZhMDMzMDBiYjNkNTQwYWE2NmYxM2I5ZDZhZGJlNGU2ZmEyMg==
+    MmI0MjVhYjkwNzg5YTUxZTgzMDhhYWE3NjM0MmU2NmIyNjQ4MGJkYw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YTBiZDljMDhmODZjMjdjOWNjMmNmOTU5MjBmOTA0ODJlMjcyOWQ4NTkyN2Ux
-    YjQyNzI0NmRlMjQyMjEzODkzZTYwNTliN2U5ZGMxMDQ5MzJmNWRhMjVjMmVk
-    Y2Q0YTZmNmRiNTE3ZGFhMGE2ZDBkNmNjYjlhOWZkMTY0NWZjMjI=
+    NzZmNjgxYzU1YmFjZTU4ZmI0MWJkY2I1YmZjN2YxN2RmOTkzOGRhYzNmN2Rm
+    ZWIzMTIxYWM1NmYxOTRjOTI5MjA5NzY3MTc4Yjk4MWM0MDQ0YTNjMTc3NGEy
+    NDk0NGE1ZjFkOTQ3YzRlNzAzNmVkYjZmMTAxNmIzZTNkYTlhODU=
   data.tar.gz: !binary |-
-    MTVjMTE5NTQyNjdlOTY5YmQ3ZjMwNTQwY2RiM2MxZjQ3Y2U4MWFiMDZkYTQx
-    MzUxYWE4MmI0NGIzZWRmNGI4NDZlZDFiYjY0MDRjZTIxMTczNjRhMTg3YTNk
-    Y2RhZDcxMDRhNmVhMWQ3YjFhMmM3N2MwODM4ZmJhOTc5MTYwNjk=
+    OTc5OTkwNmY2Yzc1MzgxMWNkN2M5YjFlYzAyNDE3N2M5MTllMTE4ZjA0MWI3
+    NjlmOWM0ODQ3NTAzZWY1YzFiNWFkMWVhOTE5OThiNmY1Y2UwZjRmYmVkNzll
+    MTU0OTQ0YTU3NzVkNGQ1NGJlNzYzMjgzNzBkMWYwMWM1ZjAxOWE=

data/README.md

@@ -13,13 +13,11 @@ 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
+Ruby attribute accessors, methods defined with no parameters and no
+parenthesis, as well as 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.
+so avoid these if you wish to target users running IE8 or lower. 
 
 Filters may be provided to add Ruby-specific or framework specific
 behavior.  Filters are essentially macro facilities that operate on
@@ -237,6 +235,14 @@ the script.
       implicit `use` statements
     * maps constant assignments in an angular module to a filter
     * maps class definitions in an angular module to a filter
+    * within a controller or within a `link` method in a directive:
+        * maps `apply`, `broadcast`, `digest`, `emit`, `eval`, `evalAsync`, and 
+          `parent` calls to `$scope` functions.
+        * maps `apply!`, `broadcast!`, `digest!`, `eval!`, and `evalAsync!`
+          calls to `$rootScope` functions.
+        * maps `filter` calls to '$filter` calls.
+        * maps `timeout` and `interval` calls with a block to `$timeout` and
+          `$interval` calls where the block is passed as the first parameter.
 
 * [angular-route](https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/angular-routerb.rb)
 

data/lib/ruby2js/converter/class.rb

@@ -31,19 +31,19 @@ module Ruby2JS
           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]))
+            s(:prop, s(:attr, name, :prototype), sym =>
+                {enumerable: s(:true), configurable: s(:true),
+                set: s(:block, s(:send, nil, :proc), *m.children[1..-1])})
           else
             if m.children[1].children.length == 0 and 
               m.children.first !~ /!/ and m.loc and m.loc.name and
               m.loc.name.source_buffer.source[m.loc.name.end_pos] != '('
 
               # property getter
-              s(:prop, s(:attr, name, :prototype), m.children.first, 
-                  enumerable: s(:true), configurable: s(:true),
+              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])))
+                    s(:autoreturn, *m.children[2..-1]))})
             else
               # method: add to prototype
               s(:method, s(:attr, name, :prototype),
@@ -55,18 +55,18 @@ module Ruby2JS
         elsif m.type == :defs and m.children.first == s(:self)
           if m.children[1] =~ /=$/
             # class property setter
-            s(:prop, name, m.children[1].to_s[0..-2], 
-                enumerable: s(:true), configurable: s(:true),
-                set: s(:block, s(:send, nil, :proc), *m.children[2..-1]))
+            s(:prop, name, m.children[1].to_s[0..-2] =>
+                {enumerable: s(:true), configurable: s(:true),
+                set: s(:block, s(:send, nil, :proc), *m.children[2..-1])})
           elsif m.children[2].children.length == 0 and
             m.children[1] !~ /!/ and m.loc and m.loc.name and
             m.loc.name.source_buffer.source[m.loc.name.end_pos] != '('
 
             # class property getter
-            s(:prop, name, m.children[1].to_s, 
-                enumerable: s(:true), configurable: s(:true),
+            s(:prop, name, m.children[1].to_s =>
+                {enumerable: s(:true), configurable: s(:true),
                 get: s(:block, s(:send, nil, :proc), m.children[2],
-                  s(:autoreturn, *m.children[3..-1])))
+                  s(:autoreturn, *m.children[3..-1]))})
           else
             # class method definition: add to prototype
             s(:prototype, s(:send, name, "#{m.children[1]}=",
@@ -77,30 +77,30 @@ module Ruby2JS
           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),
+              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))))
+                    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(: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))
+                  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(: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))
+                  configurable: s(:true)})
             end
           else
             # class method call
@@ -138,9 +138,11 @@ module Ruby2JS
         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)
+          if body[i].children[0] == body[j].children[0]
+            merge = Hash[(body[i].children[1].to_a+body[j].children[1].to_a).
+              group_by(&:first).map {|name, values|
+              [name, values.map(&:last).reduce(:merge)]}]
+            body[j] = s(:prop, body[j].children[0], merge)
             body[i] = nil
             break
           end
@@ -176,11 +178,12 @@ module Ruby2JS
               s(:pair, s(:str, node.children[1].to_s.chomp('=')),
                 node.children[2])
             else
-              s(:pair, s(:prop, node.children[1]), node.children[2])
+              node.children[1].map {|prop, descriptor|
+                s(:pair, s(:prop, prop), descriptor)}
             end
           end
           body[start...start+methods] =
-            s(:send, name, :prototype=, s(:hash, *pairs))
+            s(:send, name, :prototype=, s(:hash, *pairs.flatten))
         end
       end
 
@@ -209,10 +212,18 @@ module Ruby2JS
         instance_method, @instance_method = @instance_method, @ast
         @block_this, @block_depth = false, 0
         if @ast.type == :prop
-          obj, prop, descriptor = *args
-          parse s(:send, s(:const, nil, :Object), :defineProperty,
-            obj, s(:sym, prop), s(:hash,
-            *descriptor.map { |key, value| s(:pair, s(:sym, key), value) }))
+          obj, props = *args
+          if props.length == 1
+            prop, descriptor = props.flatten
+            parse s(:send, s(:const, nil, :Object), :defineProperty,
+              obj, s(:sym, prop), s(:hash,
+              *descriptor.map { |key, value| s(:pair, s(:sym, key), value) }))
+          else
+            parse s(:send, s(:const, nil, :Object), :defineProperties,
+              obj, s(:hash, *props.map {|prop, descriptor|
+                s(:pair, s(:sym, prop), s(:hash, *descriptor.map {|key, value| 
+                s(:pair, s(:sym, key), value) }))}))
+          end
         elsif @ast.type == :method
           parse s(:send, *args)
         else

data/lib/ruby2js/converter/hash.rb

@@ -9,6 +9,7 @@ module Ruby2JS
     handle :hash do |*pairs|
       pairs.map! do |node|
         begin
+          block_this, block_depth = @block_this, @block_depth
           @block_this, @block_depth = false, 0
 
           left, right = node.children
@@ -30,7 +31,7 @@ module Ruby2JS
           end
 
         ensure
-          @block_this, @block_depth = nil, nil
+          @block_this, @block_depth = block_this, block_depth
         end
       end
 

data/lib/ruby2js/converter/send.rb

@@ -45,7 +45,7 @@ module Ruby2JS
       if receiver
         group_receiver = receiver.type == :send &&
           op_index < operator_index( receiver.children[1] ) if receiver
-        group_receiver ||= (receiver.type == :begin)
+        group_receiver ||= [:begin, :dstr, :dsym].include? receiver.type
       end
 
       if target
@@ -125,7 +125,8 @@ module Ruby2JS
       else
         if not ast.is_method?
           if receiver
-            "#{ parse receiver }.#{ method }"
+             call = (group_receiver ? group(receiver) : parse(receiver))
+            "#{ call }.#{ method }"
           else
             parse s(:lvasgn, method), @state
           end
@@ -133,7 +134,8 @@ module Ruby2JS
           parse s(:send, s(:attr, receiver, method), :apply, 
             (receiver || s(:nil)), s(:array, *args))
         else
-          call = "#{ parse receiver }#{ '.' if receiver && method}#{ method }"
+          call = (group_receiver ? group(receiver) : parse(receiver))
+          call = "#{ call }#{ '.' 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

@@ -184,6 +184,11 @@ module Ruby2JS
             ng_watch(node, :$on)
           when :observe
             ng_observe(node)
+          when :timeout, :interval
+            method = (call.children[1] == :timeout ? :$timeout : :$interval)
+            process s(:gvar, method) # for dependency injection purposes
+            process s(:send, nil, method, s(:block, s(:send, nil, :proc), 
+              *node.children[1..-1]), *call.children[2..-1])
           else
             super
           end
@@ -460,9 +465,6 @@ module Ruby2JS
 
       def on_send(node)
         if @ngContext == :controller
-          # map well known method names to the appropriate service
-          scope, method = NG_METHOD_MAP[node.children[1]]
-
           if node.children[0..1] == [nil, :interpolate] and @ngScope
             @ngClassUses << :$interpolate
             if node.children.length > 3 and node.children[3].type == :nil
@@ -485,6 +487,9 @@ module Ruby2JS
             end
           end
 
+          # 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

data/lib/ruby2js/filter/functions.rb

@@ -5,6 +5,13 @@ module Ruby2JS
     module Functions
       include SEXP
 
+      VAR_TO_ASSIGN = {
+        lvar: :lvasgn,
+        ivar: :ivasgn,
+        cvar: :cvasgn,
+        gvar: :gvasgn
+      }
+
       def on_send(node)
         target, method, *args = node.children
 
@@ -36,9 +43,9 @@ module Ruby2JS
 
         elsif [:sub!, :gsub!].include? method
           method = :"#{method.to_s[0..-2]}"
-          if target.type == :lvar
-            process s(:lvasgn, target.children[0], s(:send,
-              s(:lvar, target.children[0]), method, *node.children[2..-1]))
+          if VAR_TO_ASSIGN.keys.include? target.type
+            process s(VAR_TO_ASSIGN[target.type], target.children[0], 
+              s(:send, target, method, *node.children[2..-1]))
           elsif target.type == :send
             if target.children[0] == nil
               process s(:lvasgn, target.children[1], s(:send,

data/lib/ruby2js/version.rb

@@ -1,7 +1,7 @@
 module Ruby2JS
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 7
+    MINOR = 8
     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.7.0"
+  s.version = "1.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2014-03-06"
+  s.date = "2014-04-02"
   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/super.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/underscore.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.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser