0
@@ -1,5 +1,4 @@
0
 require 'rubygems'
0
-require 'spec'
0
 require 'spec/rake/spectask'
0
 
0
 Spec::Rake::SpecTask.new do |t|

0
@@ -46,27 +46,19 @@ module ActiveRelation
0
   end
0
 
0
   class GreaterThanOrEqualTo < Binary
0
-    def predicate_sql
0
-      '>='
0
-    end
0
+    def predicate_sql; '>=' end
0
   end
0
 
0
   class GreaterThan < Binary
0
-    def predicate_sql
0
-      '>'
0
-    end
0
+    def predicate_sql; '>' end
0
   end
0
 
0
   class LessThanOrEqualTo < Binary
0
-    def predicate_sql
0
-      '<='
0
-    end
0
+    def predicate_sql; '<=' end
0
   end
0
 
0
   class LessThan < Binary
0
-    def predicate_sql
0
-      '<'
0
-    end
0
+    def predicate_sql; '<' end
0
   end
0
 
0
   class Match < Binary
0
@@ -74,8 +66,6 @@ module ActiveRelation
0
   end
0
   
0
   class In < Binary
0
-    def predicate_sql
0
-      operand2.inclusion_predicate_sql
0
-    end
0
+    def predicate_sql; operand2.inclusion_predicate_sql end
0
   end
0
 end
0
\ No newline at end of file

0
@@ -38,7 +38,7 @@ module ActiveRelation
0
       end
0
 
0
       def select(*predicates)
0
-        Selection.new(self, *predicates.collect {|p| p.bind(self)})
0
+        Selection.new(self, *predicates)
0
       end
0
 
0
       def project(*attributes)

0
@@ -3,8 +3,9 @@ module ActiveRelation
0
     attr_reader :predicate
0
 
0
     def initialize(relation, *predicates)
0
-      @predicate = predicates.shift
0
+      predicate = predicates.shift
0
       @relation = predicates.empty?? relation : Selection.new(relation, *predicates)
0
+      @predicate = predicate.bind(@relation)
0
     end
0
 
0
     def ==(other)

0
@@ -91,7 +91,7 @@ module ActiveRelation
0
         end
0
     
0
         it "accepts arbitrary strings" do
0
-          @relation.select("arbitrary").should == Selection.new(@relation, Value.new("arbitrary", @relation))
0
+          @relation.select("arbitrary").should == Selection.new(@relation, "arbitrary")
0
         end
0
       end
0
   

0
@@ -26,9 +26,13 @@ module ActiveRelation
0
     end
0
 
0
     describe '#descend' do
0
+      before do
0
+        @selection = Selection.new(@relation, @predicate)
0
+      end
0
+      
0
       it "distributes a block over the relation and predicates" do
0
-        Selection.new(@relation, @predicate).descend(&:qualify). \
0
-          should == Selection.new(@relation.descend(&:qualify), @predicate.descend(&:qualify))
0
+        @selection.descend(&:qualify). \
0
+          should == Selection.new(@selection.relation.descend(&:qualify), @selection.predicate.qualify)
0
       end
0
     end
0
   
0
@@ -45,7 +49,7 @@ module ActiveRelation
0
       
0
       describe 'when given a string' do
0
         before do
0
-          @string = "asdf".bind(@relation)
0
+          @string = "asdf"
0
         end
0
         
0
         it "passes the string through to the where clause" do