ruby2js 2.1.8 → 2.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc7aa6e17a303aa03f78a4f25bf01ec99dde4f34
-  data.tar.gz: 583531eec09eecf50076131ff8affccc95839b80
+  metadata.gz: bcfebf8a01ec762ebf625014b80727dafb2e22a8
+  data.tar.gz: 53775267829213753c29c2ec6927e2ab9f89d917
 SHA512:
-  metadata.gz: 6510a902460ad8073f710bfb2facb174121dcefc3884a9a69a65ee8ec18c43c4848d29c9e8055c0da10ebe3b181ae816e88093202ced6ec72f7ef7a5303e9fe4
-  data.tar.gz: '09cc922113d70a4fb096ef7f73e7e752d18fd0d68ba65be974b55cb8f35db12ecef63fd3f84dcf1307731905c3a92657c07a1ffff0575ff314cde5843b355052'
+  metadata.gz: 59b5bc183dec990415f7dc5cdc6592ebc288408ffaf97d8e370a207b589bf224ca5583091220338143c0501a362caaee39e70ece0444a37fb1789ea2fc1ff5ef
+  data.tar.gz: 1fcaa9f1f1f15663eeaa3bb2f35cdd9910862415646dc70938f0ccbbebebd7e8402901a7356426a0b68c48c16de24738067a9969729b21c025db094099dd0f3c

data/lib/ruby2js/filter/vue.rb

@@ -316,13 +316,13 @@ module Ruby2JS
       # expand 'wunderbar' like method calls
       def on_send(node)
         if not @vue_h
-          # enable React filtering within React class method calls or
+          # enable React filtering within Vue class method calls or
           # React component calls
           if
             node.children.first == s(:const, nil, :Vue)
           then
             begin
-              vue_h, @vue_h = @vue_h, :$h
+              vue_h, @vue_h = @vue_h, [s(:self), :$createElement]
               return on_send(node)
             ensure
               @vue_h = vue_h
@@ -414,25 +414,20 @@ module Ruby2JS
                         expr.children[1].type == :str
                       then
                         left = expr.children[1]
-                        right = expr.children[2] || s(:str, '')
-
-                        unless right.type == :str
-                          right = s(:or, right, s(:str, '')) 
-                        end
+                        right = expr.children[2] || s(:nil)
 
                         expr = expr.updated(nil, 
                           [expr.children[0], left, right])
-                      elsif expr.type != :str
-                        expr = s(:or, expr, s(:str, ''))
                       end
 
-                      value = s(:send, s(:str, values.join(' ')), :+, expr)
-                      pairs.unshift s(:pair, s(:sym, :class), value)
+                      hash[:class] = s(:array, 
+                        *values.join(' ').split(' ').map {|str| s(:str, str)},
+                        expr)
                     end
                   elsif [:hash, :array].include? expr.type
                     hash[:class] = expr
                   else
-                    pairs.unshift s(:pair, s(:sym, :class), expr)
+                    hash[:class] = s(:array, expr)
                   end
                 else
                   hash[:class] = s(:array, 
@@ -605,7 +600,11 @@ module Ruby2JS
               @vue_apply = false
 
               # emit $h (createElement) call
-              element = node.updated :send, [nil, @vue_h, *process_all(args)]
+              if @vue_h.instance_of? Array
+                element = node.updated :send, [*@vue_h, *process_all(args)]
+              else
+                element = node.updated :send, [nil, @vue_h, *process_all(args)]
+              end
             else
               # calls to $h (createElement) which contain a block
               #
@@ -666,8 +665,13 @@ module Ruby2JS
           node.children[0] == s(:const, nil, :Vue)
         then
           # explicit calls to Vue.createElement
-          element = node.updated nil, [nil, :$h, 
-            *process_all(node.children[2..-1])]
+          if @vue_h.instance_of? Array
+            element = node.updated nil, [*@vue_h,
+              *process_all(node.children[2..-1])]
+          else
+            element = node.updated nil, [nil, @vue_h, 
+              *process_all(node.children[2..-1])]
+          end
 
           if @vue_apply
             # if apply is set, emit code that pushes result

data/lib/ruby2js/version.rb

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

data/ruby2js.gemspec

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