pg_search 0.3.1 → 0.3.2

data/CHANGELOG

@@ -1,3 +1,9 @@
+### 0.3.2
+
+ * Fix :prefix search in PostgreSQL 8.x
+
+ * Disable {:ignoring => :accents} in PostgreSQL 8.x
+
 ### 0.3.1
 
  * Fix syntax error in generated dmetaphone migration. (Max De Marzi)

data/README.rdoc

@@ -105,7 +105,7 @@ To remove all of the documents for a given class, you can simply delete all of t
 
 Run this Rake task to regenerate all of the documents for a given class.
 
- $ rake pg_search:multisearch:rebuild CLASS=BlogPost
+ $ rake pg_search:multisearch:rebuild MODEL=BlogPost
 
 Currently this is only supported for :against methods that directly map to Active Record attributes. Until that is fixed, you could also manually rebuild all of the documents.
 
@@ -414,7 +414,7 @@ Trigram support is currently available as part of the {pg_trgm contrib package}[
 
   Website.kinda_spelled_like("Yahoo!") # => [yahooo, yohoo]
 
-=== Ignoring accent marks
+=== Ignoring accent marks (PostgreSQL 9.0 and above only)
 
 Most of the time you will want to ignore accent marks when searching. This makes it possible to find words like "piñata" when searching with the query "pinata". If you set a pg_search_scope to ignore accents, it will ignore accents in both the searchable text and the query terms.
 

data/lib/pg_search.rb

@@ -41,6 +41,8 @@ module PgSearch
       Thread.current.key?("PgSearch.enable_multisearch") ? Thread.current["PgSearch.enable_multisearch"] : true
     end
   end
+
+  class NotSupportedForPostgresqlVersion < StandardError; end
 end
 
 require "pg_search/configuration"

data/lib/pg_search/configuration.rb

@@ -61,6 +61,14 @@ module PgSearch
       @options[:order_within_rank]
     end
 
+    def postgresql_version
+      @model.connection.send(:postgresql_version)
+    end
+
+    def logger
+      @model.logger
+    end
+
     private
 
     def default_options

data/lib/pg_search/configuration/association.rb

@@ -19,7 +19,12 @@ module PgSearch
 
       def join(primary_key)
         selects = columns.map do |column|
-          "string_agg(#{column.full_name}, ' ') AS #{column.alias}"
+          case @model.connection.send(:postgresql_version)
+          when 0..90000
+            "array_to_string(array_agg(#{column.full_name}), ' ') AS #{column.alias}"
+          else
+            "string_agg(#{column.full_name}, ' ') AS #{column.alias}"
+          end
         end.join(", ")
         relation = @model.joins(@name).select("#{primary_key} AS id, #{selects}").group(primary_key)
         "LEFT OUTER JOIN (#{relation.to_sql}) #{subselect_alias} ON #{subselect_alias}.id = #{primary_key}"

data/lib/pg_search/features/tsearch.rb

@@ -31,22 +31,28 @@ module PgSearch
         @columns.map { |column| column.to_sql }.join(" || ' ' || ")
       end
 
-      def tsquery
-        return "''" if @query.blank?
+      DISALLOWED_TSQUERY_CHARACTERS = /['?\-\\:]/
 
-        @query.split(" ").compact.map do |term|
-          sanitized_term = term.gsub(/['?\-\\:]/, " ")
+      def tsquery_for_term(term)
+        sanitized_term = term.gsub(DISALLOWED_TSQUERY_CHARACTERS, " ")
 
-          term_sql = @normalizer.add_normalization(connection.quote(sanitized_term))
+        term_sql = @normalizer.add_normalization(connection.quote(sanitized_term))
 
-          # After this, the SQL expression evaluates to a string containing the term surrounded by single-quotes.
-          tsquery_sql = "#{connection.quote("' ")} || #{term_sql} || #{connection.quote(" '")}"
+        # After this, the SQL expression evaluates to a string containing the term surrounded by single-quotes.
+        # If :prefix is true, then the term will also have :* appended to the end.
+        tsquery_sql = [
+            connection.quote("' "),
+            term_sql,
+            connection.quote(" '"),
+            (connection.quote(':*') if @options[:prefix])
+        ].compact.join(" || ")
 
-          # Add tsearch prefix operator if we're using a prefix search.
-          tsquery_sql = "#{tsquery_sql} || #{connection.quote(':*')}" if @options[:prefix]
+        "to_tsquery(:dictionary, #{tsquery_sql})"
+      end
 
-          "to_tsquery(:dictionary, #{tsquery_sql})"
-        end.join(@options[:any_word] ? ' || ' : ' && ')
+      def tsquery
+        return "''" if @query.blank?
+        @query.split(" ").compact.map { |term| tsquery_for_term(term) }.join(@options[:any_word] ? ' || ' : ' && ')
       end
 
       def tsdocument
@@ -55,7 +61,7 @@ module PgSearch
           search_column.weight.nil? ? tsvector : "setweight(#{tsvector}, #{connection.quote(search_column.weight)})"
         end.join(" || ")
       end
-      
+
       # From http://www.postgresql.org/docs/8.3/static/textsearch-controls.html
       #   0 (the default) ignores the document length
       #   1 divides the rank by 1 + the logarithm of the document length

data/lib/pg_search/normalizer.rb

@@ -6,7 +6,16 @@ module PgSearch
 
     def add_normalization(original_sql)
       normalized_sql = original_sql
-      normalized_sql = "unaccent(#{normalized_sql})" if @config.ignore.include?(:accents)
+      if @config.ignore.include?(:accents)
+        if @config.postgresql_version < 90000
+          raise PgSearch::NotSupportedForPostgresqlVersion.new(<<-MESSAGE)
+          Sorry, {:ignoring => :accents} only works in PostgreSQL 9.0 and above.
+          #{@config.inspect}
+          MESSAGE
+        else
+          normalized_sql = "unaccent(#{normalized_sql})"
+        end
+      end
       normalized_sql
     end
   end

data/lib/pg_search/version.rb

@@ -1,3 +1,3 @@
 module PgSearch
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/pg_search_spec.rb

@@ -369,14 +369,14 @@ describe "an ActiveRecord model which includes PgSearch" do
           results.should =~ included
         end
       end
-      
+
       describe "ranking" do
         before do
           ["Strip Down", "Down", "Down and Out", "Won't Let You Down"].each do |name|
             ModelWithPgSearch.create! :content => name
           end
         end
-        
+
         context "with a normalization specified" do
           before do
             ModelWithPgSearch.class_eval do
@@ -389,12 +389,12 @@ describe "an ActiveRecord model which includes PgSearch" do
           end
           it "ranks the results for documents with less text higher" do
             results = ModelWithPgSearch.search_content_with_normalization("down")
-            
+
             results.map(&:content).should == ["Down", "Strip Down", "Down and Out", "Won't Let You Down"]
             results.first.rank.should be > results.last.rank
           end
         end
-        
+
         context "with no normalization" do
           before do
             ModelWithPgSearch.class_eval do
@@ -405,7 +405,7 @@ describe "an ActiveRecord model which includes PgSearch" do
           end
           it "ranks the results equally" do
             results = ModelWithPgSearch.search_content_without_normalization("down")
-            
+
             results.map(&:content).should == ["Strip Down", "Down", "Down and Out", "Won't Let You Down"]
             results.first.rank.should == results.last.rank
           end
@@ -599,14 +599,22 @@ describe "an ActiveRecord model which includes PgSearch" do
         end
       end
 
-      it "returns rows that match the query but not its accents" do
-        # \303\241 is a with acute accent
-        # \303\251 is e with acute accent
+      if ActiveRecord::Base.connection.send(:postgresql_version) < 90000
+        it "is unsupported in PostgreSQL 8.x" do
+          lambda do
+            ModelWithPgSearch.search_title_without_accents("abcd\303\251f")
+          end.should raise_exception(PgSearch::NotSupportedForPostgresqlVersion)
+        end
+      else
+        it "returns rows that match the query but not its accents" do
+          # \303\241 is a with acute accent
+          # \303\251 is e with acute accent
 
-        included = ModelWithPgSearch.create!(:title => "\303\241bcdef")
+          included = ModelWithPgSearch.create!(:title => "\303\241bcdef")
 
-        results = ModelWithPgSearch.search_title_without_accents("abcd\303\251f")
-        results.should == [included]
+          results = ModelWithPgSearch.search_title_without_accents("abcd\303\251f")
+          results.should == [included]
+        end
       end
     end
 

data/spec/spec_helper.rb

@@ -35,7 +35,9 @@ rescue => e
 end
 
 install_contrib_module_if_missing("pg_trgm", "SELECT 'abcdef' % 'cdef'", "t")
-install_contrib_module_if_missing("unaccent", "SELECT unaccent('foo')", "foo")
+unless connection.send(:postgresql_version) < 90000
+  install_contrib_module_if_missing("unaccent", "SELECT unaccent('foo')", "foo")
+end
 install_contrib_module_if_missing("fuzzystrmatch", "SELECT dmetaphone('foo')", "f")
 
 ActiveRecord::Base.connection.execute(File.read(File.join(File.dirname(__FILE__), '..', 'sql', 'dmetaphone.sql')))

metadata

@@ -1,46 +1,60 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: pg_search
-version: !ruby/object:Gem::Version
-  version: 0.3.1
+version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
+  segments: 
+  - 0
+  - 3
+  - 2
+  version: 0.3.2
 platform: ruby
-authors:
+authors: 
 - Case Commons, LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-08 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-10-18 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: &2164362320 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        version: "3"
   type: :runtime
-  prerelease: false
-  version_requirements: *2164362320
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &2164361700 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        version: "3"
   type: :runtime
-  prerelease: false
-  version_requirements: *2164361700
-description: PgSearch builds ActiveRecord named scopes that take advantage of PostgreSQL's
-  full text search
-email:
+  version_requirements: *id002
+description: PgSearch builds ActiveRecord named scopes that take advantage of PostgreSQL's full text search
+email: 
 - casecommons-dev@googlegroups.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .autotest
 - .gitignore
 - .rspec
@@ -80,30 +94,38 @@ files:
 - sql/uninstall_dmetaphone.sql
 homepage: https://github.com/Casecommons/pg_search
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.4
 signing_key: 
 specification_version: 3
-summary: PgSearch builds ActiveRecord named scopes that take advantage of PostgreSQL's
-  full text search
-test_files:
+summary: PgSearch builds ActiveRecord named scopes that take advantage of PostgreSQL's full text search
+test_files: 
 - spec/associations_spec.rb
 - spec/pg_search/document_spec.rb
 - spec/pg_search/multisearch_spec.rb