mensa 0.7.2 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca5c6f3fab08895527058f4cbb70a55608297da85a234c2476d120be6de13882
-  data.tar.gz: f09da64e3c8dfaaf1917e1097845171aa29fab13c18285d3802278d5a7d8bfc9
+  metadata.gz: ab3722840d818b5e39cac9b51fe13230d93fc1bcc3cfa61ecebedbff2f1fdc52
+  data.tar.gz: cb5a23038d098bcde99caf7db0764288c82e882c31416a18875ffda4916dc12f
 SHA512:
-  metadata.gz: 2f9ff2a45fd5d5784a31ee7e96d45b683bc16aecb53947eb6a942f5764d175fcbbc16303103ad3c46f71a571da8c5a8b5e8af9fa82000fdd8bbd025694108263
-  data.tar.gz: 9948a29ea8daee96c71466b33d3e63e4a7dd20496247edf36740c779cf2b2743fbfdedf92f03a391abe5d43544aa32f25825b340b6fb8a8f471bb66432107dda
+  metadata.gz: 32c0a1ada80a403d35e9400e10273f6122c445e7c71ee2cdd4bc4492f9c11881de46f1020bd4db7591f97a3ec8a16c89012458f89a77e1a65e223800298c95f0
+  data.tar.gz: 0a5532668ef39a57ff4b9118d2940fb63566bd41d287d28e579f4b729c0e811eff494e95a9035f53c97f6f4f12d7758295ba7d6ff7ffbf1956a238e201737273

data/.shipkit.yml

@@ -1,2 +1,2 @@
 ---
-previous_version: 0.7.1
+previous_version: 0.7.3

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.7.4
+
+- **Behaviour change:** the `matches` and `does_not_match` filters now do a
+  case-insensitive "contains" (`ILIKE '%value%'`), the same way search does.
+  Before, they passed the value to `LIKE` as it was, so `matches "LLC"` only
+  found rows that were exactly `LLC`. The value is taken literally, so saved
+  views that relied on typing `%` or `_` wildcards now match a literal `%` or
+  `_`. `does_not_match` now also returns rows where the column is NULL.
+  Attributes without a `type` are cast to text for the comparison.
+- Search leaves out internal columns. They aren't shown, so a row found
+  through one looked like it didn't match.
+
 ## 0.7.2
 
 - The verifier's report only lists failures and warnings. `-v`/`--verbose` (or

data/Gemfile.lock

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

data/README.md

@@ -187,6 +187,11 @@ The operators are `is`, `isnt`, `matches`, `does_not_match`, `gt`, `gteq`, `lt`,
 | boolean, uuid, enums and other types | `is`, `isnt` |
 | jsonb, json | none (json also has no `is_duplicate`) |
 
+`matches` finds rows where the column contains the value anywhere, ignoring case
+(`ILIKE '%value%'`), and `does_not_match` finds the others, including rows where the
+column is empty (NULL). The value is taken literally: `%`, `_` and `\` are matched as
+characters, not as wildcards. A blank value matches only empty strings.
+
 `matches` and `does_not_match` are left out when the filter has a `collection`, and
 `is_current` is only offered when `Current` has a method named after the column.
 

data/app/tables/mensa/filter.rb

@@ -14,7 +14,7 @@ module Mensa
     config_reader :multiple
     config_reader :having?
 
-    # Types that LIKE works on, nil is an attribute without a type
+    # Types that ILIKE works on, nil is an attribute without a type
     TEXT_TYPES = [:string, :text, :citext, nil].freeze
     # Types with a meaningful order, for gt, gteq, lt and lteq
     RANGE_TYPES = %i[integer bigint float decimal money date datetime timestamp timestamptz time interval].freeze
@@ -139,9 +139,12 @@ module Mensa
         hash[:value] = Current.public_send(column.name)
         "#{col} = :value"
       when :matches
-        "#{col} LIKE :value"
+        hash[:value] = contains_pattern(hash[:value])
+        "#{text_col(col)} ILIKE :value"
       when :does_not_match
-        "#{col} NOT LIKE :value"
+        # Rows without a value don't contain it either
+        hash[:value] = contains_pattern(hash[:value])
+        "(#{col} IS NULL OR #{text_col(col)} NOT ILIKE :value)"
       when :is
         hash[:value].is_a?(Array) ? "#{col} IN (:value)" : "#{col} = :value"
       when :isnt
@@ -280,6 +283,23 @@ module Mensa
       record_scope.having("#{column_sql} IN (#{duplicate_values_scope.to_sql})")
     end
 
+    # A case-insensitive "contains" pattern, with %, _ and \ in the value
+    # matched literally. A blank value is compared as it is, like `is` does,
+    # so it doesn't turn into '%%' and match everything.
+    def contains_pattern(value)
+      return value if value.to_s.empty?
+
+      "%#{ActiveRecord::Base.sanitize_sql_like(value.to_s)}%"
+    end
+
+    # An attribute without a type may not be text in SQL (e.g. a count), cast
+    # it like search does. Typed columns are compared as they are, so an
+    # explicit `matches` on e.g. a boolean still fails (and the verifier
+    # reports it).
+    def text_col(col)
+      column.type.nil? ? "CAST(#{col} AS text)" : col
+    end
+
     # Unused at the moment
     def normalize(query)
       query

data/app/tables/mensa/search.rb

@@ -10,8 +10,9 @@ module Mensa
       return record_scope if query.blank?
       return record_scope unless record_scope.is_a?(ActiveRecord::Relation)
 
-      # Aggregates (filter having) can't be in a WHERE
-      searchable_attributes = columns.reject { |column| column.filter&.having? }.filter_map(&:attribute_for_condition).uniq
+      # Aggregates (filter having) can't be in a WHERE, and internal columns
+      # aren't shown, so a match on them can't be seen
+      searchable_attributes = columns.reject { |column| column.internal? || column.filter&.having? }.filter_map(&:attribute_for_condition).uniq
       return record_scope if searchable_attributes.empty?
 
       @search_order_clause = nil

data/lib/mensa/version.rb

@@ -1,3 +1,3 @@
 module Mensa
-  VERSION = "0.7.2"
+  VERSION = "0.7.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mensa
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.4
 platform: ruby
 authors:
 - Tom de Grunt