ruby2js 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19d8eddc8012fef1657da5408d86e0be5b6d3aac
-  data.tar.gz: 2a7a41d3e3a64965c32ea625273cf754bea743a8
+  metadata.gz: 14b0c4f156b0f543afde3c3a0a8e339b5ece18bc
+  data.tar.gz: 363dafc8a9f6814ea754af8025f60c1668ec2e70
 SHA512:
-  metadata.gz: 9ad39b7ca03a48876499314942e22da4fd636512c2b793e23c1cd4b13d96749e3a9612c887c972a02493beec9898e6f6cab9635fff5f52adb420db22f1749dec
-  data.tar.gz: 5695f7a816be85ffd21756553ccb9917d18b723e8c39c9c3647fcd7fa6e3242135a6f64b8e8c41a3faea98201d8c50438ea94ca7bcfaaf1d8194757bd316b694
+  metadata.gz: 1d58ad86fa85e3ecbe88be541faa486013407a993cf3b0a14e0b05771863219f0f69eeb67e8b5597eeeedb8d54d515d48058aa2b4792099aba4421286833972d
+  data.tar.gz: b03e0fa66154948bd4abdff01b766b916b6758efffe70de8b6e3515d76f171e353e5c3ba06a5f3694f761970cc58d07d7fc8dab9b237e9c82298604238d96758

data/lib/ruby2js/filter/vue.rb

@@ -10,11 +10,17 @@ module Ruby2JS
         :once, :set, :watch
       ]
 
+      VUE_LIFECYCLE = [
+        :data, :render, :beforeCreate, :created, :beforeMount, :mounted,
+        :beforeUpdate, :updated, :beforeDestroy, :destroyed
+      ]
+
       def initialize(*args)
         @vue_h = nil
         @vue_self = nil
         @vue_apply = nil
         @vue_inventory = Hash.new {|h, k| h[k] = []}
+        @vue_instance = []
         super
       end
 
@@ -45,6 +51,8 @@ module Ruby2JS
 
         hash = []
         methods = []
+        computed = []
+        setters = []
 
         # insert constructor if none present
         unless body.any? {|statement| 
@@ -55,6 +63,18 @@ module Ruby2JS
         end
 
         @vue_inventory = vue_walk(node)
+        @vue_instance = []
+
+        # collect instance methods (including getters and setters)
+        body.each do |statement|
+          if statement.type == :def
+            method = statement.children.first
+            unless VUE_LIFECYCLE.include? method or method == :initialize
+              method = method.to_s[0..-2].to_sym if method.to_s.end_with? '='
+              @vue_instance << method unless @vue_instance.include? method
+            end
+          end
+        end
 
         # convert body into hash
         body.each do |statement|
@@ -137,14 +157,21 @@ module Ruby2JS
                 end
               end
 
+              if statement.is_method?
+                method_type = :proc
+              else
+                method_type = :lambda
+              end
+
               # add to hash in the appropriate location
-              pair = s(:pair, s(:sym, method),
-                s(:block, s(:send, nil, :lambda), args, process(block)))
-              if %w(data render beforeCreate created beforeMount mounted
-                    beforeUpdate updated beforeDestroy destroyed
-                ).include? method.to_s
-              then
+              pair = s(:pair, s(:sym, method.to_s.chomp('=')),
+                s(:block, s(:send, nil, method_type), args, process(block)))
+              if VUE_LIFECYCLE.include? method
                 hash << pair
+              elsif not statement.is_method? 
+                computed << pair
+              elsif method.to_s.end_with? '='
+                setters << pair
               else
                 methods << pair
               end
@@ -167,6 +194,30 @@ module Ruby2JS
           hash << s(:pair, s(:sym, :methods), s(:hash, *methods))
         end
 
+        @vue_instance = []
+
+        # add setters to computed list
+        setters.each do |setter|
+          index = computed.find_index do |pair| 
+            pair.children[0].children[0].to_s ==
+              setter.children[0].children[0]
+          end
+
+          if index
+            computed[index] = s(:pair, setter.children[0],
+              s(:hash, s(:pair, s(:sym, :get), computed[index].children[1]),
+                s(:pair, s(:sym, :set), setter.children[1])))
+          else
+            computed << s(:pair, setter.children[0],
+              s(:hash, s(:pair, s(:sym, :set), setter.children[1])))
+          end
+        end
+
+        # add computed to hash
+        unless computed.empty?
+          hash << s(:pair, s(:sym, :computed), s(:hash, *computed))
+        end
+
         # convert class name to camel case
         camel = cname.children.last.to_s.gsub(/[^\w]/, '-').
           sub(/^[A-Z]/) {|c| c.downcase}.
@@ -210,6 +261,12 @@ module Ruby2JS
           end
         end
 
+        # calls to methods (including getters) defined in this class
+        if node.children[0]==nil and @vue_instance.include? node.children[1]
+          return node.updated nil, [s(:self), node.children[1],
+            *process_all(node.children[2..-1])]
+        end
+
         return super unless @vue_h
 
         if node.children[0] == nil and node.children[1] =~ /^_\w/
@@ -703,6 +760,12 @@ module Ruby2JS
           node.children[1], process(node.children[2])]
       end
 
+      def on_lvasgn(node)
+        return super unless @vue_instance.include? node.children.first
+        s(:send, s(:self), "#{node.children.first}=",
+          process(node.children[1]))
+      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  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/ruby2js.gemspec

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