eql 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66fb4278a980fcd7f7e5b847dd3a63307dff72c7
-  data.tar.gz: cd95b8e03f2fc3b22736b80cac798241e03cff1f
+  metadata.gz: 6643d26606fd2a4cb8db4aca24a135011f59ba79
+  data.tar.gz: 8041b8f8da26a83346f01f5df4639f7bd0b541a7
 SHA512:
-  metadata.gz: 16e8023d31c859e25b4c216e6d464138df5f3c1030c6cbd8e4147814a0f3f2a36ea3269d4eee827443db1a43f0dde8fea725e5e665ef56575a159e20fe836028
-  data.tar.gz: b0b2f2636666281c710148ac9523cc7b8531f350f243167e73fcdd8e5cd15e77aeeb20dcb5739549d9efc52bbfe12dea18b612c537c482523d086e27a3e6ceae
+  metadata.gz: 10efaee6d2e49b855583dba20a204d6239b94c63adbbbce3887fdda6ee70e99e1baa8531c279678557dda48340e0dcfe839f357ccdac05b3939c3828832a6a4e
+  data.tar.gz: e6927c0b72bfbfab019cab6247a52cd609b6ce97ce6d4071bf9a40765657317d0da6454e0c4c6bdca8b3f542ce4c8f434dcfbfbfcd65cc72cbaedefc1bce5a8a

data/README.md

@@ -53,6 +53,7 @@ b.execute_params(id: 74)
 Eql.configure do |config|
   config.path = Rails.root.join('app/queries')
   config.adapter = :active_record
+  config.cache_templates = !Rails.env.development?
 end
 ```
 

data/lib/eql.rb

@@ -9,7 +9,7 @@ module Eql
     #
     # Create new builder
     #
-    # @param [String, nil] path template's root folder
+    # @param [Array<String>, String, nil] path template's root folder
     # @param [Object, nil] conn DB connection or cursor
     #
     def new(path = nil, conn = nil)

data/lib/eql/builder.rb

@@ -9,11 +9,11 @@ module Eql
     attr_reader :conn
 
     #
-    # @param [String] path path to a root folder with templates
+    # @param [Array<String>, String] path path to a root folder with templates
     # @param [String] conn DB connection or a cursor
     #
     def initialize(path, conn)
-      @path = path
+      @path = Array.wrap(path)
       @conn = conn
     end
 

data/lib/eql/template_loader.rb

@@ -50,13 +50,12 @@ module Eql
     #
     # @param [String, Symbol] file template's name
     #
-    # @return [String] returns file path pattern
+    # @return [Array<String>] returns file path pattern
     #
     def template_path(file)
-      [
-        File.join(@builder.path.to_s, file.to_s),
-        @builder.adapter.extension
-      ].join
+      @builder.path.map do |path|
+        [File.join(path, file.to_s), @builder.adapter.extension].join
+      end
     end
 
     #
@@ -71,10 +70,14 @@ module Eql
     # @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
+      paths = template_path(file)
+
+      paths.each do |path|
+        filepath = Dir.glob(path).first
+        return filepath if filepath.present?
       end
+
+      raise "Unable to find query template with #{paths.inspect} location"
     end
 
     #

data/lib/eql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eql
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Oleg Yashchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-03 00:00:00.000000000 Z
+date: 2018-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Eql Query Language