ruby2js 2.1.9 → 2.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcfebf8a01ec762ebf625014b80727dafb2e22a8
-  data.tar.gz: 53775267829213753c29c2ec6927e2ab9f89d917
+  metadata.gz: 5ce20d44e74884ee6398867509b8857afe6637c0
+  data.tar.gz: b747496f4be90b29eb5d0f53847687e699350540
 SHA512:
-  metadata.gz: 59b5bc183dec990415f7dc5cdc6592ebc288408ffaf97d8e370a207b589bf224ca5583091220338143c0501a362caaee39e70ece0444a37fb1789ea2fc1ff5ef
-  data.tar.gz: 1fcaa9f1f1f15663eeaa3bb2f35cdd9910862415646dc70938f0ccbbebebd7e8402901a7356426a0b68c48c16de24738067a9969729b21c025db094099dd0f3c
+  metadata.gz: c421c508524c62b8edb36a605b3d9fdb91645a20298ce4451f90f69d00cfa1acd9eb4300c515d2b8d50973eb26fbb13e0980ec2bfc611d32d0badb025e48dcc4
+  data.tar.gz: 0642a682af8b19be72b772c78702e709ae3d7a4b83a5a67913b967852833be89c39bdda61497cd9f7b727006e63cca6ce428544ea5e9bfbe58a62512296166d8

data/lib/ruby2js.rb

@@ -1,5 +1,6 @@
 begin
   # silence warnings, see 
+  # https://github.com/whitequark/parser/issues/346#issuecomment-317617695
   # https://github.com/bbatsov/rubocop/issues/1819#issuecomment-95280926
   old_verbose, $VERBOSE = $VERBOSE, nil
   require 'parser/current'

data/lib/ruby2js/filter/vue.rb

@@ -127,8 +127,13 @@ module Ruby2JS
                 block = s(:begin, block) unless block and block.type == :begin
 
                 if
-                  block.children.length != 1 or not block.children.last or
-                  not [:send, :block].include? block.children.first.type
+                  (block.children.length != 1 and
+                    not vue_wunderbar_free(block.children[0..-2])) or
+
+                  not block.children.last or
+
+                  (block.children.length == 1 and
+                    not [:send, :block].include? block.children.first.type)
                 then
                   # wrap multi-line blocks with a 'span' element
                   block = s(:return,
@@ -529,6 +534,7 @@ module Ruby2JS
 
             if value and value.type == :ivar
               hash[:domProps]['value'] ||= value
+              hash[:domProps]['textContent'] ||= value if tag == 'textarea'
               hash[:attrs].delete('value')
 
               # disable control until script is ready
@@ -681,7 +687,7 @@ module Ruby2JS
           end
 
         elsif
-          VUE_METHODS.include? node.children[1] and
+          @vue_self and VUE_METHODS.include? node.children[1] and
           node.children[0] == s(:const, nil, :Vue)
         then
           # vm methods
@@ -904,6 +910,30 @@ module Ruby2JS
           process(node.children[1]))
       end
 
+      # ensure that there are no "wunderbar" or "createElement" calls in
+      # a set of statements.
+      def vue_wunderbar_free(nodes)
+        nodes.each do |node|
+          if Parser::AST::Node === node
+            if node.type == :send
+              # wunderbar style calls
+              return false if node.children[0] == nil and 
+                node.children[1].to_s.start_with? '_'
+
+              # Vue.createElement calls
+              return false if node.children[0] == s(:const, nil, :Vue) and 
+                node.children[1] == :createElement
+            end
+
+            # recurse
+            return false unless vue_wunderbar_free(node.children)
+          end
+        end
+
+        # no problems found
+        return true
+      end
+
       # gather ivar and cvar usage
       def vue_walk(node, inventory = Hash.new {|h, k| h[k] = []})
         # extract ivars and cvars

data/lib/ruby2js/version.rb

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

data/ruby2js.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: ruby2js 2.1.9 ruby lib
+# stub: ruby2js 2.1.10 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ruby2js".freeze
-  s.version = "2.1.9"
+  s.version = "2.1.10"
 
   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-17"
+  s.date = "2017-09-19"
   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.9
+  version: 2.1.10
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-17 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser