meta_where 0.9.4 → 0.9.5

data/CHANGELOG

@@ -1,3 +1,6 @@
+Changes since 0.9.4 (2010-09-23):
+  * Fix those fun problems with cache_classes.
+
 Changes since 0.9.3 (2010-09-08):
   * alias :& to :merge in singleton to work properly with Ruby 1.8.7.
   * Fix merge to only use associations if not against the same base class. (STI)

data/VERSION

@@ -1 +1 @@
-0.9.4
+0.9.5

data/lib/meta_where/relation.rb

@@ -14,7 +14,7 @@ module MetaWhere
     end
 
     def merge(r, association_name = nil)
-      if (r && (association_name || base_class != r.klass.base_class)) # Merging relations with different base.
+      if (r && (association_name || base_class.name != r.klass.base_class.name)) # Merging relations with different base.
         association_name ||= (default_association = reflect_on_all_associations.detect {|a| a.klass.name == r.klass.name}) ?
                              default_association.name : r.table_name.to_sym
         r = r.clone

data/meta_where.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{meta_where}
-  s.version = "0.9.4"
+  s.version = "0.9.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ernie Miller"]
-  s.date = %q{2010-09-23}
+  s.date = %q{2010-09-27}
   s.description = %q{
       MetaWhere offers the ability to call any Arel predicate methods
       (with a few convenient aliases) on your Model's attributes instead

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 4
-  version: 0.9.4
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - Ernie Miller
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-23 00:00:00 -04:00
+date: 2010-09-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency