tramway 3.1.2.8 → 4.0.1.1

data/lib/tramway/searchable.rb

@@ -1,43 +1,25 @@
 # frozen_string_literal: true
 
+require 'tramway/pg_searchable'
+
 module Tramway
-  # Searchable module provides a class method `tramway_search` for ActiveRecord models to perform full-text search
-  # across all string and text columns using PostgreSQL's full-text search capabilities.
+  # Searchable module provides a class method `tramway_search` for ActiveRecord models to
+  # perform a generic search across all string and text columns, using the `pg_search` gem.
+  # It is the fallback Tramway::EntitiesController uses when a model does not define its
+  # own `.search` scope. See Tramway::PgSearchable for the PostgreSQL requirement.
   module Searchable
     extend ActiveSupport::Concern
 
     class_methods do
       def tramway_search(query)
-        tokens = search_tokens(query)
-        columns_to_search = searchable_column_names
-
-        return all if tokens.empty? || columns_to_search.empty?
-
-        where(
-          Arel.sql("to_tsvector('simple', #{tsvector_expression(columns_to_search)}) @@ to_tsquery('simple', ?)"),
-          tsquery_expression(tokens)
-        )
-      end
-
-      private
+        return all if query.blank?
 
-      def search_tokens(query)
-        query.to_s.scan(/[[:alnum:]]+/)
+        Tramway::PgSearchable.call(self, query)
       end
 
       def searchable_column_names
         columns.select { |column| column.type.in?(%i[string text]) }.map(&:name)
       end
-
-      def tsvector_expression(column_names)
-        column_names.map do |column_name|
-          "coalesce(#{connection.quote_column_name(column_name)}, '')"
-        end.join(" || ' ' || ")
-      end
-
-      def tsquery_expression(tokens)
-        tokens.map { |token| "#{token}:*" }.join(' & ')
-      end
     end
   end
 end

data/lib/tramway/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tramway
-  VERSION = '3.1.2.8'
+  VERSION = '4.0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway
 version: !ruby/object:Gem::Version
-  version: 3.1.2.8
+  version: 4.0.1.1
 platform: ruby
 authors:
 - kalashnikovisme
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: font-awesome-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
@@ -80,13 +94,27 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg_search
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
     - - "<"
       - !ruby/object:Gem::Version
         version: '9'
@@ -96,7 +124,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
     - - "<"
       - !ruby/object:Gem::Version
         version: '9'
@@ -138,7 +166,10 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/assets/builds/tailwind.css
 - app/assets/javascripts/tramway/tramway.js
+- app/assets/stylesheets/font-awesome.css
+- app/assets/tailwind/application.css
 - app/components/tailwind_component.html.haml
 - app/components/tailwind_component.rb
 - app/components/tramway/actions_buttons_container_component.html.haml
@@ -207,6 +238,10 @@ files:
 - app/components/tramway/form/tramway_select/selected_item_template_component.rb
 - app/components/tramway/form/tramway_select_component.html.haml
 - app/components/tramway/form/tramway_select_component.rb
+- app/components/tramway/grid/card_component.html.haml
+- app/components/tramway/grid/card_component.rb
+- app/components/tramway/grid_component.html.haml
+- app/components/tramway/grid_component.rb
 - app/components/tramway/native_text_component.html.haml
 - app/components/tramway/native_text_component.rb
 - app/components/tramway/nav/item/button_component.html.haml
@@ -266,7 +301,9 @@ files:
 - config/routes.rb
 - config/tailwind.config.js
 - docs/AGENTS.md
+- lib/generators/tramway/install/font_awesome_helpers.rb
 - lib/generators/tramway/install/install_generator.rb
+- lib/generators/tramway/install/layout_helpers.rb
 - lib/kaminari/helpers/tag.rb
 - lib/rules/turbo_html_attributes_rules.rb
 - lib/tasks/tramway_tasks.rake
@@ -286,6 +323,7 @@ files:
 - lib/tramway/duck_typing.rb
 - lib/tramway/duck_typing/active_record_compatibility.rb
 - lib/tramway/engine.rb
+- lib/tramway/errors.rb
 - lib/tramway/forms/class_helper.rb
 - lib/tramway/forms/fields.rb
 - lib/tramway/forms/normalizations.rb
@@ -296,8 +334,10 @@ files:
 - lib/tramway/helpers/form_helper.rb
 - lib/tramway/helpers/navbar_helper.rb
 - lib/tramway/helpers/routes_helper.rb
+- lib/tramway/helpers/table_helper.rb
 - lib/tramway/helpers/views_helper.rb
 - lib/tramway/navbar.rb
+- lib/tramway/pg_searchable.rb
 - lib/tramway/searchable.rb
 - lib/tramway/utils/field.rb
 - lib/tramway/utils/render.rb
@@ -326,7 +366,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Tramway Rails Engine
 test_files: []