pg_search 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0129477dd69209f0276e0207d137556bfe486039
-  data.tar.gz: f1c644b3a6659eb823c0993534e3b25dc9ffdf72
+  metadata.gz: 165dd9636ca6fe145f0c619c1223f9c5d120d8de
+  data.tar.gz: 2aec51ab9d72cf504dc8c8af979ca30c57f4a19a
 SHA512:
-  metadata.gz: 38795ff477f256ba5acdb5ce1c368d8830294cabc04bd3ca1b84554f26094e39f14eca31574d6de0821803c987a1040946913b008a06de0ad4d376b7b2cfebfe
-  data.tar.gz: e7ce0c0536b72f1857cd638cb55eb3a2a1087262a4a973a26057a18e45d6ea15df0818637f4c8bd9e4d9757895feeb3d0fb255893c0c01d0e09aa6c9e066a0bd
+  metadata.gz: e80100d386747b57fb18be03e4de9fe04561f58cc0a3dc687971542d41e9491d0daab9f278e19b6672c36d00cab5adfab8c66e45a97cc706c72848891dd512d7
+  data.tar.gz: 13b258daf15ced5f205560cda4a1b451d07544e1ca687090e98a996dace0aeedc61a71b7397fd9e43d18ee8b2084669583e047183cce6224d6f33123f97a1bbc

data/.travis.yml

@@ -3,13 +3,14 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.1
+  - 2.1.2
   - jruby-19mode
 
 env:
   - ACTIVE_RECORD_BRANCH="master"
   - ACTIVE_RECORD_BRANCH="4-1-stable"
   - ACTIVE_RECORD_BRANCH="4-0-stable"
+  - ACTIVE_RECORD_VERSION="~> 4.2.0.beta1"
   - ACTIVE_RECORD_VERSION="~> 4.1.0"
   - ACTIVE_RECORD_VERSION="~> 4.0.0"
   - ACTIVE_RECORD_VERSION="~> 3.2.0"
@@ -21,6 +22,7 @@ matrix:
     - env: ACTIVE_RECORD_BRANCH="master"
     - env: ACTIVE_RECORD_BRANCH="4-1-stable"
     - env: ACTIVE_RECORD_BRANCH="4-0-stable"
+    - env: ACTIVE_RECORD_VERSION="~> 4.2.0.beta1"
 
 before_script:
   - "psql -c 'create database pg_search_test;' -U postgres >/dev/null"

data/CHANGELOG.md

@@ -1,9 +1,13 @@
 # pg_search changelog
 
+## 0.7.7
+
+*   Fix future compatibility with Active Record 4.2.
+
 ## 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)
+*   Add `:only` option for limiting search fields per feature. (Jonathan Greenberg)
 
 ## 0.7.5
 

data/Guardfile

@@ -1,4 +1,4 @@
-guard 'rspec' do
+guard 'rspec', cmd: "bin/rspec" do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }

data/bin/guard

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'guard' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('guard', 'guard')

data/bin/rspec

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rspec-core', 'rspec')

data/lib/pg_search/compatibility.rb

@@ -5,5 +5,13 @@ module PgSearch
         read_attribute(:pg_search_rank).to_f
       end
     end
+
+    def self.build_quoted(string)
+      if defined?(Arel::Nodes::Quoted)
+        Arel::Nodes.build_quoted(string)
+      else
+        string
+      end
+    end
   end
 end

data/lib/pg_search/features/tsearch.rb

@@ -1,3 +1,4 @@
+require "pg_search/compatibility"
 require "active_support/core_ext/module/delegation"
 
 module PgSearch
@@ -27,17 +28,22 @@ module PgSearch
 
       DISALLOWED_TSQUERY_CHARACTERS = /['?\\:]/
 
-      def tsquery_for_term(term)
-        sanitized_term = term.gsub(DISALLOWED_TSQUERY_CHARACTERS, " ")
+      def tsquery_for_term(unsanitized_term)
+        sanitized_term = unsanitized_term.gsub(DISALLOWED_TSQUERY_CHARACTERS, " ")
 
         term_sql = Arel.sql(normalize(connection.quote(sanitized_term)))
 
         # 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.
-        terms = ["' ", term_sql, " '", (':*' if options[:prefix])].compact
+        terms = [
+          Compatibility.build_quoted("' "),
+          term_sql,
+          Compatibility.build_quoted(" '"),
+          (Compatibility.build_quoted(":*") if options[:prefix])
+        ].compact
 
         tsquery_sql = terms.inject do |memo, term|
-          Arel::Nodes::InfixOperation.new("||", memo, term)
+          Arel::Nodes::InfixOperation.new("||", memo, Compatibility.build_quoted(term))
         end
 
         Arel::Nodes::NamedFunction.new(
@@ -84,7 +90,7 @@ module PgSearch
       end
 
       def dictionary
-        options[:dictionary] || :simple
+        Compatibility.build_quoted(options[:dictionary] || :simple)
       end
 
       def arel_wrap(sql_string)

data/lib/pg_search/migration/templates/create_pg_search_documents.rb.erb

@@ -4,7 +4,7 @@ class CreatePgSearchDocuments < ActiveRecord::Migration
       create_table :pg_search_documents do |t|
         t.text :content
         t.belongs_to :searchable, :polymorphic => true
-        t.timestamps
+        t.timestamps null: false
       end
     end
   end

data/lib/pg_search/version.rb

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

data/spec/integration/pg_search_spec.rb

@@ -256,7 +256,7 @@ describe "an Active Record model which includes PgSearch" do
       context "when the column is not text" do
         with_model :ModelWithTimestamps do
           table do |t|
-            t.timestamps
+            t.timestamps null: false
           end
 
           model do
@@ -1012,7 +1012,7 @@ describe "an Active Record model which includes PgSearch" do
         expect(PgSearch::Document).to receive(:search).with(query).and_return(relation)
       end
 
-      it { should == relation }
+      it { is_expected.to eq(relation) }
     end
 
     context "with PgSearch.multisearch_options set to a Hash" do
@@ -1031,7 +1031,7 @@ describe "an Active Record model which includes PgSearch" do
 
       let!(:soundalike_record) { MultisearchableModel.create!(:title => 'foning') }
       let(:query) { "Phoning" }
-      it { should include(soundalike_record) }
+      it { is_expected.to include(soundalike_record) }
     end
 
     context "with PgSearch.multisearch_options set to a Proc" do
@@ -1064,12 +1064,12 @@ describe "an Active Record model which includes PgSearch" do
 
       context "with soundalike true" do
         let(:soundalike) { true }
-        it { should include(soundalike_record) }
+        it { is_expected.to include(soundalike_record) }
       end
 
       context "with soundalike false" do
         let(:soundalike) { false }
-        it { should_not include(soundalike_record) }
+        it { is_expected.not_to include(soundalike_record) }
       end
     end
 

data/spec/lib/pg_search/document_spec.rb

@@ -11,7 +11,7 @@ describe PgSearch::Document do
     end
   end
 
-  it { should be_an(ActiveRecord::Base) }
+  it { is_expected.to be_an(ActiveRecord::Base) }
 
   describe "callbacks" do
     describe "before_validation" do
@@ -34,7 +34,7 @@ describe PgSearch::Document do
 
         describe '#content' do
           subject { super().content }
-          it { should == text }
+          it { is_expected.to eq(text) }
         end
       end
 
@@ -48,7 +48,7 @@ describe PgSearch::Document do
 
         describe '#content' do
           subject { super().content }
-          it { should == "1 2" }
+          it { is_expected.to eq("1 2") }
         end
       end
     end

data/spec/lib/pg_search/multisearch_spec.rb

@@ -7,7 +7,7 @@ describe PgSearch::Multisearch do
     table do |t|
       t.string :title
       t.text :content
-      t.timestamps
+      t.timestamps null: false
     end
     model do
       include PgSearch

data/spec/lib/pg_search/normalizer_spec.rb

@@ -7,7 +7,7 @@ describe PgSearch::Normalizer do
         context "when passed an Arel node" do
           it "wraps the expression in unaccent()" do
             config = double("config", :ignore => [:accents], :postgresql_version => 90000)
-            node = Arel::Nodes::NamedFunction.new("foo", ["bar"])
+            node = Arel::Nodes::NamedFunction.new("foo", [PgSearch::Compatibility.build_quoted("bar")])
 
             normalizer = PgSearch::Normalizer.new(config)
             expect(normalizer.add_normalization(node)).to eq("unaccent(foo('bar'))")
@@ -16,7 +16,7 @@ describe PgSearch::Normalizer do
           context "when a custom unaccent function is specified" do
             it "wraps the expression in that function" do
               allow(PgSearch).to receive(:unaccent_function).and_return("my_unaccent")
-              node = Arel::Nodes::NamedFunction.new("foo", ["bar"])
+              node = Arel::Nodes::NamedFunction.new("foo", [PgSearch::Compatibility.build_quoted("bar")])
 
               config = double("config", :ignore => [:accents], :postgresql_version => 90000)
 

data/spec/spec_helper.rb

@@ -18,5 +18,5 @@ require 'support/with_model'
 DOCUMENTS_SCHEMA = lambda do |t|
   t.belongs_to :searchable, :polymorphic => true
   t.text :content
-  t.timestamps
+  t.timestamps null: false
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_search
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - Grant Hutchins
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -114,7 +114,9 @@ description: PgSearch builds Active Record named scopes that take advantage of P
 email:
 - gems@nertzy.com
 - casecommons-dev@googlegroups.com
-executables: []
+executables:
+- guard
+- rspec
 extensions: []
 extra_rdoc_files: []
 files:
@@ -129,6 +131,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/guard
+- bin/rspec
 - lib/pg_search.rb
 - lib/pg_search/compatibility.rb
 - lib/pg_search/configuration.rb