eql 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e33f72aa2566593bd50d1c463141b7d9537b1c8
-  data.tar.gz: 4b3ad6517ece31d344173518e79ccd027f07e0c9
+  metadata.gz: 9aef4bcdca60abb3b59d17f32199073965fc2aa8
+  data.tar.gz: 4848ccd3aa324bd0d4869301fa128401bef73e04
 SHA512:
-  metadata.gz: ea8ca0cb04bbc77c9fee071dd06baf02ec825a05987bcd8e44e2ca50cde1427d16b0d3d98296da13e0c43f73ad0a286e9ee76863d5797b9bc2504637e528ea95
-  data.tar.gz: b301f3a1dac9231422892b655946b92ca567f102fcc6133977f74ef38ddd892f87c5f9c20e92f8b0f1b04ab6fe8187e83109bdbea80dd028b90ddc5e5dc3c7e6
+  metadata.gz: 38c8a56b15f1a30c6fe2b1504f5a035498e8e19927ef4b8a85358094b5e0ec0166cc7231c1b19255ce470bc827deb12f1557bea973db0169cd0296bb74c00cf7
+  data.tar.gz: f8b934bddd07357feb230de012b4e7f7c80ed0b1e8b19ebf27bd9a301e8fc1e9e7792ee784656ab30221cb5eb0f35f6b11cf58c4c40e5aee5a46f01ef865a5ff

data/lib/eql.rb

@@ -1,4 +1,5 @@
 require 'erb'
+require 'forwardable'
 
 #
 # Eql module renders ERB query templates and runs them
@@ -78,6 +79,7 @@ end
   config
   proxy
   builder
+  template_loader
   adapter_factory
   adapters/base
   adapters/active_record

data/lib/eql/builder.rb

@@ -34,7 +34,14 @@ module Eql
     # @param [String, Symbol] name template's name
     #
     def load_template(name)
-      @template_content = File.read(resolve_path(name))
+      @template_content = loader.load_template(name)
+    end
+
+    #
+    # @return [Eql::TemplateLoader]
+    #
+    def loader
+      @loader ||= TemplateLoader.new(self)
     end
 
     #
@@ -73,12 +80,6 @@ module Eql
       @template_content.to_s
     end
 
-    class H < Hash
-      def name
-        :h
-      end
-    end
-
     #
     # Render a template
     #
@@ -97,33 +98,6 @@ module Eql
       Eql::Proxy.generate(adapter)
     end
 
-    #
-    # File template to find
-    #
-    # @param [String, Symbol] file template's name
-    #
-    # @return [String] returns file path pattern
-    #
-    def template_path(file)
-      File.join(@path.to_s, file.to_s) + adapter.extension
-    end
-
-    #
-    # Resolve file's path
-    #
-    # @raise [RuntimeError] when can't wind a file
-    #
-    # @param [String] file template's name
-    #
-    # @return [String] returns template's path
-    #
-    def resolve_path(file)
-      path = template_path(file)
-      Dir.glob(path).first.tap do |f|
-        raise "Unable to find query template with #{path.inspect} location" unless f
-      end
-    end
-
     def method_missing(name, *args, &block)
       adapter.send(name, *args, &block)
     end

data/lib/eql/config.rb

@@ -3,13 +3,24 @@ module Eql
   # Config class holds rendering settings
   #
   class Config
-    # @param [String]
+    # @return [String] returns default templates folder
     attr_accessor :path
-    # @param [Symbol]
+    # @return [Symbol] returns key of default adapter
     attr_accessor :adapter
+    attr_writer :cache_templates
 
     def initialize
-      @adapter = :active_record
+      @adapter         = :active_record
+      @cache_templates = true
+    end
+
+    #
+    # Should templates be cached?
+    #
+    # @return [Boolean]
+    #
+    def cache_templates?
+      @cache_templates
     end
 
     #

data/lib/eql/template_loader.rb

@@ -0,0 +1,89 @@
+module Eql
+  #
+  # Loader class loads templates and caches them.
+  #
+  class TemplateLoader
+    extend Forwardable
+
+    def_delegator 'self.class', :cache
+
+    # @return [Eql::Builder]
+    attr_reader :builder
+
+    #
+    # @param [Eql::Builder] builder
+    #
+    def initialize(builder)
+      @builder = builder
+    end
+
+    #
+    # Load builder template
+    #
+    # @param [String, Symbol] name template's name
+    #
+    # @return [String] returns loaded template
+    #
+    def load_template(name)
+      path = resolve_path(name)
+      return load_file(path) unless Eql.config.cache_templates?
+      cache[path] ||= load_file(path)
+    end
+
+    #
+    # Load file's content
+    #
+    # @api private
+    #
+    # @param [String] path file's path
+    #
+    # @return [String]
+    #
+    def load_file(path)
+      File.read(path)
+    end
+
+    #
+    # File template to find
+    #
+    # @api private
+    #
+    # @param [String, Symbol] file template's name
+    #
+    # @return [String] returns file path pattern
+    #
+    def template_path(file)
+      [
+        File.join(@builder.path.to_s, file.to_s),
+        @builder.adapter.extension
+      ].join
+    end
+
+    #
+    # Resolve file's path
+    #
+    # @api private
+    #
+    # @raise [RuntimeError] when can't wind a file
+    #
+    # @param [String] file template's name
+    #
+    # @return [String] returns template's path
+    #
+    def resolve_path(file)
+      path = template_path(file)
+      Dir.glob(path).first.tap do |f|
+        raise "Unable to find query template with #{path.inspect} location" unless f
+      end
+    end
+
+    #
+    # Templates cache
+    #
+    # @return [Hash{String => String}]
+    #
+    def self.cache
+      @cache ||= {}
+    end
+  end
+end

data/lib/eql/version.rb

@@ -1,4 +1,4 @@
 module Eql
   # @return [String] returns gem version
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eql
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Oleg Yashchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,7 +80,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Erb provides an ability to use ERB templates with your DB queries
+description: Eql provides an ability to use ERB templates with your DB queries
 email:
 - oazoer@gmail.com
 executables: []
@@ -96,6 +96,7 @@ files:
 - lib/eql/builder.rb
 - lib/eql/config.rb
 - lib/eql/proxy.rb
+- lib/eql/template_loader.rb
 - lib/eql/version.rb
 homepage: 
 licenses:
@@ -120,5 +121,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Erb Query Language
+summary: Eql Query Language
 test_files: []