ruby-ejs 1.0.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 232f0b535162a8e22d9af9531aad70ec430854b1bfbbdf09748cac64169307c8
-  data.tar.gz: 6e7a19b04327933e6c56961233cef0635b7c8d8def2d04a845a7b1697862ce07
+  metadata.gz: e6f2553149b74aaab5eccde973398291061768402d5dea28fb17913aa6343f1e
+  data.tar.gz: 6cd17fe9a3ed414bbfe7a762d5deb18067b295ffb744663a20e5ee598e97146c
 SHA512:
-  metadata.gz: 29c23c1b84a8ce4383753b7f6ec562fad487c40f3111fb0180a5db51bb0b9a6910dd65fea44b646225042f2f7865758dfc08bdda8737d16f29507380568620e8
-  data.tar.gz: 1758fe11dd541ea571a9c6a4a6e804dc06a698cebcebc589b13d42be2ab7dfe6f22d37fa57c47c76f1a0d1c98089a14936efefc548fccc7a5286d6cbf56ce630
+  metadata.gz: 525cecf3021650777d0ccf269cb41010a6c1a3a433337655c8651f0eab786450c41e9fe7e2110daf58eb7784a1203510e948ff712252c19448c0ede5a066d052
+  data.tar.gz: 0bf8751b796b579f5125bb49a917367d2ed94e66ff325c521fc45e1778ef0048ca7b16e6e96be5f76501311045e0bcfe32e667ed98055d0ab409c2eae67d123d

data/lib/ejs.rb

@@ -42,8 +42,10 @@ module EJS
         "import {escape} from 'ejs';\n"
       end
       
+      fs = function_source(source, options)
+      output << fs[1]
       output << "export default function (locals) {\n"
-      output << function_source(source, options)
+      output << fs[0]
       output << "}"
 
       output
@@ -53,7 +55,7 @@ module EJS
       options = default(options)
       
       output = "function(locals, escape) {\n"
-      output << function_source(source, options)
+      output << function_source(source, options)[0]
       output << "}"
       output
     end
@@ -222,12 +224,15 @@ module EJS
 
       def function_source(source, options)
         stack = []
+        imports = ""
         output =  "    var __output = [], __append = __output.push.bind(__output);\n"
-        output << "    with (locals || {}) {\n"
+        output << "    with (locals || {}) {\n" unless options[:strict]
 
         digest(source, options) do |segment, type, modifier|
           if type == :js
-            if segment.match(/\A\s*\}/m)
+            if segment.match(/\A\s*\}.*\{\s*\Z/m)
+              output << "        " << segment << "\n"
+            elsif segment.match(/\A\s*\}/m)
               case stack.pop
               when :escape
                 output << "\n            return __output.join(\"\");\n"
@@ -257,18 +262,25 @@ module EJS
               when :unescape
                 output << "        __append(" << segment << ");\n"
               else
-                output << "        " << segment << "\n"
+                if segment =~ /\A\s*import/
+                  imports << segment.strip
+                  imports << ';' unless segment =~ /;\s*\Z/
+                  imports << "\n"
+                else
+                  output << "        " << segment << "\n"
+                end
               end
             end
           elsif segment.length > 0
-            output << "        __append(`" + segment.gsub("\\"){"\\\\"}.gsub(/\n/, '\\n').gsub(/\r/, '\\r') + "`);\n"
+            output << '        __append("' + segment.gsub("\\"){"\\\\"}.gsub(/\n/, '\\n').gsub(/\r/, '\\r').gsub('"', '\\"') + "\");\n"
           end
         end
 
-        output << "    }\n"
+        output << "    }\n" unless options[:strict]
         output << "    return __output.join(\"\");\n"
-
-        output
+        imports << "\n"
+        
+        [output, imports]
       end
       
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-ejs
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Jonathan Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-11 00:00:00.000000000 Z
+date: 2019-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -111,8 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: EJS (Embedded JavaScript) template compiler