full_search 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5343bec22958a4f873a86fa226a66e925606f1eb01743e70993b6f2a4d598786
-  data.tar.gz: 3cb1d8b6d8cc8577901c4f6eb79e3340d5899da4ae1bb378ae752e4c89ed7d28
+  metadata.gz: 90ca9a454b8cacf2619c28ced3b07420fbf26ab34ddb55b79f93ce82ce69c06e
+  data.tar.gz: e37851d2e693989a7585fe40460af0bab1ae91c9b171faca76114394b3c97799
 SHA512:
-  metadata.gz: 792eee7f1854aeac5b038f8e9496bf353637ffa85e72117e69ef6ae085c14f6849e43b7fd9c3c9edec5457ac94eaadc1bf6ea6b121294474d43ed135617d70b1
-  data.tar.gz: 3221491574ddbeca5e5299fc38b2959fb31b679c89244bdaaba68ffba8da2a06f3419d61cb857f754bb66a0a55dc80770a816e35ed396e46c3b7a53834f85b5a
+  metadata.gz: 76f1883ee4d70669bd85bfac929b2dfaf820efb40400cfaabe98fd0d7dc68ad867e551cb0cb7d292f51694e74fa0349080497adb6a6dd52154b1e80b259540e1
+  data.tar.gz: f5e1fa063bcf8ff247ff52506f98fcacd98d47de827601a48d2070f8da58d380dc72d628089d69f63a89bc0a88dacec123c68566ec82e502defeaa76a5546958

data/lib/full_search/highlighter.rb

@@ -4,12 +4,18 @@ module FullSearch
   class Highlighter
     def self.apply!(records, model, query)
       snippets = build_snippets(model, query)
+      if snippets.values.all?(&:nil?) && records.any?
+        snippets = manual_snippets(records, model, query)
+      end
       records.each { |record| record.full_search_snippet = snippets[record.id] }
       records
     end
 
     def self.apply_fields!(records, model, query)
       fields = build_field_snippets(model, query)
+      if fields.empty? && records.any?
+        fields = manual_field_snippets(records, model, query)
+      end
       records.each { |record| record.full_search_highlight_fields = fields[record.id] || {} }
       records
     end
@@ -41,6 +47,38 @@ module FullSearch
       end
     end
 
+    def self.manual_snippets(records, model, query)
+      dsl = model.full_search_dsl
+      config = dsl.highlight_config || { open_tag: "<mark>", close_tag: "</mark>" }
+      cols = dsl.fields.map(&:name)
+
+      records.to_h do |record|
+        text = cols.map { |col| record.public_send(col).to_s }.join(" ").strip
+        highlighted = manual_highlight(text, query, config)
+        [record.id, highlighted.presence]
+      end
+    end
+
+    def self.manual_field_snippets(records, model, query)
+      dsl = model.full_search_dsl
+      config = dsl.highlight_config || { open_tag: "<mark>", close_tag: "</mark>" }
+      cols = dsl.fields.map(&:name)
+
+      records.to_h do |record|
+        snippets = cols.each_with_object({}) do |col, hash|
+          value = record.public_send(col).to_s
+          highlighted = manual_highlight(value, query, config)
+          hash[col.to_s] = highlighted if highlighted.include?(config[:open_tag])
+        end
+        [record.id, snippets]
+      end
+    end
+
+    def self.manual_highlight(text, query, config)
+      return text if text.empty? || query.empty?
+      text.gsub(/#{Regexp.escape(query)}/i, "#{config[:open_tag]}\\0#{config[:close_tag]}")
+    end
+
     def self.highlight_rows(model, query)
       dsl = model.full_search_dsl
       config = dsl.highlight_config || { open_tag: "<mark>", close_tag: "</mark>" }

data/lib/full_search/search.rb

@@ -82,7 +82,11 @@ module FullSearch
       return [] if match_expr.empty?
 
       term = parsed.last rescue nil
-      return [] if term.nil? || term.length < dsl.typo_tolerance_min_term_length.to_i
+      return [] if term.nil?
+
+      if term.length < dsl.typo_tolerance_min_term_length.to_i
+        return like_prefix_ids(term)
+      end
 
       trigram_table = FullSearch::Index.trigram_table_name(model)
 
@@ -100,6 +104,27 @@ module FullSearch
       connection.execute("#{sql} #{filter_conditions}").map { |r| r["id"] }
     end
 
+    def like_prefix_ids(term)
+      column_fields = dsl.fields.select { |f| f.source.nil? }
+      return [] if column_fields.empty?
+
+      like_conditions = column_fields.map do |field|
+        "#{connection.quote_table_name(model.table_name)}.#{connection.quote_column_name(field.name)} LIKE #{connection.quote("#{term}%")}"
+      end.join(" OR ")
+
+      sql = <<~SQL
+        SELECT #{model.table_name}.id
+        FROM #{model.table_name}
+        WHERE (#{like_conditions})
+      SQL
+
+      filter_conditions = filters.map do |name, value|
+        "AND #{model.table_name}.#{name} = #{connection.quote(value)}"
+      end.join(" ")
+
+      connection.execute("#{sql} #{filter_conditions}").map { |r| r["id"] }
+    end
+
     def apply_ranking(rel, all_ids, exact_ids)
       return rel if all_ids.empty?
 

data/lib/full_search/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: full_search
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Ben D'Angelo