arel 0.1.0 → 0.1.2

data/spec/arel/algebra/unit/relations/group_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Group do

data/spec/arel/algebra/unit/relations/insert_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Insert do

data/spec/arel/algebra/unit/relations/join_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Join do

data/spec/arel/algebra/unit/relations/order_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Order do
@@ -6,7 +6,7 @@ module Arel
       @relation = Table.new(:users)
       @attribute = @relation[:id]
     end
-    
+
     describe "#==" do
       it "returns true when the Orders are for the same attribute and direction" do
         Ascending.new(@attribute).should == Ascending.new(@attribute)

data/spec/arel/algebra/unit/relations/project_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Project do

data/spec/arel/algebra/unit/relations/relation_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Relation do
@@ -17,8 +17,8 @@ module Arel
 
       describe 'when given a', Symbol, String do
         it "returns the attribute with the same name, if it exists" do
-          @relation[:id].should == @attribute1
-          @relation['id'].should == @attribute1
+          check @relation[:id].should == @attribute1
+          check @relation['id'].should == @attribute1
           @relation[:does_not_exist].should be_nil
         end
       end
@@ -80,7 +80,7 @@ module Arel
 
       describe '#where' do
         before do
-          @predicate = Equality.new(@attribute1, @attribute2)
+          @predicate = Predicates::Equality.new(@attribute1, @attribute2)
         end
 
         it "manufactures a where relation" do
@@ -180,7 +180,7 @@ module Arel
 
     describe Relation::Enumerable do
       it "implements enumerable" do
-        @relation.collect.should == @relation.session.read(@relation).collect
+        check @relation.collect.should == @relation.session.read(@relation).collect
         @relation.first.should   == @relation.session.read(@relation).first
       end
     end

data/spec/arel/algebra/unit/relations/skip_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Skip do

data/spec/arel/algebra/unit/relations/table_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Table do
@@ -9,7 +9,7 @@ module Arel
     describe '[]' do
       describe 'when given a', Symbol do
         it "manufactures an attribute if the symbol names an attribute within the relation" do
-          @relation[:id].should == Attribute.new(@relation, :id)
+          check @relation[:id].should == Attribute.new(@relation, :id)
           @relation[:does_not_exist].should be_nil
         end
       end

data/spec/arel/algebra/unit/relations/take_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Take do

data/spec/arel/algebra/unit/relations/update_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Update do

data/spec/arel/algebra/unit/relations/where_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Where do

data/spec/arel/algebra/unit/session/session_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Session do

data/spec/arel/engines/memory/integration/joins/cross_engine_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Join do
@@ -10,9 +10,8 @@ module Arel
       ], [:id, :name])
       @photos = Table.new(:photos)
       @photos.delete
-      @photos                                                                              \
-        .insert(@photos[:id] => 1, @photos[:user_id] => 1, @photos[:camera_id] => 6) \
-        .insert(@photos[:id] => 2, @photos[:user_id] => 2, @photos[:camera_id] => 42)
+      @photos.insert(@photos[:id] => 1, @photos[:user_id] => 1, @photos[:camera_id] => 6)
+      @photos.insert(@photos[:id] => 2, @photos[:user_id] => 2, @photos[:camera_id] => 42)
     end
 
     describe 'when the in memory relation is on the left' do

data/spec/arel/engines/memory/unit/relations/array_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Array do

data/spec/arel/engines/memory/unit/relations/insert_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Insert do
@@ -14,13 +14,13 @@ module Arel
       it "manufactures an array of hashes of attributes to values" do
         @relation                                                         \
           .insert(@relation[:id] => 4, @relation[:name] => 'guinea fowl') \
-        .let do |relation|
-          relation.call.should == [
-            Row.new(relation, [1, 'duck']),
-            Row.new(relation, [2, 'duck']),
-            Row.new(relation, [3, 'goose']),
-            Row.new(relation, [4, 'guinea fowl'])
-          ]
+         do |relation|
+           relation.should == [
+             Row.new(relation, [1, 'duck']),
+             Row.new(relation, [2, 'duck']),
+             Row.new(relation, [3, 'goose']),
+             Row.new(relation, [4, 'guinea fowl'])
+           ]
         end
       end
     end

data/spec/arel/engines/memory/unit/relations/join_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Join do

data/spec/arel/engines/memory/unit/relations/order_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Order do

data/spec/arel/engines/memory/unit/relations/project_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Project do

data/spec/arel/engines/memory/unit/relations/skip_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Skip do

data/spec/arel/engines/memory/unit/relations/take_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Take do

data/spec/arel/engines/memory/unit/relations/where_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Where do

data/spec/arel/engines/sql/integration/joins/with_adjacency_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Join do

data/spec/arel/engines/sql/integration/joins/with_aggregations_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Join do

data/spec/arel/engines/sql/integration/joins/with_compounds_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Join do

data/spec/arel/engines/sql/unit/engine_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Sql::Engine do

data/spec/arel/engines/sql/unit/predicates/binary_spec.rb

@@ -1,113 +1,116 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
-  describe Binary do
-    before do
-      @relation = Table.new(:users)
-      @attribute1 = @relation[:id]
-      @attribute2 = @relation[:name]
+  module Predicates
+    describe Binary do
       class ConcreteBinary < Binary
         def predicate_sql
           "<=>"
         end
       end
-    end
 
-    describe "with compound predicates" do
       before do
-        @operand1 = ConcreteBinary.new(@attribute1, 1)
-        @operand2 = ConcreteBinary.new(@attribute2, "name")
+        @relation = Table.new(:users)
+        @attribute1 = @relation[:id]
+        @attribute2 = @relation[:name]
       end
 
-      describe Or do
-        describe "#to_sql" do
-          it "manufactures sql with an OR operation" do
-            sql = Or.new(@operand1, @operand2).to_sql
+      describe "with compound predicates" do
+        before do
+          @operand1 = ConcreteBinary.new(@attribute1, 1)
+          @operand2 = ConcreteBinary.new(@attribute2, "name")
+        end
 
-            adapter_is :mysql do
-              sql.should be_like(%Q{(`users`.`id` <=> 1 OR `users`.`name` <=> 'name')})
-            end
+        describe Or do
+          describe "#to_sql" do
+            it "manufactures sql with an OR operation" do
+              sql = Or.new(@operand1, @operand2).to_sql
 
-            adapter_is :postgresql do
-              sql.should be_like(%Q{("users"."id" <=> 1 OR "users"."name" <=> E'name')})
-            end
+              adapter_is :mysql do
+                sql.should be_like(%Q{(`users`.`id` <=> 1 OR `users`.`name` <=> 'name')})
+              end
+
+              adapter_is :postgresql do
+                sql.should be_like(%Q{("users"."id" <=> 1 OR "users"."name" <=> E'name')})
+              end
 
-            adapter_is :sqlite3 do
-              sql.should be_like(%Q{("users"."id" <=> 1 OR "users"."name" <=> 'name')})
+              adapter_is :sqlite3 do
+                sql.should be_like(%Q{("users"."id" <=> 1 OR "users"."name" <=> 'name')})
+              end
             end
           end
         end
-      end
 
-      describe And do
-        describe "#to_sql" do
-          it "manufactures sql with an AND operation" do
-            sql = And.new(@operand1, @operand2).to_sql
+        describe And do
+          describe "#to_sql" do
+            it "manufactures sql with an AND operation" do
+              sql = And.new(@operand1, @operand2).to_sql
 
-            adapter_is :mysql do
-              sql.should be_like(%Q{(`users`.`id` <=> 1 AND `users`.`name` <=> 'name')})
-            end
+              adapter_is :mysql do
+                sql.should be_like(%Q{(`users`.`id` <=> 1 AND `users`.`name` <=> 'name')})
+              end
 
-            adapter_is :sqlite3 do
-              sql.should be_like(%Q{("users"."id" <=> 1 AND "users"."name" <=> 'name')})
-            end
+              adapter_is :sqlite3 do
+                sql.should be_like(%Q{("users"."id" <=> 1 AND "users"."name" <=> 'name')})
+              end
 
-            adapter_is :postgresql do
-              sql.should be_like(%Q{("users"."id" <=> 1 AND "users"."name" <=> E'name')})
+              adapter_is :postgresql do
+                sql.should be_like(%Q{("users"."id" <=> 1 AND "users"."name" <=> E'name')})
+              end
             end
           end
         end
       end
-    end
 
-    describe '#to_sql' do
-      describe 'when relating two attributes' do
-        it 'manufactures sql with a binary operation' do
-          sql = ConcreteBinary.new(@attribute1, @attribute2).to_sql
+      describe '#to_sql' do
+        describe 'when relating two attributes' do
+          it 'manufactures sql with a binary operation' do
+            sql = ConcreteBinary.new(@attribute1, @attribute2).to_sql
 
-          adapter_is :mysql do
-            sql.should be_like(%Q{`users`.`id` <=> `users`.`name`})
-          end
+            adapter_is :mysql do
+              sql.should be_like(%Q{`users`.`id` <=> `users`.`name`})
+            end
 
-          adapter_is_not :mysql do
-            sql.should be_like(%Q{"users"."id" <=> "users"."name"})
+            adapter_is_not :mysql do
+              sql.should be_like(%Q{"users"."id" <=> "users"."name"})
+            end
           end
         end
-      end
 
-      describe 'when relating an attribute and a value' do
-        before do
-          @value = "1-asdf"
-        end
+        describe 'when relating an attribute and a value' do
+          before do
+            @value = "1-asdf"
+          end
 
-        describe 'when relating to an integer attribute' do
-          it 'formats values as integers' do
-            sql = ConcreteBinary.new(@attribute1, @value).to_sql
+          describe 'when relating to an integer attribute' do
+            it 'formats values as integers' do
+              sql = ConcreteBinary.new(@attribute1, @value).to_sql
 
-            adapter_is :mysql do
-              sql.should be_like(%Q{`users`.`id` <=> 1})
-            end
+              adapter_is :mysql do
+                sql.should be_like(%Q{`users`.`id` <=> 1})
+              end
 
-            adapter_is_not :mysql do
-              sql.should be_like(%Q{"users"."id" <=> 1})
+              adapter_is_not :mysql do
+                sql.should be_like(%Q{"users"."id" <=> 1})
+              end
             end
           end
-        end
 
-        describe 'when relating to a string attribute' do
-          it 'formats values as strings' do
-            sql = ConcreteBinary.new(@attribute2, @value).to_sql
+          describe 'when relating to a string attribute' do
+            it 'formats values as strings' do
+              sql = ConcreteBinary.new(@attribute2, @value).to_sql
 
-            adapter_is :mysql do
-              sql.should be_like(%Q{`users`.`name` <=> '1-asdf'})
-            end
+              adapter_is :mysql do
+                sql.should be_like(%Q{`users`.`name` <=> '1-asdf'})
+              end
 
-            adapter_is :sqlite3 do
-              sql.should be_like(%Q{"users"."name" <=> '1-asdf'})
-            end
+              adapter_is :sqlite3 do
+                sql.should be_like(%Q{"users"."name" <=> '1-asdf'})
+              end
 
-            adapter_is :postgresql do
-              sql.should be_like(%Q{"users"."name" <=> E'1-asdf'})
+              adapter_is :postgresql do
+                sql.should be_like(%Q{"users"."name" <=> E'1-asdf'})
+              end
             end
           end
         end

data/spec/arel/engines/sql/unit/predicates/equality_spec.rb

@@ -1,43 +1,60 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
-  describe Equality do
-    before do
-      @relation1 = Table.new(:users)
-      @relation2 = Table.new(:photos)
-      @attribute1 = @relation1[:id]
-      @attribute2 = @relation2[:user_id]
-    end
+  module Predicates
+    describe Equality do
+      before do
+        @relation1 = Table.new(:users)
+        @relation2 = Table.new(:photos)
+        @attribute1 = @relation1[:id]
+        @attribute2 = @relation2[:user_id]
+      end
 
-    describe '#to_sql' do
-      describe 'when relating to a non-nil value' do
-        it "manufactures an equality predicate" do
-          sql = Equality.new(@attribute1, @attribute2).to_sql
+      describe '#to_sql' do
+        describe 'when relating to a non-nil value' do
+          it "manufactures an equality predicate" do
+            sql = Equality.new(@attribute1, @attribute2).to_sql
 
-          adapter_is :mysql do
-            sql.should be_like(%Q{`users`.`id` = `photos`.`user_id`})
-          end
+            adapter_is :mysql do
+              sql.should be_like(%Q{`users`.`id` = `photos`.`user_id`})
+            end
 
-          adapter_is_not :mysql do
-            sql.should be_like(%Q{"users"."id" = "photos"."user_id"})
+            adapter_is_not :mysql do
+              sql.should be_like(%Q{"users"."id" = "photos"."user_id"})
+            end
           end
         end
-      end
 
-      describe 'when relation to a nil value' do
-        before do
-          @nil = nil
-        end
+        describe 'when relation to a nil value' do
+          before do
+            @nil = nil
+          end
+
+          it "manufactures an is null predicate" do
+            sql = Equality.new(@attribute1, @nil).to_sql
 
-        it "manufactures an is null predicate" do
-          sql = Equality.new(@attribute1, @nil).to_sql
+            adapter_is :mysql do
+              sql.should be_like(%Q{`users`.`id` IS NULL})
+            end
 
-          adapter_is :mysql do
-            sql.should be_like(%Q{`users`.`id` IS NULL})
+            adapter_is_not :mysql do
+              sql.should be_like(%Q{"users"."id" IS NULL})
+            end
           end
+        end
+
+        describe "when relating to a nil Value" do
+          it "manufactures an IS NULL predicate" do
+            value = nil.bind(@relation1)
+            sql = Equality.new(@attribute1, value).to_sql
+
+            adapter_is :mysql do
+              sql.should be_like(%Q{`users`.`id` IS NULL})
+            end
 
-          adapter_is_not :mysql do
-            sql.should be_like(%Q{"users"."id" IS NULL})
+            adapter_is_not :mysql do
+              sql.should be_like(%Q{"users"."id" IS NULL})
+            end
           end
         end
       end