ruby2js 1.1.0 → 1.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2MyOGI2ZTQxMWYwMjJlYjc4M2M1OGFjNGVhNmRhOGJkYTc3ZGFjNA==
+    NDlkZTE5MGYzYzBlZDc0YzBmZmU5YmE2NWZmNTU1MWQwYWE1ZjVmNw==
   data.tar.gz: !binary |-
-    ZWNmN2FhYmI4OTUyODhjMDI0MGQ3ZjJmZjA1NTczM2EzN2M2NmQ4Ng==
+    ZWM4OGU4OTgzMGU0ZjAxMDc1MGFhOGNmMDU2YWZjOWU0ZmNjYWFjNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YWZjYzYxN2NlMjNhZWNmMGE1ODRlZjY3ODg0ZjQ3YjkxYzFhZDNmNWRiODUy
-    ZTI0MTExMTQwMjg5YTMzZDQyNjEzOTE5NjdlN2VkNDM3NjZhMjFiOTZhNjQy
-    YmZmYmNlNmIxZmMxNmI4NTk4Yjg5MTFkNjAzZjc5N2I0ZTQ3ZDk=
+    YzNiMmJmNTg5MDBiZmQzMTc1OGQ5ZDNiNTEyYzZjN2FjNjlhNjAwYTA2NGVl
+    ZWYxZjZiNDc0NDFhZjI1YmZlMjU3ZGNkOWVlNjEwNTg0NGFlZDhhZmNlZTBj
+    YzI0OGYyZGRjMmI3NDRlODk0ZTNkYzBjNGQ4MDYxNWUwYzVhOGQ=
   data.tar.gz: !binary |-
-    MzcwYTRlZjI0Mjc5ODM0ZmY5MzQwZDE1NDZlMDE0YzU0NmZjZmI0YTFkMjFl
-    OTE3ZWM5MjFhMDE3NzRjZWYyMTFiMjI4YzQxNDgzNTJiOTU1NWZiODc4ZmY4
-    YjViNmZiMmYzMWFhYTliNjk1NjAwMWIzY2JmOGYwNDFlOWE3Nzk=
+    NGNiMTlkMGEyYzVjNDg3ODc2OGQ3ZDE1ODcyZTk0YjRiN2Q3MGNlZjlhNWQ1
+    MmNlOGFiYjNlM2RiMjJmZDZjYzUxMzc5NGMzZjg4MmU3NDEwZjM3ZDg0NGNi
+    NGRmOWQ3OWQwNzI3ZjNhZTNkNDA4MzEzY2YwODY2NWE1NTRmNTM=

data/lib/ruby2js/converter/case.rb

@@ -12,10 +12,10 @@ module Ruby2JS
       whens.map! do |node|
         *values, code = node.children
         cases = values.map {|value| "case #{ parse value }:#@ws"}.join
-        "#{ cases }#{ parse code }#{@sep}break#@sep"
+        "#{ cases }#{ parse code, :statement }#{@sep}break#@sep"
       end
 
-      other = "#{@nl}default:#@ws#{ parse other }#@nl" if other
+      other = "#{@nl}default:#@ws#{ parse other, :statement }#@nl" if other
 
       "switch (#{ parse expr }) {#@nl#{whens.join(@nl)}#{other}}"
     end

data/lib/ruby2js/converter/if.rb

@@ -7,10 +7,13 @@ module Ruby2JS
     #   (...))
 
     handle :if do |condition, then_block, else_block|
+      # return parse condition if not else_block and not then_block
       if else_block and not then_block
         return parse(s(:if, s(:send, condition, :!), else_block, nil), @state) 
       end
 
+      then_block ||= s(:nil)
+
       if @state == :statement
         output = "if (#{ parse condition }) {#@nl#{ scope then_block }#@nl}"
         while else_block and else_block.type == :if

data/lib/ruby2js/filter/jquery.rb

@@ -16,6 +16,10 @@ require 'ruby2js'
 # to match jQuery's convention for getters and setters:
 #  http://learn.jquery.com/using-jquery-core/working-with-selections/
 #
+# Selected DOM properties (namely checked, disabled, readOnly, and required)
+# can also use getter and setter syntax.  Additionally, readOnly may be
+# spelled 'readonly'.
+#
 # Of course, using jQuery's style of getter and setter calls is supported,
 # and indeed is convenient when using method chaining.
 #
@@ -26,12 +30,15 @@ require 'ruby2js'
 # 
 # Some examples of before/after conversions:
 #
-#   `this.val
+#   ~this.val
 #   $(this).val()
 #
-#   `"button.continue".html = "Next Step..."
+#   ~"button.continue".html = "Next Step..."
 #   $("button.continue").html("Next Step...")
 #
+#   ~"button".readonly = false
+#   $("button").prop("readOnly", false)
+#   
 #  $$.ajax(
 #    url: "/api/getWeather",
 #    data: {zipcode: 97201},
@@ -79,8 +86,23 @@ module Ruby2JS
         elsif node.children[1] == :~
           # map ~expression.method to $(expression).method
 
+          if node.children[0] and node.children[0].type == :op_asgn
+            asgn = node.children[0]
+            if asgn.children[0] and asgn.children[0].type == :send
+              inner = asgn.children[0]
+              return on_send s(:send, s(:send, inner.children[0],
+                (inner.children[1].to_s+'=').to_sym,
+                s(:send, s(:send, s(:send, inner.children[0], :~),
+                *inner.children[1..-1]), *asgn.children[1..-1])), :~)
+            else
+              return on_send asgn.updated nil, [s(:send, asgn.children[0], :~),
+                *asgn.children[1..-1]]
+            end
+          end
+
           # See http://api.jquery.com/category/properties/
           props = :context, :jquery, :browser, :fx, :support, :length, :selector
+          domprops = %w(checked disabled readonly readOnly required)
 
           rewrite_tilda = proc do |node|
             # Example conversion:
@@ -105,6 +127,9 @@ module Ruby2JS
                   method, *process_all(node.children[2..-1])]
                 if props.include? node.children[1]
                   node.updated nil, rewrite
+                elsif domprops.include? method.to_s
+                  method = :readOnly if method.to_s == 'readonly'
+                  s(:send, rewrite[0], :prop, s(:sym, method), *rewrite[2..-1]) 
                 else
                   s(:send, *rewrite)
                 end

data/lib/ruby2js/version.rb

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

data/ruby2js.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby2js"
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2013-11-18"
+  s.date = "2013-11-22"
   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", "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"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2013-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser