ruby2js 1.5.0 → 1.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmM0YzQzZjZkNGQ5YTMzZTA0N2Q4YjU3ZTJjNGFkMDZjYTY3YTdmZQ==
+    NzY5MTI2YzczYzk3NTUwMjczNzk1MzBiOTQ2Yjg4NTE1OGFhN2VjNQ==
   data.tar.gz: !binary |-
-    ZjVlOTkzMWE4NjcwMDI0MjdlYTdmZDAyMmYzZGVjNWM0ZWM0ZDI4Yg==
+    YjVlMWM3ZWI3ODZkNTdkNmE2OTQ0NzhkNzJjMGI4NmQwNzZhOTcxYQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YTBiMjdjZTA1ZjYyNWRkMjI5OTVmYzRhOTIxYmNmMjQwMTEzNjEwZTQ5OGFk
-    NjUzMzQzOGFlZTU4ODM2ZjJlN2E5NTcwMzEwYzNmMjRkNzg4ZjdkYmM2N2U0
-    OWNlY2Q2MzUyMGZjY2UxNjBlYjU3ZTc2ODAzZGY5ZjdjNjBiMGY=
+    NmJhNDY0ZmNlMjAwNzk4NDUxMTViYjJjNzViMjRhYzQxZTI4YTI4NTg3MWMw
+    MzUxOGU0NTVmZGI5NDcwN2VlMTQ4MmNlOGQzM2QwZmExNmUxYTliOWI2YTdi
+    MzlkOTgxNDM1YmFhNDRkMDAzZjdkNThiZjc4NzQ5NDFmODlkOWI=
   data.tar.gz: !binary |-
-    NThlN2I2N2RiMzJlMDY0OWIzMGYwN2Y4MjQzZTkxNDdhZWJlMGFhMjkxZjY5
-    ZDMzMDdkNzI0OTNjNGVjNGNmZjlmNDZkMTU4ODg5MTRhN2JjNGJhOTdjNjVh
-    M2IwYjkzYTg4ZWUzNjEwZDBlYzA3YzBhODE4YmE2M2E3Y2E1YWU=
+    OGJlNzI1NTBjYzM0ODkwMjAxZTY0NmIwMGYzYTMxMzJhYjA3NjcyMTQ0MjU1
+    MzdiOWMzNDQxOGZlNmRjMmIyYWYzZmU5YjFhZDY0NGQzMzI0MjU3NjIwYzMx
+    OTNlODVkZWM0YmVmNzhiMWFkZWU3NGY4NmZiNGFjNmNmNGQ3YWM=

data/lib/ruby2js.rb

@@ -15,10 +15,17 @@ module Ruby2JS
     class Processor < Parser::AST::Processor
       BINARY_OPERATORS = Converter::OPERATORS[2..-1].flatten
 
-      def on_attr(node)
-        on_send(node)
-      end
-
+      # handle all of the 'invented' ast types
+      def on_attr(node); on_send(node); end
+      def on_autoreturn(node); on_return(node); end
+      def on_constructor(node); on_def(node); end
+      def on_method(node); on_send(node); end
+      def on_prop(node); on_array(node); end
+      def on_prototype(node); on_begin(node); end
+      def on_sendw(node); on_send(node); end
+      def on_undefined?(node); on_defined?(node); end
+
+      # convert map(&:symbol) to a block
       def on_send(node)
         if node.children.length > 2 and node.children.last.type == :block_pass
           method = node.children.last.children.first.children.last

data/lib/ruby2js/converter.rb

@@ -148,6 +148,7 @@ require 'ruby2js/converter/regexp'
 require 'ruby2js/converter/return'
 require 'ruby2js/converter/self'
 require 'ruby2js/converter/send'
+require 'ruby2js/converter/super'
 require 'ruby2js/converter/sym'
 require 'ruby2js/converter/undef'
 require 'ruby2js/converter/until'

data/lib/ruby2js/converter/class.rb

@@ -6,7 +6,7 @@ module Ruby2JS
     #   (const nil :B)
     #   (...)
 
-    # NOTE: macro :prop is defined at the bottom of this file
+    # NOTE: :prop and :method macros are defined at the bottom of this file
 
     handle :class do |name, inheritance, *body|
       init = s(:def, :initialize, s(:args))
@@ -28,17 +28,22 @@ module Ruby2JS
             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].to_s.chomp('!')}=",
-              s(:block, s(:send, nil, :proc), *m.children[1..-1]))
+            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),
+                  get: s(:block, s(:send, nil, :proc), m.children[1],
+                    s(:autoreturn, *m.children[2..-1])))
+            else
+              # method: add to prototype
+              s(:method, s(:attr, name, :prototype),
+                :"#{m.children[0].to_s.chomp('!')}=",
+                s(:block, s(:send, nil, :proc), *m.children[1..-1]))
+            end
           end
         elsif m.type == :defs and m.children.first == s(:self)
           # class method definition: add to prototype
@@ -117,51 +122,54 @@ module Ruby2JS
       end
 
       if inheritance
-        body.unshift s(:send, name, :prototype=, s(:send, inheritance, :new))
+        body.unshift s(:send, name, :prototype=, 
+          s(:send, s(:const, nil, :Object), :create, inheritance)),
+          s(:send, s(:attr, name, :prototype), :constructor=, name)
       else
         body.compact!
 
-        # look for a sequence of methods
+        # look for first sequence of methods and properties
         methods = 0
+        start = 0
         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
+          if [:method, :prop].include? node.type
+            methods += 1
+          elsif methods == 0
+            start += 1
+          else
             break
           end
-          methods += 1
         end
 
-        # collapse sequence of methods to a single assignment
-        if methods > 1 or (methods == 1 and body[0].type == :prop)
-          pairs = body[0...methods].map do |node|
-            if node.type == :send
-              s(:pair, s(:str, node.children[1].to_s.chomp('=')), 
+        # collapse sequence to a single assignment
+        if methods > 1 or (methods == 1 and body[start].type == :prop)
+          pairs = body[start...start+methods].map do |node|
+            if node.type == :method
+              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))
+          body[start...start+methods] =
+            s(:send, name, :prototype=, s(:hash, *pairs))
         end
       end
 
       # prepend constructor
-      body.unshift s(:def, parse(name), *init.children[1..-1])
+      body.unshift s(:constructor, parse(name), *init.children[1..-1])
 
       begin
         # save class name
         class_name, @class_name = @class_name, name
+        class_parent, @class_parent = @class_parent, inheritance
         # inhibit ivar substitution within a class definition.  See ivars.rb
         ivars, self.ivars = self.ivars, nil
         parse s(:begin, *body.compact)
       ensure
         self.ivars = ivars
         @class_name = class_name
+        @class_parent = class_parent
       end
     end
 
@@ -171,5 +179,25 @@ module Ruby2JS
         obj, s(:sym, prop), s(:hash,
         *descriptor.map { |key, value| s(:pair, s(:sym, key), value) }))
     end
+
+    # capture methods for use by super
+    handle :method do |*args|
+      begin
+        instance_method, @instance_method = @instance_method, @ast
+        parse s(:send, *args)
+      ensure
+        @instance_method = instance_method
+      end
+    end
+
+    # capture constructors for use by super
+    handle :constructor do |*args|
+      begin
+        instance_method, @instance_method = @instance_method, @ast
+        parse s(:def, *args)
+      ensure
+        @instance_method = instance_method
+      end
+    end
   end
 end

data/lib/ruby2js/converter/return.rb

@@ -13,7 +13,7 @@ module Ruby2JS
     end
 
     EXPRESSIONS = [ :array, :float, :hash, :int, :lvar, :nil, :send, :attr,
-      :str, :sym, :dstr, :dsym ]
+      :str, :sym, :dstr, :dsym, :cvar, :ivar ]
 
     handle :autoreturn do |*statements|
       return if statements == [nil]

data/lib/ruby2js/converter/super.rb

@@ -0,0 +1,33 @@
+module Ruby2JS
+  class Converter
+
+    # (zsuper)
+    # 
+    # (super ...)
+
+    handle :super, :zsuper do |*args|
+      unless @class_parent and @instance_method
+        raise NotImplementedError, "super outside of a method"
+      end
+
+      # what to call
+      if @instance_method.type == :method
+        method = ".prototype.#{ @instance_method.children[1].to_s.chomp('=') }"
+      else
+        method = ''
+      end
+
+      # what to pass
+      if @ast.type == :zsuper
+        if @instance_method.type == :method
+          args = @instance_method.children[2].children[1].children
+        else
+          args = @instance_method.children[1].children
+        end
+      end
+
+      args = [s(:self), *args].map {|arg| parse arg}.join(', ')
+      "#{ parse @class_parent }#{ method }.call(#{ args })"
+    end
+  end
+end

data/lib/ruby2js/filter/angularrb.rb

@@ -400,7 +400,7 @@ module Ruby2JS
       #    ...
       #  end
       def ng_observe(node)
-        if @ngContext == :directive
+        if @ngContext == :controller and @ngScope
           call = node.children[0]
           expression = call.children[2]
           call = s(:send, expression.children[0], :$observe, 
@@ -461,6 +461,28 @@ module Ruby2JS
           # 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
+              return process node.updated nil, [nil, :$interpolate, 
+                node.children[2]]
+            else
+              return process s(:send, s(:send, nil, :$interpolate, 
+                *node.children[2..-1]), nil, @ngScope)
+            end
+
+          elsif node.children[0..1] == [nil, :compile] and @ngScope
+
+            @ngClassUses << :$compile
+            if node.children.length > 3 and node.children.last.type == :nil
+              return process node.updated nil, [nil, :$compile, 
+                *node.children[2..-2]]
+            else
+              return process s(:send, s(:send, nil, :$compile, 
+                *node.children[2..-1]), nil, @ngScope)
+            end
+          end
+
           return super unless node.children.first == nil and method
 
           scope = s(:gvar, scope) if scope
@@ -483,32 +505,28 @@ module Ruby2JS
           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]
+        else
+          super
+        end
+      end
 
-            @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])
+      # convert instance method definitions in controllers to $scope
+      def on_pair(node)
+        if @ngContext == :directive and node.children[0] == s(:sym, :link)
+          begin
+            ngScope = @ngScope
+            if node.children[1].type == :block
+              args = node.children[1].children[1]
+              if args.children.length > 0
+                @ngScope = s(:lvar, args.children[0].children[0])
+                @ngContext = :controller
+              end
             end
-
-
-          else
             super
+          ensure
+            @ngScope = ngScope
+            @ngContext = :directive
           end
-
         else
           super
         end
@@ -524,6 +542,8 @@ module Ruby2JS
       end
 
       def on_gvar(node)
+        return @ngScope if node.children.first == :$scope and @ngScope
+        
         if @ngClassUses
           @ngClassUses << node.children.first
         end

data/lib/ruby2js/version.rb

@@ -1,7 +1,7 @@
 module Ruby2JS
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 5
+    MINOR = 6
     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.5.0"
+  s.version = "1.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2014-01-23"
+  s.date = "2014-02-26"
   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/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"]
+  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"]
   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.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -67,6 +67,7 @@ files:
 - 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