pg_searchable 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0f35f235f18026427b95a9fd5620f83ad6236c6
-  data.tar.gz: 712e910b1aa3bf8a66e7bd353cb0fc18358f2626
+  metadata.gz: 4f553a86615e8566e48c2c9bd8e8eb13d77f89c7
+  data.tar.gz: 4add369c55d6351311b69e31b44f03d613298b4c
 SHA512:
-  metadata.gz: c5ba190060495e370921954a87f011b81806c5ab3122ddb9c878109ad77ee21280e7d064e42e5844f154da294a45d90ef1933398c5f63bce5a5e698e433af999
-  data.tar.gz: 9f7b4d1dfc96ab333f6181dd549e7af662ca10287e876ce014ab7d786356293dfd93194892f645ee1f215d96a0eb4b0b4fc3bffe0fa61b25009dc0b4e9d75171
+  metadata.gz: eb5c14e5a1f3b7a8282d38a0b982759163881f36b70098049c347e203d398684c7b9a685794fee5b9ffe6acc0a3a8ba617c541921660a00b770706c0deaa622a
+  data.tar.gz: 16b7aa8e9cfce373a61dd2c4f7bee3620519f5fa2247a810461c7a4c4007a91cf668b7bc02764f3a477dddf91b3f3b48e19fde3303bb3d9578d960f715bfc9f6

data/lib/pg_searchable/active_record/extensions.rb

@@ -8,9 +8,11 @@ module PgSearchable
 
       DEFAULT_WEIGHTS     = [0.1, 0.2, 0.4, 1.0]
       DEFAULT_DICTIONARY  = 'english'
-      DEFAULT_OPTIONS     = { weights: DEFAULT_WEIGHTS, dictionary: DEFAULT_DICTIONARY }
+      DEFAULT_OPTIONS     = { weights: DEFAULT_WEIGHTS, dictionary: DEFAULT_DICTIONARY, normalization: 41 }
 
       module ClassMethods
+        delegate :close_to, :rank_by, :search_for, to: :scoped
+
         def pg_searchable (name, options = {})
           pg_searchable_configs[name.to_sym] = {
             tgrm:       _pg_searchable_options,
@@ -23,14 +25,6 @@ module PgSearchable
           @pg_searchable_configs ||= {}
         end
 
-        def search_for(term, options = {})
-          scoped.search_for(term, options)
-        end
-
-        def close_to(longitude, latitude, distance_in_miles = 5)
-          scoped.close_to(longitude, latitude, distance_in_miles)
-        end
-
       private
         def _pg_searchable_options
           @_pg_searchable_options ||= DEFAULT_OPTIONS.merge(columns: _pg_searchable_columns)

data/lib/pg_searchable/active_record/relation.rb

@@ -6,17 +6,30 @@ module PgSearchable
       def search_for(term, options = {})
         using       = Array(options.delete(:using) || :default)
         models      = Array(options[:in]).map {|association| klass.reflect_on_association(association).klass }
-        conditions  = [self.klass, models].flatten.inject([]) do |conditions, klass|
+        conditions  = []
+        orders      = []
+
+        [self.klass, models].flatten.each do |klass|
           name    = using.find {|name| klass.pg_searchable_configs.key?(name.to_sym) }
           config  = klass.pg_searchable_configs[name]
 
-          Array(config[:tgrm][:columns]).each       {|name| conditions << klass.arel_table[name].tgrm(term).to_sql }
-          Array(config[:tsearch][:columns]).each    {|name| conditions << klass.arel_table[name].tsearch(term, config[:tsearch][:dictionary]).to_sql }
-          Array(config[:dmetaphone][:columns]).each {|name| conditions << klass.arel_table[name].dmetaphone(term, config[:dmetaphone][:dictionary]).to_sql }
-          conditions
+          Array(config[:tsearch][:columns]).each do |name|
+            conditions << klass.arel_table[name].tsearch(term, config[:tsearch][:dictionary]).to_sql
+            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]})"
+          end
+
+          Array(config[:tgrm][:columns]).each do |name|
+            conditions  << klass.arel_table[name].tgrm(term).to_sql
+            orders      << "(coalesce(similarity(#{klass.arel_table.name}.#{name}, '#{term}'), 0) / 4)"
+          end
+
+          Array(config[:dmetaphone][:columns]).each do |name|
+            conditions  << klass.arel_table[name].dmetaphone(term, config[:dmetaphone][:dictionary]).to_sql
+            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)"
+          end
         end
 
-        where("#{conditions.join(' OR ')}")
+        where("#{conditions.join(' OR ')}")#.order("#{orders.join(' + ')} DESC")
       end
 
       def close_to(longitude, latitude, distance_in_miles = 5)
@@ -28,12 +41,10 @@ module PgSearchable
             ST_GeographyFromText('SRID=4326;POINT(' || #{arel_table.name}.#{longitude_column} || ' ' || #{arel_table.name}.#{latitude_column} || ')'),
             ST_GeographyFromText('SRID=4326;POINT(%f %f)'), %d
           )", longitude, latitude, distance_in_meters)
-      end
-
-      def rank_by(rank)
-        # TODO: add ranks to projections
-        puts "ranking by #{rank}"
-        self
+        .order("ST_Distance(
+          ST_GeographyFromText('SRID=4326;POINT(' || #{arel_table.name}.#{longitude_column} || ' ' || #{arel_table.name}.#{latitude_column} || ')'),
+          ST_GeographyFromText('SRID=4326;POINT(#{longitude} #{latitude})')
+        )")
       end
     end
   end

data/lib/pg_searchable/version.rb

@@ -1,3 +1,3 @@
 module PgSearchable
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_searchable
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Stephen St. Martin