ruby2js 2.1.14 → 2.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7142ef3a080ba4a5342d66a8b08a99389172cb74
-  data.tar.gz: 4cb6bb9b94504d1ba771f4605e6a886afb35e4a5
+  metadata.gz: 121d094f331f90e10cd459c3a1f4b22276582ff9
+  data.tar.gz: db0ef09b980ac15ed08e009cf3a09191c4dd32b4
 SHA512:
-  metadata.gz: ab2b9562a0fda5be938edfd54fe713208459d4b062e38be7559571ca15af266cd5fdc5d0ca0c52a6361b5460446d3d156448e70c56d877522525e3ec900f9990
-  data.tar.gz: d4dc3b4d5f713ff050d7f26581dbb05690a20e09eb6f02612682c4365c6ad0828e9759039ed28bafc0637a260b6198a2e277649260a7f06f8735cda3529b6389
+  metadata.gz: '049e26bdf2fda7434b19073fd51a931f4b7655e134f7b73167015b7a175dfd8ad6e05719d63841ef115c909872bd623475b9c774a8d271ec4d997fd74a3c37ba'
+  data.tar.gz: 8d4f7975ba5036f8e5b55b0db6a2ec2f4d457260451583a13d051506db8ac35acc659aec78323f7ec3a6c5d26b5a4d0b000507f85bc7c0d716fdab2c4fad2e22

data/lib/ruby2js/filter/vue.rb

@@ -610,7 +610,17 @@ module Ruby2JS
                        hash['nativeOn']['input'] ||
                        hash['nativeOn']['change']
 
-            if value and value.type == :ivar
+            # test if value is assignable
+            test = value
+            while 
+              test and test.type == :send and test.children.length == 2 and
+              test.children.last.instance_of? Symbol do
+              test = test.children.first 
+            end
+
+            if value and (not test or 
+              test.is_a? Symbol or [:ivar, :cvar].include? test.type)
+            then
               hash[:domProps]['value'] ||= value
               hash[:domProps]['textContent'] ||= value if tag == 'textarea'
               hash[:attrs].delete('value')
@@ -623,10 +633,20 @@ module Ruby2JS
 
               # define event handler to update ivar on input events
               if not onChange
+                update = s(:attr, s(:attr, s(:lvar, :event), :target), :value)
+
+                if value.type == :ivar
+                  assign = s(:ivasgn, value.children.first, update)
+                elsif value.type == :cvar
+                  assign = s(:cvasgn, value.children.first, update)
+                else
+                  assign = value.updated nil, [value.children.first,
+                    "#{value.children[1]}=", update]
+                end
+
                 hash['on']['input'] ||=
                   s(:block, s(:send, nil, :proc), s(:args, s(:arg, :event)),
-                  s(:ivasgn, value.children.first,
-                  s(:attr, s(:attr, s(:lvar, :event), :target), :value)))
+                  assign)
               end
             end
 
@@ -634,7 +654,17 @@ module Ruby2JS
               # search for the presence of a 'checked' attribute
               checked = hash[:attrs]['checked']
 
-              if checked and checked.type == :ivar
+              # test if value is assignable
+              test = checked
+              while 
+                test and test.type == :send and test.children.length == 2 and
+                test.children.last.instance_of? Symbol do
+                test = test.children.first 
+              end
+
+              if checked and (not test or 
+                test.is_a? Symbol or [:ivar, :cvar].include? test.type)
+              then
                 hash[:domProps]['checked'] ||= checked
                 hash[:attrs].delete('checked')
 
@@ -646,10 +676,19 @@ module Ruby2JS
 
                 # define event handler to update ivar on click events
                 if not onChange
+                  update = s(:send, checked, :!)
+
+                  if checked.type == :ivar
+                    assign = s(:ivasgn, checked.children.first, update)
+                  elsif checked.type == :cvar
+                    assign = s(:cvasgn, checked.children.first, update)
+                  else
+                    assign = checked.updated nil, [checked.children.first,
+                      "#{checked.children[1]}=", update]
+                  end
+
                   hash['on']['click'] ||=
-                    s(:block, s(:send, nil, :proc), s(:args),
-                    s(:ivasgn,checked.children.first,
-                    s(:send, checked, :!)))
+                    s(:block, s(:send, nil, :proc), s(:args), assign)
                 end
               end
             end

data/lib/ruby2js/version.rb

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

data/ruby2js.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: ruby2js 2.1.14 ruby lib
+# stub: ruby2js 2.1.15 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ruby2js".freeze
-  s.version = "2.1.14"
+  s.version = "2.1.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 2.1.14
+  version: 2.1.15
 platform: ruby
 authors:
 - Sam Ruby