pg_search 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33f93dcf75cdfe31418fe81f7f4eb4a1f6bef1c7
-  data.tar.gz: 7358d769fbba0629a3212550a2838e3478b748ec
+  metadata.gz: d88e1b1a697e2b7c60254e229f05ef8a7e7290fd
+  data.tar.gz: 237578e6b7961e9662d513f246878ad07e27d52e
 SHA512:
-  metadata.gz: a60014add058e2749d7f13b4286016e9d1d30c503714e3c054d0ffb46937e04f63b6a2ac7b18e3510fb8cd6dd9d08786d93d8e4b8db1ebaab3b128e36ebd8614
-  data.tar.gz: bb56ae42146f2c5b2c345f4e7ea07716292dddf7899c9c034bd1dec02c53ff2082111b9c87525d048eeddf3a872c0b18d5809edd5a0143d1a73528f62d8295bc
+  metadata.gz: 8a20e4bccc363bd4625b97d4533fedbb4a2fe22d0be7f28b4498456c7189a4ee34209e6e3f81109a2285680dc693a6cf17946ba301b3d67c7e7c6a4a4dac0e28
+  data.tar.gz: 0e119a3b707bbb3b55272763893eacf8d2857f4171733e114797a68d8d1d506c7b491b6e27eccb9994276f0615911947748c4553dafd9f4a56df0f50c4c9e963

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # pg_search changelog
 
+## 1.0.4
+
+*   Assert valid options for features. (Janko Marohnić)
+*   Enable chaining of pg_search scopes. (Nicolas Buduroi)
+
 ## 1.0.3
 
 *   Support STI models using a custom inheritance column. (Nick Doiron)

data/lib/pg_search/features/feature.rb

@@ -1,13 +1,18 @@
 require "active_support/core_ext/module/delegation"
+require "active_support/core_ext/hash/keys"
 
 module PgSearch
   module Features
     class Feature
+      def self.valid_options
+        [:only, :sort_only]
+      end
+
       delegate :connection, :quoted_table_name, :to => :'@model'
 
       def initialize(query, options, all_columns, model, normalizer)
         @query = query
-        @options = options || {}
+        @options = (options || {}).assert_valid_keys(self.class.valid_options)
         @all_columns = all_columns
         @model = model
         @normalizer = normalizer

data/lib/pg_search/features/trigram.rb

@@ -1,6 +1,9 @@
 module PgSearch
   module Features
     class Trigram < Feature
+      def self.valid_options
+        super + [:threshold]
+      end
 
       def conditions
         if options[:threshold]

data/lib/pg_search/features/tsearch.rb

@@ -4,6 +4,10 @@ require "active_support/core_ext/module/delegation"
 module PgSearch
   module Features
     class TSearch < Feature
+      def self.valid_options
+        super + [:dictionary, :prefix, :negation, :any_word, :normalization, :tsvector_column]
+      end
+
       def initialize(*args)
         super
 

data/lib/pg_search/scope_options.rb

@@ -13,9 +13,22 @@ module PgSearch
     end
 
     def apply(scope)
+      unless scope.instance_variable_get(:@pg_search_scope_applied_count)
+        scope = if ::ActiveRecord::VERSION::STRING < "4.0.0"
+                  scope.scoped
+                else
+                  scope.all.spawn
+                end
+      end
+
+      alias_id = scope.instance_variable_get(:@pg_search_scope_applied_count) || 0
+      scope.instance_variable_set(:@pg_search_scope_applied_count, alias_id + 1)
+
+      aka = pg_search_alias scope, alias_id
+
       scope
-        .joins(rank_join)
-        .order("pg_search.rank DESC, #{order_within_rank}")
+        .joins(rank_join(aka))
+        .order("#{aka}.rank DESC, #{order_within_rank}")
         .extend(DisableEagerLoading)
         .extend(WithPgSearchRank)
     end
@@ -31,7 +44,10 @@ module PgSearch
       def with_pg_search_rank
         scope = self
         scope = scope.select("*") unless scope.select_values.any?
-        scope.select("pg_search.rank AS pg_search_rank")
+        arel_table = scope.instance_variable_get(:@table)
+        aka = "pg_search_#{arel_table.name}"
+
+        scope.select("#{aka}.rank AS pg_search_rank")
       end
     end
 
@@ -105,8 +121,15 @@ module PgSearch
       end
     end
 
-    def rank_join
-      "INNER JOIN (#{subquery.to_sql}) pg_search ON #{primary_key} = pg_search.pg_search_id"
+    def pg_search_alias(scope, n)
+      arel_table = scope.instance_variable_get(:@table)
+      prefix = "pg_search_#{arel_table.name}"
+
+      0 == n ? prefix : "#{prefix}_#{n}"
+    end
+
+    def rank_join(aka)
+      "INNER JOIN (#{subquery.to_sql}) #{aka} ON #{primary_key} = #{aka}.pg_search_id"
     end
   end
 end

data/lib/pg_search/version.rb

@@ -1,3 +1,3 @@
 module PgSearch
-  VERSION = "1.0.3".freeze
+  VERSION = "1.0.4".freeze
 end

data/spec/integration/pg_search_spec.rb

@@ -194,7 +194,9 @@ describe "an Active Record model which includes PgSearch" do
           end
 
           model do
+            include PgSearch
             belongs_to :person
+            pg_search_scope :search_city, against: [:city]
           end
         end
 
@@ -210,6 +212,9 @@ describe "an Active Record model which includes PgSearch" do
             scope :with_house_in_city, ->(city) {
               joins(:houses).where(House.table_name.to_sym => {city: city})
             }
+            scope :house_search_city, ->(query) {
+              joins(:houses).merge(House.search_city(query))
+            }
           end
         end
 
@@ -246,6 +251,26 @@ describe "an Active Record model which includes PgSearch" do
           expect(results).to include bob_in_duluth
           expect(results).not_to include [bob_in_sheboygan, sally_in_duluth]
         end
+
+        context "when chaining merged scopes" do
+          it "does not raise an exception" do
+            relation = Person.named('foo').house_search_city('bar')
+
+            expect { relation.to_a }.to_not raise_error
+          end
+        end
+      end
+
+      context "when chaining scopes" do
+        before do
+          ModelWithPgSearch.pg_search_scope :search_title, against: :title
+        end
+
+        it "does not raise an exception" do
+          relation = ModelWithPgSearch.search_content('foo').search_title('bar')
+
+          expect { relation.to_a }.to_not raise_error
+        end
       end
 
       it "returns an empty array when a blank query is passed in" do
@@ -307,7 +332,7 @@ describe "an Active Record model which includes PgSearch" do
         twice = ModelWithPgSearch.create!(:content => 'foo foo')
 
         records = ModelWithPgSearch.search_content('foo')
-                  .where("pg_search.rank > 0.07")
+                  .where("pg_search_#{ModelWithPgSearch.table_name}.rank > 0.07")
 
         expect(records).to eq [twice]
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_search
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Grant Hutchins
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord