querier 0.0.5 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31e48481f70f97cfdd3afb78f304b6aafab887c129aab817808a44271c9d2c56
-  data.tar.gz: e46be7a0c70ae3e3048bfaeee3c8ae4ef47d94d2fc340d530b533b938e05eaa5
+  metadata.gz: f15f96f79aea614fe9eec3fa44a8ed7c6f51009c4bdb6ee18316aef6577b41f9
+  data.tar.gz: e4d5d7abe1357c899a4f6e45fa407a3fedc831779aa5af1b999dd51917986cb0
 SHA512:
-  metadata.gz: df307669dbf4a7de150e6d3fbe197ba87dca147c21370bec05cbb9d07956f9ad6522735816d06fb8fbabe3b7f05a78bd5c2cdbe25679d2ff14989f2e6b30e1cd
-  data.tar.gz: bbbd8830d8b90a6d2dc2a6303f043b6074dd21ed7546a96b0a209d29bf8cc3048755c58f6ed96444277af68a1cf0464b9544560b9bf746beba7649a4721b7b67
+  metadata.gz: 0baf3ced087fa4a9a5c1525fa0b8ae4076290a8d8af8d9be5257d83c610becf469fba2624e73ea3689d78a20cf28df811830c67bfba89198b8e148c421e4e33c
+  data.tar.gz: eeae2b170e2268b7569f8aaa531de5e7a49a702ad99746c32c8269c2cc0679ecd4e5d054c9a189e00ab1270faa1d3762c76efcc761c1a5c0510d8a0ecd41acbe

data/lib/querier.rb

@@ -2,21 +2,34 @@ class Querier
   PARAM_NAME_INDEX = 0
   PARAM_VALUE_INDEX = 1
 
-  attr_reader :query_template, :query_params
+  attr_reader :query_execution_count, :query_template, :query_params
   
   def initialize **template_query_params
+    @query_execution_count = 0
     @query_params = template_query_params.dup
   end
 
   def execute
-    ActiveRecord::Base.connection.select_all fill_query_params(query_template: @query_template, query_params: @query_params)
+    @query_execution_count += 1
+    @execution_cached_result = ActiveRecord::Base.connection.select_all(fill_query_params(query_template: @query_template, query_params: @query_params))
+    @execution_cached_result = execution_cached_result.map! { |record| record.symbolize_keys! }
   end   
 
+  def cached_result format: :hash
+    raise 'query not executed yet' if @query_execution_count.eql?(0)
+    
+    case format.to_s
+      when 'hash' 
+        @execution_cached_result
+      when 'open_struct'
+          hash_to_open_struct(dataset: @execution_cached_result)
+      else
+          raise 'invalid value type'
+    end
+  end
+  
   def structured_results
-    query_results = self.execute
-    structured_results = [] 
-    query_results.each {|query_result| structured_results << OpenStruct.new(query_result.symbolize_keys!)}
-    structured_results
+    hash_to_open_struct dataset: self.execute
   end  
 
   def to_sql
@@ -28,11 +41,26 @@ class Querier
     File.open("tmp/#{file_name}", 'w') {|f| f << self.to_sql}
   end
 
+  def field_group_and_count field_name:, sort_element_index: nil, reverse_sort: true
+    count_result = self.cached_results(format: :open_struct).group_by(&field_name).map {|k, v| [k, v.count]}
+    
+    unless sort_element_index.nil?
+      count_result = count_result.sort_by {|el| el[sort_element_index]}
+      count_result.reverse! if reverse_sort.eql? true
+    end
+    
+    count_result
+  end    
+
   private
+
+  def hash_to_open_struct dataset:
+    dataset.map {|record| OpenStruct.new(record.symbolize_keys!)}
+  end  
   
-  def get_param_value raw_query_param
+  def get_param_value raw_query_param:, quotefy_param: true
     # where's String#quote when we need it?
-    raw_query_param.class.eql?(String) ? "'#{raw_query_param.to_s}'" : raw_query_param.to_s
+    raw_query_param.class.eql?(String) && quotefy_param ? "'#{raw_query_param.to_s}'" : raw_query_param.to_s
   end
 
   def fill_query_params query_template:, query_params:
@@ -40,22 +68,16 @@ class Querier
     
     query_params.each do |query_param|
       query_param_name = query_param[PARAM_NAME_INDEX].to_s
-      query_param_value = get_param_value(query_param[PARAM_VALUE_INDEX])
 
-      query.gsub! /{\?#{query_param_name}}/, query_param_value
+      query.gsub!(/\${#{query_param_name}}/,
+                  get_param_value(raw_query_param: query_param[PARAM_VALUE_INDEX], 
+                                  quotefy_param: true))
+
+      query.gsub!(/\${#{query_param_name}\/no_quote}/,
+                  get_param_value(raw_query_param: query_param[PARAM_VALUE_INDEX],
+                                  quotefy_param: false))
     end
 
     query
   end
-
-  def field_group_and_count field_name:, sort_element_index: nil, reverse_sort: true
-    count_result = @cached_results.group_by(&field_name).map {|k, v| [k, v.count]}
-    
-    unless sort_element_index.nil?
-      count_result = count_result.sort_by {|el| el[sort_element_index]}
-      count_result.reverse! if reverse_sort.eql? true
-    end
-    
-    count_result
-  end  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: querier
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.10
 platform: ruby
 authors:
 - Gedean Dias
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-01-20 00:00:00.000000000 Z
+date: 2020-12-28 00:00:00.000000000 Z
 dependencies: []
 description: Active Record queries with variable number of params
 email: gedean.dias@gmail.com
@@ -22,7 +22,7 @@ homepage: https://github.com/gedean/querier
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -30,16 +30,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Active Record Querier
 test_files: []