full_search 0.1.3 → 0.3.0

data/lib/full_search/typo.rb

@@ -5,23 +5,25 @@ module FullSearch
     MIN_SQLITE_VERSION = [3, 34].freeze
 
     class << self
-      def supported?
-        major, minor = sqlite_version_parts
+      def supported?(model = nil)
+        conn = model&.connection || ActiveRecord::Base.connection
+        major, minor = sqlite_version_parts(conn)
         major > MIN_SQLITE_VERSION.first || (major == MIN_SQLITE_VERSION.first && minor >= MIN_SQLITE_VERSION.last)
       end
 
-      def warn_unsupported!
-        warn "[full_search] SQLite #{sqlite_version} does not support the trigram tokenizer. typo_tolerance requires SQLite >= 3.34."
+      def warn_unsupported!(model = nil)
+        version = sqlite_version(model&.connection || ActiveRecord::Base.connection)
+        warn "[full_search] SQLite #{version} does not support the trigram tokenizer. typo_tolerance requires SQLite >= 3.34."
       end
 
       private
 
-      def sqlite_version_parts
-        sqlite_version.split(".").first(2).map(&:to_i)
+      def sqlite_version_parts(conn)
+        sqlite_version(conn).split(".").first(2).map(&:to_i)
       end
 
-      def sqlite_version
-        ActiveRecord::Base.connection.execute("SELECT sqlite_version() AS v").first["v"]
+      def sqlite_version(conn)
+        conn.execute("SELECT sqlite_version() AS v").first["v"]
       end
     end
   end

data/lib/full_search/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FullSearch
-  VERSION = "0.1.3"
+  VERSION = "0.3.0"
 end

data/lib/full_search.rb

@@ -6,6 +6,8 @@ require "active_support/concern"
 
 require "full_search/version"
 require "full_search/config"
+require "full_search/distance"
+require "full_search/quoting"
 require "full_search/errors"
 require "full_search/tokenizer"
 require "full_search/dsl"
@@ -19,6 +21,7 @@ require "full_search/search"
 require "full_search/soft_delete"
 require "full_search/callbacks"
 require "full_search/reindex_job"
+require "full_search/optimize_job"
 require "full_search/test_helpers"
 require "full_search/multi_search"
 
@@ -29,7 +32,19 @@ end
 module FullSearch
   class << self
     def models
-      @models ||= []
+      @models ||= Set.new
+    end
+
+    def register_model(model)
+      models << model
+    end
+
+    def deregister_model(model)
+      models.delete(model)
+    end
+
+    def optimize!
+      models.each { |model| Index.optimize!(model) }
     end
   end
 end

data/lib/generators/full_search/install/templates/full_search.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FullSearch.configure do |config|
-  config.auto_manage_schema = Rails.env.local?
+  config.auto_rebuild_schema = Rails.env.local?
 
   config.stale_query_behavior = Rails.env.production? ? :log_and_fallback : :raise
 

data/lib/tasks/full_search.rake

@@ -1,30 +1,50 @@
 # frozen_string_literal: true
 
+def resolve_full_search_models(args)
+  if args[:models]
+    args[:models].split(",").map do |name|
+      klass = begin
+        name.singularize.camelize.constantize
+      rescue NameError, LoadError => e
+        warn "[full_search] Could not resolve model '#{name}': #{e.message}"
+        nil
+      end
+      klass || FullSearch.models.find { |m| m.table_name == name }
+    end.compact
+  else
+    FullSearch.models
+  end
+end
+
 namespace :full_search do
-  desc "Rebuild full_search indexes"
+  desc "Rebuild indexes when DSL has changed (checks config hash; safe for production)"
   task :rebuild, [:models] => :environment do |_t, args|
     Rails.application.eager_load!
 
-    models = if args[:models]
-               args[:models].split(",").map do |name|
-                 klass = name.singularize.camelize.constantize rescue nil
-                 klass || FullSearch.models.find { |m| m.table_name == name }
-               end.compact
-             else
-               FullSearch.models
-             end
+    resolve_full_search_models(args).each do |model|
+      if FullSearch::Index.rebuild_if_needed!(model)
+        puts "Rebuilt #{FullSearch::Index.fts_table_name(model)}"
+      else
+        puts "#{FullSearch::Index.fts_table_name(model)} is current"
+      end
+    end
+  end
 
-    models.each do |model|
+  desc "Force reset indexes (drops and recreates all FTS tables)"
+  task :reset, [:models] => :environment do |_t, args|
+    Rails.application.eager_load!
+
+    resolve_full_search_models(args).each do |model|
       FullSearch::Index.rebuild!(model)
-      puts "Rebuilt #{FullSearch::Index.fts_table_name(model)}"
+      puts "Reset #{FullSearch::Index.fts_table_name(model)}"
     end
   end
 
   desc "Optimize full_search indexes"
   task optimize: :environment do
     Rails.application.eager_load!
+    FullSearch.optimize!
     FullSearch.models.each do |model|
-      FullSearch::Index.optimize!(model)
       puts "Optimized #{FullSearch::Index.fts_table_name(model)}"
     end
   end
@@ -35,8 +55,24 @@ namespace :full_search do
     FullSearch.models.each do |model|
       stored = FullSearch::Index.stored_config_hash(model)
       current = model.full_search_dsl.config_hash
-      status = stored == current ? "ok" : "stale"
-      puts "#{model.table_name}: #{status} (stored=#{stored}, current=#{current})"
+      status = (stored == current) ? "ok" : "stale"
+      source_fields = model.full_search_dsl.fields.select(&:source).map(&:name)
+
+      drift_info = if source_fields.any?
+        conn = ActiveRecord::Base.connection
+        qc = ->(name) { conn.quote_column_name(name) }
+        qt = ->(name) { conn.quote_table_name(name) }
+        empty_count = ActiveRecord::Base.connection.execute(<<~SQL).first["c"]
+          SELECT COUNT(*) AS c
+          FROM #{qt.call(FullSearch::Index.fts_table_name(model))}
+          WHERE #{source_fields.map { |c| "#{qc.call(c)} = ''" }.join(" OR ")}
+        SQL
+        " | empty source fields: #{empty_count}"
+      else
+        ""
+      end
+
+      puts "#{model.table_name}: #{status}#{drift_info}"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: full_search
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Ben D'Angelo
@@ -16,6 +16,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '8.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -23,6 +26,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '8.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -30,6 +36,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '8.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -37,6 +46,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '8.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -51,6 +63,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: ostruct
   requirement: !ruby/object:Gem::Requirement
@@ -58,7 +98,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -66,33 +106,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: irb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '1.40'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '1.40'
 description: Declarative full-text search for Rails apps backed by SQLite FTS5
 executables: []
 extensions: []
@@ -102,6 +142,7 @@ files:
 - lib/full_search.rb
 - lib/full_search/callbacks.rb
 - lib/full_search/config.rb
+- lib/full_search/distance.rb
 - lib/full_search/dsl.rb
 - lib/full_search/errors.rb
 - lib/full_search/exact_match.rb
@@ -109,7 +150,9 @@ files:
 - lib/full_search/index.rb
 - lib/full_search/model.rb
 - lib/full_search/multi_search.rb
+- lib/full_search/optimize_job.rb
 - lib/full_search/query_parser.rb
+- lib/full_search/quoting.rb
 - lib/full_search/railtie.rb
 - lib/full_search/reindex_job.rb
 - lib/full_search/search.rb
@@ -132,12 +175,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 4.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 requirements: []
 rubygems_version: 4.0.15
 specification_version: 4