ruby2js 2.1.18 → 2.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a08fc298d4b735b9baf096df5cfd8400bd0a835b
-  data.tar.gz: '00480bb656522c7b65d21626a94383bddf9ea9f1'
+  metadata.gz: f7b23a1eb7fd7935ab82f280f2f2f5a4821b6166
+  data.tar.gz: 94d15ef972ce2ddf3f2d9e91c51197ffceed47cd
 SHA512:
-  metadata.gz: f0e1232149f304e953d69992632d45e9dcab0ec0accd3a1a56257af1d7e32c38db29fcfdee0ca5b4decde5ee3f10159a3adc12fb9f106bcf9888fc4e47552002
-  data.tar.gz: d9b20d5925b96b1425fe64d8febb9b9b8b640caa155db784d1fa64376c720b7940d5f62fcfafc9a7cacba72b247339ca8ee5254b15624f8418ca1cd808d7b333
+  metadata.gz: 1a1f7af042c2594af8ccb07dd21fcf996f4b79746dad1cf9edfddc89c5bc90cb2fbcaab4f6baeddd341a4c330db16bf76d2431463fe81b1e869cf27f1c0f02e4
+  data.tar.gz: dd5232baf9d596fe77a80f66372e911c5c0c504807e8e672e8e9484c8f2a5ca7f673776307510bc724843d4f55aa69591ffc094cb0e0cccc112615e5ff35b920

data/lib/ruby2js/converter.rb

@@ -145,8 +145,11 @@ module Ruby2JS
 
       walk = proc do |ast|
         if ast.loc and ast.loc.expression
-          filename = ast.loc.expression.source_buffer.name.dup.untaint
-          @timestamps[filename] ||= File.mtime(filename) if filename
+          filename = ast.loc.expression.source_buffer.name
+          if filename
+            filename = filename.dup.untaint
+            @timestamps[filename] ||= File.mtime(filename)
+          end
         end
 
         ast.children.each do |child|

data/lib/ruby2js/filter/vue.rb

@@ -604,26 +604,39 @@ module Ruby2JS
             # search for the presence of a 'value' attribute
             value = hash[:attrs]['value']
 
-            # search for the presence of a 'onChange' attribute
-            onChange = hash['on']['input'] ||
-                       hash['on']['change'] ||
-                       hash['nativeOn']['input'] ||
-                       hash['nativeOn']['change']
+            if value
+              # search for the presence of a 'onChange' attribute
+              onChange = hash['on']['input'] ||
+                         hash['on']['change'] ||
+                         hash['nativeOn']['input'] ||
+                         hash['nativeOn']['change']
+              attr = 'value'
+              event = 'input'
+            elsif tag == 'input'
+              value = hash[:attrs]['checked']
+              onChange = hash['on']['click'] ||
+                         hash['nativeOn']['click']
+              attr = 'checked'
+              event = 'click'
+            end
 
             # 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
+            loop do
+              break unless test and test.type == :send 
+              break unless (test.children.length == 2 and
+                test.children.last.instance_of? Symbol and
+                not [:not, :!, :*, :+, :-].include? test.children.last) or
+                test.children[1] == :[]
               test = test.children.first 
             end
 
             if value and value.type != :cvar and (not test or 
               test.is_a? Symbol or [:ivar, :cvar, :self].include? test.type)
             then
-              hash[:domProps]['value'] ||= value
+              hash[:domProps][attr] ||= value
               hash[:domProps]['textContent'] ||= value if tag == 'textarea'
-              hash[:attrs].delete('value')
+              hash[:attrs].delete(attr)
 
               # disable control until script is ready
               unless hash[:domProps]['disabled'] or hash[:attrs]['disabled']
@@ -633,7 +646,13 @@ 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 attr == 'value'
+                  update = s(:attr, s(:attr, s(:lvar, :event), :target), :value)
+                  upargs = [s(:arg, :event)]
+                else
+                  update = s(:send, value, :!)
+                  upargs = []
+                end
 
                 if value.type == :ivar
                   assign = s(:ivasgn, value.children.first, update)
@@ -641,60 +660,16 @@ module Ruby2JS
                   assign = s(:cvasgn, value.children.first, update)
                 elsif value.type == :send and value.children.first == nil
                   assign = value.updated :lvasgn, [value.children[1], update]
+                elsif value.children[1] == :[]
+                  assign = value.updated nil, [value.children[0], :[]=,
+                    value.children[2], 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)),
-                  assign)
-              end
-            end
-
-            if not value and not onChange and tag == 'input'
-              # search for the presence of a 'checked' attribute
-              checked = hash[:attrs]['checked']
-
-              # 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 checked.type != :cvar and (not test or 
-                test.is_a? Symbol or [:ivar, :cvar, :self].include? test.type)
-              then
-                hash[:domProps]['checked'] ||= checked
-                hash[:attrs].delete('checked')
-
-                # disable control until script is ready
-                unless hash[:domProps]['disabled'] or hash[:attrs]['disabled']
-                  hash[:domProps]['disabled'] = s(:false)
-                  hash[:attrs]['disabled'] = s(:true)
-                end
-
-                # 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)
-                  elsif checked.type == :send and checked.children.first == nil
-                    assign = checked.updated :lvasgn, [checked.children[1],
-                      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), assign)
-                end
+                hash['on'][event] ||=
+                  s(:block, s(:send, nil, :proc), s(:args, *upargs), assign)
               end
             end
           end

data/lib/ruby2js/version.rb

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

data/ruby2js.gemspec

@@ -1,21 +1,21 @@
 # -*- encoding: utf-8 -*-
-# stub: ruby2js 2.1.18 ruby lib
+# stub: ruby2js 2.1.19 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ruby2js".freeze
-  s.version = "2.1.18"
+  s.version = "2.1.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Sam Ruby".freeze]
-  s.date = "2017-09-30"
+  s.date = "2017-10-08"
   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".freeze
   s.email = "rubys@intertwingly.net".freeze
   s.files = ["README.md".freeze, "lib/ruby2js".freeze, "lib/ruby2js.rb".freeze, "lib/ruby2js/cgi.rb".freeze, "lib/ruby2js/converter".freeze, "lib/ruby2js/converter.rb".freeze, "lib/ruby2js/converter/arg.rb".freeze, "lib/ruby2js/converter/args.rb".freeze, "lib/ruby2js/converter/array.rb".freeze, "lib/ruby2js/converter/begin.rb".freeze, "lib/ruby2js/converter/block.rb".freeze, "lib/ruby2js/converter/blockpass.rb".freeze, "lib/ruby2js/converter/boolean.rb".freeze, "lib/ruby2js/converter/break.rb".freeze, "lib/ruby2js/converter/case.rb".freeze, "lib/ruby2js/converter/casgn.rb".freeze, "lib/ruby2js/converter/class.rb".freeze, "lib/ruby2js/converter/const.rb".freeze, "lib/ruby2js/converter/cvar.rb".freeze, "lib/ruby2js/converter/cvasgn.rb".freeze, "lib/ruby2js/converter/def.rb".freeze, "lib/ruby2js/converter/defined.rb".freeze, "lib/ruby2js/converter/defs.rb".freeze, "lib/ruby2js/converter/dstr.rb".freeze, "lib/ruby2js/converter/for.rb".freeze, "lib/ruby2js/converter/hash.rb".freeze, "lib/ruby2js/converter/if.rb".freeze, "lib/ruby2js/converter/in.rb".freeze, "lib/ruby2js/converter/ivar.rb".freeze, "lib/ruby2js/converter/ivasgn.rb".freeze, "lib/ruby2js/converter/kwbegin.rb".freeze, "lib/ruby2js/converter/literal.rb".freeze, "lib/ruby2js/converter/logical.rb".freeze, "lib/ruby2js/converter/masgn.rb".freeze, "lib/ruby2js/converter/module.rb".freeze, "lib/ruby2js/converter/next.rb".freeze, "lib/ruby2js/converter/nil.rb".freeze, "lib/ruby2js/converter/nthref.rb".freeze, "lib/ruby2js/converter/opasgn.rb".freeze, "lib/ruby2js/converter/prototype.rb".freeze, "lib/ruby2js/converter/regexp.rb".freeze, "lib/ruby2js/converter/return.rb".freeze, "lib/ruby2js/converter/self.rb".freeze, "lib/ruby2js/converter/send.rb".freeze, "lib/ruby2js/converter/super.rb".freeze, "lib/ruby2js/converter/sym.rb".freeze, "lib/ruby2js/converter/undef.rb".freeze, "lib/ruby2js/converter/until.rb".freeze, "lib/ruby2js/converter/untilpost.rb".freeze, "lib/ruby2js/converter/var.rb".freeze, "lib/ruby2js/converter/vasgn.rb".freeze, "lib/ruby2js/converter/while.rb".freeze, "lib/ruby2js/converter/whilepost.rb".freeze, "lib/ruby2js/converter/xstr.rb".freeze, "lib/ruby2js/execjs.rb".freeze, "lib/ruby2js/filter".freeze, "lib/ruby2js/filter/angular-resource.rb".freeze, "lib/ruby2js/filter/angular-route.rb".freeze, "lib/ruby2js/filter/angularrb.rb".freeze, "lib/ruby2js/filter/camelCase.rb".freeze, "lib/ruby2js/filter/functions.rb".freeze, "lib/ruby2js/filter/jquery.rb".freeze, "lib/ruby2js/filter/minitest-jasmine.rb".freeze, "lib/ruby2js/filter/react.rb".freeze, "lib/ruby2js/filter/require.rb".freeze, "lib/ruby2js/filter/return.rb".freeze, "lib/ruby2js/filter/rubyjs.rb".freeze, "lib/ruby2js/filter/strict.rb".freeze, "lib/ruby2js/filter/underscore.rb".freeze, "lib/ruby2js/filter/vue.rb".freeze, "lib/ruby2js/rails.rb".freeze, "lib/ruby2js/serializer.rb".freeze, "lib/ruby2js/sinatra.rb".freeze, "lib/ruby2js/version.rb".freeze, "ruby2js.gemspec".freeze]
   s.homepage = "http://github.com/rubys/ruby2js".freeze
   s.licenses = ["MIT".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.3".freeze)
-  s.rubygems_version = "2.6.11".freeze
+  s.rubygems_version = "2.6.8".freeze
   s.summary = "Minimal yet extensible Ruby to JavaScript conversion.".freeze
 
   if s.respond_to? :specification_version then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 2.1.18
+  version: 2.1.19
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-30 00:00:00.000000000 Z
+date: 2017-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Minimal yet extensible Ruby to JavaScript conversion.