full_search 0.1.2 → 0.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/full_search/highlighter.rb +38 -0
- data/lib/full_search/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 90ca9a454b8cacf2619c28ced3b07420fbf26ab34ddb55b79f93ce82ce69c06e
|
|
4
|
+
data.tar.gz: e37851d2e693989a7585fe40460af0bab1ae91c9b171faca76114394b3c97799
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 76f1883ee4d70669bd85bfac929b2dfaf820efb40400cfaabe98fd0d7dc68ad867e551cb0cb7d292f51694e74fa0349080497adb6a6dd52154b1e80b259540e1
|
|
7
|
+
data.tar.gz: f5e1fa063bcf8ff247ff52506f98fcacd98d47de827601a48d2070f8da58d380dc72d628089d69f63a89bc0a88dacec123c68566ec82e502defeaa76a5546958
|
|
@@ -4,12 +4,18 @@ module FullSearch
|
|
|
4
4
|
class Highlighter
|
|
5
5
|
def self.apply!(records, model, query)
|
|
6
6
|
snippets = build_snippets(model, query)
|
|
7
|
+
if snippets.values.all?(&:nil?) && records.any?
|
|
8
|
+
snippets = manual_snippets(records, model, query)
|
|
9
|
+
end
|
|
7
10
|
records.each { |record| record.full_search_snippet = snippets[record.id] }
|
|
8
11
|
records
|
|
9
12
|
end
|
|
10
13
|
|
|
11
14
|
def self.apply_fields!(records, model, query)
|
|
12
15
|
fields = build_field_snippets(model, query)
|
|
16
|
+
if fields.empty? && records.any?
|
|
17
|
+
fields = manual_field_snippets(records, model, query)
|
|
18
|
+
end
|
|
13
19
|
records.each { |record| record.full_search_highlight_fields = fields[record.id] || {} }
|
|
14
20
|
records
|
|
15
21
|
end
|
|
@@ -41,6 +47,38 @@ module FullSearch
|
|
|
41
47
|
end
|
|
42
48
|
end
|
|
43
49
|
|
|
50
|
+
def self.manual_snippets(records, model, query)
|
|
51
|
+
dsl = model.full_search_dsl
|
|
52
|
+
config = dsl.highlight_config || { open_tag: "<mark>", close_tag: "</mark>" }
|
|
53
|
+
cols = dsl.fields.map(&:name)
|
|
54
|
+
|
|
55
|
+
records.to_h do |record|
|
|
56
|
+
text = cols.map { |col| record.public_send(col).to_s }.join(" ").strip
|
|
57
|
+
highlighted = manual_highlight(text, query, config)
|
|
58
|
+
[record.id, highlighted.presence]
|
|
59
|
+
end
|
|
60
|
+
end
|
|
61
|
+
|
|
62
|
+
def self.manual_field_snippets(records, model, query)
|
|
63
|
+
dsl = model.full_search_dsl
|
|
64
|
+
config = dsl.highlight_config || { open_tag: "<mark>", close_tag: "</mark>" }
|
|
65
|
+
cols = dsl.fields.map(&:name)
|
|
66
|
+
|
|
67
|
+
records.to_h do |record|
|
|
68
|
+
snippets = cols.each_with_object({}) do |col, hash|
|
|
69
|
+
value = record.public_send(col).to_s
|
|
70
|
+
highlighted = manual_highlight(value, query, config)
|
|
71
|
+
hash[col.to_s] = highlighted if highlighted.include?(config[:open_tag])
|
|
72
|
+
end
|
|
73
|
+
[record.id, snippets]
|
|
74
|
+
end
|
|
75
|
+
end
|
|
76
|
+
|
|
77
|
+
def self.manual_highlight(text, query, config)
|
|
78
|
+
return text if text.empty? || query.empty?
|
|
79
|
+
text.gsub(/#{Regexp.escape(query)}/i, "#{config[:open_tag]}\\0#{config[:close_tag]}")
|
|
80
|
+
end
|
|
81
|
+
|
|
44
82
|
def self.highlight_rows(model, query)
|
|
45
83
|
dsl = model.full_search_dsl
|
|
46
84
|
config = dsl.highlight_config || { open_tag: "<mark>", close_tag: "</mark>" }
|
data/lib/full_search/version.rb
CHANGED