Create Predicates module to match directory structure

4 files changed, 219 insertions, 211 deletions

diff --git a/spec/arel/engines/sql/unit/predicates/binary_spec.rb b/spec/arel/engines/sql/unit/predicates/binary_spec.rb
index 783e6c6a7b..23bce54792 100644
--- a/spec/arel/engines/sql/unit/predicates/binary_spec.rb
+++ b/spec/arel/engines/sql/unit/predicates/binary_spec.rb
@@ -1,114 +1,116 @@
 require 'spec_helper'
 
 module Arel
-  describe Binary do
-    class ConcreteBinary < Binary
-      def predicate_sql
-        "<=>"
+  module Predicates
+    describe Binary do
+      class ConcreteBinary < Binary
+        def predicate_sql
+          "<=>"
+        end
       end
-    end
-
-    before do
-      @relation = Table.new(:users)
-      @attribute1 = @relation[:id]
-      @attribute2 = @relation[:name]
-    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
diff --git a/spec/arel/engines/sql/unit/predicates/equality_spec.rb b/spec/arel/engines/sql/unit/predicates/equality_spec.rb
index c4dd2c0c31..4004bb5881 100644
--- a/spec/arel/engines/sql/unit/predicates/equality_spec.rb
+++ b/spec/arel/engines/sql/unit/predicates/equality_spec.rb
@@ -1,58 +1,60 @@
 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})
+            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
 
-      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
+        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 :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
diff --git a/spec/arel/engines/sql/unit/predicates/in_spec.rb b/spec/arel/engines/sql/unit/predicates/in_spec.rb
index 4a3eff79ec..bb00733e60 100644
--- a/spec/arel/engines/sql/unit/predicates/in_spec.rb
+++ b/spec/arel/engines/sql/unit/predicates/in_spec.rb
@@ -1,83 +1,85 @@
 require 'spec_helper'
 
 module Arel
-  describe In do
-    before do
-      @relation = Table.new(:users)
-      @attribute = @relation[:id]
-    end
+  module Predicates
+    describe In do
+      before do
+        @relation = Table.new(:users)
+        @attribute = @relation[:id]
+      end
 
-    describe '#to_sql' do
-      describe 'when relating to an array' do
-        describe 'when the array\'s elements are the same type as the attribute' do
-          before do
-            @array = [1, 2, 3]
-          end
+      describe '#to_sql' do
+        describe 'when relating to an array' do
+          describe 'when the array\'s elements are the same type as the attribute' do
+            before do
+              @array = [1, 2, 3]
+            end
 
-          it 'manufactures sql with a comma separated list' do
-            sql = In.new(@attribute, @array).to_sql
+            it 'manufactures sql with a comma separated list' do
+              sql = In.new(@attribute, @array).to_sql
 
-            adapter_is :mysql do
-              sql.should be_like(%Q{`users`.`id` IN (1, 2, 3)})
+              adapter_is :mysql do
+                sql.should be_like(%Q{`users`.`id` IN (1, 2, 3)})
+              end
+
+              adapter_is_not :mysql do
+                sql.should be_like(%Q{"users"."id" IN (1, 2, 3)})
+              end
             end
+          end
 
-            adapter_is_not :mysql do
-              sql.should be_like(%Q{"users"."id" IN (1, 2, 3)})
+          describe 'when the array\'s elements are not same type as the attribute' do
+            before do
+              @array = ['1-asdf', 2, 3]
+            end
+
+            it 'formats values in the array as the type of the attribute' do
+              sql = In.new(@attribute, @array).to_sql
+
+              adapter_is :mysql do
+                sql.should be_like(%Q{`users`.`id` IN (1, 2, 3)})
+              end
+
+              adapter_is_not :mysql do
+                sql.should be_like(%Q{"users"."id" IN (1, 2, 3)})
+              end
             end
           end
         end
 
-        describe 'when the array\'s elements are not same type as the attribute' do
+        describe 'when relating to a range' do
           before do
-            @array = ['1-asdf', 2, 3]
+            @range = 1..2
           end
 
-          it 'formats values in the array as the type of the attribute' do
-            sql = In.new(@attribute, @array).to_sql
+          it 'manufactures sql with a between' do
+            sql = In.new(@attribute, @range).to_sql
 
             adapter_is :mysql do
-              sql.should be_like(%Q{`users`.`id` IN (1, 2, 3)})
+              sql.should be_like(%Q{`users`.`id` BETWEEN 1 AND 2})
             end
 
             adapter_is_not :mysql do
-              sql.should be_like(%Q{"users"."id" IN (1, 2, 3)})
+              sql.should be_like(%Q{"users"."id" BETWEEN 1 AND 2})
             end
           end
         end
-      end
-
-      describe 'when relating to a range' do
-        before do
-          @range = 1..2
-        end
-
-        it 'manufactures sql with a between' do
-          sql = In.new(@attribute, @range).to_sql
-
-          adapter_is :mysql do
-            sql.should be_like(%Q{`users`.`id` BETWEEN 1 AND 2})
-          end
-
-          adapter_is_not :mysql do
-            sql.should be_like(%Q{"users"."id" BETWEEN 1 AND 2})
-          end
-        end
-      end
 
-      describe 'when relating to a relation' do
-        it 'manufactures sql with a subselect' do
-          sql = In.new(@attribute, @relation).to_sql
+        describe 'when relating to a relation' do
+          it 'manufactures sql with a subselect' do
+            sql = In.new(@attribute, @relation).to_sql
 
-          adapter_is :mysql do
-            sql.should be_like(%Q{
-              `users`.`id` IN (SELECT `users`.`id`, `users`.`name` FROM `users`)
-            })
-          end
+            adapter_is :mysql do
+              sql.should be_like(%Q{
+                `users`.`id` IN (SELECT `users`.`id`, `users`.`name` FROM `users`)
+              })
+            end
 
-          adapter_is_not :mysql do
-            sql.should be_like(%Q{
-              "users"."id" IN (SELECT "users"."id", "users"."name" FROM "users")
-            })
+            adapter_is_not :mysql do
+              sql.should be_like(%Q{
+                "users"."id" IN (SELECT "users"."id", "users"."name" FROM "users")
+              })
+            end
           end
         end
       end
diff --git a/spec/arel/engines/sql/unit/predicates/predicates_spec.rb b/spec/arel/engines/sql/unit/predicates/predicates_spec.rb
index fe0010a8cb..7d53351546 100644
--- a/spec/arel/engines/sql/unit/predicates/predicates_spec.rb
+++ b/spec/arel/engines/sql/unit/predicates/predicates_spec.rb
@@ -1,62 +1,64 @@
 require 'spec_helper'
 
 module Arel
-  describe Predicate do
-    before do
-      @relation = Table.new(:users)
-      @attribute1 = @relation[:id]
-      @attribute2 = @relation[:name]
-      @operand1 = Equality.new(@attribute1, 1)
-      @operand2 = Equality.new(@attribute2, "name")
-    end
+  module Predicates
+    describe Predicate do
+      before do
+        @relation = Table.new(:users)
+        @attribute1 = @relation[:id]
+        @attribute2 = @relation[:name]
+        @operand1 = Equality.new(@attribute1, 1)
+        @operand2 = Equality.new(@attribute2, "name")
+      end
 
-    describe "when being combined with another predicate with AND logic" do
-      describe "#to_sql" do
-        it "manufactures sql with an AND operation" do
-          sql = @operand1.and(@operand2).to_sql
+      describe "when being combined with another predicate with AND logic" do
+        describe "#to_sql" do
+          it "manufactures sql with an AND operation" do
+            sql = @operand1.and(@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
 
-    describe "when being combined with another predicate with OR logic" do
-      describe "#to_sql" do
-        it "manufactures sql with an OR operation" do
-          sql = @operand1.or(@operand2).to_sql
+      describe "when being combined with another predicate with OR logic" do
+        describe "#to_sql" do
+          it "manufactures sql with an OR operation" do
+            sql = @operand1.or(@operand2).to_sql
 
-          adapter_is :mysql do
-            sql.should be_like(%Q{
-              (`users`.`id` = 1 OR `users`.`name` = 'name')
-            })
-          end
+            adapter_is :mysql do
+              sql.should be_like(%Q{
+                (`users`.`id` = 1 OR `users`.`name` = 'name')
+              })
+            end
 
-          adapter_is :sqlite3 do
-            sql.should be_like(%Q{
-              ("users"."id" = 1 OR "users"."name" = 'name')
-            })
-          end
+            adapter_is :sqlite3 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')
-            })
+            adapter_is :postgresql do
+              sql.should be_like(%Q{
+                ("users"."id" = 1 OR "users"."name" = E'name')
+              })
+            end
           end
         end
       end