ruby2js 2.1.12 → 2.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dfa682bc15df0daf1f338a8e4b5e3b6b4e2b61c
-  data.tar.gz: 17fd4bd2202c3bd701961564da623fd5ac366ecf
+  metadata.gz: aa0964592b03f2fb107cd059b0be53ce6af09f2c
+  data.tar.gz: 6e6d30ac12b9814b00bd975cf18fe293e64a5fda
 SHA512:
-  metadata.gz: a3c326f0df3d9520ad2a32f8dc0af3db3fc7efff0abbd032ae58617da807a8ec396c04543b7abeddb5636f201ebb5bf00a38ca0b24ad430be72ec5e7b6f56a08
-  data.tar.gz: c9f5fd421b7103ddb323b1de864e73e7e0a8fd4ffa74655952de0d9dd5bfdba2b9ad8ded74d92b9898b864710e190fa1539300bc1d279fe2faa1f962456cb509
+  metadata.gz: 4cbb3f66dc9ca5f90194c014dca58e16eb84fa2f968edef959b5b9556b13261825cbcc6b6d59d7d8ecbf1e9a10739b93c7288a4ac2166f8c623e35f77d08b6ab
+  data.tar.gz: ecc003b41211afd67b5de07d266a51c1664d58a3a7f74548419cde92f76eec944a49ed2c37b7656d112137a2d3f615c5493daaa5a4e5d84db45bf1b8c9fc8c2f

data/lib/ruby2js/filter/vue.rb

@@ -27,6 +27,7 @@ module Ruby2JS
         @vue_inventory = Hash.new {|h, k| h[k] = []}
         @vue_methods = []
         @vue_props = []
+        @vue_reactive = []
         super
       end
 
@@ -76,8 +77,10 @@ module Ruby2JS
         @vue_inventory = vue_walk(node)
         @vue_methods = []
         @vue_props = []
+        @vue_reactive = []
 
-        # collect instance methods (including getters and setters)
+        # collect instance methods (including getters and setters) and
+        # reactive class attributes
         body.each do |statement|
           if statement.type == :def
             method = statement.children.first
@@ -91,6 +94,16 @@ module Ruby2JS
                 @vue_props << method unless @vue_props.include? method
               end
             end
+
+          elsif 
+            statement.type == :send and statement.children[0] == cname and
+            statement.children[1].to_s.end_with? '='
+          then
+            @vue_reactive << statement.updated(:send, [
+              s(:attr, s(:const, nil, :Vue), :util), :defineReactive, cname, 
+              s(:sym, statement.children[1].to_s[0..-2]),
+              process(statement.children[2])])
+
           end
         end
 
@@ -285,14 +298,52 @@ module Ruby2JS
           statement.type == :defs  and statement.children[0] == s(:self)
         end
 
-        if class_methods.empty?
+        if class_methods.empty? and @vue_reactive.empty?
           defn
         else
           s(:begin, defn, *process_all(class_methods.map {|method|
             fn = if method.is_method?
-              # class method
-              s(:send, s(:const, nil, cname), "#{method.children[1]}=",
-                s(:block, s(:send , nil, :proc), *method.children[2..-1]))
+              if not method.children[1].to_s.end_with? '='
+                # class method
+                s(:send, s(:const, nil, cname), "#{method.children[1]}=",
+                  s(:block, s(:send , nil, :proc), method.children[2],
+                   *process_all(method.children[3..-1])))
+              else
+                getter = class_methods.find do |other_method| 
+                  "#{other_method.children[1]}=" == method.children[1].to_s
+                end
+
+                if getter
+                  # both a getter and setter
+                  s(:send, s(:const, nil, :Object), :defineProperty,
+                    s(:const, nil, cname), s(:str, getter.children[1].to_s),
+                    s(:hash, s(:pair, s(:sym, :enumerable), s(:true)),
+                    s(:pair, s(:sym, :configurable), s(:true)),
+                    s(:pair, s(:sym, :get), s(:block, s(:send, nil, :proc),
+                      getter.children[2],
+                      s(:autoreturn, process(getter.children[3])))),
+                    s(:pair, s(:sym, :set), s(:block, s(:send, nil, :proc),
+                      method.children[2],
+                      *process_all(method.children[3..-1])))))
+                else
+                  # setter only
+                  s(:send, s(:const, nil, :Object), :defineProperty,
+                    s(:const, nil, cname), 
+                    s(:str, method.children[1].to_s[0..-2]),
+                    s(:hash, s(:pair, s(:sym, :enumerable), s(:true)),
+                    s(:pair, s(:sym, :configurable), s(:true)),
+                    s(:pair, s(:sym, :set), s(:block, s(:send, nil, :proc),
+                      method.children[2],
+                      *process_all(method.children[3..-1])))))
+                end
+              end
+
+            elsif
+              class_methods.any? do |other_method| 
+                other_method.children[1].to_s == "#{method.children[1]}="
+              end
+            then
+              nil
 
             elsif
               method.children.length == 4 and
@@ -309,12 +360,12 @@ module Ruby2JS
                 s(:hash, s(:pair, s(:sym, :enumerable), s(:true)),
                 s(:pair, s(:sym, :configurable), s(:true)),
                 s(:pair, s(:sym, :get), s(:block, s(:send, nil, :proc),
-                  *method.children[2..-1]))))
+                  method.children[2], *process_all(method.children[3..-1])))))
             end
 
             @comments[fn] = @comments[method]
             fn
-          }))
+          }).compact, *@vue_reactive)
         end
       end
 

data/lib/ruby2js/version.rb

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

data/ruby2js.gemspec

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