ruby2js 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45fd791073d23f08643df9e169c0ed9bb5080878
-  data.tar.gz: 56b543e32dd116330c516de800655109be51069f
+  metadata.gz: '08e0daaccf6d0c253ce1f592c6f4450165a0b7cf'
+  data.tar.gz: d98f7229563f4117d27d1bbd02d7773ce34c3a23
 SHA512:
-  metadata.gz: 60b63eb3edfb9a0d688af957ecf51ae34b5d1456b670d0b78cb3e0bcfaa867b0a553a1d1e1ef747934c0a2993fa5aa1eb3ea18ad46c6fbf4cedb51c17a22b264
-  data.tar.gz: 6f10eb6ff3e67f255c8125b2ea88bd200f77507b60b1c2df1945a929945688c7318e719a533788e6ded68447a93bf1af3e36b30bc6e8693c6fd60750289e9095
+  metadata.gz: 6f2034b25a657087e47b66f094b6b3933b575636fdef15028506640db10748035d5a159d978b09d84547a161f7190e833660eb8923255ac4f5553dde1f3b9c75
+  data.tar.gz: 709f7d21bb0ae7a475933ff18e776091711a1a20e386cbba1176893954a9f84c44782ca6457c82e76a16954280a70200cc69a8d3f7585b8099f7bb2b1aad0562

data/lib/ruby2js/filter/vue.rb

@@ -188,6 +188,7 @@ module Ruby2JS
               # add to hash in the appropriate location
               pair = s(:pair, s(:sym, method.to_s.chomp('=')),
                 s(:block, s(:send, nil, method_type), args, process(block)))
+              @comments[pair] = @comments[statement]
               if VUE_LIFECYCLE.include? method
                 hash << pair
               elsif not statement.is_method? 
@@ -250,18 +251,56 @@ module Ruby2JS
         end
 
         # convert class name to camel case
-        camel = cname.children.last.to_s.gsub(/[^\w]/, '-').
+        cname = cname.children.last
+        camel = cname.to_s.gsub(/[^\w]/, '-').
           sub(/^[A-Z]/) {|c| c.downcase}.
           gsub(/[A-Z]/) {|c| "-#{c.downcase}"}
 
         if inheritance == s(:const, nil, :Vue)
           # build component
-          s(:casgn, nil, cname.children.last,
+          defn = s(:casgn, nil, cname,
             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))
+          defn = s(:casgn, nil, cname, s(:hash, *hash))
+        end
+
+        # append class methods (if any)
+        class_methods = body.select do |statement| 
+          statement.type == :defs  and statement.children[0] == s(:self)
+        end
+
+        if class_methods.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]))
+
+            elsif
+              method.children.length == 4 and
+              Converter::EXPRESSIONS.include? method.children[3].type
+            then
+              # class property - simple
+              s(:send, s(:const, nil, cname), "#{method.children[1]}=",
+                method.children[3])
+
+            else
+              # class computed property
+              s(:send, s(:const, nil, :Object), :defineProperty,
+                s(:const, nil, cname), s(:str, method.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),
+                  *method.children[2..-1]))))
+            end
+
+            @comments[fn] = @comments[method]
+            fn
+          }))
         end
       end
 

data/lib/ruby2js/version.rb

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

data/ruby2js.gemspec

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