ruby2js 2.1.7 → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a277807e88b954b5a9619db0bb63ec6dd0005e46
-  data.tar.gz: a23009a0456e561d89ee78f1e30eef1a1253e932
+  metadata.gz: dc7aa6e17a303aa03f78a4f25bf01ec99dde4f34
+  data.tar.gz: 583531eec09eecf50076131ff8affccc95839b80
 SHA512:
-  metadata.gz: 853c846f55f18bbb2ddf2b9695020ff01a3188ba08a8b2787604affb88aa764aa7600a0a44366dce31a387a908abe8f5d62f621778c5bb79e1ad46d558bda599
-  data.tar.gz: 86b1c6c03a8e4c36d21c47616f6061585d81b0fd62abea2c3202b336b320d44b2b36b5ee3dfb09969f0b0c42bee6d3da9bfebdb9ff79910e1bee6cb2bd570d60
+  metadata.gz: 6510a902460ad8073f710bfb2facb174121dcefc3884a9a69a65ee8ec18c43c4848d29c9e8055c0da10ebe3b181ae816e88093202ced6ec72f7ef7a5303e9fe4
+  data.tar.gz: '09cc922113d70a4fb096ef7f73e7e752d18fd0d68ba65be974b55cb8f35db12ecef63fd3f84dcf1307731905c3a92657c07a1ffff0575ff314cde5843b355052'

data/lib/ruby2js/converter/if.rb

@@ -30,9 +30,16 @@ module Ruby2JS
 
             while else_block and else_block.type == :if
               condition, then_block, else_block = else_block.children
-              put ' else if ('; parse condition; puts ') {'
-              parse then_block, :statement
-              sput '}'
+              if then_block
+                put ' else if ('; parse condition; puts ') {'
+                parse then_block, :statement
+                sput '}'
+              else
+                put ' else if ('; parse s(:not, condition); puts ') {'
+                parse else_block, :statement
+                sput '}'
+                else_block = nil
+              end
             end
 
             if else_block

data/lib/ruby2js/filter/vue.rb

@@ -25,7 +25,8 @@ module Ruby2JS
         @vue_self = nil
         @vue_apply = nil
         @vue_inventory = Hash.new {|h, k| h[k] = []}
-        @vue_instance = []
+        @vue_methods = []
+        @vue_props = []
         super
       end
 
@@ -73,15 +74,22 @@ module Ruby2JS
         end
 
         @vue_inventory = vue_walk(node)
-        @vue_instance = []
+        @vue_methods = []
+        @vue_props = []
 
         # 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
+              if method.to_s.end_with? '='
+                method = method.to_s[0..-2].to_sym
+                @vue_props << method unless @vue_props.include? method
+              elsif statement.is_method?
+                @vue_methods << method unless @vue_methods.include? method
+              else
+                @vue_props << method unless @vue_props.include? method
+              end
             end
           end
         end
@@ -226,7 +234,7 @@ module Ruby2JS
           hash << s(:pair, s(:sym, :methods), s(:hash, *methods))
         end
 
-        @vue_instance = []
+        @vue_methods = []
 
         # append setters to computed list
         setters.each do |setter|
@@ -338,9 +346,20 @@ module Ruby2JS
         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])]
+        if node.children[0]==nil and Symbol === node.children[1]
+          if node.is_method?
+            if @vue_methods.include? node.children[1]
+              # calls to methods defined in this class
+              return node.updated nil, [s(:self), node.children[1],
+                *process_all(node.children[2..-1])]
+            end
+          else
+            if @vue_props.include? node.children[1]
+              # access to properties defined in this class
+              return node.updated nil, [s(:self), node.children[1],
+                *process_all(node.children[2..-1])]
+            end
+          end
         end
 
         return super unless @vue_h
@@ -863,7 +882,7 @@ module Ruby2JS
 
         elsif 
           node.children.first.type == :lvasgn and
-          @vue_instance.include? node.children[0].children[0]
+          @vue_props.include? node.children[0].children[0]
         then
           node.updated nil, [s(:attr, s(:self), 
             node.children[0].children[0]),
@@ -876,7 +895,7 @@ module Ruby2JS
 
       # for computed variables with setters, map x= to this.x=
       def on_lvasgn(node)
-        return super unless @vue_instance.include? node.children.first
+        return super unless @vue_props.include? node.children.first
         s(:send, s(:self), "#{node.children.first}=",
           process(node.children[1]))
       end

data/lib/ruby2js/serializer.rb

@@ -229,6 +229,7 @@ module Ruby2JS
       slice = @lines[mark.first..-1]
       reindent(slice)
       slice.each_with_index do |line, index|
+        line << "" if line.empty?
         if line.first.start_with? '//'
           len += @width # comments are a deal breaker
         else

data/lib/ruby2js/version.rb

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

data/ruby2js.gemspec

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