ejx 0.2 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f52677d4f3ebc419528b87b62deb8c54c4c87b65193a58efd675ebf4cdec670
-  data.tar.gz: 1d3529c96bb7756822e0b1f0708f5f39ab6fabccb20376196ee1729cddf75e8c
+  metadata.gz: 2dc481f36010e82885f2b6ea60a4f13bb4e6c9c4b823ee6899fd02ce12650942
+  data.tar.gz: 7262002c9a7cb0b3ce87def1d77911e45d6a3e85dde2ae4bfe3fa41aff0f7741
 SHA512:
-  metadata.gz: 7ca36c97ddf80cef591f4f2c0c0787c6c8ea09f52484ca30932aae9c8a1c4195cbdab3a5a8f12579a671e47fa0fcbdaeeefd0ba849218cfbb1c698ad70ec34df
-  data.tar.gz: dd5c1d1c21812e910e24fd156d0dca8458aacf6f04958a073c172fe4bf7cf6f8e3e11d6c0b52904dae3597cb13996267228ba5896f703198646f3c41a53330f8
+  metadata.gz: 58f1139b43dcf0205a43619b0f167460d27bd5a75b1708cb4b9497887b8696c7aa5489df61ac89da4e17b3df22a460d3b9fa4ca2f8ce2e5ed6b5fa6c30ca41a4
+  data.tar.gz: 8cd338246eb063e0156504252c83216fc003f507af94655b3f383984e98831ff5e01ddcc669d6c80e85fa84b8a47888170c97e1ccf11e28b0a80be6f23606142

data/lib/ejx/template.rb

@@ -69,7 +69,7 @@ class EJX::Template
           subtemplate.children << pm.strip
           @tree.last.children << subtemplate
           @stack.pop
-        elsif open_modifier && (pm.match(/function\s*\([^\)]*\)\s*\{\s*\Z/m) || pm.match(/=>\s*\{\s*\Z/m))
+        elsif pm.match(/function\s*\([^\)]*\)\s*\{\s*\Z/m) || pm.match(/=>\s*\{\s*\Z/m)
           @tree << EJX::Template::Subtemplate.new(pm.strip, [open_modifier, close_modifier].compact)
           @stack.pop
         else

data/lib/ejx/template/base.rb

@@ -12,7 +12,7 @@ class EJX::Template::Base
     var_generator = EJX::Template::VarGenerator.new
     
     output = if @escape
-      "import {" + @escape.split('.').reverse.join(" as escape} from '") + "';\n"
+      "import {" + @escape.split('.').reverse.join(" as __ejx_append} from '") + "';\n"
     else
       "import {append as __ejx_append} from 'ejx';\n"
     end

data/lib/ejx/template/subtemplate.rb

@@ -27,7 +27,7 @@ class EJX::Template::Subtemplate
     
     output << ' '*(indentation+4) << "#{global_output_var}.push(#{output_var});\n";
     output << ' '*(indentation+4) << "return #{output_var};\n";
-    output << ' '*indentation << @children.last
+    output << ' '*indentation << @children.last.strip.delete_suffix(';')
     output << ", #{append}, true, __promises, #{global_output_var});\n"
 
     output

data/lib/ejx/version.rb

@@ -1,3 +1,3 @@
 module EJX
-  VERSION = '0.2'
+  VERSION = '1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ejx
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '1.0'
 platform: ruby
 authors:
 - Jonathan Bracy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-10 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: EJX Template Compiler