pg_searchable 0.0.3 → 0.0.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d0f35f235f18026427b95a9fd5620f83ad6236c6
4
- data.tar.gz: 712e910b1aa3bf8a66e7bd353cb0fc18358f2626
3
+ metadata.gz: 4f553a86615e8566e48c2c9bd8e8eb13d77f89c7
4
+ data.tar.gz: 4add369c55d6351311b69e31b44f03d613298b4c
5
5
  SHA512:
6
- metadata.gz: c5ba190060495e370921954a87f011b81806c5ab3122ddb9c878109ad77ee21280e7d064e42e5844f154da294a45d90ef1933398c5f63bce5a5e698e433af999
7
- data.tar.gz: 9f7b4d1dfc96ab333f6181dd549e7af662ca10287e876ce014ab7d786356293dfd93194892f645ee1f215d96a0eb4b0b4fc3bffe0fa61b25009dc0b4e9d75171
6
+ metadata.gz: eb5c14e5a1f3b7a8282d38a0b982759163881f36b70098049c347e203d398684c7b9a685794fee5b9ffe6acc0a3a8ba617c541921660a00b770706c0deaa622a
7
+ data.tar.gz: 16b7aa8e9cfce373a61dd2c4f7bee3620519f5fa2247a810461c7a4c4007a91cf668b7bc02764f3a477dddf91b3f3b48e19fde3303bb3d9578d960f715bfc9f6
@@ -8,9 +8,11 @@ module PgSearchable
8
8
 
9
9
  DEFAULT_WEIGHTS = [0.1, 0.2, 0.4, 1.0]
10
10
  DEFAULT_DICTIONARY = 'english'
11
- DEFAULT_OPTIONS = { weights: DEFAULT_WEIGHTS, dictionary: DEFAULT_DICTIONARY }
11
+ DEFAULT_OPTIONS = { weights: DEFAULT_WEIGHTS, dictionary: DEFAULT_DICTIONARY, normalization: 41 }
12
12
 
13
13
  module ClassMethods
14
+ delegate :close_to, :rank_by, :search_for, to: :scoped
15
+
14
16
  def pg_searchable (name, options = {})
15
17
  pg_searchable_configs[name.to_sym] = {
16
18
  tgrm: _pg_searchable_options,
@@ -23,14 +25,6 @@ module PgSearchable
23
25
  @pg_searchable_configs ||= {}
24
26
  end
25
27
 
26
- def search_for(term, options = {})
27
- scoped.search_for(term, options)
28
- end
29
-
30
- def close_to(longitude, latitude, distance_in_miles = 5)
31
- scoped.close_to(longitude, latitude, distance_in_miles)
32
- end
33
-
34
28
  private
35
29
  def _pg_searchable_options
36
30
  @_pg_searchable_options ||= DEFAULT_OPTIONS.merge(columns: _pg_searchable_columns)
@@ -6,17 +6,30 @@ module PgSearchable
6
6
  def search_for(term, options = {})
7
7
  using = Array(options.delete(:using) || :default)
8
8
  models = Array(options[:in]).map {|association| klass.reflect_on_association(association).klass }
9
- conditions = [self.klass, models].flatten.inject([]) do |conditions, klass|
9
+ conditions = []
10
+ orders = []
11
+
12
+ [self.klass, models].flatten.each do |klass|
10
13
  name = using.find {|name| klass.pg_searchable_configs.key?(name.to_sym) }
11
14
  config = klass.pg_searchable_configs[name]
12
15
 
13
- Array(config[:tgrm][:columns]).each {|name| conditions << klass.arel_table[name].tgrm(term).to_sql }
14
- Array(config[:tsearch][:columns]).each {|name| conditions << klass.arel_table[name].tsearch(term, config[:tsearch][:dictionary]).to_sql }
15
- Array(config[:dmetaphone][:columns]).each {|name| conditions << klass.arel_table[name].dmetaphone(term, config[:dmetaphone][:dictionary]).to_sql }
16
- conditions
16
+ Array(config[:tsearch][:columns]).each do |name|
17
+ conditions << klass.arel_table[name].tsearch(term, config[:tsearch][:dictionary]).to_sql
18
+ orders << "ts_rank_cd(ARRAY[#{config[:tsearch][:weights][0]}, #{config[:tsearch][:weights][1]}, #{config[:tsearch][:weights][2]}, #{config[:tsearch][:weights][3]}], #{arel_table.name}.#{name}, to_tsquery('#{config[:tsearch][:dictionary]}', '#{term}'), #{config[:tsearch][:normalization]})"
19
+ end
20
+
21
+ Array(config[:tgrm][:columns]).each do |name|
22
+ conditions << klass.arel_table[name].tgrm(term).to_sql
23
+ orders << "(coalesce(similarity(#{klass.arel_table.name}.#{name}, '#{term}'), 0) / 4)"
24
+ end
25
+
26
+ Array(config[:dmetaphone][:columns]).each do |name|
27
+ conditions << klass.arel_table[name].dmetaphone(term, config[:dmetaphone][:dictionary]).to_sql
28
+ orders << "(ts_rank_cd(ARRAY[#{config[:dmetaphone][:weights][0]}, #{config[:dmetaphone][:weights][1]}, #{config[:dmetaphone][:weights][2]}, #{config[:dmetaphone][:weights][3]}], #{arel_table.name}.#{name}, to_tsquery('#{config[:dmetaphone][:dictionary]}', pg_searchable_dmetaphone('#{term}')), #{config[:dmetaphone][:normalization]}) / 2)"
29
+ end
17
30
  end
18
31
 
19
- where("#{conditions.join(' OR ')}")
32
+ where("#{conditions.join(' OR ')}")#.order("#{orders.join(' + ')} DESC")
20
33
  end
21
34
 
22
35
  def close_to(longitude, latitude, distance_in_miles = 5)
@@ -28,12 +41,10 @@ module PgSearchable
28
41
  ST_GeographyFromText('SRID=4326;POINT(' || #{arel_table.name}.#{longitude_column} || ' ' || #{arel_table.name}.#{latitude_column} || ')'),
29
42
  ST_GeographyFromText('SRID=4326;POINT(%f %f)'), %d
30
43
  )", longitude, latitude, distance_in_meters)
31
- end
32
-
33
- def rank_by(rank)
34
- # TODO: add ranks to projections
35
- puts "ranking by #{rank}"
36
- self
44
+ .order("ST_Distance(
45
+ ST_GeographyFromText('SRID=4326;POINT(' || #{arel_table.name}.#{longitude_column} || ' ' || #{arel_table.name}.#{latitude_column} || ')'),
46
+ ST_GeographyFromText('SRID=4326;POINT(#{longitude} #{latitude})')
47
+ )")
37
48
  end
38
49
  end
39
50
  end
@@ -1,3 +1,3 @@
1
1
  module PgSearchable
2
- VERSION = "0.0.3"
2
+ VERSION = "0.0.4"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pg_searchable
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.3
4
+ version: 0.0.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Stephen St. Martin