pg_search 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc5ae6e460c82b93f20a957e4c5a14454fca1f84
-  data.tar.gz: 2a262bd65fb27b8efa689dde40c289f3a3ebc4fb
+  metadata.gz: 061b1d5b8c2b15a078a7e24519d6ce8431165a89
+  data.tar.gz: 5f8d8ad2b97af42fe20a8bcbcfe3b506b865d29a
 SHA512:
-  metadata.gz: d9133994756acc700d4cd09e7b9904f1ab89fcc0e3d79e9aff06017a64b96f4ec7239d5267fc1c146f072846de60bf9d36399bfd4171e9a733180a8f7139cfc5
-  data.tar.gz: efbe3aaab68b0495499a8709b0a5a50454beea08b13f645439d4263fd0df6c538080069665b36e769938d4993414ee9d568c3c8f00cf5099900142bbc3014e5c
+  metadata.gz: 8395420354b745b6f31b860637ab36b0d3ade94bbc3fb5745c0d888d5feb7e2ff86a7790cc0f53360b540acfe8c1314d404cd3c48fe118a9bf2771be8210251e
+  data.tar.gz: 3e3ee515686fada644a424e3372d6f1891faa3506a4c18993f899684de7450505e174d71abde33c16196e13a378e0673ba9d13727e58bbaa706cf6158aded71d

data/.travis.yml

@@ -3,22 +3,24 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - jruby-19mode
-  - rbx-19mode
 
 env:
   - ACTIVE_RECORD_BRANCH="master"
   - ACTIVE_RECORD_BRANCH="4-0-stable"
+  - ACTIVE_RECORD_VERSION="~> 4.1.0.beta1"
   - ACTIVE_RECORD_VERSION="~> 4.0.0"
   - ACTIVE_RECORD_VERSION="~> 3.2.0"
   - ACTIVE_RECORD_VERSION="~> 3.1.0"
 
 matrix:
   allow_failures:
-    - rvm: rbx-19mode
+    - rvm: 2.1.0
     - rvm: jruby-19mode
     - env: ACTIVE_RECORD_BRANCH="master"
     - env: ACTIVE_RECORD_BRANCH="4-0-stable"
+    - env: ACTIVE_RECORD_VERSION="~> 4.1.0.beta1"
 
 before_script:
   - "psql -c 'create database pg_search_test;' -U postgres >/dev/null"

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # pg_search changelog
 
+## 0.7.3
+
+*   Allow simultaneously searching using `:associated_against` and `:tsvector_column` (Adam Becker)
+
 ## 0.7.2
 
 *   Add :threshold option for configuring how permissive trigram searches are.

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec
 

data/README.md

@@ -22,8 +22,8 @@ Read the blog post introducing PgSearch at http://pivotallabs.com/pg-search/
 
 ## REQUIREMENTS
 
-*   Ruby 1.9.2 or later
-*   Active Record 3.1 or later
+*   Ruby 1.9.2, 2.0, or later
+*   Active Record 3.1, 3.2, 4.0 or later
 *   PostgreSQL
 *   [PostgreSQL contrib packages for certain
     features](https://github.com/Casecommons/pg_search/wiki/Installing-Postgres-Contrib-Modules)
@@ -33,7 +33,7 @@ Read the blog post introducing PgSearch at http://pivotallabs.com/pg-search/
 
     gem install pg_search
 
-### Rails 3.1 or later, Ruby 1.9.2 or later
+### Rails 3.1, 3.2, 4.0 or later, Ruby 1.9.2, 2.0, or later
 
 In Gemfile
 

data/lib/pg_search.rb

@@ -2,19 +2,20 @@ require "active_record"
 require "active_support/concern"
 require "active_support/core_ext/module/attribute_accessors"
 require "active_support/core_ext/string/strip"
+
+require "pg_search/compatibility"
+require "pg_search/configuration"
 require "pg_search/extensions/arel"
+require "pg_search/features"
+require "pg_search/multisearch"
+require "pg_search/multisearchable"
+require "pg_search/normalizer"
+require "pg_search/scope_options"
+require "pg_search/version"
 
 module PgSearch
-  autoload :Configuration, "pg_search/configuration"
-  autoload :Document, "pg_search/document"
-  autoload :Features, "pg_search/features"
-  autoload :Multisearch, "pg_search/multisearch"
-  autoload :Multisearchable, "pg_search/multisearchable"
-  autoload :Normalizer, "pg_search/normalizer"
-  autoload :ScopeOptions, "pg_search/scope_options"
-  autoload :VERSION, "pg_search/version"
-
   extend ActiveSupport::Concern
+  include Compatibility::ActiveRecord3 if ActiveRecord::VERSION::MAJOR == 3
 
   mattr_accessor :multisearch_options
   self.multisearch_options = {}
@@ -53,10 +54,6 @@ module PgSearch
     end
   end
 
-  def pg_search_rank
-    read_attribute(:pg_search_rank).to_f
-  end
-
   class << self
     def multisearch(*args)
       PgSearch::Document.search(*args)
@@ -81,4 +78,5 @@ module PgSearch
   class NotSupportedForPostgresqlVersion < StandardError; end
 end
 
+require "pg_search/document"
 require "pg_search/railtie" if defined?(Rails)

data/lib/pg_search/compatibility.rb

@@ -0,0 +1,9 @@
+module PgSearch
+  module Compatibility
+    module ActiveRecord3
+      def pg_search_rank
+        read_attribute(:pg_search_rank).to_f
+      end
+    end
+  end
+end

data/lib/pg_search/configuration.rb

@@ -1,8 +1,9 @@
+require "pg_search/configuration/association"
+require "pg_search/configuration/column"
+require "pg_search/configuration/foreign_column"
+
 module PgSearch
   class Configuration
-    autoload :Association, "pg_search/configuration/association"
-    autoload :Column, "pg_search/configuration/column"
-    autoload :ForeignColumn, "pg_search/configuration/foreign_column"
 
     attr_reader :model
 

data/lib/pg_search/features.rb

@@ -1,9 +1,10 @@
+require "pg_search/features/feature"
+
+require "pg_search/features/dmetaphone"
+require "pg_search/features/trigram"
+require "pg_search/features/tsearch"
+
 module PgSearch
   module Features
-    autoload :Feature, "pg_search/features/feature"
-
-    autoload :DMetaphone, "pg_search/features/dmetaphone"
-    autoload :Trigram, "pg_search/features/trigram"
-    autoload :TSearch, "pg_search/features/tsearch"
   end
 end

data/lib/pg_search/features/feature.rb

@@ -1,3 +1,5 @@
+require "active_support/core_ext/module/delegation"
+
 module PgSearch
   module Features
     class Feature

data/lib/pg_search/features/tsearch.rb

@@ -54,11 +54,14 @@ module PgSearch
       end
 
       def tsdocument
-        if options[:tsvector_column]
-          column_name = connection.quote_column_name(options[:tsvector_column])
-          "#{quoted_table_name}.#{column_name}"
-        else
-          columns.map do |search_column|
+        tsdocument_terms = []
+
+        columns_to_use = options[:tsvector_column] ?
+                           columns.select { |c| c.is_a?(PgSearch::Configuration::ForeignColumn) } :
+                           columns
+
+        if columns_to_use.present?
+          tsdocument_terms << columns_to_use.map do |search_column|
             tsvector = Arel::Nodes::NamedFunction.new(
               "to_tsvector",
               [dictionary, Arel.sql(normalize(search_column.to_sql))]
@@ -71,6 +74,13 @@ module PgSearch
             end
           end.join(" || ")
         end
+
+        if options[:tsvector_column]
+          column_name = connection.quote_column_name(options[:tsvector_column])
+          tsdocument_terms << "#{quoted_table_name}.#{column_name}"
+        end
+
+        tsdocument_terms.join(' || ')
       end
 
       # From http://www.postgresql.org/docs/8.3/static/textsearch-controls.html

data/lib/pg_search/multisearch.rb

@@ -1,6 +1,7 @@
+require "pg_search/multisearch/rebuilder"
+
 module PgSearch
   module Multisearch
-    autoload :Rebuilder, "pg_search/multisearch/rebuilder"
 
     class << self
       def rebuild(model, clean_up=true)

data/lib/pg_search/multisearchable.rb

@@ -1,18 +1,17 @@
-require "active_support/concern"
 require "active_support/core_ext/class/attribute"
 
 module PgSearch
   module Multisearchable
-    extend ActiveSupport::Concern
+    def self.included mod
+      mod.class_eval do
+        has_one :pg_search_document,
+          :as => :searchable,
+          :class_name => "PgSearch::Document",
+          :dependent => :delete
 
-    included do
-      has_one :pg_search_document,
-        :as => :searchable,
-        :class_name => "PgSearch::Document",
-        :dependent => :delete
-
-      after_save :update_pg_search_document,
-        :if => lambda { PgSearch.multisearch_enabled? }
+        after_save :update_pg_search_document,
+          :if => lambda { PgSearch.multisearch_enabled? }
+      end
     end
 
     def update_pg_search_document

data/lib/pg_search/version.rb

@@ -1,3 +1,3 @@
 module PgSearch
-  VERSION = "0.7.2"
+  VERSION = "0.7.3".freeze
 end

data/spec/integration/pg_search_spec.rb

@@ -151,6 +151,14 @@ describe "an Active Record model which includes PgSearch" do
         results.should_not include(excluded)
       end
 
+      it "returns the correct count" do
+        ModelWithPgSearch.create!(:content => 'foo')
+        ModelWithPgSearch.create!(:content => 'bar')
+
+        results = ModelWithPgSearch.search_content('foo')
+        expect(results.count(:all)).to eq 1
+      end
+
       it "returns rows where the column contains all the terms in the query in any order" do
         included = [ModelWithPgSearch.create!(:content => 'foo bar'),
                     ModelWithPgSearch.create!(:content => 'bar foo')]
@@ -621,7 +629,7 @@ describe "an Active Record model which includes PgSearch" do
         ModelWithPgSearch.with_trigram(accent_query).should_not include(record)
         ModelWithPgSearch.with_trigram_and_ignoring_accents(accent_query).should include(record)
         ModelWithPgSearch.with_tsearch(accent_query).should_not include(record)
-        ModelWithPgSearch.with_tsearch_and_trigram(accent_query).should be_empty
+        ModelWithPgSearch.with_tsearch_and_trigram(accent_query).count(:all).should == 0
         ModelWithPgSearch.complex_search(accent_query).should include(record)
 
         # matches tsearch only
@@ -668,7 +676,66 @@ describe "an Active Record model which includes PgSearch" do
       end
     end
 
-    context "using a tsvector column" do
+    context "using a tsvector column and an association" do
+      with_model :Comment do
+        table do |t|
+          t.integer :post_id
+          t.string :body
+        end
+
+        model do
+          belongs_to :post
+        end
+      end
+
+      with_model :Post do
+        table do |t|
+          t.text 'content'
+          t.tsvector 'content_tsvector'
+        end
+
+        model do
+          include PgSearch
+          has_many :comments
+        end
+      end
+
+      let!(:expected) { Post.create!(content: 'phooey') }
+      let!(:unexpected) { Post.create!(content: 'longcat is looooooooong') }
+
+      before do
+        ActiveRecord::Base.connection.execute <<-SQL.strip_heredoc
+          UPDATE #{Post.quoted_table_name}
+          SET content_tsvector = to_tsvector('english'::regconfig, #{Post.quoted_table_name}."content")
+        SQL
+
+        expected.comments.create(body: 'commentone')
+        unexpected.comments.create(body: 'commentwo')
+
+        Post.pg_search_scope :search_by_content_with_tsvector,
+          :associated_against => { comments: [:body] },
+          :using => {
+            :tsearch => {
+              :tsvector_column => 'content_tsvector',
+              :dictionary => 'english'
+            }
+          }
+      end
+
+      it "should find by the tsvector column" do
+        Post.search_by_content_with_tsvector("phooey").map(&:id).should == [expected.id]
+      end
+
+      it "should find by the associated record" do
+        Post.search_by_content_with_tsvector("commentone").map(&:id).should == [expected.id]
+      end
+
+      it 'should find by a combination of the two' do
+        Post.search_by_content_with_tsvector("phooey commentone").map(&:id).should == [expected.id]
+      end
+    end
+
+    context "using a tsvector column with" do
       with_model :ModelWithTsvector do
         table do |t|
           t.text 'content'
@@ -877,7 +944,7 @@ describe "an Active Record model which includes PgSearch" do
         end
       end
 
-      it "should returns only results for that subclass" do
+      it "returns only results for that subclass" do
         included = [
           SubclassModel.create!(:content => "foo bar")
         ]

data/spec/lib/pg_search/configuration/association_spec.rb

@@ -0,0 +1,76 @@
+require "spec_helper"
+
+describe PgSearch::Configuration::Association do
+  with_model :AssociatedModel do
+    table do |t|
+      t.string "title"
+    end
+  end
+
+  with_model :Model do
+    table do |t|
+      t.string "title"
+      t.belongs_to :another_model
+    end
+
+    model do
+      include PgSearch
+      belongs_to :another_model, :class_name => 'AssociatedModel'
+
+      pg_search_scope :with_another, :associated_against => {:another_model => :title}
+    end
+  end
+
+  let(:association) { described_class.new(Model, :another_model, :title) }
+
+  describe "#table_name" do
+    it "returns the table name for the associated model" do
+      expect(association.table_name).to eq AssociatedModel.table_name
+    end
+  end
+
+  describe "#join" do
+    let(:expected_sql) do
+      <<-EOS.gsub(/\s+/, ' ').strip
+        LEFT OUTER JOIN
+          (SELECT model_id AS id,
+                  #{column_select} AS #{association.columns.first.alias}
+          FROM \"#{Model.table_name}\"
+          INNER JOIN \"#{association.table_name}\"
+          ON \"#{association.table_name}\".\"id\" = \"#{Model.table_name}\".\"another_model_id\"
+          GROUP BY model_id) #{association.subselect_alias}
+        ON #{association.subselect_alias}.id = model_id
+      EOS
+    end
+
+    context "given postgresql_version 0..90_000" do
+      let(:column_select) do
+        "array_to_string(array_agg(\"#{association.table_name}\".\"title\"::text), ' ')"
+      end
+
+      it "returns the correct SQL join" do
+        allow(Model.connection).to receive(:postgresql_version).and_return(1)
+        expect(association.join("model_id")).to eq(expected_sql)
+      end
+    end
+
+    context "given any other postgresql_version" do
+      let(:column_select) do
+        "string_agg(\"#{association.table_name}\".\"title\"::text, ' ')"
+      end
+
+      it "returns the correct SQL join" do
+        allow(Model.connection).to receive(:postgresql_version).and_return(100_000)
+        expect(association.join("model_id")).to eq(expected_sql)
+      end
+    end
+  end
+
+  describe "#subselect_alias" do
+    it "returns a consistent string" do
+      subselect_alias = association.subselect_alias
+      expect(subselect_alias).to be_a String
+      expect(association.subselect_alias).to eq subselect_alias
+    end
+  end
+end

data/spec/lib/pg_search/configuration/foreign_column_spec.rb

@@ -0,0 +1,36 @@
+require "spec_helper"
+
+describe PgSearch::Configuration::ForeignColumn do
+  describe "#alias" do
+    with_model :AssociatedModel do
+      table do |t|
+        t.string "title"
+      end
+    end
+
+    with_model :Model do
+      table do |t|
+        t.string "title"
+        t.belongs_to :another_model
+      end
+
+      model do
+        include PgSearch
+        belongs_to :another_model, :class_name => 'AssociatedModel'
+
+        pg_search_scope :with_another, :associated_against => {:another_model => :title}
+      end
+    end
+
+    it "returns a consistent string" do
+      association = PgSearch::Configuration::Association.new(Model,
+                                                             :another_model,
+                                                             :title)
+      foreign_column = described_class.new("title", nil, Model, association)
+
+      column_alias = foreign_column.alias
+      expect(column_alias).to be_a String
+      expect(foreign_column.alias).to eq column_alias
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_search
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Grant Hutchins
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2014-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -130,6 +130,7 @@ files:
 - README.md
 - Rakefile
 - lib/pg_search.rb
+- lib/pg_search/compatibility.rb
 - lib/pg_search/configuration.rb
 - lib/pg_search/configuration/association.rb
 - lib/pg_search/configuration/column.rb
@@ -159,7 +160,9 @@ files:
 - spec/integration/associations_spec.rb
 - spec/integration/pagination_spec.rb
 - spec/integration/pg_search_spec.rb
+- spec/lib/pg_search/configuration/association_spec.rb
 - spec/lib/pg_search/configuration/column_spec.rb
+- spec/lib/pg_search/configuration/foreign_column_spec.rb
 - spec/lib/pg_search/document_spec.rb
 - spec/lib/pg_search/features/dmetaphone_spec.rb
 - spec/lib/pg_search/features/trigram_spec.rb
@@ -195,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: PgSearch builds Active Record named scopes that take advantage of PostgreSQL's
@@ -204,7 +207,9 @@ test_files:
 - spec/integration/associations_spec.rb
 - spec/integration/pagination_spec.rb
 - spec/integration/pg_search_spec.rb
+- spec/lib/pg_search/configuration/association_spec.rb
 - spec/lib/pg_search/configuration/column_spec.rb
+- spec/lib/pg_search/configuration/foreign_column_spec.rb
 - spec/lib/pg_search/document_spec.rb
 - spec/lib/pg_search/features/dmetaphone_spec.rb
 - spec/lib/pg_search/features/trigram_spec.rb