hsql 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82602edd7ada1606c4d57b9295082549d459f219
-  data.tar.gz: 127987efbe6ea8b8b35c29cff1ee19e79fcf3343
+  metadata.gz: ce29f4c933417b28a33a4741dd68a5272fa826a5
+  data.tar.gz: 16b6f10369799d91d44b1826718c971f13963201
 SHA512:
-  metadata.gz: 0202059f7b57dba2b6fa56278cf534748f191c46454d43634619e8e6653dd19fa518caf1c11d929bfc8f435804763f77f4f21539f4ea6ebc20ed7e36322137b7
-  data.tar.gz: 5902bb40c3f183f693434ee7c0789812456ec19ce40e08b82d76f9010be2b4ab432e0e042ef4d2f805bac3c3a077da9494ae5c9b89a87d3ffbc348e4bdcf5c2f
+  metadata.gz: 5bfc48d11fe07b44a55111afdd05beed8adb2d3ce8d7ef99afee150ef0ced242123bf669f0fc1a30e39bb2c18d3ce968fadd2e7b7ce28c5da5a0fa625175bfbb
+  data.tar.gz: aec9536a228153c16622d22c1fbe675b2551f00208ccd4337b972950f7938c8550ee6baeee5fbf4234c3f9c9561e10b95bb342277a8a7ce09f98574d0a5546f9

data/.rubocop.yml

@@ -12,6 +12,3 @@ StructInheritance:
 # `module_function` introduces by not copying private methods to the class.
 Style/ModuleFunction:
   Enabled: false
-
-Style/TrivialAccessors:
-  Enabled: false

data/lib/hsql/file.rb

@@ -10,10 +10,6 @@ module HSQL
   class File
     attr_reader :string, :timestamp, :environment
 
-    # This is used to indicate when a source file is malformed.
-    class FormatError < StandardError
-    end
-
     def initialize(string, options)
       @string = string
       @timestamp = options.fetch(:timestamp, Time.current)
@@ -56,10 +52,6 @@ module HSQL
 
     private
 
-    def verbose?
-      @verbose
-    end
-
     def split!
       @split ||= begin
         top_half, divider, rest = string.partition(/^---$/)
@@ -81,27 +73,9 @@ module HSQL
       end
     end
 
-    def template
-      template = Template.new(@sql)
-      template.variable_names.each do |name|
-        next if data.key?(name)
-        if environment
-          fail FormatError, "#{name.inspect} is not set in #{environment.inspect} environment"
-        else
-          fail FormatError, "#{name.inspect} is not set! Did you provide the right environment argument?"
-        end
-      end
-      template
-    end
-
     def interpolate_data!
       # Insert the `data:` section of YAML for the given environment into our SQL queries.
-      @rendered_sql = template.render(data)
-      if verbose?
-        STDERR.puts '-- Rendered SQL:'
-        STDERR.puts @rendered_sql
-      end
-      @rendered_sql
+      @rendered_sql = Template.new(@sql, @verbose).render(data)
     end
   end
 end

data/lib/hsql/template.rb

@@ -6,28 +6,36 @@ module HSQL
   class Template
     attr_reader :input
 
-    def initialize(input)
-      @input = input
+    # This is used to indicate when a source file is malformed.
+    class FormatError < StandardError
     end
 
-    def variable_names
-      extract_variable_names(ast).uniq
+    def initialize(input, verbose)
+      @input = input
+      @verbose = verbose
     end
 
     def render(hash)
-      Mustache.render(input, hash)
+      Mustache.raise_on_context_miss = true
+      output = Mustache.render(input, hash)
+      if @verbose
+        STDERR.puts '-- Rendered SQL:'
+        STDERR.puts output
+      end
+      output
+    rescue Mustache::ContextMiss => e
+      fail_with(e.message, hash.keys.sort)
     end
 
     private
 
-    # See Mustache::Generator#compile! for reference code
-    def extract_variable_names(tree)
-      return unless tree.is_a?(Array)
-      if tree[1] == :fetch
-        tree.last.first
-      else
-        tree.map { |token| extract_variable_names(token) }.flatten.compact
-      end
+    def fail_with(message, keys)
+      # Pull the missing template tag out of the message
+      tag = message.scan(/Can't find (\w+) in /).flatten.first
+      message = "Missing variable {{{ #{tag} }}}. At this point in the template the available variables are:"
+      message += "\n"
+      message += keys.join(', ')
+      fail FormatError, message
     end
 
     def ast

data/lib/hsql/version.rb

@@ -1,4 +1,4 @@
 # http://semver.org/
 module HSQL
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hsql
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Jack Danger Canty