smolbars 0.1.2 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c86063c597fa360633865862f4b842436d6d5489b84cc9d1f9510e20dbf28dd
-  data.tar.gz: ff87fb9498227b9f241784568aaf179e0e4830dc0493021ea3cb07ef1339695a
+  metadata.gz: cb5c650020d40b4cbb2eba845fd599113c44de878d58bb7015b1573248a3dba0
+  data.tar.gz: 00f4d9f37f81a1c081d1db373eb62819f2b852ea5b7f50b83884381f084ddd44
 SHA512:
-  metadata.gz: df4fbdf91b1fe83b5b09882265d4d6674d9f32c9099aa5f5fea0ae176d001ca772ccb23784ea0d86949d0b91e24a7fc60f58bd1c1a21820b7b59701bdf3628ca
-  data.tar.gz: 8460b1163060ce6759b643213e84b4a09f3f262ce3d53cfc0adc336243038ae052f53b9fcd931f004c4b8ad579065fd1c9def115d25db2708e5a602206978416
+  metadata.gz: ba0bb6952537564b7c0d7324f3aef4444ba7c142d478d5d283c617fb0de2aa5aaa26797c6e23a9e76b62efdfce4b77751bf595c4eafa3639aa5776ef55d5f7aa
+  data.tar.gz: bfd01f873c70f5a71272f4ad55f2a2b20f500a0396028d07d615df7cfe1f614e30ba1ef33e63bd199543b544f88a5078b74e7b4ada199e8d6c66b0e04eff8499

data/lib/smolbars/context.rb

@@ -4,6 +4,18 @@ require 'securerandom'
 
 module Smolbars
   class Context
+    JS_ESCAPE_MAP = {
+      '\\'    => '\\\\',
+      "</"    => '<\/',
+      "\r\n"  => '\n',
+      "\n"    => '\n',
+      "\r"    => '\n',
+      '"'     => '\\"',
+      "'"     => "\\'",
+      "`"     => "\\`",
+      "$"     => "\\$"
+    }.freeze
+
     def initialize(**kwargs)
       @js = MiniRacer::Context.new(kwargs)
       @js.load(Handlebars::Source.bundled_path)
@@ -13,11 +25,8 @@ module Smolbars
     # hope the template passed in does not form invalid Ruby. So don't use templates with backtick characters without
     # manually escaping them
     def compile(template)
-      if template.include?("`")
-        raise RuntimeError.new("template cannot contain a backtick character '`'")
-      end
       handle = fn_handle
-      invocation = %Q{var #{handle} = Handlebars.compile(`#{template}`);}
+      invocation = %{var #{handle} = Handlebars.compile("#{escape_javascript(template)}");}
       @js.eval(invocation)
       ::Smolbars::Template.new(self, handle)
     end
@@ -27,7 +36,7 @@ module Smolbars
     end
 
     def load_pattern(pattern)
-      Dir[pattern].each{ |path| load(path) }
+      Dir[pattern].each { |path| load(path) }
     end
 
     def load(path)
@@ -39,5 +48,14 @@ module Smolbars
     def fn_handle
       "js_fn_#{SecureRandom.hex}"
     end
+
+    def escape_javascript(javascript)
+      javascript = javascript.to_s
+      if javascript.empty?
+        ''
+      else
+        javascript.gsub(/(\\|<\/|\r\n|\342\200\250|\342\200\251|[\n\r"']|[`]|[$])/u, JS_ESCAPE_MAP)
+      end
+    end
   end
 end

data/lib/smolbars/template.rb

@@ -8,8 +8,7 @@ module Smolbars
       if args.length == 0
         invocation = "%s(%s)" % [@fn, kwargs.to_json]
       else
-        raise "unsupported"
-        invocation = "%s(%s)" % [@fn, args.to_json]
+        invocation = "%s(%s)" % [@fn, args.first.to_json]
       end
       @context.eval(invocation)
     end

data/lib/smolbars/version.rb

@@ -1,3 +1,3 @@
 module Smolbars
-  VERSION = "0.1.2"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smolbars
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.5
 platform: ruby
 authors:
 - Charles Lowell
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-15 00:00:00.000000000 Z
+date: 2022-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_racer
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.23
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Ruby bindings for the smolbars.js templating library