mensa 0.6.6 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e66178b4b3d7f5431a1997a2abc5e2dcb048af8a5af7b5c7b865917ca9d0cb0f
-  data.tar.gz: cd6fd8240ac179b2b2376e05790b152064b9c6c0ab355726dfd125238ea58007
+  metadata.gz: 5cc6a4c7a0cbea3b05559bad2910becc5458e74137015835b0d8a753d1e8012e
+  data.tar.gz: 65afa4de844a8741a342bbd38e8e717eaa59c35650eef0b4297e8420cd380821
 SHA512:
-  metadata.gz: b6fec9dc9274285bcaa1541b707960a57ec16a04b13344093916e9b980f09a803af34d3694fcb11a8158d9265f8a1d33f30584b49a50975c36c95beb6c7a3458
-  data.tar.gz: b82a1ce70210d3b70ef9c79d1b3c3e23f492b666f79714aea7731d13c4e178b51f25c1fb8dc50dc7a82190d0b37e47530dfc875ff6434f53e0e3661ec2104664
+  metadata.gz: 3282238437abbc28f4896ff086241eb5a8ff6fb12202691bb7f3f8c85c5cda4677a28406c6f367c582660335853a496c7c7f42ab0ef98518512350d6ef2ff479
+  data.tar.gz: 82374fe57fdf48bae11d6c784bbcc7f4ad2380fc739565500b70a6df49bfbc2392bb1cfde5dba69e23222a85bf3d33a0c38cd1e35dcd4d5d3b33ba47ba65ccaf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mensa (0.6.5)
+    mensa (0.6.7)
       csv
       importmap-rails
       pagy (>= 43)

data/app/components/mensa/table/component.rb

@@ -10,7 +10,13 @@ module Mensa
 
       def initialize(table_name, params: {}, **options)
         @params = params
-        @table = Mensa.for_name(table_name, {params: params})
+        config = {params: params}
+        view_lookup_table = Mensa.for_name(table_name, config)
+        view = view_lookup_table.default_system_view
+
+        table_config = (view&.config&.deep_transform_keys(&:to_sym) || {}).merge(config)
+        @table = Mensa.for_name(table_name, table_config)
+        @table.table_view = view
         @table.original_view_context = options[:original_view_context]
         @table.component = self
       end

data/app/controllers/mensa/tables_controller.rb

@@ -1,17 +1,20 @@
 module Mensa
   class TablesController < ApplicationController
     def show
-      config = params.permit(:format, :query, :id, :page, :table_view_id, :turbo_frame_id, order: {}, column_order: [], hidden_columns: [], params: {}).to_h
-      config[:filters] = params[:filters].to_unsafe_h if params.key?(:filters)
-      config[:params] = params[:params]&.to_unsafe_h || {}
+      config = params.permit(:format, :query, :id, :page, :table_view_id, :turbo_frame_id, order: {}, column_order: [], hidden_columns: [], params: {}, filters: {}).to_h
 
-      if params[:table_view_id]
-        view_lookup_table = Mensa.for_name(params[:id], config)
-        @view = Mensa::TableView.find_by(table_name: params[:id], id: params[:table_view_id])
-        @view ||= view_lookup_table.system_views.find { |v| v.id == params[:table_view_id].to_sym }
-        config = (@view&.config&.deep_transform_keys(&:to_sym) || {}).merge(config)
+      @table = Mensa.for_name(params[:id], config)
+
+      view_lookup_table = Mensa.for_name(params[:id], config)
+      @view = if params[:table_view_id]
+        Mensa::TableView.find_by(table_name: params[:id], id: params[:table_view_id]) ||
+          view_lookup_table.system_views.find { |v| v.id == params[:table_view_id].to_sym }
+      else
+        view_lookup_table.default_system_view
       end
 
+      config = (@view&.config&.deep_transform_keys(&:to_sym) || {}).merge(config)
+
       @table = Mensa.for_name(params[:id], config)
       @table.request = request
       @table.table_view = @view

data/app/tables/mensa/base.rb

@@ -85,6 +85,10 @@ module Mensa
       views + (config[:views] || {}).keys.map { |view_name| Mensa::SystemView.new(view_name, config: config.dig(:views, view_name), table: self) }
     end
 
+    def default_system_view
+      system_views.find { |view| view.id == :default }
+    end
+
     # Returns true if the table has filters
     def filters?
       columns.any?(&:filter?)
@@ -143,7 +147,7 @@ module Mensa
     end
 
     def views?
-      all_views.reject{_1.id == :default}.present?
+      all_views.reject { it.id == :default }.present?
     end
 
     # The user that owns custom views. Returns nil when the host application has

data/app/tables/mensa/config/filter_dsl.rb

@@ -2,12 +2,14 @@ module Mensa::Config
   class FilterDsl
     include DslLogic
 
-    option :operator, default: :is
-    option :value
-    option :collection
-    option :scope
-    option :multiple, default: false
+    option :operator, default: :is      # Operator for filtering
+    option :value                       # Value for filtering
+
+    option :collection                  # Collection shown in filtering
+    option :scope                       # Scope for filtering
+    option :multiple, default: false    # Multiple values allowed
     option :as
-    option :operators
+    option :operators, default: []      # Supported operators
+    option :having, default: false      # Needs having when filtering
   end
 end

data/app/tables/mensa/filter.rb

@@ -12,6 +12,7 @@ module Mensa
     config_reader :value
     config_reader :scope
     config_reader :multiple
+    config_reader :having?
 
     class << self
       def OPERATORS
@@ -80,7 +81,7 @@ module Mensa
         record_scope.instance_exec(normalize(value), &scope)
       else
         query, hash = query_and_hash_for_operator
-        record_scope = record_scope.where(query, hash) if query.present?
+        record_scope = (column.filter.having? ? record_scope.having(query, hash) : record_scope.where(query, hash)) if query.present?
         record_scope
       end
     end
@@ -99,14 +100,15 @@ module Mensa
       operators
     end
 
+    # Used in the where clause
     def query_and_hash_for_operator
-      hash = { column: column.attribute_for_condition, value: normalize(value) }
+      hash = {column: column.attribute_for_condition, value: normalize(value)}
 
       query = case operator
       when :is_empty
-        column.type == :string ? ":column IS NULL OR :column = ''" : ":column IS NULL"
+        (column.type == :string) ? ":column IS NULL OR :column = ''" : ":column IS NULL"
       when :isnt_empty
-        column.type == :string ? ":column IS NOT NULL AND :column != ''" : ":column IS NOT NULL"
+        (column.type == :string) ? ":column IS NOT NULL AND :column != ''" : ":column IS NOT NULL"
       when :is_current
         ":column = :value"
       when :matches

data/lib/mensa/version.rb

@@ -1,3 +1,3 @@
 module Mensa
-  VERSION = "0.6.6"
+  VERSION = "0.6.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mensa
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.8
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-17 00:00:00.000000000 Z
+date: 2026-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails