querier 0.2.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de1729ce8cc885a52a8a5892e79d2a4e4008b48d95d5a821c2f985bc5925abf9
-  data.tar.gz: 0db5814a6b46ecd4d73f766763d1f82347c2fecf3075c0f1c3218d6870b4cfa9
+  metadata.gz: 40c24ee7c142f7bf047c967cdbee1e703a7c41ee6aafda911c36e02008642b6f
+  data.tar.gz: d4203cdcc429107b363c917ec493dc30c25e730fcef9cbf7a76f9653e533eb36
 SHA512:
-  metadata.gz: b3384fe46ceb0cbfbd19e15caa51d4e8bb14e77e2565d4db001f773d6fb2d8ac1a88f53ede1527f150ae3d916a50d41e7ac7aed789ca59f72b58a9f0f1871c8f
-  data.tar.gz: 343e400b47d07e0e8e55be4b025fbca6c3e672e01ece56ab3bd6c13061eb9e1597d27dfe70c36ebeb17904efcc2676a4ee7f90ffc921f1f63b9799755f5af88d
+  metadata.gz: 5400b60fbc5e6c9bcaec3cc844ed919f855557e8e76b78c6eede62da5700a040beeac4b2fae880fd92a5bdf068cf5052e255d5182306ba411d8fd8b3e6a925ca
+  data.tar.gz: f7304d4dfaf39b60845e1931e2040f4bafa84a745158d4ea03f08459bf48e0f4eec72a28b255c2d6537c4e31da1279fd91c2240f875eaba03c11172ba1c6b1c2

data/README.md

@@ -1,11 +1,13 @@
-# querier
+# Active Record Querier
 
-# class UserQuerier < Querier
-    @active_record_class = ApplicationRecord
-    def initialize user_name:, active:
-        @query_template = "SELECT * FROM users WHERE name = ${user_name} AND active = ${active}"
-        super
-    end
-end
+> class UserQuerier < Querier
+> > @active_record_class = ApplicationRecord  
+def initialize user_name:, active:  
+> > > @query_template = "SELECT * FROM users WHERE   name = ${user_name} AND active = ${active/no_quote}"  
+super
+> > 
+> > end
+> > 
+> end
 
-# UserQuerier.new(user_name: 'foo', active: true).execute
+> UserQuerier.new(user_name: 'foo', active: true).select_all.to_struct

data/lib/querier.rb

@@ -1,91 +1,89 @@
-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)
-    @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 = @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)
-    raise 'query not executed yet' if @query_execution_count.eql?(0)
-
-    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: 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 << to_sql }
-  end
-
-  def field_group_and_count(field_name:, sort_element_index: nil, reverse_sort: true)
-    count_result = cached_result(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:, quotefy_param: true)
-    # where's String#quote when we need it?
-    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:)
-    query = query_template.dup
-
-    query_params.each do |query_param|
-      query_param_name = query_param[PARAM_NAME_INDEX].to_s
-
-      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
+require 'active_record'
+
+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, :query_template, :query_params
+
+  def initialize(template_query_params = {})
+    @active_record_class = self.class.active_record_class || self.class.superclass.active_record_class
+    @query_params = template_query_params
+    @query = fill_query_params
+  end
+
+  def execute
+    @active_record_class.connection.execute(@query)
+  end
+
+  def exec_query
+    decorate_dataset_format(@active_record_class.connection.exec_query(@query))
+  end
+
+  def select_all
+    decorate_dataset_format(@active_record_class.connection.select_all(@query))
+  end
+
+  def select_one
+    @active_record_class.connection.select_one(@query)
+  end
+
+  def select_values
+    @active_record_class.connection.select_values(@query)
+  end
+
+  def select_rows
+    @active_record_class.connection.select_rows(@query)
+  end
+
+  def select_value
+    @active_record_class.connection.select_value(@query)
+  end
+
+  private
+
+  def decorate_dataset_format(dataset)
+    def dataset.as_hash
+      map(&:symbolize_keys)
+    end
+
+    def dataset.as_struct
+      map { |record| OpenStruct.new(record) }
+    end
+
+    dataset
+  end
+
+  def get_param_value(raw_query_param:, quotefy_param: true)
+    if raw_query_param.instance_of?(String) && quotefy_param
+      @active_record_class.connection.quote(raw_query_param.to_s)
+    else
+      raw_query_param.to_s
+    end
+  end
+
+  def fill_query_params
+    query = @query_template.dup
+
+    @query_params.each_pair do |query_param|
+      query_param_name = query_param[PARAM_NAME_INDEX].to_s
+
+      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

data/lib/querier_bkp.rb

@@ -0,0 +1,93 @@
+require 'active_record'
+
+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 = {})
+    @active_record_class = self.class.active_record_class || self.class.superclass.active_record_class
+    @query_execution_count = 0
+    @query_params = template_query_params
+  end
+
+  def execute
+    @query_execution_count += 1
+    @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)
+    raise 'query not executed yet' if @query_execution_count.eql?(0)
+
+    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: 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.write "tmp/#{file_name}", to_sql
+  end
+
+  def field_group_and_count(field_name:, sort_element_index: nil, reverse_sort: true)
+    count_result = cached_result(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:, quotefy_param: true)
+    # where's String#quote when we need it?
+    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:)
+    query = query_template
+
+    query_params.each_pair do |query_param|
+      query_param_name = query_param[PARAM_NAME_INDEX].to_s
+
+      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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: querier
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Gedean Dias
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-14 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies: []
 description: Active Record queries with variable number of params
 email: gedean.dias@gmail.com
@@ -18,6 +18,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/querier.rb
+- lib/querier_bkp.rb
 homepage: https://github.com/gedean/querier
 licenses:
 - MIT
@@ -30,14 +31,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.25
+rubygems_version: 3.2.27
 signing_key:
 specification_version: 4
 summary: Active Record Querier