teer 1.0.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 596efc44c3293a8a3049ee3237a2c2850b5af0096cf401468eade5b6345420c1
-  data.tar.gz: 53bc54ff807d5eb487fe8574394ec4532e9f522469d1294fd4b634f5283e3dd0
+  metadata.gz: a15d1b1af5104587de13695cd26cd528f0a206a89db62cc11c68271a9fa70259
+  data.tar.gz: 6c0a3e17256f6f079700506a84c42c922eeac2a249fef2bdf9d2676601d20b6a
 SHA512:
-  metadata.gz: 6ce7372ae800b855691a47b697b5e994373287fa71db57cc72e6873cdc2c92d1803b2d95ff8d23c28e292bb64cdd7b756c89a636bfcd4b81ccff72260709cb14
-  data.tar.gz: ead6c277842110c63da076fbc932cbba9fd085a0abf17d051dc69fd2d4c1378a028b3edeb2b53385829813ea195a8097941f1d0ebc446b1e1cf32b0bda624b37
+  metadata.gz: e687fb6692312faef3308dc7e91b760068d2528b39a502143fbe5518253661f79327f55b73478548cbb40bbba600703eb79f19c0b972bddb396311d7efeeb141
+  data.tar.gz: 23ce2483830c047446e77e98cc97ab52fb972295953fcea355877a046c7fbc1206e5237ee61eb45411bf187c417bfc78d561c4b53a5a681164869890523c7f9c

data/lib/teer.rb

@@ -1,6 +1,6 @@
 require 'teer/version'
 require 'teer/engine'
-require 'handlebars'
+require 'teer/parser'
 require 'yaml'
 
 module Teer
@@ -12,7 +12,7 @@ module Teer
       register_helpers
       data_keys = data.first.keys
       raise ArgumentError, "#{names} not present in data" if (Array(names) - data_keys).count != 0
-      @template = Engine.new(data, names, template(rules_path_or_obj, locale), handlebars, locale, kwargs)
+      @template = Engine.new(data, names, template(rules_path_or_obj, locale), parser, locale, kwargs)
     end
 
     def pre_parsed_finding
@@ -32,16 +32,16 @@ module Teer
       end
     end
 
-    def self.handlebars
-      @handlebars ||= Handlebars::Context.new
+    def self.parser
+      @parser ||= Parser.new
     end
 
     def self.register_helpers
-      handlebars.register_helper(:round) do |_context, condition, _block|
-        condition < 1 ? condition.round(2) : condition.round(1)
+      parser.register_helper(:round) do |ctx, value|
+        value < 1 ? value.round(2) : value.round(1)
       end
-      handlebars.register_helper(:month) do |_context, condition, _block|
-        Time.at(condition).strftime('%B')
+      parser.register_helper(:month) do |ctx, value|
+        Time.at(value).strftime('%B')
       end
     end
   end

data/lib/teer/data_store.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'vector_store'
 
 module Teer

data/lib/teer/engine.rb

@@ -7,9 +7,9 @@ require 'ostruct'
 
 module Teer
   class Engine
-    def initialize(data, names, template, handlebars, locale, kwargs)
+    def initialize(data, names, template, parser, locale, kwargs)
       @template = template
-      @handlebars = handlebars
+      @parser = parser
       @locale = locale
       @findings = []
       setup_store(data, names)
@@ -65,17 +65,7 @@ module Teer
     end
 
     def interpolate
-      @interpolate ||= proc { |string|
-        begin
-           @handlebars.compile(string).call(@store.to_h)
-        rescue StandardError => e
-          if e.to_s.match(/Missing helper:/)
-            raise e
-          else
-            raise ArgumentError, "Could not parse variables in string: '#{string}'"
-          end
-        end
-      }
+      @interpolate ||= proc { |string| @parser.render(string, @store.to_h) }
     end
 
     def add_to_store(template)
@@ -104,10 +94,16 @@ module Teer
         text += new_text + ' ' if new_text
         pre_parsed_text += unparsed_new_text + ' ' if unparsed_new_text
       end
-      @pre_parsed_finding = CGI.unescapeHTML(pre_parsed_text[0...-1]) if !pre_parsed_text.nil? && !pre_parsed_text.empty?
+      update_preparsed_finding(pre_parsed_text)
       CGI.unescapeHTML(text[0...-1]) if !text.nil? && !text.empty?
     end
 
+    def update_preparsed_finding(text)
+      if !text.nil? && !text.empty?
+        @pre_parsed_finding = CGI.unescapeHTML(text[0...-1])
+      end
+    end
+
     def catch_eval(k)
       begin
         eval(k, @store.instance_eval { binding })

data/lib/teer/parser.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+ module Teer
+  class Parser
+    def initialize
+      @helpers = {}
+    end
+
+     def register_helper(func, &fn)
+      @helpers[func.to_sym] = fn
+    end
+
+     def render(template = '', ctx = {})
+      rendered_template = template.dup
+      template.scan(/{{\s*[\w\. ]+\s*}}/).map do |substr|
+        key, func = parse_func(substr)
+        value = value_from_ctx(ctx, key)
+        if func
+          raise ArgumentError, "Missing helper: '#{func}'" if !@helpers[func.to_sym]
+          value = @helpers[func.to_sym].call(ctx, value)
+        end
+        rendered_template[substr] = value.to_s
+      end
+      rendered_template
+    end
+
+     private
+
+     def parse_func(substr) # if multiple and function
+      split = substr.gsub(/{|}/, '').split.reverse
+      if split.size == 2
+        split
+      else
+        split.first
+      end
+    end
+
+     def value_from_ctx(ctx, key)
+      split = key.split('.')# currently only support . function calls
+      value = ctx[split.shift.to_sym]
+      split.each do |func|
+        value = value.send(func)
+      end
+      raise ArgumentError, "Could not parse variable: '#{key}'" if !value
+      value
+    end
+  end
+end

data/lib/teer/vector_store.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Teer
   class VectorStore
     def initialize(data, locale)

data/lib/teer/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Teer
-  VERSION = "1.0.2"
+  VERSION = '2.0.0'
 end

data/teer.gemspec

@@ -35,7 +35,6 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.add_dependency 'handlebars'
   spec.add_dependency 'activesupport'
   spec.add_development_dependency 'bundler', '~> 1.17'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: teer
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Mark Ramotowski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-28 00:00:00.000000000 Z
+date: 2019-05-29 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: handlebars
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -129,6 +115,7 @@ files:
 - lib/teer.rb
 - lib/teer/data_store.rb
 - lib/teer/engine.rb
+- lib/teer/parser.rb
 - lib/teer/vector_store.rb
 - lib/teer/version.rb
 - teer.gemspec