pg_search 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e731121eded3c8c6fc307d432507be225d61134
-  data.tar.gz: a19f47bb6292573ae715b2b055805a4b9992825f
+  metadata.gz: 002be327b000c695d0971186e1b3a2a1924f5b9f
+  data.tar.gz: b414d034c40908cd3d8e18a64916ae72724e3d9e
 SHA512:
-  metadata.gz: 74a646b6bcac56df197514459c42789b69f6862d14340184444cf8438b24d8847e226f4ae0d0a23e20c1409611417702e6f47a9f0c18fbcf67aa77e86bafc663
-  data.tar.gz: 6b546e771fe0b0c1f6970b0812d15c71c155cce162f4ccdd11c63e2f180b98e1e74d024b42f196a753b18c4c038d49ad4053effa53a11097ff5f9e8e45a53fc7
+  metadata.gz: af2d2c1a826dd76a0157d701832a891f0e799b20bfa4dd3200444cbc3e7c280b6e342dae220997585b44f28f83bf041cf52c6aa8ef33afa9f168baf4a455bef0
+  data.tar.gz: 8021aadff3504589004416926ca131fb1c90b4e0c6d81bcd1b8c2d67d76ec7c4ffcb64b595e7161a0dce4338baaff8195266268cc474d946514527d2e85a066e

data/.travis.yml

@@ -11,7 +11,8 @@ rvm:
   - ree
 
 env:
-  - ACTIVE_RECORD_VERSION="~> 4.0.0.beta1"
+  - ACTIVE_RECORD_BRANCH="master"
+  - ACTIVE_RECORD_BRANCH="4-0-stable"
   - ACTIVE_RECORD_VERSION="~> 3.2.0"
   - ACTIVE_RECORD_VERSION="~> 3.1.0"
 
@@ -20,17 +21,25 @@ matrix:
     - rvm: rbx-18mode
     - rvm: rbx-19mode
     - rvm: jruby-19mode
-    - env: ACTIVE_RECORD_VERSION="~> 4.0.0.beta1"
+    - env: ACTIVE_RECORD_BRANCH="master"
+    - env: ACTIVE_RECORD_BRANCH="4-0-stable"
   exclude:
     - rvm: 1.8.7
-      env: ACTIVE_RECORD_VERSION="~> 4.0.0.beta1"
+      env: ACTIVE_RECORD_BRANCH="master"
+    - rvm: 1.8.7
+      env: ACTIVE_RECORD_BRANCH="4-0-stable"
+    - rvm: jruby-18mode
+      env: ACTIVE_RECORD_BRANCH="master"
     - rvm: jruby-18mode
-      env: ACTIVE_RECORD_VERSION="~> 4.0.0.beta1"
+      env: ACTIVE_RECORD_BRANCH="4-0-stable"
+    - rvm: rbx-18mode
+      env: ACTIVE_RECORD_BRANCH="master"
     - rvm: rbx-18mode
-      env: ACTIVE_RECORD_VERSION="~> 4.0.0.beta1"
+      env: ACTIVE_RECORD_BRANCH="4-0-stable"
     - rvm: ree
-      env: ACTIVE_RECORD_VERSION="~> 4.0.0.beta1"
-
+      env: ACTIVE_RECORD_BRANCH="master"
+    - rvm: ree
+      env: ACTIVE_RECORD_BRANCH="4-0-stable"
 
 before_script:
   - "psql -c 'create database pg_search_test;' -U postgres >/dev/null"

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = PgSearch
 
+== 0.6.3
+
+* Fix issues and deprecations for Active Record 4.0.0.rc1
+
 == 0.6.2
 
 * Add workaround for issue with how ActiveRecord relations handle Arel OR

data/Gemfile

@@ -6,6 +6,7 @@ gem 'pg', :platform => :ruby
 gem "activerecord-jdbcpostgresql-adapter", :platform => :jruby
 
 gem "activerecord", ENV["ACTIVE_RECORD_VERSION"] if ENV["ACTIVE_RECORD_VERSION"]
+gem "activerecord", :github => "rails", :branch => ENV["ACTIVE_RECORD_BRANCH"] if ENV["ACTIVE_RECORD_BRANCH"]
 
 gem 'coveralls', :require => false, :platform => :mri_20
 

data/lib/pg_search/scope_options.rb

@@ -49,9 +49,11 @@ module PgSearch
     end
 
     def joins
-      config.associations.map do |association|
-        association.join(primary_key)
-      end.join(' ')
+      if config.associations.any?
+        config.associations.map do |association|
+          association.join(primary_key)
+        end.join(' ')
+      end
     end
 
     FEATURE_CLASSES = {

data/lib/pg_search/version.rb

@@ -1,3 +1,3 @@
 module PgSearch
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/spec/integration/pg_search_spec.rb

@@ -16,7 +16,7 @@ describe "an Active Record model which includes PgSearch" do
   describe ".pg_search_scope" do
     it "builds a chainable scope" do
       ModelWithPgSearch.pg_search_scope "matching_query", :against => []
-      scope = ModelWithPgSearch.scoped({}).matching_query("foo").scoped({})
+      scope = ModelWithPgSearch.where("1 = 1").matching_query("foo").where("1 = 1")
       scope.should be_an ActiveRecord::Relation
     end
 
@@ -660,7 +660,7 @@ describe "an Active Record model which includes PgSearch" do
 
         it "should refer to the tsvector column in the query unambiguously" do
           expect {
-            ModelWithTsvector.joins(:another_models).search_by_content_with_tsvector("test").all
+            ModelWithTsvector.joins(:another_models).search_by_content_with_tsvector("test").to_a
           }.not_to raise_exception
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_search
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Grant Hutchins
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-20 00:00:00.000000000 Z
+date: 2013-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: PgSearch builds Active Record named scopes that take advantage of PostgreSQL's