mensa 0.6.14 → 0.6.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3d23dc5f37173fea8736de1271cd1c55f192f9bf28df2b2df7bc6d5c8e0d922
-  data.tar.gz: 190e32dd6e3d9b8e8cd3fb34875535dc494873a923895a6306289df521a17ae3
+  metadata.gz: cd9ef2e0b14473937b5da9f4e7d82628501bb106e03dc892c3f055a15e2c562f
+  data.tar.gz: 8b088073a2fcc12813252c42e04ba277b97c44126e786c157a7090c253f4868a
 SHA512:
-  metadata.gz: 9b5913385d0de9990422c6a897631d8a3f119e025f48a994f976a30c94f7655f04874da6626e02d4aa6e88f4f45d952089b87784fb8228e2f24c14030342f950
-  data.tar.gz: ef17f02b50efaa802a7dbdbfe0fde4f8463da3c8c16fd3aa87b5344c2bbfcd21d52a36a072515a43d34caa21894bd3d4f7c75e6ac71ee613264d5692299c43c5
+  metadata.gz: 949a19530126d3a298bd4c34b10ea1c3db21c86555565f0ea7db3289cba10067f82a9ca289384c940358a34bf98d1109f364723333e9420e0c663318fffca6f7
+  data.tar.gz: 7670004d48f01f5aeec0e56772f51a4eee30d9b910c9c11bccb57b82d22c56ae62ea4d763d5ae1fbfd99c50ac1486f055774d1bda6af2dcc390b757c534322db

data/.shipkit.yml

@@ -1,2 +1,2 @@
 ---
-previous_version: 0.6.13
+previous_version: 0.6.14

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 0.6.15
+
+- Custom filter `scope` blocks now work. Applied filters are built from the
+  column's `filter do ... end` definition (`scope`, `operators`, `multiple`,
+  `collection`, `having`, ...) with the requested `value` and `operator`
+  layered on top, and `Mensa::Filter#scope` returns the proc instead of
+  calling it without arguments. Host apps can remove workarounds that patch
+  `Mensa::Base#active_filters` or `Mensa::Filter#scope`.
+- Only `value` and `operator` are taken from the request for applied filters;
+  other filter options come from the column definition.
+- Exports are refused (403) for tables with `exportable false`, instead of
+  being created and failing in `Mensa::ExportJob`.
+
 ## 0.6.12
 
 - Tables built with `params` (`table :name, params: {...}`) now work in filters,

data/Gemfile.lock

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

data/app/controllers/mensa/tables/exports_controller.rb

@@ -21,6 +21,8 @@ module Mensa
       # Creates a new export for the current user and enqueues the job that
       # generates and attaches the CSV.
       def create
+        return head :forbidden unless table.exportable?
+
         export = Mensa::Export.new(
           table_name: params[:table_id],
           table_view_id: params[:table_view_id].presence,
@@ -108,6 +110,12 @@ module Mensa
         @table_params ||= Mensa::TableParams.from_request(params)
       end
 
+      def table
+        @table ||= Mensa.for_name(params[:table_id], params: table_params).tap do |table|
+          table.original_view_context = helpers
+        end
+      end
+
       def list_stream
         turbo_stream.replace(Mensa::Export.list_dom_id(params[:table_id], current_mensa_user, params: table_params),
           partial: "mensa/exports/list", locals: list_locals)

data/app/tables/mensa/base.rb

@@ -107,12 +107,15 @@ module Mensa
       columns.any?(&:filter?)
     end
 
-    # Returns the active filters, skipping any whose column no longer exists.
     def active_filters
       (config[:filters] || {}).filter_map do |column_name, filter_config|
         col = column(column_name)
         next unless col
-        Mensa::Filter.new(column: col, config: filter_config, table: self)
+
+        definition = config.dig(:columns, col.name, :filter)
+        definition = {} unless definition.is_a?(Hash)
+        requested = (filter_config || {}).to_h.symbolize_keys.slice(:value, :operator)
+        Mensa::Filter.new(column: col, config: definition.merge(requested), table: self)
       end
     end
 

data/app/tables/mensa/filter.rb

@@ -10,7 +10,7 @@ module Mensa
 
     config_reader :operator, cast: :to_sym
     config_reader :value
-    config_reader :scope
+    config_reader :scope, call: false
     config_reader :multiple
     config_reader :having?
 
@@ -88,7 +88,7 @@ module Mensa
         return record_scope if value.is_a?(Array) && value.compact_blank.empty?
 
         query, hash = query_and_hash_for_operator
-        record_scope = (column.filter.having? ? record_scope.having(query, hash) : record_scope.where(query, hash)) if query.present?
+        record_scope = (having? ? record_scope.having(query, hash) : record_scope.where(query, hash)) if query.present?
         record_scope
       end
     end

data/lib/mensa/version.rb

@@ -1,3 +1,3 @@
 module Mensa
-  VERSION = "0.6.14"
+  VERSION = "0.6.15"
 end

metadata

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