mensa 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 194b34ee31bebddc3962cc66e5c789e5369f828eb6087f67f72b54aba97f65d8
-  data.tar.gz: 1ead92c4d986f5e69c3d5745fcee27541f8205bf0106bd25f757b7603cdc117f
+  metadata.gz: 10a862acae838d21598f9ce5d3e07b553a7a5e002b66c4993e32e0cb665d5a5d
+  data.tar.gz: 36115f04215a21212ad1f5f81ecd108f75e68199d4ae9a5db1c11cf74e136350
 SHA512:
-  metadata.gz: f5c078859d1c6214b8b65ab36fd077a2c36e2f5b50a69efd0dc20621d6373977be10ed543bc68add8b81338b4322903c3c305a15a0bd47c8ea906d77953c2a9d
-  data.tar.gz: 6e68ccdd3ffea1ef460876f61a9d624a8d7de198addad7c712bfac67eac1cc08fbe0874221ba76f241ce5d47c8dec0b09c7950f058865ee232ca540868bea95d
+  metadata.gz: cfa2040a481694e363da898e51ab521ec7b8b4defc6775d46b919f8775296d57839e34afd690da5b7bfb478ab1ef9e727536ff6892db660fb4439026e5c7d2e0
+  data.tar.gz: 3080bef3dfe7f0ff02c64e43e7296865c1e835caa86f47bfeaa74d3e0c6232c2c886bd6f2ba3dafb7ffa0c7bc2790cce77a0fe5052e45c72a273874a7b63e226

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mensa (0.3.3)
+    mensa (0.3.4)
       csv
       importmap-rails
       pagy (>= 43)
@@ -10,7 +10,6 @@ PATH
       rubyzip (>= 1.2.2)
       stimulus-rails
       tailwindcss-rails (~> 3.3)
-      textacular (>= 5)
       turbo-rails
       view_component (~> 3.11)
 
@@ -337,8 +336,6 @@ GEM
     tailwindcss-ruby (3.4.19-arm64-darwin)
     tailwindcss-ruby (3.4.19-x86_64-darwin)
     tailwindcss-ruby (3.4.19-x86_64-linux)
-    textacular (5.7.0)
-      activerecord (>= 5.0)
     thor (1.5.0)
     timeout (0.6.1)
     tsort (0.2.0)

data/app/components/mensa/filter_pill/component.css

@@ -1,8 +1,13 @@
 .mensa-filter-pill {
-    @apply inline-flex items-stretch text-xs;
+    @apply inline-flex items-stretch text-xs rounded-md overflow-hidden;
 
     &__chip {
-        @apply flex items-center gap-1 pl-2 pr-1.5 py-0.5 bg-gray-100 dark:bg-gray-700 rounded-l-md cursor-pointer hover:bg-gray-200 dark:hover:bg-gray-600 transition-colors;
+        @apply flex items-center gap-1 pl-2 pr-1.5 py-0.5 bg-gray-100 dark:bg-gray-700 rounded-md cursor-pointer transition-all;
+    }
+
+    &:hover &__chip,
+    &:focus-within &__chip {
+        @apply bg-gray-200 dark:bg-gray-600 rounded-r-none;
     }
 
     &__column {
@@ -18,6 +23,15 @@
     }
 
     &__remove {
-        @apply inline-flex items-center justify-center px-1.5 text-gray-400 bg-gray-100 dark:bg-gray-700 rounded-r-md hover:text-gray-700 hover:bg-gray-200 dark:hover:bg-gray-600 dark:hover:text-gray-200 cursor-pointer transition-colors;
+        @apply inline-flex items-center justify-center w-0 px-0 text-gray-400 bg-gray-100 dark:bg-gray-700 cursor-pointer overflow-hidden opacity-0 -translate-x-1 pointer-events-none transition-all duration-200;
+    }
+
+    &:hover &__remove,
+    &:focus-within &__remove {
+        @apply w-7 px-1.5 opacity-100 translate-x-0 pointer-events-auto;
+    }
+
+    &__remove:hover {
+        @apply text-gray-700 bg-gray-200 dark:bg-gray-600 dark:text-gray-200;
     }
 }

data/app/controllers/mensa/tables_controller.rb

@@ -7,7 +7,7 @@ module Mensa
       if params[:table_view_id]
         @view = Mensa::TableView.find_by(table_name: params[:id], id: params[:table_view_id])
         @view ||= @table.system_views.find { |v| v.id == params[:table_view_id].to_sym }
-        config = @view&.config&.deep_transform_keys(&:to_sym)
+        config = @view&.config&.deep_transform_keys(&:to_sym) if @view
       end
 
       config = config.merge(params.permit!.to_h)
@@ -21,7 +21,7 @@ module Mensa
 
       respond_to do |format|
         format.turbo_stream # Used for filterering
-        format.html
+        format.html # You shouldn't get here
       end
     end
   end

data/app/tables/mensa/base.rb

@@ -159,7 +159,7 @@ module Mensa
       config[:columns] ||= {}
 
       auto_internal_column_names.each do |column_name|
-        config[:columns][column_name] ||= {internal: true}
+        config[:columns][column_name] ||= {internal: true, filter: false}
       end
     end
 

data/app/tables/mensa/column.rb

@@ -22,7 +22,7 @@ module Mensa
 
     def sort_direction
       value = table.config.dig(:order, name)
-      value.present? ? value.to_sym : nil
+      value.presence&.to_sym
     end
 
     def next_sort_direction
@@ -41,12 +41,22 @@ module Mensa
       @attribute = if config[:attribute].present?
         "#{config[:attribute]} AS #{name}"
       elsif table.model.column_names.include? name.to_s
-        name.to_s
+        "#{table.model.table_name}.#{name}"
+      end
+    end
+
+    def raw_attribute
+      return @raw_attribute if @raw_attribute
+
+      @raw_attribute = if config[:attribute].present?
+        config[:attribute]
+      elsif table.model.column_names.include? name.to_s
+        "#{table.model.table_name}.#{name}"
       end
     end
 
     def active_record_column
-      @active_record_column ||= table.model&.columns&.find { it.name == name.to_s }
+      @active_record_column ||= table.model&.columns&.find { |column| column.name == name.to_s }
     end
 
     def active_record_column_type
@@ -61,15 +71,15 @@ module Mensa
       return @attribute_for_condition if @attribute_for_condition
 
       @attribute_for_condition = if config[:attribute].present?
-        config[:attribute]
+        raw_attribute
       elsif table.model.column_names.include? name.to_s
-        name.to_s
+        "#{table.model.table_name}.#{name}"
       end
     end
 
     # Returns true if the column supports filtering
     def filter?
-      config.key?(:filter)
+      config[:filter] != false
     end
 
     def filter

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

@@ -59,8 +59,8 @@ module Mensa::Config
       # by calling option :render, dsl: Mensa::RenderDsl
       #
       def dsl_option(option_name, klass)
-        define_method(option_name) do |name = nil, &block|
-          config[option_name.to_sym] = block && klass.new(name, &block).config
+        define_method(option_name) do |value = nil, &block|
+          config[option_name.to_sym] = block ? klass.new(value, &block).config : value
         end
       end
 

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

@@ -88,6 +88,7 @@ module Mensa::Config
     def internal(name, &block)
       column(name) do
         internal true
+        filter false
         instance_exec(&block) if block
       end
     end

data/app/tables/mensa/filter.rb

@@ -24,7 +24,8 @@ module Mensa
           [:gteq, I18n.t("mensa.operators.gteq"), true],
           [:lt, I18n.t("mensa.operators.lt"), true],
           [:lteq, I18n.t("mensa.operators.lteq"), true],
-          [:is_current, I18n.t("mensa.operators.is_current"), false]
+          [:is_current, I18n.t("mensa.operators.is_current"), false],
+          [:is_empty, I18n.t("mensa.operators.is_empty"), false]
         ].freeze
       end
     end
@@ -69,6 +70,12 @@ module Mensa
         record_scope.instance_exec(normalize(value), &scope)
       else
         case operator
+        when :is_empty
+          if column.type == :string
+            record_scope.where("#{column.attribute_for_condition} IS NULL OR #{column.attribute_for_condition} = ''")
+          else
+            record_scope.where("#{column.attribute_for_condition} IS NULL")
+          end
         when :is_current
           record_scope.where("#{column.attribute_for_condition} = ?", Current.send(column.name))
         when :matches

data/app/tables/mensa/scope.rb

@@ -4,6 +4,7 @@ module Mensa
   # scope -> filtered_scope -> ordered_scope -> selected_scope ->
   module Scope
     extend ActiveSupport::Concern
+    include Search
 
     included do
     end
@@ -13,15 +14,7 @@ module Mensa
       return @filtered_scope if @filtered_scope
 
       @filtered_scope = scope
-      # See https://github.com/textacular/textacular
-      # This has problems - not all table fields are searched
-      if params[:query].present?
-        @filtered_scope = if Mensa.config.search == :fuzzy
-          @filtered_scope.fuzzy_search(params[:query])
-        else
-          @filtered_scope.basic_search(params[:query])
-        end
-      end
+      @filtered_scope = search(@filtered_scope, params[:query]) if params[:query].present?
 
       # Use inject
       active_filters.each do |filter|
@@ -36,7 +29,13 @@ module Mensa
       return @ordered_scope if @ordered_scope
 
       @ordered_scope = filtered_scope
-      @ordered_scope = @ordered_scope.reorder(effective_order)
+      @ordered_scope = if effective_order.present?
+        @ordered_scope.reorder(effective_order)
+      elsif search_order_clause.present?
+        @ordered_scope.reorder(Arel.sql(search_order_clause))
+      else
+        @ordered_scope.reorder(nil)
+      end
 
       @ordered_scope
     end
@@ -75,7 +74,7 @@ module Mensa
     def effective_order
       result = params.key?(:order) ? (params[:order] || {}) : (config[:order] || {})
       result = result.symbolize_keys.compact_blank.transform_values(&:to_sym)
-      result.transform_keys { column(_1).attribute_for_condition }
+      result.transform_keys { |column_name| column(column_name).attribute_for_condition }
     end
 
     # Builds an order hash for URL generation. Merges current order with overrides;

data/app/tables/mensa/search.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module Mensa
+  module Search
+    extend ActiveSupport::Concern
+
+    private
+
+    def search(record_scope, query)
+      return record_scope if query.blank?
+      return record_scope unless record_scope.is_a?(ActiveRecord::Relation)
+
+      searchable_attributes = columns.filter_map(&:attribute_for_condition).uniq
+      return record_scope if searchable_attributes.empty?
+
+      @search_order_clause = nil
+
+      fuzzy_search?(record_scope) ? fuzzy_search(record_scope, searchable_attributes, query.to_s) : basic_search(record_scope, searchable_attributes, query.to_s)
+    end
+
+    def basic_search(record_scope, searchable_attributes, query)
+      sanitized_query = ActiveRecord::Base.sanitize_sql_like(query)
+      conditions = searchable_attributes.map do |attribute|
+        "CAST((#{attribute}) AS text) ILIKE :term"
+      end.join(" OR ")
+
+      record_scope.where(conditions, term: "%#{sanitized_query}%")
+    end
+
+    def fuzzy_search(record_scope, searchable_attributes, query)
+      sanitized_query = ActiveRecord::Base.sanitize_sql_like(query)
+      compare_quoted = record_scope.model.connection.quote(query)
+      text_expression = searchable_text_expression(searchable_attributes)
+      score_sql = "similarity(#{text_expression}, #{compare_quoted})"
+
+      @search_order_clause = "#{score_sql} DESC"
+
+      record_scope
+        .select(Arel.sql("#{score_sql} AS mensa_search_score"))
+        .where("#{text_expression} % :query OR #{text_expression} ILIKE :term", query: query, term: "%#{sanitized_query}%")
+        .order(Arel.sql(@search_order_clause))
+    end
+
+    def searchable_text_expression(searchable_attributes)
+      fields = searchable_attributes.map do |attribute|
+        "COALESCE(CAST((#{attribute}) AS text), '')"
+      end.join(", ")
+
+      "CONCAT_WS(' ', #{fields})"
+    end
+
+    def search_order_clause
+      @search_order_clause
+    end
+
+    def fuzzy_search?(record_scope)
+      Mensa.config.search == :fuzzy && pg_trgm_enabled?(record_scope)
+    end
+
+    def pg_trgm_enabled?(record_scope)
+      connection = record_scope.model.connection
+      return false unless connection.adapter_name.to_s.downcase.include?("postgres")
+      return connection.extension_enabled?("pg_trgm") if connection.respond_to?(:extension_enabled?)
+
+      connection.select_value("SELECT 1 FROM pg_extension WHERE extname = 'pg_trgm' LIMIT 1").present?
+    rescue
+      false
+    end
+  end
+end

data/app/views/mensa/tables/show.html.erb

@@ -1,5 +1,3 @@
-Test
-<button class="text-xs">Esc</button>
 <turbo-frame id="<%= @table.table_id %>" target="_top">
   <%= render Mensa::View::Component.new(@table) %>
 </turbo-frame>

data/config/locales/en.yml

@@ -10,6 +10,7 @@ en:
       lt: less than
       gteq: greater than or equal to
       lteq: less than or equal to
+      is_empty: is empty
     add_filter:
       component:
         add_filter: Add filter

data/config/locales/nl.yml

@@ -10,6 +10,7 @@ nl:
       lt: kleiner dan
       gteq: groter dan of gelijk aan
       lteq: kleiner dan of gelijk aan
+      is_empty: is leeg
     add_filter:
       component:
         add_filter: Filter toevoegen

data/lib/mensa/configuration.rb

@@ -78,13 +78,7 @@ module Mensa
 
     option :row_actions_position, default: :back
     # It's either :basic or :fuzzy, for fuzzy search you need to have `pg_trgm` extension installed
-    option :search, default: -> {
-      @_search_cache ||= begin
-        (ActiveRecord::Base.connection.execute("SELECT extname FROM pg_extension where extname='pg_trgm';")&.first&.[]("extname") == "pg_trgm") ? :fuzzy : :basic
-      rescue
-        :basic
-      end
-    }, proc: true
+    option :search, default: :basic
 
     def initialize
       set_defaults!

data/lib/mensa/engine.rb

@@ -1,5 +1,4 @@
 require "pagy"
-require "textacular"
 require "tailwindcss-rails"
 require "importmap-rails"
 require "turbo-rails"

data/lib/mensa/version.rb

@@ -1,3 +1,3 @@
 module Mensa
-  VERSION = "0.3.4"
+  VERSION = "0.4.0"
 end

data/mensa.gemspec

@@ -35,7 +35,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rubyzip", ">= 1.2.2"
   spec.add_dependency "pagy", ">=43"
   spec.add_dependency "pg", ">= 1.6"
-  spec.add_dependency "textacular", ">=5"
   spec.add_dependency "view_component", "~> 3.11"
 
   spec.add_dependency "tailwindcss-rails", "~> 3.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mensa
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-11 00:00:00.000000000 Z
+date: 2026-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: textacular
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
 - !ruby/object:Gem::Dependency
   name: view_component
   requirement: !ruby/object:Gem::Requirement
@@ -282,6 +268,7 @@ files:
 - app/tables/mensa/filter.rb
 - app/tables/mensa/row.rb
 - app/tables/mensa/scope.rb
+- app/tables/mensa/search.rb
 - app/tables/mensa/system_view.rb
 - app/views/mensa/exports/_badge.html.erb
 - app/views/mensa/exports/_dialog.html.erb