ruby2js 1.8.0 → 1.9.0

data/lib/ruby2js.rb

@@ -19,6 +19,7 @@ module Ruby2JS
       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_defp(node); on_defs(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

data/lib/ruby2js/converter.rb

@@ -100,9 +100,21 @@ module Parser
     class Node
       def is_method?
         return false if type == :attr
-        return true if children.length > 2
         return true unless loc
-        selector = loc.selector
+
+        if loc.respond_to? :selector
+          return true if children.length > 2
+          selector = loc.selector
+        elsif type == :defs
+          return true if children[1] =~ /[!?]$/
+          return true if children[2].children.length > 0
+          selector = loc.name
+        elsif type == :def
+          return true if children[0] =~ /[!?]$/
+          return true if children[1].children.length > 0
+          selector = loc.name
+        end
+
         return true unless selector.source_buffer
         selector.source_buffer.source[selector.end_pos] == '('
       end

data/lib/ruby2js/converter/begin.rb

@@ -7,7 +7,45 @@ module Ruby2JS
 
     handle :begin do |*statements|
       state = @state
+      props = false
+
+      statements.map! do |statement|
+        case statement and statement.type
+        when :defs, :defp
+          props = true
+          @ast = statement
+          transform_defs(*statement.children)
+        when :prop
+          props = true
+          statement
+        else
+          statement
+        end
+      end
+
+      if props
+        combine_properties(statements) if props
+        statements.compact!
+      end
+
       statements.map{ |statement| parse statement, state }.join(@sep)
     end
+
+    def combine_properties(body)
+      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] == body[j].children[0]
+            merge = Hash[(body[i].children[1].to_a+body[j].children[1].to_a).
+              group_by {|name, value| name.to_s}.map {|name, values|
+              [name, values.map(&:last).reduce(:merge)]}]
+            body[j] = s(:prop, body[j].children[0], merge)
+            body[i] = nil
+            break
+          end
+        end
+      end
+    end
   end
 end

data/lib/ruby2js/converter/class.rb

@@ -35,10 +35,7 @@ module Ruby2JS
                 {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] != '('
-
+            if not m.is_method?
               # property getter
               s(:prop, s(:attr, name, :prototype), m.children.first =>
                   {enumerable: s(:true), configurable: s(:true),
@@ -133,21 +130,8 @@ module Ruby2JS
 
       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] == 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
-        end
-      end
+      # merge property definitions
+      combine_properties(body)
 
       if inheritance
         body.unshift s(:send, name, :prototype=, 

data/lib/ruby2js/converter/defs.rb

@@ -1,13 +1,31 @@
 module Ruby2JS
   class Converter
 
-    # (def (self) :foo
+    # (defs (self) :foo
     #   (args)
     #   (...)
 
-    handle :defs do |target, method, args, body|
-      parse s(:send, target, "#{method}=", 
-        s(:block, s(:send, nil, :lambda), args, body))
+    # NOTE: defp is only produced by filters
+
+    handle :defs, :defp do |target, method, args, body|
+      parse transform_defs(target, method, args, body)
+    end
+
+    def transform_defs(target, method, args, body)
+      if not @ast.is_method? or @ast.type == :defp
+        s(:prop, target, method.to_s => 
+          {enumerable: s(:true), configurable: s(:true),
+          get: s(:block, s(:send, nil, :proc), args,
+          s(:autoreturn, body))})
+      elsif method =~ /=$/
+        s(:prop, target, method.to_s.sub('=', '') => 
+          {enumerable: s(:true), configurable: s(:true),
+          set: s(:block, s(:send, nil, :proc), args,
+          body)})
+      else
+        s(:send, target, "#{method}=", 
+          s(:block, s(:send, nil, :lambda), args, body))
+      end
     end
   end
 end

data/lib/ruby2js/converter/dstr.rb

@@ -10,7 +10,24 @@ module Ruby2JS
     #   (...))
 
     handle :dstr, :dsym do |*children|
-      children.map{ |child| parse child }.join(' + ')
+      children.map! do |child| 
+        if child.type == :begin and child.children.length == 1
+          child = child.children.first
+        end
+
+        if child.type == :send
+          op_index = operator_index child.children[1]
+          if op_index >= operator_index(:+)
+            group child
+          else
+            parse child
+          end
+        else
+          parse child
+        end
+      end
+
+      children.join(' + ')
     end
   end
 end

data/lib/ruby2js/filter/angularrb.rb

@@ -542,7 +542,11 @@ module Ruby2JS
       # convert instance method definitions in controllers to $scope
       def on_def(node)
         if @ngContext == :controller
-          process s(:defs, s(:gvar, :$scope), *node.children)
+          if node.is_method?
+            process s(:defs, s(:gvar, :$scope), *node.children)
+          else
+            process s(:defp, s(:gvar, :$scope), *node.children)
+          end
         else
           super
         end

data/lib/ruby2js/version.rb

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

data/ruby2js.gemspec

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

metadata

@@ -1,29 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
+  prerelease: 
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &15788320 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *15788320
 description: ! "    The base package maps Ruby syntax to JavaScript semantics.\n    Filters
   may be provided to add Ruby-specific or framework specific\n    behavior.\n"
 email: rubys@intertwingly.net
@@ -33,88 +31,89 @@ extra_rdoc_files: []
 files:
 - ruby2js.gemspec
 - README.md
-- lib/ruby2js/rails.rb
-- lib/ruby2js/version.rb
-- lib/ruby2js/converter/kwbegin.rb
-- lib/ruby2js/converter/const.rb
-- lib/ruby2js/converter/return.rb
+- lib/ruby2js/sinatra.rb
+- lib/ruby2js/converter.rb
+- lib/ruby2js/filter/angular-route.rb
+- lib/ruby2js/filter/jquery.rb
+- lib/ruby2js/filter/return.rb
+- lib/ruby2js/filter/underscore.rb
+- lib/ruby2js/filter/angularrb.rb
+- lib/ruby2js/filter/strict.rb
+- lib/ruby2js/filter/functions.rb
+- lib/ruby2js/filter/angular-resource.rb
+- lib/ruby2js/converter/ivasgn.rb
+- lib/ruby2js/converter/self.rb
 - lib/ruby2js/converter/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/undef.rb
+- lib/ruby2js/converter/casgn.rb
 - lib/ruby2js/converter/nil.rb
 - lib/ruby2js/converter/logical.rb
-- lib/ruby2js/converter/next.rb
-- lib/ruby2js/converter/while.rb
-- lib/ruby2js/converter/whilepost.rb
-- lib/ruby2js/converter/arg.rb
-- lib/ruby2js/converter/case.rb
-- lib/ruby2js/converter/break.rb
-- lib/ruby2js/converter/hash.rb
+- lib/ruby2js/converter/ivar.rb
+- lib/ruby2js/converter/super.rb
+- lib/ruby2js/converter/class.rb
 - lib/ruby2js/converter/for.rb
+- lib/ruby2js/converter/arg.rb
+- lib/ruby2js/converter/literal.rb
+- lib/ruby2js/converter/cvasgn.rb
+- lib/ruby2js/converter/dstr.rb
+- lib/ruby2js/converter/return.rb
+- lib/ruby2js/converter/defined.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/next.rb
+- lib/ruby2js/converter/array.rb
+- lib/ruby2js/converter/def.rb
+- lib/ruby2js/converter/args.rb
 - lib/ruby2js/converter/regexp.rb
-- lib/ruby2js/converter/untilpost.rb
+- lib/ruby2js/converter/var.rb
+- lib/ruby2js/converter/defs.rb
+- lib/ruby2js/converter/if.rb
 - lib/ruby2js/converter/masgn.rb
-- lib/ruby2js/converter/cvasgn.rb
+- lib/ruby2js/converter/hash.rb
+- lib/ruby2js/converter/cvar.rb
+- lib/ruby2js/converter/whilepost.rb
+- lib/ruby2js/converter/break.rb
+- lib/ruby2js/converter/opasgn.rb
+- lib/ruby2js/converter/begin.rb
+- lib/ruby2js/converter/xstr.rb
+- lib/ruby2js/converter/vasgn.rb
 - lib/ruby2js/converter/block.rb
-- lib/ruby2js/converter/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/converter/case.rb
+- lib/ruby2js/converter/kwbegin.rb
+- lib/ruby2js/converter/const.rb
+- lib/ruby2js/converter/module.rb
+- lib/ruby2js/converter/until.rb
+- lib/ruby2js/converter/untilpost.rb
+- lib/ruby2js/converter/blockpass.rb
+- lib/ruby2js/converter/while.rb
 - lib/ruby2js/cgi.rb
-- lib/ruby2js/converter.rb
-- 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/version.rb
+- lib/ruby2js/rails.rb
 - lib/ruby2js.rb
 homepage: http://github.com/rubys/ruby2js
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 1.8.11
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Minimal yet extensible Ruby to JavaScript conversion.
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZTQ1ZGU1ZTI0NWQ4ZmMwNzNiMjExYjk1MWY5YWJkNTY1MzYzNTQwYg==
-  data.tar.gz: !binary |-
-    MmI0MjVhYjkwNzg5YTUxZTgzMDhhYWE3NjM0MmU2NmIyNjQ4MGJkYw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NzZmNjgxYzU1YmFjZTU4ZmI0MWJkY2I1YmZjN2YxN2RmOTkzOGRhYzNmN2Rm
-    ZWIzMTIxYWM1NmYxOTRjOTI5MjA5NzY3MTc4Yjk4MWM0MDQ0YTNjMTc3NGEy
-    NDk0NGE1ZjFkOTQ3YzRlNzAzNmVkYjZmMTAxNmIzZTNkYTlhODU=
-  data.tar.gz: !binary |-
-    OTc5OTkwNmY2Yzc1MzgxMWNkN2M5YjFlYzAyNDE3N2M5MTllMTE4ZjA0MWI3
-    NjlmOWM0ODQ3NTAzZWY1YzFiNWFkMWVhOTE5OThiNmY1Y2UwZjRmYmVkNzll
-    MTU0OTQ0YTU3NzVkNGQ1NGJlNzYzMjgzNzBkMWYwMWM1ZjAxOWE=