ruby2js 2.0.2 → 2.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 41b51a0b8a9e699a3940a9266d6ed450865c5d25
+  data.tar.gz: 9b8169f14d942efc013c22880fbc6999b3777197
+SHA512:
+  metadata.gz: f22fa0762024fe374b7e57cac75114b58b0f9d26d6dd62a7da0ffa336c4f0fec738521579c136c328d10cdecee392ae78f36e4c7ad3b721ba88940ef2b500c7c
+  data.tar.gz: a104f444d257a72652349a8de2ab0c2cb3d816c922707a3450f90fffb77179aeeea3c5e2b2fbbe379c62297a3311b1b5b863984cda8ca9298c255694cc7f7d2b

data/lib/ruby2js/converter/block.rb

@@ -12,8 +12,10 @@ module Ruby2JS
       if
         @state == :statement and args.children.length == 1 and
         call.children.first and call.children.first.type == :begin and
+        call.children[1] == :step and
         [:irange, :erange].include? call.children.first.children.first.type
       then
+        # convert combinations of range, step and block to a for loop
         var = args.children.first
         expression = call.children.first.children.first
         comp = (expression.type == :irange ? '<=' : '<')
@@ -22,7 +24,24 @@ module Ruby2JS
         put "; "; parse var; put " += "; parse call.children[2]; puts ") {"
         scope block
         sput "}"
+
+      elsif
+        call.children[0] == nil and call.children[1] == :function and
+        call.children[2..-1].all? do |child|
+          child.type == :lvar or (child.type == :send and
+            child.children.length == 2 and child.children[0] == nil and 
+            Symbol === child.children[1])
+        end
+      then
+        # accommodate javascript style syntax: convert function blocks with
+        # simple arguments into an anonymous function
+        args = call.children[2..-1].map {|arg| s(:arg, arg.children.last)}
+        parse @ast.updated(:block, [s(:send, nil, :lambda),
+          s(:args, *args), block])
+
       else
+        # convert blocks into method calls with an additional argument
+        # consisting of an anonymous function
         block ||= s(:begin)
         function = @ast.updated(:def, [nil, args, block])
         parse s(:send, *call.children, function)

data/lib/ruby2js/filter/react.rb

@@ -66,8 +66,8 @@ module Ruby2JS
           body.select {|child| child.type == :defs}.each do |child|
             parent, mname, args, *block = child.children
             if child.is_method?
-              statics << s(:pair, s(:sym, mname), child.updated(:block, 
-                [s(:send, nil, :proc), args, s(:autoreturn, *block)]))
+              statics << s(:pair, s(:sym, mname), process(child.updated(:block, 
+                [s(:send, nil, :proc), args, s(:autoreturn, *block)])))
             elsif 
               block.length == 1 and 
               Converter::EXPRESSIONS.include? block.first.type
@@ -314,10 +314,25 @@ module Ruby2JS
             pairs -= classes
             if expr
               if values.length > 1
-                value = s(:send, s(:str, values.join(' ')), :+, 
-                  s(:or, expr, s(:str, '')))
+                while expr.type == :begin and expr.children.length == 1
+                  expr = expr.children.first
+                end
+
+                if 
+                  expr.type == :if and expr.children[1] and
+                  expr.children[1].type == :str
+                then
+                  left = expr.children[1]
+                  right = expr.children[2] || s(:str, '')
+                  right = s(:or, right, s(:str, '')) unless right.type == :str
+                  expr = expr.updated(nil, [expr.children[0], left, right])
+                elsif expr.type != :str
+                  expr = s(:or, expr, s(:str, ''))
+                end
+
+                value = s(:send, s(:str, values.join(' ')), :+, expr)
               else
-                value = s(:or, expr, s(:str, ''))
+                value = expr
               end
             else
               value = s(:str, values.join(' '))

data/lib/ruby2js/version.rb

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

data/ruby2js.gemspec

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

metadata

@@ -1,34 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: parser
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :runtime
-  name: parser
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-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"
+description: |2
+      The base package maps Ruby syntax to JavaScript semantics.
+      Filters may be provided to add Ruby-specific or framework specific
+      behavior.
 email: rubys@intertwingly.net
 executables: []
 extensions: []
@@ -36,98 +35,97 @@ extra_rdoc_files: []
 files:
 - ruby2js.gemspec
 - README.md
-- lib/ruby2js/execjs.rb
-- lib/ruby2js/converter.rb
-- lib/ruby2js/version.rb
-- lib/ruby2js/filter/jquery.rb
-- lib/ruby2js/filter/return.rb
-- lib/ruby2js/filter/underscore.rb
-- lib/ruby2js/filter/require.rb
-- lib/ruby2js/filter/angularrb.rb
-- lib/ruby2js/filter/minitest-jasmine.rb
-- lib/ruby2js/filter/camelCase.rb
-- lib/ruby2js/filter/rubyjs.rb
-- lib/ruby2js/filter/strict.rb
-- lib/ruby2js/filter/functions.rb
-- lib/ruby2js/filter/angular-resource.rb
-- lib/ruby2js/filter/react.rb
-- lib/ruby2js/filter/angular-route.rb
-- lib/ruby2js/sinatra.rb
-- lib/ruby2js/rails.rb
-- lib/ruby2js/serializer.rb
 - lib/ruby2js/cgi.rb
-- lib/ruby2js/converter/self.rb
 - lib/ruby2js/converter/arg.rb
-- lib/ruby2js/converter/dstr.rb
-- lib/ruby2js/converter/xstr.rb
-- lib/ruby2js/converter/sym.rb
-- lib/ruby2js/converter/return.rb
-- lib/ruby2js/converter/break.rb
-- lib/ruby2js/converter/for.rb
-- lib/ruby2js/converter/defined.rb
-- lib/ruby2js/converter/cvasgn.rb
-- lib/ruby2js/converter/whilepost.rb
-- lib/ruby2js/converter/logical.rb
-- lib/ruby2js/converter/in.rb
 - lib/ruby2js/converter/args.rb
-- lib/ruby2js/converter/def.rb
-- lib/ruby2js/converter/prototype.rb
-- lib/ruby2js/converter/class.rb
-- lib/ruby2js/converter/nthref.rb
-- lib/ruby2js/converter/opasgn.rb
-- lib/ruby2js/converter/module.rb
-- lib/ruby2js/converter/kwbegin.rb
-- lib/ruby2js/converter/send.rb
+- lib/ruby2js/converter/array.rb
+- lib/ruby2js/converter/begin.rb
+- lib/ruby2js/converter/block.rb
+- lib/ruby2js/converter/blockpass.rb
 - lib/ruby2js/converter/boolean.rb
-- lib/ruby2js/converter/masgn.rb
-- lib/ruby2js/converter/hash.rb
-- lib/ruby2js/converter/cvar.rb
-- lib/ruby2js/converter/ivasgn.rb
+- lib/ruby2js/converter/break.rb
 - lib/ruby2js/converter/case.rb
+- lib/ruby2js/converter/casgn.rb
+- lib/ruby2js/converter/class.rb
 - lib/ruby2js/converter/const.rb
-- lib/ruby2js/converter/vasgn.rb
-- lib/ruby2js/converter/untilpost.rb
-- lib/ruby2js/converter/begin.rb
+- lib/ruby2js/converter/cvar.rb
+- lib/ruby2js/converter/cvasgn.rb
+- lib/ruby2js/converter/def.rb
+- lib/ruby2js/converter/defined.rb
+- lib/ruby2js/converter/defs.rb
+- lib/ruby2js/converter/dstr.rb
+- lib/ruby2js/converter/for.rb
+- lib/ruby2js/converter/hash.rb
+- lib/ruby2js/converter/if.rb
+- lib/ruby2js/converter/in.rb
 - lib/ruby2js/converter/ivar.rb
-- lib/ruby2js/converter/while.rb
+- lib/ruby2js/converter/ivasgn.rb
+- lib/ruby2js/converter/kwbegin.rb
+- lib/ruby2js/converter/literal.rb
+- lib/ruby2js/converter/logical.rb
+- lib/ruby2js/converter/masgn.rb
+- lib/ruby2js/converter/module.rb
 - lib/ruby2js/converter/next.rb
 - lib/ruby2js/converter/nil.rb
-- lib/ruby2js/converter/blockpass.rb
-- lib/ruby2js/converter/super.rb
-- lib/ruby2js/converter/defs.rb
-- lib/ruby2js/converter/array.rb
-- lib/ruby2js/converter/block.rb
-- lib/ruby2js/converter/if.rb
-- lib/ruby2js/converter/until.rb
+- lib/ruby2js/converter/nthref.rb
+- lib/ruby2js/converter/opasgn.rb
+- lib/ruby2js/converter/prototype.rb
 - lib/ruby2js/converter/regexp.rb
-- lib/ruby2js/converter/casgn.rb
+- lib/ruby2js/converter/return.rb
+- lib/ruby2js/converter/self.rb
+- lib/ruby2js/converter/send.rb
+- lib/ruby2js/converter/super.rb
+- lib/ruby2js/converter/sym.rb
 - lib/ruby2js/converter/undef.rb
-- lib/ruby2js/converter/literal.rb
+- lib/ruby2js/converter/until.rb
+- lib/ruby2js/converter/untilpost.rb
 - lib/ruby2js/converter/var.rb
+- lib/ruby2js/converter/vasgn.rb
+- lib/ruby2js/converter/while.rb
+- lib/ruby2js/converter/whilepost.rb
+- lib/ruby2js/converter/xstr.rb
+- lib/ruby2js/converter.rb
+- lib/ruby2js/execjs.rb
+- lib/ruby2js/filter/angular-resource.rb
+- lib/ruby2js/filter/angular-route.rb
+- lib/ruby2js/filter/angularrb.rb
+- lib/ruby2js/filter/camelCase.rb
+- lib/ruby2js/filter/functions.rb
+- lib/ruby2js/filter/jquery.rb
+- lib/ruby2js/filter/minitest-jasmine.rb
+- lib/ruby2js/filter/react.rb
+- lib/ruby2js/filter/require.rb
+- lib/ruby2js/filter/return.rb
+- lib/ruby2js/filter/rubyjs.rb
+- lib/ruby2js/filter/strict.rb
+- lib/ruby2js/filter/underscore.rb
+- lib/ruby2js/rails.rb
+- lib/ruby2js/serializer.rb
+- lib/ruby2js/sinatra.rb
+- lib/ruby2js/version.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
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Minimal yet extensible Ruby to JavaScript conversion.
 test_files: []