pg_search 0.4 → 0.4.1

data/.rvmrc

@@ -1 +1,81 @@
-rvm use ree@pg_search
+#!/usr/bin/env bash
+
+# This is an RVM Project .rvmrc file, used to automatically load the ruby
+# development environment upon cd'ing into the directory
+
+# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
+environment_id="ree-1.8.7-2011.12@pg_search"
+
+#
+# Uncomment the following lines if you want to verify rvm version per project
+#
+# rvmrc_rvm_version="1.10.2" # 1.10.1 seams as a safe start
+# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
+#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
+#   return 1
+# }
+#
+
+#
+# Uncomment following line if you want options to be set only for given project.
+#
+# PROJECT_JRUBY_OPTS=( --1.9 )
+#
+# The variable PROJECT_JRUBY_OPTS requires the following to be run in shell:
+#
+#    chmod +x ${rvm_path}/hooks/after_use_jruby_opts
+#
+
+#
+# First we attempt to load the desired environment directly from the environment
+# file. This is very fast and efficient compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+#
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
+  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
+then
+  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+
+  if [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]]
+  then
+    . "${rvm_path:-$HOME/.rvm}/hooks/after_use"
+  fi
+else
+  # If the environment file has not yet been created, use the RVM CLI to select.
+  if ! rvm --create use  "$environment_id"
+  then
+    echo "Failed to create RVM environment '${environment_id}'."
+    return 1
+  fi
+fi
+
+#
+# If you use an RVM gemset file to install a list of gems (*.gems), you can have
+# it be automatically loaded. Uncomment the following and adjust the filename if
+# necessary.
+#
+# filename=".gems"
+# if [[ -s "$filename" ]]
+# then
+#   rvm gemset import "$filename" | grep -v already | grep -v listed | grep -v complete | sed '/^$/d'
+# fi
+
+# If you use bundler, this might be useful to you:
+# if [[ -s Gemfile ]] && ! command -v bundle >/dev/null
+# then
+#   printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
+#   gem install bundler
+# fi
+# if [[ -s Gemfile ]] && command -v bundle
+# then
+#   bundle install
+# fi
+
+if [[ $- == *i* ]] # check for interactive shells
+then
+    echo "Using: $(tput setaf 2)$GEM_HOME$(tput sgr0)" # show the user the ruby and gemset they are using in green
+else 
+	echo "Using: $GEM_HOME" # don't use colors in interactive shells
+fi
+

data/CHANGELOG.rdoc

@@ -1,5 +1,11 @@
 = PgSearch
 
+== 0.4.1
+
+* Fix Active Record 3.2 deprecation warnings. (Steven Harman)
+
+* Fix issue with undefined logger when PgSearch::Document.search is already defined.
+
 == 0.4
 
 * Add ability to search again tsvector columns. (Kris Hicks)
@@ -42,6 +48,10 @@
 
 * Add :any_word option to :tsearch which uses OR between query terms instead of AND. (Fernando Espinosa)
 
+== 0.2.1
+
+* Backport support for searching against tsvector columns (Kris Hicks)
+
 == 0.2
 
 * Set dictionary to :simple by default for :tsearch. Before it was unset,

data/Gemfile

@@ -8,3 +8,5 @@ gem "pg"
 gem "rspec", ">=2.4"
 gem "autotest"
 gem "with_model"
+
+gem "activerecord", "~> #{ENV["ACTIVE_RECORD_VERSION"]}.0" if ENV["ACTIVE_RECORD_VERSION"]

data/README.rdoc

@@ -18,6 +18,12 @@ In Gemfile
 
  gem 'pg_search'
 
+=== Rails 2
+
+The newest versions of PgSearch no longer support Rails 2. However, the 0.2 series still works. It's not actively maintained, but submissions are welcome for backports and bugfixes.
+
+The 0.2 branch lives at https://github.com/Casecommons/pg_search/tree/0.2-stable
+
 === Other ActiveRecord-based projects
 
 In addition to installing and requiring the gem, you may want to include the PgSearch rake tasks in your Rakefile:
@@ -95,9 +101,9 @@ PgSearch.multisearch returns an ActiveRecord::Relation, just like scopes do, so
 
 ==== Configuring multi-search
 
-PgSearch.multisearch can be configured using the same options as `pg_search_scope` (explained in more detail below). Just set the PgSearch.multisearchable_options in an initializer:
+PgSearch.multisearch can be configured using the same options as `pg_search_scope` (explained in more detail below). Just set the PgSearch.multisearch_options in an initializer:
 
- PgSearch.multisearchable_options = {
+ PgSearch.multisearch_options = {
    :using => [:tsearch, :trigram],
    :ignoring => :accents
  }

data/lib/pg_search.rb

@@ -23,10 +23,8 @@ module PgSearch
     end
   end
 
-  module InstanceMethods
-    def rank
-      attributes['pg_search_rank'].to_f
-    end
+  def rank
+    attributes['pg_search_rank'].to_f
   end
 
   class << self

data/lib/pg_search/document.rb

@@ -1,18 +1,25 @@
+require "logger"
 require "pg_search/scope"
 
 module PgSearch
   class Document < ActiveRecord::Base
     include PgSearch
-    set_table_name :pg_search_documents
+    self.table_name = 'pg_search_documents'
     belongs_to :searchable, :polymorphic => true
 
     before_validation :update_content
 
+    # The logger might not have loaded yet.
+    # https://github.com/Casecommons/pg_search/issues/26
+    def self.logger
+      super || Logger.new(STDERR)
+    end
+
     pg_search_scope :search, lambda { |*args|
-      if PgSearch.multisearch_options.respond_to?(:call)
-        options = PgSearch.multisearch_options.call(*args)
+      options = if PgSearch.multisearch_options.respond_to?(:call)
+        PgSearch.multisearch_options.call(*args)
       else
-        options = PgSearch.multisearch_options.reverse_merge(:query => args.first)
+        PgSearch.multisearch_options.reverse_merge(:query => args.first)
       end
       options.reverse_merge(:against => :content)
     }

data/lib/pg_search/multisearchable.rb

@@ -18,11 +18,9 @@ module PgSearch
         :if => lambda { PgSearch.multisearch_enabled? }
     end
 
-    module InstanceMethods
-      def update_pg_search_document
-        create_pg_search_document unless self.pg_search_document
-        self.pg_search_document.save
-      end
+    def update_pg_search_document
+      create_pg_search_document unless self.pg_search_document
+      self.pg_search_document.save
     end
   end
 end

data/lib/pg_search/version.rb

@@ -1,3 +1,3 @@
 module PgSearch
-  VERSION = "0.4"
+  VERSION = "0.4.1"
 end

data/spec/associations_spec.rb

@@ -292,4 +292,50 @@ describe PgSearch do
       end
     end
   end
+
+  context "merging a pg_search_scope into another model's scope" do
+    with_model :ModelWithAssociation do
+      model do
+        has_many :associated_models
+      end
+    end
+
+    with_model :AssociatedModel do
+      table do |t|
+        t.string :content
+        t.belongs_to :model_with_association
+      end
+
+      model do
+        include PgSearch
+        belongs_to :model_with_association
+
+        pg_search_scope :search_content, :against => :content
+      end
+    end
+
+    it "should find records of the other model" do
+      included_associated_1 = AssociatedModel.create(:content => "foo bar")
+      included_associated_2 = AssociatedModel.create(:content => "foo baz")
+      excluded_associated_1 = AssociatedModel.create(:content => "baz quux")
+      excluded_associated_2 = AssociatedModel.create(:content => "baz bar")
+
+      included = [
+        ModelWithAssociation.create(:associated_models => [included_associated_1]),
+        ModelWithAssociation.create(:associated_models => [included_associated_2, excluded_associated_1])
+      ]
+
+      excluded = [
+        ModelWithAssociation.create(:associated_models => [excluded_associated_2]),
+        ModelWithAssociation.create(:associated_models => [])
+      ]
+
+      relation = AssociatedModel.search_content("foo")
+
+      results = ModelWithAssociation.joins(:associated_models).merge(relation)
+
+      results.should include(*included)
+      results.should_not include(*excluded)
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -26,6 +26,7 @@ end
 
 def install_extension_if_missing(name, query, expected_result)
   connection = ActiveRecord::Base.connection
+  postgresql_version = connection.send(:postgresql_version)
   result = connection.select_value(query)
   raise "Unexpected output for #{query}: #{result.inspect}" unless result.downcase == expected_result.downcase
 rescue => e

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_search
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-15 00:00:00.000000000 Z
+date: 2012-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70335492023760 !ruby/object:Gem::Requirement
+  requirement: &70164267785940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70335492023760
+  version_requirements: *70164267785940
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70335492023220 !ruby/object:Gem::Requirement
+  requirement: &70164267784280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70335492023220
+  version_requirements: *70164267784280
 description: PgSearch builds ActiveRecord named scopes that take advantage of PostgreSQL's
   full text search
 email: