tabulatr2 0.9.45 → 0.9.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85a7e7801f49237c37d89984b6a7fbc35033cb774ccb3fb59e90b4f26cde7297
-  data.tar.gz: 0f8700a986dfb3060b10095f7b04e31e60dfc622f12c8995eb26f109301c45ac
+  metadata.gz: 5dcccfb8018a85997ce1e6645fbc01a16a4db014fc25eee4a364b561a846fce2
+  data.tar.gz: 0ed7c9e6ddf4dde151edc68ff914c2a30f3cfe6720df3fb928b36310f9d3776e
 SHA512:
-  metadata.gz: d3f1f5edecd4c81c236d45587c3ef152e5352f82f2fdb461a9cd183682ce031dcf0425b52bb841147c06f84d03d8ba79f1bf2a9baf6e903268870ec53eaf031e
-  data.tar.gz: 667d67f611177319edbde3d778e914e9dd53f85cfac71f84e29830207e39bb4b3b3658b0ff463fd2c36f4f73efe10eac5746a5b90e6a8968c221d100f84e12ec
+  metadata.gz: 68ecf2a9df11419a27f87c57947985f90fb8782d11c89b6430544df8d73d02cd375a5f86d558847f141edbb63207c70dd067ef9bba92ecaaf8e3ec954feca222
+  data.tar.gz: cf1627feddae12607afcff88995223837d07907705649303ce2a72f0cd1e0186e408647594f44ba720a7131e444ed83d032b33cc05de4fc7d2ac7a94a0e6b683

data/lib/tabulatr/data/dsl.rb

@@ -34,6 +34,7 @@ module Tabulatr::Data::DSL
     opts = {
             sort_sql: sql_options[:sort_sql],
             filter: true,
+            default_filter: nil,
             sortable: true,
             filter_sql: sql_options[:filter_sql]}.merge(opts)
     table_column = Tabulatr::Renderer::Column.from(

data/lib/tabulatr/data/filtering.rb

@@ -42,8 +42,13 @@ module Tabulatr::Data::Filtering
   end
 
   def apply_filters(filter_params)
-    return unless filter_params
-    filter_params.permit!.to_hash.with_indifferent_access.each do |param|
+    default_filters = table_columns.map do |col|
+      next if col.col_options.default_filter.nil?
+      ["#{col.table_name}:#{col.name}", col.col_options.default_filter]
+    end.compact.to_h
+    return unless filter_params || default_filters.present?
+    filters = default_filters.merge(filter_params&.permit! || {})
+    filters.to_hash.with_indifferent_access.each do |param|
       name, value = param
       next unless value.present?
 
@@ -84,7 +89,7 @@ module Tabulatr::Data::Filtering
     when 'this_month' then date_in_between(today.at_beginning_of_month.beginning_of_day,
                               today.at_end_of_month.end_of_day, n)
     when 'last_30_days' then date_in_between((today - 29.day).beginning_of_day, today.at_end_of_day, n)
-    when 'from_to' then date_in_between((Date.parse(cond['from']) rescue nil), (Date.parse(cond['to']) rescue nil), n)
+    when 'from_to' then date_in_between((Time.zone.parse(cond['from']) rescue nil), (Time.zone.parse(cond['to']) rescue nil), n)
     end
   end
 

data/lib/tabulatr/params_builder.rb

@@ -2,7 +2,9 @@ module Tabulatr
   class ParamsBuilder
     ALLOWED_PARAMS    = [:header, :filter, :sortable, :data_html,
                          :header_html, :filter_sql, :sort_sql, :sql, :width,
-                         :align, :wrap, :format, :filter_label, :name, :classes]
+                         :align, :wrap, :format, :filter_label, :name, :classes,
+                         :default_filter
+                        ]
     DEPRECATED_PARAMS = []
 
     attr_accessor *ALLOWED_PARAMS

data/lib/tabulatr/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module Tabulatr
-  VERSION = "0.9.45"
+  VERSION = "0.9.47"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabulatr2
 version: !ruby/object:Gem::Version
-  version: 0.9.45
+  version: 0.9.47
 platform: ruby
 authors:
 - Peter Horn
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-17 00:00:00.000000000 Z
+date: 2024-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -279,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: A tight DSL to build tables of ActiveRecord models with sorting, pagination,