teer 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d3ca853193a72ec721fcd7c25abe2a20d12aae0515c10932f70dfdc2e9acbdc
-  data.tar.gz: 29a5486a0a33be539ae5ebcd3451e9037ab49d404428e4254d50b13a310bf88a
+  metadata.gz: 596efc44c3293a8a3049ee3237a2c2850b5af0096cf401468eade5b6345420c1
+  data.tar.gz: 53bc54ff807d5eb487fe8574394ec4532e9f522469d1294fd4b634f5283e3dd0
 SHA512:
-  metadata.gz: b6f82b3b2940ef616a6fb77b690eae714fdbeae2fcef8c4becf4793fc8a7f7e70eff6fafa02098c169a1e0ca910f16df2e062e0cefc6f8fd6808c0bc7f14e2b6
-  data.tar.gz: c2b1b73c83d878ac7f84ef05bb4c1b354e1fe5dae7cdc8dfc9aa05d680edc893fcdb8c746d95ec29bf95bdd0fa00462046052f29b4054232f34f4704b50f3a82
+  metadata.gz: 6ce7372ae800b855691a47b697b5e994373287fa71db57cc72e6873cdc2c92d1803b2d95ff8d23c28e292bb64cdd7b756c89a636bfcd4b81ccff72260709cb14
+  data.tar.gz: ead6c277842110c63da076fbc932cbba9fd085a0abf17d051dc69fd2d4c1378a028b3edeb2b53385829813ea195a8097941f1d0ebc446b1e1cf32b0bda624b37

data/lib/teer/engine.rb

@@ -68,8 +68,12 @@ module Teer
       @interpolate ||= proc { |string|
         begin
            @handlebars.compile(string).call(@store.to_h)
-        rescue StandardError
-          raise ArgumentError, "Could not parse variables in string: '#{string}'"
+        rescue StandardError => e
+          if e.to_s.match(/Missing helper:/)
+            raise e
+          else
+            raise ArgumentError, "Could not parse variables in string: '#{string}'"
+          end
         end
       }
     end
@@ -94,7 +98,7 @@ module Teer
         if k == 'text' && (!v.nil? && !v.empty?)
           @findings << (new_text = interpolate.call(v[@locale.to_s]))
           unparsed_new_text = v[@locale.to_s]
-        elsif v.is_a?(Hash) && eval(k, @store.instance_eval { binding })
+        elsif v.is_a?(Hash) && catch_eval(k)
           new_text = parse_template(v)
         end
         text += new_text + ' ' if new_text
@@ -103,5 +107,13 @@ module Teer
       @pre_parsed_finding = CGI.unescapeHTML(pre_parsed_text[0...-1]) if !pre_parsed_text.nil? && !pre_parsed_text.empty?
       CGI.unescapeHTML(text[0...-1]) if !text.nil? && !text.empty?
     end
+
+    def catch_eval(k)
+      begin
+        eval(k, @store.instance_eval { binding })
+      rescue
+        raise ArgumentError, "Could not parse variables in condition: '#{k}'"
+      end
+    end
   end
 end

data/lib/teer/version.rb

@@ -1,3 +1,3 @@
 module Teer
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Mark Ramotowski