meta_search 0.9.7 → 0.9.7.1

data/CHANGELOG

@@ -1,3 +1,6 @@
+Changes since 0.9.7 (2010-10-12):
+  * Play nicely regardless of MetaWhere/MetaSearch load order.
+
 Changes since 0.9.6 (2010-09-29):
   * Support _or_-separated conditions. I'm not crazy about 'em, but it's
     an oft-requested feature.

data/VERSION

@@ -1 +1 @@
-0.9.7
+0.9.7.1

data/lib/meta_search/builder.rb

@@ -257,7 +257,7 @@ module MetaSearch
         assoc.parent == parent
       end
       unless found_association
-        @join_dependency.send(:build, association, parent, Arel::OuterJoin, klass)
+        @join_dependency.send(:build_with_metasearch, association, parent, Arel::OuterJoin, klass)
         found_association = @join_dependency.join_associations.last
         @relation = @relation.joins(found_association)
       end

data/lib/meta_search/join_dependency.rb

@@ -4,7 +4,6 @@ module MetaSearch
 
     def self.included(base)
       base.class_eval do
-        alias_method_chain :build, :metasearch
         alias_method_chain :graft, :metasearch
       end
     end
@@ -12,7 +11,11 @@ module MetaSearch
     def graft_with_metasearch(*associations)
       associations.each do |association|
         join_associations.detect {|a| association == a} ||
-        build(association.reflection.name, association.find_parent_in(self) || join_base, association.join_class, association.reflection.klass)
+        (
+          association.class == MetaSearch::PolymorphicJoinAssociation ?
+          build_with_metasearch(association.reflection.name, association.find_parent_in(self) || join_base, association.join_class, association.reflection.klass) :
+          build(association.reflection.name, association.find_parent_in(self) || join_base, association.join_class)
+        )
       end
       self
     end
@@ -33,7 +36,7 @@ module MetaSearch
             @joins << build_join_association(reflection, parent).with_join_class(join_class)
           end
         else
-          build_without_metasearch(association, parent, join_class)
+          build(association, parent, join_class) # Shouldn't get here.
         end
       end
 

data/meta_search.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{meta_search}
-  s.version = "0.9.7"
+  s.version = "0.9.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ernie Miller"]
-  s.date = %q{2010-10-11}
+  s.date = %q{2010-10-12}
   s.description = %q{
       Allows simple search forms to be created against an AR3 model
       and its associations, has useful view helpers for sort links

metadata

@@ -6,7 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 7
-  version: 0.9.7
+  - 1
+  version: 0.9.7.1
 platform: ruby
 authors: 
 - Ernie Miller
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-11 00:00:00 -04:00
+date: 2010-10-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency