tabulatr2 0.9.46 → 0.9.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f41f421f2b5c05c35dc912a034b114706e2281d52441f78441c9c3fadb09557f
-  data.tar.gz: bb97bea3acf941cff212cc230cad2befcef4bcc6be21654c22e9a0307fe16905
+  metadata.gz: 529e1c4299c8377f6c5d108014e440fd5d3081c1c36694a54e38ff0d4aeac38c
+  data.tar.gz: a991342b3c04d2042687d4e728c937fdf9c8f919fb3840eef30d43da1fcb256b
 SHA512:
-  metadata.gz: 1bce2f2d71ce8dbf4f49efffc567ad2d828dddde65a9e4fa1507636cfcbfa358c96dd5ad32321b840c8272ba1e5207d17c48929ab48576eead97bb4e316ed014
-  data.tar.gz: a47a5311d2b87de12ac9fbb112cc26c18c2ef6e60a6404e82e5d2b558d7359580935f3f54a8aa06c2d4d5cf401dc97bbe4ca09495856a89333b1429e56128fa8
+  metadata.gz: edb0bd4150734762a714012297edc593367dbdb245e7e9feed72c10938e91a805f34b031d25687c2b6f3c1dfc1e2d43999e9150caf10753d0386b911c1fcfcb7
+  data.tar.gz: 3b70cd921bf2234566c7154e6320a04d574801937f7a365eaffabff03ad26cb0d2664f531940a53aa3c2176788bafeefb5c7329335060c4a768cd0e389209c43

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?
 

data/lib/tabulatr/data/sorting.rb

@@ -53,6 +53,7 @@ module Tabulatr::Data::Sorting
 
   def sort_by(column, orientation)
       sort_sql = column.col_options.sort_sql
+      orientation = 'asc' unless ['asc', 'desc'].member?(orientation.downcase)
       if sort_sql.respond_to? :call
         @relation = sort_sql.call(@relation, orientation, "#{@table_name}.#{@base.primary_key}", @base)
       else

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.46"
+  VERSION = "0.9.48"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabulatr2
 version: !ruby/object:Gem::Version
-  version: 0.9.46
+  version: 0.9.48
 platform: ruby
 authors:
 - Peter Horn
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2024-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails