ruby2js 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61852c6fdba706a1d5ae24c3cdcd55a40a979e59
-  data.tar.gz: 69ea3b2877046ce8525d4b1ed45ae42c20e5f88b
+  metadata.gz: 45fd791073d23f08643df9e169c0ed9bb5080878
+  data.tar.gz: 56b543e32dd116330c516de800655109be51069f
 SHA512:
-  metadata.gz: 67c6196a25c760be25a0db0f4d254610ac159bdec78cad82dbf48a488f775dc6016153441f65f8bd66a0e8f684e5c7f999b46f78fc373ab1ef9524959f0bdf16
-  data.tar.gz: e4cd05d2859a8cdb70164709bacdaf85e553ba8321b72977a3ccbfa7be845fc832c70d8c0766e220b8c8033f808de5dece5fd2d37858916cb35d88981e40e474
+  metadata.gz: 60b63eb3edfb9a0d688af957ecf51ae34b5d1456b670d0b78cb3e0bcfaa867b0a553a1d1e1ef747934c0a2993fa5aa1eb3ea18ad46c6fbf4cedb51c17a22b264
+  data.tar.gz: 6f10eb6ff3e67f255c8125b2ea88bd200f77507b60b1c2df1945a929945688c7318e719a533788e6ded68447a93bf1af3e36b30bc6e8693c6fd60750289e9095

data/lib/ruby2js/filter/vue.rb

@@ -15,6 +15,11 @@ module Ruby2JS
         :beforeUpdate, :updated, :beforeDestroy, :destroyed
       ]
 
+      VUE_PROPERTIES = [
+        :$data, :$props, :$el, :$options, :$parent, :$root, :$children,
+        :$slots, :$scopedSlots, :$refs, :$isServer, :$attrs, :$listeners
+      ]
+
       def initialize(*args)
         @vue_h = nil
         @vue_self = nil
@@ -469,9 +474,16 @@ module Ruby2JS
                        hash['nativeOn']['change']
 
             if value and value.type == :ivar
-              hash['domProps']['value'] ||= value
+              hash[:domProps]['value'] ||= value
               hash[:attrs].delete('value')
 
+              # 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 input events
               if not onChange
                 hash['on']['input'] ||=
                   s(:block, s(:send, nil, :proc), s(:args, s(:arg, :event)),
@@ -485,9 +497,16 @@ module Ruby2JS
               checked = hash[:attrs]['checked']
 
               if checked and checked.type == :ivar
-                hash['domProps']['checked'] ||= checked
+                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
                   hash['on']['click'] ||=
                     s(:block, s(:send, nil, :proc), s(:args),
@@ -760,11 +779,11 @@ module Ruby2JS
         s(:attr, s(:attr, s(:self), :$props), node.children[0].to_s[2..-1])
       end
 
-      # expand $options to this.$options
+      # expand instance properties like $options to this.$options
       def on_gvar(node)
         return super unless @vue_self
-        if node.children[0] == :$options
-          node.updated :attr, [s(:self), :$options]
+        if VUE_PROPERTIES.include? node.children[0]
+          node.updated :attr, [s(:self), node.children[0]]
         else
           super
         end

data/lib/ruby2js/version.rb

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

data/ruby2js.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: ruby2js 2.1.4 ruby lib
+# stub: ruby2js 2.1.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ruby2js".freeze
-  s.version = "2.1.4"
+  s.version = "2.1.5"
 
   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-08"
+  s.date = "2017-09-09"
   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]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2017-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser