pg_search 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56abc4100a0dcd75ed558ec0ec631d53088ab5bf
-  data.tar.gz: 33edaaa054f61e59efa18c8e96f0ecd9cc12630c
+  metadata.gz: 0129477dd69209f0276e0207d137556bfe486039
+  data.tar.gz: f1c644b3a6659eb823c0993534e3b25dc9ffdf72
 SHA512:
-  metadata.gz: d4e3fb0b2571d4fec4f447f1f6df9108b70e6219c7381e9d79e95d559bb063389a4ded5f50db1c320a1564647a83a9050ba6dfb32f3b87adae9866028c7633b8
-  data.tar.gz: f618f99de2af02e89346f6cde00036e6c56b88292511b434140276d470b6033da2717ebc132b5364e4ba9bdf32afc29ed6811098c532916db6973154b0db0d9e
+  metadata.gz: 38795ff477f256ba5acdb5ce1c368d8830294cabc04bd3ca1b84554f26094e39f14eca31574d6de0821803c987a1040946913b008a06de0ad4d376b7b2cfebfe
+  data.tar.gz: e7ce0c0536b72f1857cd638cb55eb3a2a1087262a4a973a26057a18e45d6ea15df0818637f4c8bd9e4d9757895feeb3d0fb255893c0c01d0e09aa6c9e066a0bd

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # pg_search changelog
 
+## 0.7.6
+
+*   Fix migration generator in Rails 3. (Andrew Marshall and Nora Lin)
+*   Add :only option for limiting search fields per feature. (Jonathan Greenberg)
+
 ## 0.7.5
 
 *   Add option to make feature available only for sorting. (Brent Wheeldon)

data/README.md

@@ -790,6 +790,39 @@ Vegetable.roughly_spelled_like("collyflower") # => [cauliflower]
 Vegetable.strictly_spelled_like("collyflower") # => []
 ```
 
+### Limiting Fields When Combining Features 
+
+Sometimes when doing queries combining different features you 
+might want to searching against only some of the fields with certain features.
+For example perhaps you want to only do a trigram search against the shorter fields
+so that you don't need to reduce the threshold excessively. You can specify 
+which fields using the 'only' option:
+
+```ruby
+class Image < ActiveRecord::Base
+  include PgSearch
+
+  pg_search_scope :combined_search,
+                  :against => [:file_name, :short_description, :long_description]
+                  :using => {
+                    :tsearch => { :dictionary  => 'english' },
+                    :trigram => {
+                      :only => [:file_name, :short_description]
+                    }
+                  }
+
+end
+```
+
+Now you can succesfully retrieve an Image with a file_name: 'image_foo.jpg' 
+and long_description: 'This description is so long that it would make a trigram search
+fail any reasonable threshold limit' with:
+
+```ruby
+Image.combined_search('reasonable') # found with tsearch
+Image.combined_search('foo') # found with trigram
+```
+
 ### Ignoring accent marks (PostgreSQL 9.0 and newer only)
 
 Most of the time you will want to ignore accent marks when searching. This

data/lib/pg_search/configuration/column.rb

@@ -3,9 +3,10 @@ require 'digest'
 module PgSearch
   class Configuration
     class Column
-      attr_reader :weight
+      attr_reader :weight, :name
 
       def initialize(column_name, weight, model)
+        @name = column_name.to_s
         @column_name = column_name.to_s
         @weight = weight
         @model = model

data/lib/pg_search/features/feature.rb

@@ -5,22 +5,32 @@ module PgSearch
     class Feature
       delegate :connection, :quoted_table_name, :to => :'@model'
 
-      def initialize(query, options, columns, model, normalizer)
+      def initialize(query, options, all_columns, model, normalizer)
         @query = query
         @options = options || {}
-        @columns = columns
+        @all_columns = all_columns
         @model = model
         @normalizer = normalizer
       end
 
       private
 
-      attr_reader :query, :options, :columns, :model, :normalizer
+      attr_reader :query, :options, :all_columns, :model, :normalizer
 
       def document
         columns.map { |column| column.to_sql }.join(" || ' ' || ")
       end
 
+      def columns
+        if options[:only]
+          all_columns.select do |column|
+            Array.wrap(options[:only]).map(&:to_s).include? column.name
+          end
+        else
+          all_columns
+        end
+      end
+
       def normalize(expression)
         normalizer.add_normalization(expression)
       end

data/lib/pg_search/features/trigram.rb

@@ -1,6 +1,7 @@
 module PgSearch
   module Features
     class Trigram < Feature
+
       def conditions
         if options[:threshold]
           Arel::Nodes::Grouping.new(

data/lib/pg_search/migration/generator.rb

@@ -3,7 +3,7 @@ require 'rails/generators/base'
 module PgSearch
   module Migration
     class Generator < Rails::Generators::Base
-      hide!
+      Rails::Generators.hide_namespace namespace
 
       def self.inherited(subclass)
         super

data/lib/pg_search/version.rb

@@ -1,3 +1,3 @@
 module PgSearch
-  VERSION = "0.7.5".freeze
+  VERSION = "0.7.6".freeze
 end

data/spec/lib/pg_search/features/trigram_spec.rb

@@ -50,6 +50,27 @@ describe PgSearch::Features::Trigram do
       end
     end
 
+    context 'only certain columns are selected' do
+      context 'one column' do
+        let(:options) { { only: :name } }
+
+        it 'only searches against the select column' do
+          options = { only: :name }
+          coalesced_column = "coalesce(#{Model.quoted_table_name}.\"name\"::text, '')"
+          expect(feature.conditions.to_sql).to eq("((#{coalesced_column}) % '#{query}')")
+        end
+
+      end
+      context 'multiple columns' do
+        let(:options) { { only: [:name, :content] } }
+
+        it 'concatenates when multiples columns are selected' do
+          options = { only: [:name, :content] }
+          expect(feature.conditions.to_sql).to eq("((#{coalesced_columns}) % '#{query}')")
+        end
+      end
+    end
+
   end
 
   describe '#rank' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_search
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Grant Hutchins
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord