mensa 0.7.1 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9016fbd279d8168641f18891986045e07f26b124842610e22728268d3f7557e
-  data.tar.gz: 9ca2ab7decb8b7a5d901821a3d129c94ae3a43f20bd981c1d7cb1d0ab68cb402
+  metadata.gz: 9bf52a653e507bed6b1fe67a162dfa882b8dab27aa377b3d883e3da45f67f727
+  data.tar.gz: da0c8e7b5c349f4f5bd8c4358797a5eec1327ecf1171dc6de7158b0cc9cfbee4
 SHA512:
-  metadata.gz: dbcd2b404c1da8e152ac4ad555a3a95093a0a33bafb3f809f9f099c2b21b21028667b2dae708ffae57dcd9d0e9db2fd539de2baea1110e0628d536b01d9aab49
-  data.tar.gz: 49e1a2b30f5efd72d913d22981aad389116d3935dedd4245ffebbc87637222a1f3bca58850bbbd094461b59b29bce9400e9a94867608195d96fc2ecf4773313b
+  metadata.gz: 0c9e920e4760b45ea4d3ecb2f4e09745a84bc1830e70a3a2085fba4b5511411df65b607fecc9e11ec827811a71848d8a4f66c1be7f0a71b61a77d4100b3b5c99
+  data.tar.gz: b86ee152657699c2739acda33e9b24afcd04e2360a2f034c2d20b27bb2aaa7d5ba53b1677ea0cef76fa238e179c05eec5194fc268069a1c0fda06d7a761ac10e

data/.shipkit.yml

@@ -1,2 +1,2 @@
 ---
-previous_version: 0.7.0
+previous_version: 0.7.2

data/CHANGELOG.md

@@ -1,10 +1,21 @@
 # Changelog
 
-## Unreleased
+## 0.7.3
+
+- **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.
+
+## 0.7.2
 
 - The verifier's report only lists failures and warnings. `-v`/`--verbose` (or
   `VERBOSE=1`) on the rake tasks, or `result.to_s(verbose: true)`, lists every
-  check.
+  check, and the classes in `app/tables` that were skipped as they aren't Mensa
+  tables.
 
 ## 0.7.0
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mensa (0.7.0)
+    mensa (0.7.2)
       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.
 
@@ -458,7 +463,7 @@ bin/rails "mensa:verify[inventories]" -v
 ```
 
 Classes and modules that don't descend from `Mensa::Base` (e.g. helpers in
-`app/tables`) are reported as skipped.
+`app/tables`) are skipped, and only reported as such with `-v`.
 
 #### From tests
 

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/lib/mensa/verifier.rb

@@ -95,21 +95,23 @@ module Mensa
       # Context comes from USER_ID, ACCOUNT_ID and PARAMS (JSON) in +env+, and
       # STRICT=1 makes warnings fail, used by the mensa:verify rake tasks.
       # The reports list failures and warnings, +verbose+ (or VERBOSE=1) lists
-      # every check.
+      # every check and the classes skipped as they aren't Mensa tables.
       def run(tables = nil, env: ENV, io: $stdout, verbose: false)
         classes = tables.present? ? Array(tables).map { |table| resolve_table_class(table) } : table_classes
         options = options_from_env(env)
         verbose ||= %w[1 true yes].include?(env["VERBOSE"].to_s.downcase)
 
         results = classes.flat_map do |klass|
-          verify(klass, **options).each { |result| io.puts(result.to_s(verbose: verbose), "") }
+          verify(klass, **options).each do |result|
+            io.puts(result.to_s(verbose: verbose), "") if verbose || result.mensa_table?
+          end
         end
 
         by_table = results.select(&:mensa_table?).group_by(&:table_class)
         others = results.reject(&:mensa_table?)
-        if results.size > 1
+        if by_table.size > 1 || (verbose && results.size > 1)
           passed = by_table.count { |_table, table_results| table_results.all?(&:success?) }
-          io.puts ["#{passed}/#{by_table.size} tables passed", ("#{others.size} skipped, not a Mensa::Base subclass" if others.any?)].compact.join(", ")
+          io.puts ["#{passed}/#{by_table.size} tables passed", ("#{others.size} skipped, not a Mensa::Base subclass" if verbose && others.any?)].compact.join(", ")
         end
         results.all?(&:success?)
       end

data/lib/mensa/version.rb

@@ -1,3 +1,3 @@
 module Mensa
-  VERSION = "0.7.1"
+  VERSION = "0.7.3"
 end

metadata

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