query_helper 0.2.10 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e3dd5610d199d135d33794e31fd824b8e740ee9b80a0418367aca153b384fa7
-  data.tar.gz: acdce15045001595f1fe71a1761e28997b9438fc2cba1309eaaa22fbf5d804dd
+  metadata.gz: a322338c9c9fd1675506690061efb3e40715f8efb438a6a552335cb7948a3e86
+  data.tar.gz: 6da1ce413feabd5f72b48fe599b6ce020e6288830af637e9c330a2083a49e91f
 SHA512:
-  metadata.gz: dbece4da70456952af5ef843e0f0d10e9742179082027eb91b6cb772709521576a598648cab59544473ef1511136757a36658cdc910cf8eaf30cf6370f87ded6
-  data.tar.gz: 955ea1597dfa7bd8f387f3c27e35fd632e42fdb04dde6902e81bedeedaca2d12f4807ed5deb2c9b579e7f3952b004766cbefddd0d6e0d212acfe7a13d178b2db
+  metadata.gz: b0257379a11c98ed103f6cdd9751d341b815bb817789ee0b8054438c920813c94d2b25c4c5d26a75de53734e8ccf78b6a7077516011b3fd021a561a12681fda5
+  data.tar.gz: f75e4d2e80c083dc579829b46443b1dc6661a8fd57b648ed1d2ebedda14c016cf5d78a82ba388998e320d42d7ac065d2f7644b0c266076ea33a6afe595400800

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    query_helper (0.2.10)
+    query_helper (0.2.15)
       activerecord (> 5)
       activesupport (> 5)
 

data/lib/query_helper.rb

@@ -13,7 +13,7 @@ require "query_helper/invalid_query_error"
 
 class QueryHelper
 
-  attr_accessor :model, :bind_variables, :sql_filter, :sql_sort, :page, :per_page, :single_record, :associations, :as_json_options, :executed_query, :api_payload, :preload
+  attr_accessor :model, :bind_variables, :sql_filter, :sql_sort, :page, :per_page, :single_record, :associations, :as_json_options, :executed_query, :api_payload, :preload, :search_field, :search_string, :metadata
   attr_reader :query
 
   def initialize(
@@ -31,7 +31,8 @@ class QueryHelper
     api_payload: false, # Return the paginated payload or simply return the result array
     preload: [], # preload activerecord associations - used instead of `associations` when you don't want them included in the payload
     search_fields: [],
-    search_string: nil
+    search_string: nil,
+    metadata: {}
   )
     @query = query.class < ActiveRecord::Relation ? query.to_sql : query
     @model = query.class < ActiveRecord::Relation ? query.base_class : model
@@ -49,6 +50,7 @@ class QueryHelper
     @preload = preload
     @search_fields = search_fields
     @search_string = search_string
+    @metadata = metadata
   end
 
   def update(
@@ -66,7 +68,8 @@ class QueryHelper
     sql_sort: nil,
     page: nil,
     per_page: nil,
-    search_string: nil
+    search_string: nil,
+    metadata: nil
   )
     @query = query.class < ActiveRecord::Relation ? query.to_sql : query if query
     @model = query.class < ActiveRecord::Relation ? query.base_class : model if model || query
@@ -83,6 +86,7 @@ class QueryHelper
     @search_string = search_string if search_string 
     @page = determine_page(page: page, per_page: per_page) if page
     @per_page = determine_per_page(page: page, per_page: per_page) if per_page
+    @metadata = metadata if metadata 
     set_limit_and_offset()
     return self
   end
@@ -140,7 +144,7 @@ class QueryHelper
   end
 
   def to_json(args)
-    JSON.generate(results)
+    results.to_json
   end
 
   def to_sql
@@ -175,6 +179,29 @@ class QueryHelper
     return @results
   end
 
+  def pagination_results(count=@count)
+    # Set pagination params if they aren't provided
+    results_per_page = @per_page || count 
+    results_page = @page || 1 
+
+    total_pages = (count/(results_per_page.nonzero? || 1).to_f).ceil
+    next_page = results_page + 1 if results_page.between?(1, total_pages - 1)
+    previous_page = results_page - 1 if results_page.between?(2, total_pages)
+    first_page = results_page == 1
+    last_page = results_page == total_pages
+    out_of_range = !results_page.between?(1,total_pages)
+
+    { count: count,
+      current_page: results_page,
+      next_page: next_page,
+      previous_page: previous_page,
+      total_pages: total_pages,
+      per_page: results_per_page,
+      first_page: first_page,
+      last_page: last_page,
+      out_of_range: out_of_range }
+  end
+
   private
 
     def determine_page(page:, per_page:)
@@ -203,7 +230,8 @@ class QueryHelper
 
     def paginated_results
       { pagination: pagination_results(),
-        data: @results }
+        data: @results,
+        metadata: @metadata }
     end
 
     def determine_count
@@ -234,29 +262,6 @@ class QueryHelper
       @results.map!{ |r| r.except("_query_full_count") } if @page && @per_page && !@single_record
     end
 
-    def pagination_results
-      # Set pagination params if they aren't provided
-      results_per_page = @per_page || @count 
-      results_page = @page || 1 
-
-      total_pages = (@count/(results_per_page.nonzero? || 1).to_f).ceil
-      next_page = results_page + 1 if results_page.between?(1, total_pages - 1)
-      previous_page = results_page - 1 if results_page.between?(2, total_pages)
-      first_page = results_page == 1
-      last_page = results_page == total_pages
-      out_of_range = !results_page.between?(1,total_pages)
-
-      { count: @count,
-        current_page: results_page,
-        next_page: next_page,
-        previous_page: previous_page,
-        total_pages: total_pages,
-        per_page: results_per_page,
-        first_page: first_page,
-        last_page: last_page,
-        out_of_range: out_of_range }
-    end
-
     def create_column_maps
       ColumnMap.create_column_mappings(
         query: @query,

data/lib/query_helper/sql_manipulator.rb

@@ -55,7 +55,7 @@ class QueryHelper
 
     def insert_order_by_and_limit_clause
       @sql.slice!(@parser.limit_clause) if @parser.limit_included? # remove existing limit clause
-      @sql.slice!(@parser.order_by_clause) if @parser.order_by_included? # remove existing order by clause
+      @sql.slice!(@parser.order_by_clause) if @parser.order_by_included? && @order_by_clauses.length > 0 # remove existing order by clause
       @sql += " order by #{@order_by_clauses.join(", ")} " if @order_by_clauses.length > 0
       @sql += " limit :limit offset :offset " if @include_limit_clause
     end

data/lib/query_helper/version.rb

@@ -1,3 +1,3 @@
 class QueryHelper
-  VERSION = "0.2.10"
+  VERSION = "0.2.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: query_helper
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.15
 platform: ruby
 authors:
 - Evan McDaniel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-27 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler