table_on_steroids 0.1.1.11 → 0.1.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1378468bf399d1096d6d742f411713b663d79b17e8ce51acde40c1e17ca9083b
-  data.tar.gz: f5fa42544357f2ee09879351e98960b8c05d276bf8a372e3f0b66aa27c7d0be4
+  metadata.gz: 2f24d4f105e27626f6ac9038284f6ddff75784239fd7004fa5146cbb57c0c134
+  data.tar.gz: e1b9627cf54ffc485856845972d776b2614663a21cd812cf7c8030a8a510ee03
 SHA512:
-  metadata.gz: 51fb1cedc9bc4d726094e024b7b51a4ce0ac91cb35103838a0e9a50cae1c6c2e4ab3c5f939f543e6a813edad82f218e6eb9e45700b50832a86a30eaa32d3335e
-  data.tar.gz: e44da86c8988df5c3385925aa35249a5a9509d438fb6d3ddd4734ab9b883e0347b11d18f132db541e25f28217732e6f57966cef8f67afdbd7e94852ee3d7f671
+  metadata.gz: 3f506dea75e687c7240cdb61d10806a504cca35f311ce1213e6c51b514ac259024ecd644e9a1120c10d167755c6c470e16c9021ddb8bb00d7973ebd09dc77835
+  data.tar.gz: 5fb0e6809e49d51a9cce6a65cc8c4d5f8fddd38558b510e0feb0f03029197e1f6f286f6ee02479b735c318f45ea2cc9931b72580a63e25a49c4756a3b752caa2

data/README.md

@@ -123,6 +123,14 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/table_on_steroids. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
+## Build and deploy a new version
+
+1. Upgrade the version number
+2. `gem build table_on_steroids` it will create a .gem file
+3. `gem push table_on_steroids-[newversion].gem`
+
+Adding an owner `gem owner --add {{email}} {{gem}}` (the person must have a https://rubygems.org/ account)
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/app/controllers/concerns/table_on_steroids/table_concern.rb

@@ -39,7 +39,10 @@ module TableOnSteroids
       OBJECTS_PER_PAGE = 50
     end
 
-    def filter_and_order(objects, columns_on_steroid, global_search = nil, include_counts = false, all_pages = false, table_on_steroids = nil)
+    def filter_and_order(objects, columns_on_steroid, global_search = nil, include_counts = false, all_pages = false, table_on_steroids = nil, rows_to_display = nil)
+
+      limit = rows_to_display || OBJECTS_PER_PAGE
+
       # execute the global search if you have one
       if params[:search].present?
         objects = global_search.call(objects, params[:search]) if global_search
@@ -50,18 +53,16 @@ module TableOnSteroids
         # column search
         objects = objects_where(objects, columns_on_steroid, t)
 
-        # apply filters
-        if params[:filters].present?
-          params[:filters].each_pair do |k, v|
-            filter = columns_on_steroid[k]
-            next unless filter.present? && filter[t].present?
-
-            objects = filter[t][:filter_lambda].call(objects, v)
+        filter_columns = columns_on_steroid.map{|k,v| k if v.dig(t,:filter_lambda) }.compact
+        filter_columns.each do |k|
+          filter_value = (params[:filters] && params[:filters][k]) || params[k]
+          if(!filter_value.blank?)
+            objects = columns_on_steroid[k][t][:filter_lambda].call(objects, filter_value)
           end
         end
 
         #order
-        if params&.dig(:knowledge,:order) && (object_order = columns_on_steroid[params[:knowledge][:order]]).present?       
+        if params&.dig(:knowledge,:order) && (object_order = columns_on_steroid[params[:knowledge][:order]]).present?
           if(object_order[t] && object_order[t][:order_lambda])
             direction = (params&.dig(:knowledge,:ascending).to_s == 'true') ? 'asc' : 'desc'
             objects = objects.reorder(nil) if(objects.is_a?(ActiveRecord::Base) || objects.is_a?(ActiveRecord::Relation))
@@ -87,14 +88,14 @@ module TableOnSteroids
       return (include_counts ? [objects, 1, objects.count] : objects) if all_pages
 
       # GO to specific object page
-      page = get_page(objects, params, table_on_steroids)
+      page = get_page(objects, params, table_on_steroids, limit)
 
       if objects.is_a?(ActiveRecord::Base) || objects.is_a?(ActiveRecord::Relation)
-        objects = objects.page(page).per(OBJECTS_PER_PAGE)
+        objects = objects.page(page).per(limit)
         total_pages = objects.total_pages
         total_count = objects.total_count
       else
-        objects = Kaminari.paginate_array(objects).page(page).per(OBJECTS_PER_PAGE)
+        objects = Kaminari.paginate_array(objects).page(page).per(limit)
         total_pages = objects.total_pages
         total_count = objects.total_count
       end
@@ -221,7 +222,7 @@ module TableOnSteroids
       objects
     end
 
-    def get_page(objects, params, table_on_steroids)
+    def get_page(objects, params, table_on_steroids, limit)
       active_record_object_fetch_opts = table_on_steroids&.dig(:active_record_object_fetch_opts)
       key_lambda = table_on_steroids&.dig(:key_lambda)
       return params[:page] unless active_record_object_fetch_opts && key_lambda
@@ -230,7 +231,7 @@ module TableOnSteroids
       return params[:page] unless object
 
       index = objects.index { |o| key_lambda.call(o) == key_lambda.call(object) }
-      index ? index / OBJECTS_PER_PAGE + 1 : params[:page]
+      index ? index / limit + 1 : params[:page]
     end
   end
 end

data/lib/table_on_steroids/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TableOnSteroids
-  VERSION = '0.1.1.11'
+  VERSION = '0.1.1.13'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: table_on_steroids
 version: !ruby/object:Gem::Version
-  version: 0.1.1.11
+  version: 0.1.1.13
 platform: ruby
 authors:
 - Marieke Gueye
 - Matt Hiatt
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-11-09 00:00:00.000000000 Z
+date: 2024-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-datepicker-rails
@@ -136,7 +136,7 @@ homepage: http://www.github.com/mariekou
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -151,9 +151,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.7.7
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Create awesome tables for rails
 test_files: []