pg_search 0.5.3 → 0.5.4

data/CHANGELOG.rdoc

@@ -1,16 +1,22 @@
 = PgSearch
 
+== 0.5.4
+
+* Fix bug in associated_against join clause when search scope is chained after other scopes.
+
+* Fix autoloading of PgSearch::VERSION constant.
+
 == 0.5.3
 
-* Prevent multiple attempts to create pg search document within a single transaction
+* Prevent multiple attempts to create pg_search_document within a single transaction. (JT Archie & Trace Wax)
 
 == 0.5.2
 
-* Don't save twice if pg_search_document is missing on update
+* Don't save twice if pg_search_document is missing on update.
 
 == 0.5.1
 
-* Add ability to override multisearch rebuild SQL
+* Add ability to override multisearch rebuild SQL.
 
 == 0.5
 

data/lib/pg_search.rb

@@ -11,7 +11,7 @@ module PgSearch
   autoload :Normalizer, "pg_search/normalizer"
   autoload :Scope, "pg_search/scope"
   autoload :ScopeOptions, "pg_search/scope_options"
-  autoload :Version, "pg_search/version"
+  autoload :VERSION, "pg_search/version"
 
   extend ActiveSupport::Concern
 

data/lib/pg_search/configuration/association.rb

@@ -41,7 +41,7 @@ module PgSearch
       end
 
       def relation(primary_key)
-        @model.joins(@name).select("#{primary_key} AS id, #{selects}").group(primary_key)
+        @model.unscoped.joins(@name).select("#{primary_key} AS id, #{selects}").group(primary_key)
       end
     end
   end

data/lib/pg_search/version.rb

@@ -1,3 +1,3 @@
 module PgSearch
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

data/spec/associations_spec.rb

@@ -116,6 +116,23 @@ describe PgSearch do
         results.map(&:title).should =~ included.map(&:title)
         results.should_not include(excluded)
       end
+
+      it "uses an unscoped relation of the assocated model" do
+        excluded = ModelWithHasMany.create!(:title => 'abcdef', :other_models => [
+          AssociatedModelWithHasMany.create!(:title => 'abcdef')
+        ])
+        included = [
+          ModelWithHasMany.create!(:title => 'abcdef', :other_models => [
+            AssociatedModelWithHasMany.create!(:title => 'foo'),
+            AssociatedModelWithHasMany.create!(:title => 'bar')
+          ])
+        ]
+
+        results = ModelWithHasMany.limit(1).order("id ASC").with_associated('foo bar')
+        results.map(&:title).should =~ included.map(&:title)
+        results.should_not include(excluded)
+      end
+
     end
 
     context "across multiple associations" do
@@ -356,13 +373,13 @@ describe PgSearch do
       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])
+          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 => [])
+          ModelWithAssociation.create(:associated_models => [excluded_associated_2]),
+          ModelWithAssociation.create(:associated_models => [])
       ]
 
       relation = AssociatedModel.search_content("foo")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_search
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-06 00:00:00.000000000 Z
+date: 2012-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -114,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -999690345082589006
+      hash: 1787882256283338763
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -999690345082589006
+      hash: 1787882256283338763
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24