ruby2js 1.1.4 → 1.1.5

data/lib/ruby2js.rb

@@ -45,6 +45,8 @@ module Ruby2JS
         'Hash[instance_variables.map {|var| [var, instance_variable_get(var)]}]'
     end
 
+    ruby2js.width = options[:width] if options[:width]
+
     if source.include? "\n"
       ruby2js.enable_vertical_whitespace 
       lines = ruby2js.to_js.split("\n")

data/lib/ruby2js/converter.rb

@@ -14,6 +14,7 @@ module Ruby2JS
       @nl = ''
       @ws = ' '
       @varstack = []
+      @width = 80
 
       @handlers = {}
       @@handlers.each do |name|
@@ -31,6 +32,10 @@ module Ruby2JS
       @binding = binding
     end
 
+    def width=(width)
+      @width = width
+    end
+
     def to_js
       parse( @ast, :statement )
     end

data/lib/ruby2js/converter/array.rb

@@ -22,7 +22,7 @@ module Ruby2JS
         end
       else
         items.map! { |item| parse item }
-        if items.map {|item| item.length+2}.reduce(&:+).to_i < 72
+        if items.map {|item| item.length+2}.reduce(&:+).to_i < @width-8
           "[#{ items.join(', ') }]"
         else
           "[#@nl#{ items.join(",#@ws") }#@nl]"

data/lib/ruby2js/converter/hash.rb

@@ -14,7 +14,7 @@ module Ruby2JS
         "#{key}: #{parse right}"
       end
 
-      if pairs.map {|item| item.length+2}.reduce(&:+).to_i < 70
+      if pairs.map {|item| item.length+2}.reduce(&:+).to_i < @width-10
         "{#{ pairs.join(', ') }}"
       else
         "{#@nl#{ pairs.join(",#@ws") }#@nl}"

data/lib/ruby2js/converter/if.rb

@@ -24,7 +24,7 @@ module Ruby2JS
         output << " else {#@nl#{ scope else_block }#@nl}" if else_block
 
         # use short form when appropriate
-        unless output.length > 72 or else_block or then_block.type == :begin
+        unless output.length>@width-8 or else_block or then_block.type == :begin
           output = "if (#{ parse condition }) #{ scope then_block }"
         end
 

data/lib/ruby2js/converter/send.rb

@@ -103,7 +103,7 @@ module Ruby2JS
           args = args.map {|a| parse a}
           if args.any? {|arg| arg.to_s.include? "\n"}
             "#{ call }(#{ args.join(', ') })"
-          elsif args.map {|arg| arg.length+2}.reduce(&:+).to_i < 70
+          elsif args.map {|arg| arg.length+2}.reduce(&:+).to_i < @width-10
             "#{ call }(#{ args.join(', ') })"
           else
             "#{ call }(#@nl#{ args.join(",#@ws") }#@nl)"

data/lib/ruby2js/filter/jquery.rb

@@ -11,6 +11,8 @@ require 'ruby2js'
 # So as a second accomodation, the rarely used binary one's complement unary
 # operator (namely, ~) is usurped, and the AST is rewritten to provide the
 # effect of this operator being of a higher precedence than method calls.
+# Passing multiple parameters can be accomplished by using array index
+# syntax (e.g., ~['a', self])
 #
 # As a part of this rewriting, calls to getters and setters are rewritten
 # to match jQuery's convention for getters and setters:
@@ -141,8 +143,11 @@ module Ruby2JS
               # method call with a block parameter
               node.updated nil, [rewrite_tilda[node.children[0]],
                 *process_all(node.children[1..-1])]
+            elsif node.type == :array
+              # innermost expression is an array
+              s(:send, nil, '$', *process(node))
             else
-              # innermost expression
+              # innermost expression is a scalar
               s(:send, nil, '$', process(node))
             end
           end

data/lib/ruby2js/version.rb

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

data/ruby2js.gemspec

@@ -2,22 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby2js"
-  s.version = "1.1.4"
+  s.version = "1.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2013-12-02"
+  s.date = "2013-12-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/orasgn.rb", "lib/ruby2js/converter/kwbegin.rb", "lib/ruby2js/converter/const.rb", "lib/ruby2js/converter/return.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/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/ivasgn.rb", "lib/ruby2js/converter/casgn.rb", "lib/ruby2js/converter/self.rb", "lib/ruby2js/converter/andasgn.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"]
+  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/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/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/class.rb", "lib/ruby2js/converter/for.rb", "lib/ruby2js/converter/arg.rb", "lib/ruby2js/converter/literal.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/orasgn.rb", "lib/ruby2js/converter/masgn.rb", "lib/ruby2js/converter/hash.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/andasgn.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.1.4
+  version: 1.1.5
+  prerelease: 
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-02 00:00:00.000000000 Z
+date: 2013-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &15295760 !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: *15295760
 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,85 +31,86 @@ extra_rdoc_files: []
 files:
 - ruby2js.gemspec
 - README.md
-- lib/ruby2js/rails.rb
-- lib/ruby2js/version.rb
-- lib/ruby2js/converter/orasgn.rb
-- lib/ruby2js/converter/kwbegin.rb
-- lib/ruby2js/converter/const.rb
-- lib/ruby2js/converter/return.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/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/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/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/class.rb
 - lib/ruby2js/converter/for.rb
+- lib/ruby2js/converter/arg.rb
+- lib/ruby2js/converter/literal.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/orasgn.rb
 - lib/ruby2js/converter/masgn.rb
+- lib/ruby2js/converter/hash.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/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/ivasgn.rb
-- lib/ruby2js/converter/casgn.rb
-- lib/ruby2js/converter/self.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/andasgn.rb
-- lib/ruby2js/converter/begin.rb
-- lib/ruby2js/converter/dstr.rb
-- lib/ruby2js/converter/class.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/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 |-
-    MDMxNmI2YjUyMTk4MDExOWY5Mzc4NGE0YTYzOGVkYTc3YTE2YmE3OA==
-  data.tar.gz: !binary |-
-    NGIzN2ZlMGM0MjJhNmJlYTZlZDc1MGJiMzVhNTQ0NmUzMjcwY2QwMA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    N2QyMmJlN2IwZmNhY2NkZmI4ZGQzYzkwNThhMmUyMjRmOTY1NThjZDQzMGYx
-    ZjljMmZkODE0YzNjM2YxMzE3NzcyOWVmM2YyOWZiMTAzODVhYzg4ZjgyNTU5
-    YjVlNjJiNzg0OWZiOWQ0MzM2OGY1Zjc2ZmFhMTQ3YzhmN2IxNjA=
-  data.tar.gz: !binary |-
-    NTA2NzdiYThhYWRmOTYzYzg0OGNhNjRmNmU3OGJhMDg4ZWJmMWNhYTY0YmMy
-    YjM2MDdkNGUyMmRlZjNiOWFlZjJkOGQzY2FmMzJhNmE5NzIwNDcwM2ZjZDlk
-    ZGZlNGUwMjFkNmY3MGZmNDYzZjExZDI0ZTljNTAzMzBkNDVjNGY=