querier 0.0.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f6095a76853086f43c79e597c28a20917d6b0fbc0899a06e7bf7e8b4e149426
-  data.tar.gz: cd705a152f12b102461c116c53fcdd3df45d084304e9c68da8b23c038dea5254
+  metadata.gz: b665dcde0c37b483e764ddcf1d30221ba9c4b34f478533e6fb911aaf11a81996
+  data.tar.gz: 4bd3bb6e6e3cc430b257ac9b408629440b8249ad642c1db89a6f9ece21d671f3
 SHA512:
-  metadata.gz: 66791bebaf7e2821d53426ae68ed684bd0d76a5a83c7fc3c4130d417c98632cbab8a366bbaf15f4f3bc632a2119be5107b6815ace2fb11fe1a8b3d06a7a056c2
-  data.tar.gz: af12dd6bf950ae71ed78945258770330fb005bb3f94589dea44f2e6dce99717aca1c73b3424698a44ac589fef3340115c06d7295561dd0fc54992e88305bad95
+  metadata.gz: 5e0fc946d4e39bc164ffeda2bd762c4e3bddc4f769363d9590e4dc08a6a7379b3f3e27f5516b93baaea2a8c8216ac2808946096a0f48a28b847246d8a73d1da7
+  data.tar.gz: 3af81af98208e77a0f9360de68a5d15cd45e153613aaa5e1654157bcf4ea4ccf77977c80d1e30b22259db96eabff5d13bc6b66a843c4cbbcb210ad114ac905c6

data/README.md

@@ -1,22 +1,10 @@
 # querier
 
 # class UserQuerier < Querier
-    QUERY_TEMPLATE = <<-END_OF_QUERY_TEMPLATE
-
-SELECT
-  *
-FROM
-  users
-WHERE
-  name = {?user_name}
-  AND active = {?active}
-
-  END_OF_QUERY_TEMPLATE
-
     def initialize user_name:, active:
-        @query_template = QUERY_TEMPLATE
+        @query_template = "SELECT * FROM users WHERE name = ${user_name} AND active = ${active}"
         super
     end
 end
 
-# UserQuerier.new(user_name: 'foo', active: true).execute
+# UserQuerier.new(user_name: 'foo', active: true).execute

data/lib/querier.rb

@@ -2,76 +2,90 @@ class Querier
   PARAM_NAME_INDEX = 0
   PARAM_VALUE_INDEX = 1
 
+  @active_record_class = ActiveRecord::Base
+  # based on rubocop's tips at: https://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Style/ClassVars
+  # solution here: https://www.ruby-lang.org/en/documentation/faq/8/
+  class << self
+    attr_accessor :active_record_class
+  end
+
   attr_reader :query_execution_count, :query_template, :query_params
-  
-  def initialize **template_query_params
+
+  def initialize(**template_query_params)
+    @active_record_class = self.class.active_record_class || self.class.superclass.active_record_class
     @query_execution_count = 0
     @query_params = template_query_params.dup
   end
 
   def execute
     @query_execution_count += 1
-    @execution_cached_result = ActiveRecord::Base.connection.select_all fill_query_params(query_template: @query_template, query_params: @query_params)
-  end   
+    @execution_cached_result = @active_record_class.connection.select_all(fill_query_params(query_template: @query_template,
+                                                                                          query_params: @query_params)).map(&:symbolize_keys!)
+  end
 
-  def cached_result format: :hash
+  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'
+
+    case format
+    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
-    hash_to_open_struct dataset: self.execute
-  end  
+    hash_to_open_struct(dataset: execute)
+  end
 
   def to_sql
     fill_query_params(query_template: @query_template, query_params: @query_params)
   end
 
   def to_file
-    file_name = "querier #{Time.now.strftime "[%d-%m-%Y]-[%Hh %Mm %Ss]"}.sql"
-    File.open("tmp/#{file_name}", 'w') {|f| f << self.to_sql}
+    file_name = "querier #{Time.now.strftime '[%d-%m-%Y]-[%Hh %Mm %Ss]'}.sql"
+    File.open("tmp/#{file_name}", 'w') { |f| f << 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]}
-    
+  def field_group_and_count(field_name:, sort_element_index: nil, reverse_sort: true)
+    count_result = 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 = count_result.sort_by { |el| el[sort_element_index] }
       count_result.reverse! if reverse_sort.eql? true
     end
-    
+
     count_result
-  end    
+  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 hash_to_open_struct(dataset:)
+    dataset.map { |record| OpenStruct.new(record.symbolize_keys!) }
+  end
+
+  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.instance_of?(String) && quotefy_param ? "'#{raw_query_param.to_s}'" : raw_query_param.to_s
   end
 
-  def fill_query_params query_template:, query_params:
+  def fill_query_params(query_template:, query_params:)
     query = query_template.dup
-    
+
     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
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: querier
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Gedean Dias
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-01-29 00:00:00.000000000 Z
+date: 2021-04-05 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.15
+signing_key:
 specification_version: 4
 summary: Active Record Querier
 test_files: []