erb_sql_templates 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aa544ee1e549c64ddefaefb5f956036ebd5af2e
-  data.tar.gz: 70ae407e9b50cc6397cee8b8d881426596e319c7
+  metadata.gz: d0589cf7eb368addd16a828db3b427aa8189fd69
+  data.tar.gz: dccb2e6b97950b6adf1029a07118fb28c928c62e
 SHA512:
-  metadata.gz: 2f781347ca13c2ff6c6633310a145bf9b6a9e96531d76bf7fcfd5b78b39bbafc4d9b1d979f879eff65ae332559fbd01a96d891e176b64d9c49e310d467ca3fc0
-  data.tar.gz: 03bb3043452f052d5f70a17db6d19abbb1f1714f38bb00fe2f85320b4f55773c28934d79460f6d8711cc9a7e20b64adfce79f24e541c2412a44d44a08827a7e2
+  metadata.gz: b8fc54fc2b28fd4ee124bf06a65c7f5561d9191fdaab861d60e255eeef7911045b4f445a5507bbdfa9d4ce73d63a8b0c3e04f40b3c5b283f13cf29ea7e1c08d8
+  data.tar.gz: 13ee4e90bd75e20c05a50f42ea0c92a28c92fbf95479933688b3834c79ef5db87e33ad5e2bd8c484912a340713992dd291c265ca02610ba608fefad420983cda

data/lib/erb_sql_templates.rb

@@ -7,6 +7,7 @@ require 'ostruct'
 # sql = est.render(:some_sql, :my_var => 'Foo!')
 
 class ErbSqlTemplates
+  attr_reader :connection
   
   def initialize(dir, connection)
     @directory  = dir
@@ -20,7 +21,7 @@ class ErbSqlTemplates
   
   # Returns built sql
   def render(template_name, **data)
-    scope      = TemplateScope.new(@connection, data)
+    scope      = TemplateScope.new(self, data)
     erb_string = load_template(template_name)
     renderer   = ERB.new(erb_string, 0, '>') # thread level zero, and '>' means no new lines for <%= %>
     return renderer.result(scope.get_binding)
@@ -28,12 +29,18 @@ class ErbSqlTemplates
   
   # Returns string of the filename
   def locate_template(name)
-    results = Dir.glob(@directory + "/#{name}.{sql.erb,erb}")
+    results = Dir.glob(@directory + "/#{name}.{erb.sql,sql.erb}")
     if results.length > 1
       raise Exception.new("Too many templates have the name '#{name}'. ")
     elsif results.length == 0
-      raise Exception.new("Cannot find template '#{name}.erb' or '#{name}.sql.erb' in the directory '#{@directory}'.")
+      raise Exception.new("Cannot find template '#{name}.erb.sql' in the directory '#{@directory}'.")
     else
+      # Check if they are using old file extensions. Only do it once though.
+      if @@did_send_deprecation_notice != true && results.first.match(/\.sql\.erb$/)
+        @@did_send_deprecation_notice = true
+        puts "Deprecation Notice: .sql.erb extensions for ERB SQL templates has been deprecated in favor of .erb.sql extensions."
+      end
+      
       return results.first
     end
   end
@@ -46,14 +53,18 @@ class ErbSqlTemplates
   
   
   class TemplateScope < OpenStruct
-    def initialize(connection, hash)
-      @connection = connection
+    def initialize(builder, hash)
+      @builder = builder
       super hash
     end
     
+    def render(template_name, **args)
+      return @builder.render(template_name, **args)
+    end
+    
     # helper for sanitizing sql inputs
     def h(value)
-      return @connection.quote(value)
+      return @builder.connection.quote(value)
     end
     
     # Expose private binding() method.
@@ -72,6 +83,7 @@ class ErbSqlTemplates
     
   end
   
+  @@did_send_deprecation_notice=false
 end
 
 

metadata

@@ -1,24 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: erb_sql_templates
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Tyler Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-25 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies: []
-description: Utility to render and execute `.sql.erb` templates that have been customized
+description: Utility to render and execute `.erb.sql` templates that have been customized
   with ERB.
-email: tyler@westernleap.com
+email: code@polar-concepts.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/erb_sql_templates.rb
-homepage: http://github.com/bdevel/erb_sql_templates
+homepage: https://github.com/bdevel/erb_sql_templates
 licenses:
 - MIT
 metadata: {}
@@ -28,12 +28,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []