arel 2.0.1 → 2.0.2

data/test/helper.rb

@@ -0,0 +1,13 @@
+require 'rubygems'
+require 'minitest/autorun'
+require 'fileutils'
+require 'arel'
+
+require 'support/fake_record'
+Arel::Table.engine = Arel::Sql::Engine.new(FakeRecord::Base.new)
+
+class Object
+  def must_be_like other
+    self.gsub(/\s+/, ' ').strip.must_equal other.gsub(/\s+/, ' ').strip
+  end
+end

data/{spec/nodes/count_spec.rb → test/nodes/test_count.rb}

@@ -1,16 +1,16 @@
-require 'spec_helper'
+require 'helper'
 
 describe Arel::Nodes::Count do
   describe 'backwards compatibility' do
     it 'must be an expression' do
-      Arel::Nodes::Count.new('foo').should be_kind_of Arel::Expression
+      Arel::Nodes::Count.new('foo').must_be_kind_of Arel::Expression
     end
   end
 
   describe "as" do
     it 'should alias the count' do
       table = Arel::Table.new :users
-      table[:id].count.as('foo').to_sql.should be_like %{
+      table[:id].count.as('foo').to_sql.must_be_like %{
         COUNT("users"."id") AS foo
       }
     end

data/{spec/nodes/delete_statement_spec.rb → test/nodes/test_delete_statement.rb}

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'helper'
 
 describe Arel::Nodes::DeleteStatement do
   describe "#clone" do
@@ -6,10 +6,9 @@ describe Arel::Nodes::DeleteStatement do
       statement = Arel::Nodes::DeleteStatement.new
       statement.wheres = %w[a b c]
 
-      statement.wheres.should_receive(:clone).and_return([:wheres])
-
       dolly = statement.clone
-      dolly.wheres.should == [:wheres]
+      dolly.wheres.must_equal statement.wheres
+      dolly.wheres.wont_be_same_as statement.wheres
     end
   end
 end

data/{spec/nodes/equality_spec.rb → test/nodes/test_equality.rb}

@@ -1,3 +1,5 @@
+require 'helper'
+
 module Arel
   module Nodes
     describe 'equality' do
@@ -7,7 +9,7 @@ module Arel
           it 'returns :==' do
             attr = Table.new(:users)[:id]
             left  = attr.eq(10)
-            check left.operator.should == :==
+            left.operator.must_equal :==
           end
         end
 
@@ -15,7 +17,7 @@ module Arel
           it "should equal left" do
             attr = Table.new(:users)[:id]
             left  = attr.eq(10)
-            check left.left.should == left.operand1
+            left.left.must_equal left.operand1
           end
         end
 
@@ -23,7 +25,7 @@ module Arel
           it "should equal right" do
             attr = Table.new(:users)[:id]
             left  = attr.eq(10)
-            check left.right.should == left.operand2
+            left.right.must_equal left.operand2
           end
         end
 
@@ -41,7 +43,7 @@ module Arel
             attr = Table.new(:users)[:id]
             test = attr.eq(10)
             test.to_sql engine
-            check engine.connection.quote_count.should == 2
+            engine.connection.quote_count.must_equal 2
           end
         end
       end
@@ -52,8 +54,8 @@ module Arel
           left  = attr.eq(10)
           right = attr.eq(11)
           node  = left.or right
-          check node.expr.left.should == left
-          check node.expr.right.should == right
+          node.expr.left.must_equal left
+          node.expr.right.must_equal right
         end
       end
 
@@ -63,8 +65,8 @@ module Arel
           left  = attr.eq(10)
           right = attr.eq(11)
           node  = left.and right
-          check node.left.should == left
-          check node.right.should == right
+          node.left.must_equal left
+          node.right.must_equal right
         end
       end
     end

data/{spec/nodes/insert_statement_spec.rb → test/nodes/test_insert_statement.rb}

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'helper'
 
 describe Arel::Nodes::InsertStatement do
   describe "#clone" do
@@ -7,12 +7,12 @@ describe Arel::Nodes::InsertStatement do
       statement.columns = %w[a b c]
       statement.values  = %w[x y z]
 
-      statement.columns.should_receive(:clone).and_return([:columns])
-      statement.values.should_receive(:clone).and_return([:values])
-
       dolly = statement.clone
-      check dolly.columns.should == [:columns]
-      check dolly.values.should  == [:values]
+      dolly.columns.must_equal statement.columns
+      dolly.values.must_equal statement.values
+
+      dolly.columns.wont_be_same_as statement.columns
+      dolly.values.wont_be_same_as statement.values
     end
   end
 end

data/{spec/nodes/or_spec.rb → test/nodes/test_or.rb}

@@ -1,3 +1,5 @@
+require 'helper'
+
 module Arel
   module Nodes
     describe 'or' do
@@ -7,12 +9,12 @@ module Arel
           left  = attr.eq(10)
           right = attr.eq(11)
           node  = left.or right
-          check node.expr.left.should == left
-          check node.expr.right.should == right
+          node.expr.left.must_equal left
+          node.expr.right.must_equal right
 
           oror = node.or(right)
-          check oror.expr.left == node
-          check oror.expr.right == right
+          oror.expr.left.must_equal node
+          oror.expr.right.must_equal right
         end
       end
     end

data/test/nodes/test_select_core.rb

@@ -0,0 +1,22 @@
+require 'helper'
+
+describe Arel::Nodes::SelectCore do
+  describe "#clone" do
+    it "clones froms, projections and wheres" do
+      core = Arel::Nodes::SelectCore.new
+      core.froms       = %w[a b c]
+      core.projections = %w[d e f]
+      core.wheres      = %w[g h i]
+
+      dolly = core.clone
+
+      dolly.froms.must_equal core.froms
+      dolly.projections.must_equal core.projections
+      dolly.wheres.must_equal core.wheres
+
+      dolly.froms.wont_be_same_as core.froms
+      dolly.projections.wont_be_same_as core.projections
+      dolly.wheres.wont_be_same_as core.wheres
+    end
+  end
+end

data/{spec/nodes/select_statement_spec.rb → test/nodes/test_select_statement.rb}

@@ -1,14 +1,13 @@
-require 'spec_helper'
+require 'helper'
 
 describe Arel::Nodes::SelectStatement do
   describe "#clone" do
     it "clones cores" do
       statement = Arel::Nodes::SelectStatement.new %w[a b c]
 
-      statement.cores.map { |x| x.should_receive(:clone).and_return(:f) }
-
       dolly = statement.clone
-      dolly.cores.should == [:f, :f, :f]
+      dolly.cores.must_equal      statement.cores
+      dolly.cores.wont_be_same_as statement.cores
     end
   end
 end

data/test/nodes/test_sql_literal.rb

@@ -0,0 +1,52 @@
+require 'helper'
+
+module Arel
+  module Nodes
+    describe 'sql literal' do
+      describe 'sql' do
+        it 'makes a sql literal node' do
+          sql = Arel.sql 'foo'
+          sql.must_be_kind_of Arel::Nodes::SqlLiteral
+        end
+      end
+
+      describe 'count' do
+        it 'makes a count node' do
+          node = SqlLiteral.new('*').count
+          viz = Visitors::ToSql.new Table.engine
+          viz.accept(node).must_be_like %{ COUNT(*) }
+        end
+
+        it 'makes a distinct node' do
+          node = SqlLiteral.new('*').count true
+          viz = Visitors::ToSql.new Table.engine
+          viz.accept(node).must_be_like %{ COUNT(DISTINCT *) }
+        end
+      end
+
+      describe 'equality' do
+        it 'makes an equality node' do
+          node = SqlLiteral.new('foo').eq(1)
+          viz = Visitors::ToSql.new Table.engine
+          viz.accept(node).must_be_like %{ foo = 1 }
+        end
+      end
+
+      describe 'grouped "or" equality' do
+        it 'makes a grouping node with an or node' do
+          node = SqlLiteral.new('foo').eq_any([1,2])
+          viz = Visitors::ToSql.new Table.engine
+          viz.accept(node).must_be_like %{ (foo = 1 OR foo = 2) }
+        end
+      end
+
+      describe 'grouped "and" equality' do
+        it 'makes a grouping node with an or node' do
+          node = SqlLiteral.new('foo').eq_all([1,2])
+          viz = Visitors::ToSql.new Table.engine
+          viz.accept(node).must_be_like %{ (foo = 1 AND foo = 2) }
+        end
+      end
+    end
+  end
+end

data/{spec/nodes/sum_spec.rb → test/nodes/test_sum.rb}

@@ -1,10 +1,10 @@
-require 'spec_helper'
+require 'helper'
 
 describe Arel::Nodes::Sum do
   describe "as" do
     it 'should alias the sum' do
       table = Arel::Table.new :users
-      table[:id].sum.as('foo').to_sql.should be_like %{
+      table[:id].sum.as('foo').to_sql.must_be_like %{
         SUM("users"."id") AS foo
       }
     end

data/{spec/nodes/update_statement_spec.rb → test/nodes/test_update_statement.rb}

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'helper'
 
 describe Arel::Nodes::UpdateStatement do
   describe "#clone" do
@@ -7,12 +7,12 @@ describe Arel::Nodes::UpdateStatement do
       statement.wheres = %w[a b c]
       statement.values = %w[x y z]
 
-      statement.wheres.should_receive(:clone).and_return([:wheres])
-      statement.values.should_receive(:clone).and_return([:values])
-
       dolly = statement.clone
-      check dolly.wheres.should == [:wheres]
-      check dolly.values.should == [:values]
+      dolly.wheres.must_equal statement.wheres
+      dolly.wheres.wont_be_same_as statement.wheres
+
+      dolly.values.must_equal statement.values
+      dolly.values.wont_be_same_as statement.values
     end
   end
 end

data/{spec → test}/support/fake_record.rb

@@ -10,7 +10,9 @@ module FakeRecord
       @columns = {
         'users' => [
           Column.new('id', :integer),
-          Column.new('name', :string)
+          Column.new('name', :string),
+          Column.new('bool', :boolean),
+          Column.new('created_at', :date),
         ]
       }
       @primary_keys = {
@@ -66,7 +68,7 @@ module FakeRecord
     attr_reader :spec, :connection
 
     def initialize
-      @spec = Spec.new(:adapter => 'sqlite3')
+      @spec = Spec.new(:adapter => 'america')
       @connection = Connection.new
     end
 

data/{spec/activerecord_compat_spec.rb → test/test_activerecord_compat.rb}

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'helper'
 
 module Arel
   describe 'activerecord compatibility' do
@@ -9,9 +9,9 @@ module Arel
         manager.where table[:id].eq 1
         manager.where table[:name].eq 'Aaron'
 
-        check manager.wheres.map { |x|
+        manager.wheres.map { |x|
           x.value
-        }.join(', ').should == "\"users\".\"id\" = 1, \"users\".\"name\" = 'Aaron'"
+        }.join(', ').must_equal "\"users\".\"id\" = 1, \"users\".\"name\" = 'Aaron'"
       end
     end
   end

data/{spec/attributes_spec.rb → test/test_attributes.rb}

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'helper'
 
 module Arel
   describe 'Attributes' do
@@ -6,34 +6,34 @@ module Arel
       it 'returns the correct constant for strings' do
         [:string, :text, :binary].each do |type|
           column = Struct.new(:type).new type
-          Attributes.for(column).should == Attributes::String
+          Attributes.for(column).must_equal Attributes::String
         end
       end
 
       it 'returns the correct constant for ints' do
         column = Struct.new(:type).new :integer
-        Attributes.for(column).should == Attributes::Integer
+        Attributes.for(column).must_equal Attributes::Integer
       end
 
       it 'returns the correct constant for floats' do
         column = Struct.new(:type).new :float
-        Attributes.for(column).should == Attributes::Float
+        Attributes.for(column).must_equal Attributes::Float
       end
 
       it 'returns the correct constant for decimals' do
         column = Struct.new(:type).new :decimal
-        Attributes.for(column).should == Attributes::Decimal
+        Attributes.for(column).must_equal Attributes::Decimal
       end
 
       it 'returns the correct constant for boolean' do
         column = Struct.new(:type).new :boolean
-        Attributes.for(column).should == Attributes::Boolean
+        Attributes.for(column).must_equal Attributes::Boolean
       end
 
       it 'returns the correct constant for time' do
         [:date, :datetime, :timestamp, :time].each do |type|
           column = Struct.new(:type).new type
-          Attributes.for(column).should == Attributes::Time
+          Attributes.for(column).must_equal Attributes::Time
         end
       end
     end

data/{spec/crud_spec.rb → test/test_crud.rb}

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'helper'
 
 module Arel
   class FakeCrudder < SelectManager
@@ -38,7 +38,7 @@ module Arel
         fc.insert [[table[:id], 'foo']]
         fc.engine.calls.find { |method, _|
           method == :insert
-        }.should_not be_nil
+        }.wont_be_nil
       end
     end
 
@@ -50,7 +50,7 @@ module Arel
         fc.update [[table[:id], 'foo']]
         fc.engine.calls.find { |method, _|
           method == :update
-        }.should_not be_nil
+        }.wont_be_nil
       end
     end
 
@@ -62,7 +62,7 @@ module Arel
         fc.delete
         fc.engine.calls.find { |method, _|
           method == :delete
-        }.should_not be_nil
+        }.wont_be_nil
       end
     end
   end

data/{spec/delete_manager_spec.rb → test/test_delete_manager.rb}

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'helper'
 
 module Arel
   describe 'delete manager' do
@@ -13,13 +13,13 @@ module Arel
         table = Table.new(:users)
         dm = Arel::DeleteManager.new Table.engine
         dm.from table
-        dm.to_sql.should be_like %{ DELETE FROM "users" }
+        dm.to_sql.must_be_like %{ DELETE FROM "users" }
       end
 
       it 'chains' do
         table = Table.new(:users)
         dm = Arel::DeleteManager.new Table.engine
-        check dm.from(table).should == dm
+        dm.from(table).must_equal dm
       end
     end
 
@@ -29,25 +29,14 @@ module Arel
         dm = Arel::DeleteManager.new Table.engine
         dm.from table
         dm.where table[:id].eq(10)
-        dm.to_sql.should be_like %{ DELETE FROM "users" WHERE "users"."id" = 10}
+        dm.to_sql.must_be_like %{ DELETE FROM "users" WHERE "users"."id" = 10}
       end
 
       it 'chains' do
         table = Table.new(:users)
         dm = Arel::DeleteManager.new Table.engine
-        check dm.where(table[:id].eq(10)).should == dm
+        dm.where(table[:id].eq(10)).must_equal dm
       end
     end
-
-    describe "TreeManager" do
-      subject do
-        table = Table.new :users
-        Arel::DeleteManager.new(Table.engine).tap do |manager|
-          manager.where(table[:id].eq(10))
-        end
-      end
-
-      it_should_behave_like "TreeManager"
-    end
   end
 end