meta_where 1.0.2 → 1.0.3

data/CHANGELOG

@@ -1,3 +1,6 @@
+Changes since 1.0.2 (2011-02-09):
+  * Fix eager loading with order values supplied
+
 Changes since 1.0.1 (2011-01-18):
   * Fix *_all behavior to not result in ORs when collapse_wheres is called
   * Add support for NOT operator (-) on hashes, conditions, and compound

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/lib/meta_where/join_dependency.rb

@@ -34,6 +34,7 @@ module MetaWhere
           end
           association.join_type = join_type
           @joins << association
+          cache_joined_association(association)
         end
         association
       else

data/meta_where.gemspec

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

data/test/test_relations.rb

@@ -345,10 +345,30 @@ class TestRelations < Test::Unit::TestCase
                    @r.where(:name.matches => '%blah%').where(:name.matches => '%blah2%').to_sql
     end
 
-    should "erge multiple conditions on the same column but different predicate with ANDs" do
+    should "merge multiple conditions on the same column but different predicate with ANDs" do
       assert_match /"developers"."name" = 'blah' AND "developers"."name" LIKE '%blah2%'/,
                    @r.where(:name => 'blah').where(:name.matches => '%blah2%').to_sql
     end
+
+    context "with eager-loaded companies" do
+      setup do
+        @r = @r.includes(:company)
+      end
+
+      should "eager load companies" do
+        assert_equal true, @r.all.first.instance_variables.include?(:@company)
+      end
+    end
+
+    context "with eager-loaded companies and an order value" do
+      setup do
+        @r = @r.includes(:company).order(:companies => :name.asc)
+      end
+
+      should "eager load companies" do
+        assert_equal true, @r.all.first.instance_variables.include?(:@company)
+      end
+    end
   end
 
   context "A relation" do

metadata

@@ -2,7 +2,7 @@
 name: meta_where
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Ernie Miller
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 -05:00
+date: 2011-02-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency