ruby2js 1.0.0 → 1.1.0

data/lib/ruby2js/converter/var.rb

@@ -0,0 +1,11 @@
+module Ruby2JS
+  class Converter
+
+    # (lvar :a)
+    # (gvar :$a)
+
+    handle :lvar, :gvar do |var|
+      var
+    end
+  end
+end

data/lib/ruby2js/converter/vasgn.rb

@@ -0,0 +1,41 @@
+module Ruby2JS
+  class Converter
+
+    # (lvasgn :a
+    #   (int 1))
+
+    # (gvasgn :$a
+    #   (int 1))
+
+    handle :lvasgn, :gvasgn do |name, value=nil|
+      begin
+        if value and value.type == :lvasgn and @state == :statement
+          undecls = []
+          undecls << name unless @vars.include? name
+
+          child = value
+          while child and child.type == :lvasgn
+            undecls << child.children[0] unless @vars.include? child.children[0]
+            child = child.children[1]
+          end
+
+          unless undecls.empty?
+            return parse s(:begin, 
+              *undecls.map {|name| s(:lvasgn, name)}, @ast), @state
+          end
+        end
+
+        var = 'var ' unless @vars.include?(name) or @state != :statement
+
+        if value
+
+          "#{ var }#{ name } = #{ parse value }"
+        else
+          "#{ var }#{ name }"
+        end
+      ensure
+        @vars[name] = true
+      end
+    end
+  end
+end

data/lib/ruby2js/converter/while.rb

@@ -0,0 +1,12 @@
+module Ruby2JS
+  class Converter
+
+    # (while
+    #   (true)
+    #   (...))
+
+    handle :while do |condition, block|
+      "while (#{ parse condition }) {#@nl#{ scope block }#@nl}"
+    end
+  end
+end

data/lib/ruby2js/converter/whilepost.rb

@@ -0,0 +1,14 @@
+module Ruby2JS
+  class Converter
+
+    # (while-post
+    #   (true)
+    #   (kwbegin
+    #     (...)))
+
+    handle :while_post do |condition, block|
+      block = block.updated(:begin) if block.type == :kwbegin
+      "do {#@nl#{ scope block }#@nl} while (#{ parse condition })"
+    end
+  end
+end

data/lib/ruby2js/converter/xstr.rb

@@ -0,0 +1,16 @@
+module Ruby2JS
+  class Converter
+
+    # (xstr
+    #   (str 'a'))
+
+    handle :xstr do |*children|
+      str = eval children.map{ |child| parse child }.join
+      if @binding
+        @binding.eval(str).to_s
+      else
+        eval(str).to_s
+      end
+    end
+  end
+end

data/lib/ruby2js/filter/angularrb.rb

@@ -63,7 +63,7 @@ module Ruby2JS
         @ngApp = nil
 
         # replace module with a constant assign followed by the module contents
-        node.updated :begin, [casgn, *block]
+        node.updated :begin, [casgn, *block.compact]
       end
 
       # input: 

data/lib/ruby2js/filter/jquery.rb

@@ -1,4 +1,52 @@
 require 'ruby2js'
+#
+# Jquery functions are either invoked using jQuery() or, more commonly, $().
+# The former presents no problem, the latter is not legal Ruby.
+#
+# Accordingly, the first accomodation this filter provides is to map $$ to
+# $.  This works find for $$.ajax and the like, but less so for direct calls
+# as $$(this) is also a syntax error.  $$.(this) and $$[this] will work
+# but are a bit clumsy.
+#
+# 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.
+#
+# As a part of this rewriting, calls to getters and setters are rewritten
+# to match jQuery's convention for getters and setters:
+#  http://learn.jquery.com/using-jquery-core/working-with-selections/
+#
+# Of course, using jQuery's style of getter and setter calls is supported,
+# and indeed is convenient when using method chaining.
+#
+# Finally, the tilde AST rewriting can be avoided by using consecutive tildes
+# (~~ is a common Ruby idiom for Math.floor, ~~~ will return the binary
+# one's complement.); and the getter and setter AST rewriting can be avoided
+# by the use of parenthesis, e.g. (~this).text.
+# 
+# Some examples of before/after conversions:
+#
+#   `this.val
+#   $(this).val()
+#
+#   `"button.continue".html = "Next Step..."
+#   $("button.continue").html("Next Step...")
+#
+#  $$.ajax(
+#    url: "/api/getWeather",
+#    data: {zipcode: 97201},
+#    success: proc do |data|
+#      `"#weather-temp".html = "<strong>#{data}</strong> degrees"
+#    end
+#  )
+#
+#  $.ajax({
+#    url: "/api/getWeather",
+#    data: {zipcode: 97201},
+#    success: function(data) {
+#      $("#weather-temp").html("<strong>" + data + "</strong> degrees");
+#    }
+#  })
 
 module Ruby2JS
   module Filter
@@ -19,13 +67,59 @@ module Ruby2JS
       end
 
       def on_send(node)
-        if node.children[1] == :call
+        if [:call, :[]].include? node.children[1]
+          # map $$.call(..), $$.(..), and $$[...] to $(...)
           target = process(node.children.first)
           if target.type == :gvar and target.children == ['$']
             s(:send, nil, '$', *process_all(node.children[2..-1]))
           else
             super
           end
+
+        elsif node.children[1] == :~
+          # map ~expression.method to $(expression).method
+
+          # See http://api.jquery.com/category/properties/
+          props = :context, :jquery, :browser, :fx, :support, :length, :selector
+
+          rewrite_tilda = proc do |node|
+            # Example conversion:
+            #   before:
+            #    (send (send (send (send nil :a) :b) :c) :~)
+            #   after:
+            #    (send (send (send nil "$" (send nil :a)) :b) :c)
+            if node.type == :send and node.children[0]
+              if node.children[1] == :~ and node.children[0].children[1] == :~
+                # consecutive tildes
+                if node.children[0].children[0].children[1] == :~
+                  result = process(node.children[0].children[0].children[0])
+                else
+                  result = s(:send, process(node.children[0].children[0]), :~)
+                end
+                s(:send, s(:send, result, :~), :~)
+              else
+                # possible getter/setter
+                method = node.children[1]
+                method = method.to_s.chomp('=') if method =~ /=$/
+                rewrite = [rewrite_tilda[node.children[0]], 
+                  method, *process_all(node.children[2..-1])]
+                if props.include? node.children[1]
+                  node.updated nil, rewrite
+                else
+                  s(:send, *rewrite)
+                end
+              end
+            elsif node.type == :block
+              # method call with a block parameter
+              node.updated nil, [rewrite_tilda[node.children[0]],
+                *process_all(node.children[1..-1])]
+            else
+              # innermost expression
+              s(:send, nil, '$', process(node))
+            end
+          end
+
+          rewrite_tilda[node].children[0]
         else
           super
         end

data/lib/ruby2js/version.rb

@@ -1,7 +1,7 @@
 module Ruby2JS
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 0
+    MINOR = 1
     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.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2013-11-15"
+  s.date = "2013-11-18"
   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/version.rb", "lib/ruby2js/converter.rb", "lib/ruby2js/filter", "lib/ruby2js/filter/return.rb", "lib/ruby2js/filter/angularrb.rb", "lib/ruby2js/filter/functions.rb", "lib/ruby2js/filter/jquery.rb", "lib/ruby2js.rb"]
+  s.files = ["ruby2js.gemspec", "README.md", "lib/ruby2js", "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/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/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/converter.rb", "lib/ruby2js/filter", "lib/ruby2js/filter/return.rb", "lib/ruby2js/filter/angularrb.rb", "lib/ruby2js/filter/functions.rb", "lib/ruby2js/filter/jquery.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.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -34,6 +34,48 @@ files:
 - ruby2js.gemspec
 - README.md
 - 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/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/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/converter.rb
 - lib/ruby2js/filter/return.rb
 - lib/ruby2js/filter/angularrb.rb