ruby2js 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e5edb71b06e042e1f87d9e2680248470f3f1bb2
-  data.tar.gz: 596aa3eb654805d1dcc3f4ad7a7921ca2a439c48
+  metadata.gz: 61852c6fdba706a1d5ae24c3cdcd55a40a979e59
+  data.tar.gz: 69ea3b2877046ce8525d4b1ed45ae42c20e5f88b
 SHA512:
-  metadata.gz: ab33c1be48046ea978ebfbd5c1cc0eaf982ad0c498c0c97336c22ad562e045f11a8b55070ac56652eaadc8a4590f3ae71a37b7ff133942cdcad0d9f467419ce6
-  data.tar.gz: c28e2fe9c0c5bafc81d21d2e18b475e0f45ec3bcf2997702063b1b1b42513d5461f728c4da2d6e126c58ccf3cf99b7b266c725928f224f92eb976c584e1a637c
+  metadata.gz: 67c6196a25c760be25a0db0f4d254610ac159bdec78cad82dbf48a488f775dc6016153441f65f8bd66a0e8f684e5c7f999b46f78fc373ab1ef9524959f0bdf16
+  data.tar.gz: e4cd05d2859a8cdb70164709bacdaf85e553ba8321b72977a3ccbfa7be845fc832c70d8c0766e220b8c8033f808de5dece5fd2d37858916cb35d88981e40e474

data/lib/ruby2js/filter/vue.rb

@@ -38,7 +38,8 @@ module Ruby2JS
       def on_class(node)
         cname, inheritance, *body = node.children
         return super unless cname.children.first == nil
-        return super unless inheritance == s(:const, nil, :Vue)
+        return super unless inheritance == s(:const, nil, :Vue) or
+          inheritance == s(:const, s(:const, nil, :Vue), :Mixin)
 
         # traverse down to actual list of class statements
         if body.length == 1
@@ -53,13 +54,17 @@ module Ruby2JS
         methods = []
         computed = []
         setters = []
+        options = []
+        mixins = []
 
         # insert constructor if none present
-        unless body.any? {|statement| 
-          statement.type == :def and statement.children.first ==:initialize}
-        then
-          body = body.dup
-          body.unshift s(:def, :initialize, s(:args), nil)
+        if inheritance == s(:const, nil, :Vue)
+          unless body.any? {|statement| 
+            statement.type == :def and statement.children.first ==:initialize}
+          then
+            body = body.dup
+            body.unshift s(:def, :initialize, s(:args), nil)
+          end
         end
 
         @vue_inventory = vue_walk(node)
@@ -79,11 +84,23 @@ module Ruby2JS
         # convert body into hash
         body.each do |statement|
 
-          # named values
+          # named values (template, props, options, mixin[s])
           if statement.type == :send and statement.children.first == nil
             if [:template, :props].include? statement.children[1]
               hash << s(:pair, s(:sym, statement.children[1]), 
                 statement.children[2])
+
+            elsif 
+              statement.children[1] == :options and
+              statement.children[2].type == :hash
+            then
+              options += statement.children[2].children
+
+            elsif statement.children[1] == :mixin or
+                  statement.children[1] == :mixins
+            then
+
+              mixins += statement.children[2..-1]
             end
 
           # methods
@@ -182,6 +199,10 @@ module Ruby2JS
           end
         end
 
+        # add options to the front
+        hash.unshift(*options)
+
+        # add properties before that
         unless hash.any? {|pair| pair.children[0].children[0] == :props}
           unless @vue_inventory[:cvar].empty?
             hash.unshift s(:pair, s(:sym, :props), s(:array, 
@@ -189,14 +210,19 @@ module Ruby2JS
           end
         end
 
-        # add methods to hash
+        # add mixins before that
+        unless mixins.empty?
+          hash.unshift s(:pair, s(:sym, :mixins), s(:array, *mixins))
+        end
+
+        # append methods to hash
         unless methods.empty?
           hash << s(:pair, s(:sym, :methods), s(:hash, *methods))
         end
 
         @vue_instance = []
 
-        # add setters to computed list
+        # append setters to computed list
         setters.each do |setter|
           index = computed.find_index do |pair| 
             pair.children[0].children[0].to_s ==
@@ -213,7 +239,7 @@ module Ruby2JS
           end
         end
 
-        # add computed to hash
+        # append computed to hash
         unless computed.empty?
           hash << s(:pair, s(:sym, :computed), s(:hash, *computed))
         end
@@ -223,10 +249,15 @@ module Ruby2JS
           sub(/^[A-Z]/) {|c| c.downcase}.
           gsub(/[A-Z]/) {|c| "-#{c.downcase}"}
 
-        # build component
-        s(:casgn, nil, cname.children.last,
-          s(:send, s(:const, nil, :Vue), :component, 
-          s(:str, camel), s(:hash, *hash)))
+        if inheritance == s(:const, nil, :Vue)
+          # build component
+          s(:casgn, nil, cname.children.last,
+            s(:send, s(:const, nil, :Vue), :component, 
+            s(:str, camel), s(:hash, *hash)))
+        else
+          # build mixin
+          s(:casgn, nil, cname.children.last, s(:hash, *hash))
+        end
       end
 
       # expand 'wunderbar' like method calls
@@ -729,6 +760,16 @@ module Ruby2JS
         s(:attr, s(:attr, s(:self), :$props), node.children[0].to_s[2..-1])
       end
 
+      # expand $options to this.$options
+      def on_gvar(node)
+        return super unless @vue_self
+        if node.children[0] == :$options
+          node.updated :attr, [s(:self), :$options]
+        else
+          super
+        end
+      end
+
       # prevent attempts to assign to Vue properties
       def on_cvasgn(node)
         return super unless @vue_self
@@ -752,14 +793,29 @@ module Ruby2JS
         end
       end
 
+      # for instance variables, map @x+= to this.x+=
+      # for computed variables with setters, map x+= to this.x+=
       def on_op_asgn(node)
         return super unless @vue_self
-        return super unless node.children.first.type == :ivasgn
-        node.updated nil, [s(:attr, @vue_self, 
-          node.children[0].children[0].to_s[1..-1]),
-          node.children[1], process(node.children[2])]
+        if node.children.first.type == :ivasgn
+          node.updated nil, [s(:attr, @vue_self, 
+            node.children[0].children[0].to_s[1..-1]),
+            node.children[1], process(node.children[2])]
+
+        elsif 
+          node.children.first.type == :lvasgn and
+          @vue_instance.include? node.children[0].children[0]
+        then
+          node.updated nil, [s(:attr, s(:self), 
+            node.children[0].children[0]),
+            node.children[1], process(node.children[2])]
+
+        else
+          super
+        end
       end
 
+      # for computed variables with setters, map x= to this.x=
       def on_lvasgn(node)
         return super unless @vue_instance.include? node.children.first
         s(:send, s(:self), "#{node.children.first}=",

data/lib/ruby2js/version.rb

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

data/ruby2js.gemspec

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

metadata

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