arel 0.3.1 → 0.3.2

data/spec/attributes/string_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+require 'bigdecimal'
+
+module Arel
+  describe "Attributes::String" do
+
+    before :all do
+      @relation = Model.build do |r|
+        r.engine Testing::Engine.new
+        r.attribute :name, Attributes::String
+      end
+    end
+
+    def type_cast(val)
+      @relation[:name].type_cast(val)
+    end
+
+    describe "#type_cast" do
+      it "returns same value if passed a String" do
+        val = "hell"
+        type_cast(val).should eql(val)
+      end
+
+      it "returns nil if passed nil" do
+        type_cast(nil).should be_nil
+      end
+
+      it "returns String representation of Symbol" do
+        type_cast(:hello).should == "hello"
+      end
+
+      it "returns string representation of Integer" do
+        type_cast(1).should == '1'
+      end
+
+      it "calls #to_s on arbitrary objects" do
+        obj = Object.new
+        obj.extend Module.new { def to_s ; 'hello' ; end }
+        type_cast(obj).should == 'hello'
+      end
+    end
+  end
+end

data/spec/attributes/time_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+require 'bigdecimal'
+
+module Arel
+  describe "Attributes::Time" do
+
+    before :all do
+      @relation = Model.build do |r|
+        r.engine Testing::Engine.new
+        r.attribute :created_at, Attributes::Time
+      end
+    end
+
+    def type_cast(val)
+      @relation[:created_at].type_cast(val)
+    end
+
+    describe "#type_cast" do
+      it "works"
+    end
+  end
+end

data/spec/{arel/engines → engines}/memory/integration/joins/cross_engine_spec.rb

@@ -7,7 +7,7 @@ module Arel
         [1, 'bryan' ],
         [2, 'emilio' ],
         [3, 'nick']
-      ], [:id, :name])
+      ], [[:id, Attributes::Integer], [:name, Attributes::String]])
       @photos = Table.new(:photos)
       @photos.delete
       @photos.insert(@photos[:id] => 1, @photos[:user_id] => 1, @photos[:camera_id] => 6)

data/spec/{arel/engines → engines}/memory/unit/relations/array_spec.rb

@@ -7,7 +7,7 @@ module Arel
         [1, 'duck' ],
         [2, 'duck' ],
         [3, 'goose']
-      ], [:id, :name])
+      ], [[:id, Attributes::Integer], [:name, Attributes::String]])
     end
 
     describe '#attributes' do

data/spec/{arel/engines → engines}/memory/unit/relations/insert_spec.rb

@@ -7,7 +7,7 @@ module Arel
         [1, 'duck' ],
         [2, 'duck' ],
         [3, 'goose']
-      ], [:id, :name])
+      ], [[:id, Attributes::Integer], [:name, Attributes::String]])
     end
 
     describe '#call' do

data/spec/{arel/engines → engines}/memory/unit/relations/join_spec.rb

@@ -7,7 +7,7 @@ module Arel
         [1, 'duck' ],
         [2, 'duck' ],
         [3, 'goose']
-      ], [:id, :name])
+      ], [[:id, Attributes::Integer], [:name, Attributes::String]])
       @relation2 = @relation1.alias
     end
 

data/spec/{arel/engines → engines}/memory/unit/relations/order_spec.rb

@@ -7,7 +7,7 @@ module Arel
         [1, 'duck' ],
         [2, 'duck' ],
         [3, 'goose']
-      ], [:id, :name])
+      ], [[:id, Attributes::Integer], [:name, Attributes::String]])
     end
 
     describe '#call' do

data/spec/{arel/engines → engines}/memory/unit/relations/project_spec.rb

@@ -7,7 +7,7 @@ module Arel
         [1, 'duck' ],
         [2, 'duck' ],
         [3, 'goose']
-      ], [:id, :name])
+      ], [[:id, Attributes::Integer], [:name, Attributes::String]])
     end
 
     describe '#call' do

data/spec/{arel/engines → engines}/memory/unit/relations/skip_spec.rb

@@ -7,7 +7,7 @@ module Arel
         [1, 'duck' ],
         [2, 'duck' ],
         [3, 'goose']
-      ], [:id, :name])
+      ], [[:id, Attributes::Integer], [:name, Attributes::String]])
     end
 
     describe '#call' do

data/spec/{arel/engines → engines}/memory/unit/relations/take_spec.rb

@@ -7,7 +7,7 @@ module Arel
         [1, 'duck' ],
         [2, 'duck' ],
         [3, 'goose']
-      ], [:id, :name])
+      ], [[:id, Attributes::Integer], [:name, Attributes::String]])
     end
 
     describe '#call' do

data/spec/{arel/engines → engines}/memory/unit/relations/where_spec.rb

@@ -7,7 +7,7 @@ module Arel
         [1, 'duck' ],
         [2, 'duck' ],
         [3, 'goose']
-      ], [:id, :name])
+      ], [[:id, Attributes::Integer], [:name, Attributes::String]])
     end
 
     describe '#call' do

data/spec/relations/join_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe "Arel" do
+  before :all do
+    @owner = Arel::Model.build do |r|
+      r.engine Arel::Testing::Engine.new
+
+      r.attribute :id, Arel::Attributes::Integer
+    end
+
+    @thing = Arel::Model.build do |r|
+      r.engine Arel::Testing::Engine.new
+
+      r.attribute :id,       Arel::Attributes::Integer
+      r.attribute :owner_id, Arel::Attributes::Integer
+      r.attribute :age,      Arel::Attributes::Integer
+    end
+  end
+
+  describe "Join" do
+    before :all do
+      @relation = @thing.join(@owner).on(@thing[:owner_id].eq(@owner[:id]))
+      @expected = []
+
+      3.times do |owner_id|
+        @owner.insert([owner_id])
+
+        8.times do |i|
+          thing_id = owner_id * 8 + i
+          age      = 2 * thing_id
+
+          @thing.insert([thing_id, owner_id, age])
+          @expected << Arel::Row.new(@relation, [thing_id, owner_id, age, owner_id])
+        end
+      end
+    end
+
+    it_should_behave_like 'A Relation'
+  end
+end

data/spec/relations/relation_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe "Arel" do
+  before :all do
+    @engine = Arel::Testing::Engine.new
+    @relation = Arel::Model.build do |r|
+      r.engine @engine
+
+      r.attribute :id,   Arel::Attributes::Integer
+      r.attribute :name, Arel::Attributes::String
+      r.attribute :age,  Arel::Attributes::Integer
+    end
+  end
+
+  describe "Relation" do
+    before :all do
+      @expected = (1..20).map { |i| @relation.insert([i, nil, 2 * i]) }
+    end
+
+    it_should_behave_like 'A Relation'
+  end
+
+  describe "Relation" do
+    describe "#insert" do
+      it "inserts the row into the engine" do
+        @relation.insert([1, 'Foo', 10])
+        @engine.rows.should == [[1, 'Foo', 10]]
+      end
+    end
+  end
+end

data/spec/shared/relation_spec.rb

@@ -0,0 +1,142 @@
+share_examples_for 'A Relation' do
+
+  before :all do
+    # The two needed instance variables need to be set in a
+    # before :all callback.
+    #   @relation is the relation being tested here.
+    #   @expected is an array of the elements that are expected to be in
+    #     the relation.
+    %w[ @relation @expected ].each do |ivar|
+      raise "#{ivar} needs to be defined" unless instance_variable_get(ivar)
+    end
+
+    # There needs to be enough items to be able to run all the tests
+    raise "@expected needs to have at least 6 items" unless @expected.length >= 6
+  end
+
+  before :each do
+    @expected = @expected.dup
+  end
+
+  describe "#each" do
+    it "iterates over the rows in any order" do
+      @relation.should have_rows(@expected)
+    end
+  end
+
+  describe "#where" do
+    before :all do
+      @expected = @expected.sort_by { |r| r[@relation[:age]] }
+      @pivot = @expected[@expected.length / 2]
+    end
+
+    it "finds rows with an equal to predicate" do
+      expected = @expected.select { |r| r[@relation[:age]] == @pivot[@relation[:age]] }
+      @relation.where(@relation[:age].eq(@pivot[@relation[:age]])).should have_rows(expected)
+    end
+
+    it "finds rows with a not predicate" do
+      expected = @expected.select { |r| r[@relation[:age]] != @pivot[@relation[:age]] }
+      @relation.where(@relation[:age].not(@pivot[@relation[:age]])).should have_rows(expected)
+    end
+
+    it "finds rows with a less than predicate" do
+      expected = @expected.select { |r| r[@relation[:age]] < @pivot[@relation[:age]] }
+      @relation.where(@relation[:age].lt(@pivot[@relation[:age]])).should have_rows(expected)
+    end
+
+    it "finds rows with a less than or equal to predicate" do
+      expected = @expected.select { |r| r[@relation[:age]] <= @pivot[@relation[:age]] }
+      @relation.where(@relation[:age].lteq(@pivot[@relation[:age]])).should have_rows(expected)
+    end
+
+    it "finds rows with a greater than predicate" do
+      expected = @expected.select { |r| r[@relation[:age]] > @pivot[@relation[:age]] }
+      @relation.where(@relation[:age].gt(@pivot[@relation[:age]])).should have_rows(expected)
+    end
+
+    it "finds rows with a greater than or equal to predicate" do
+      expected = @expected.select { |r| r[@relation[:age]] >= @pivot[@relation[:age]] }
+      @relation.where(@relation[:age].gteq(@pivot[@relation[:age]])).should have_rows(expected)
+    end
+
+    it "finds rows with a matches predicate"
+
+    it "finds rows with an in predicate" do
+      pending
+      set = @expected[1..(@expected.length/2+1)]
+      @relation.all(:id.in => set.map { |r| r.id }).should have_resources(set)
+    end
+  end
+
+  describe "#order" do
+    describe "by one attribute" do
+      before :all do
+        @expected.map! { |r| r[@relation[:age]] }
+        @expected.sort!
+      end
+
+      it "can be specified as ascending order" do
+        actual = []
+        @relation.order(@relation[:age].asc).each { |r| actual << r[@relation[:age]] }
+        actual.should == @expected
+      end
+
+      it "can be specified as descending order" do
+        actual = []
+        @relation.order(@relation[:age].desc).each { |r| actual << r[@relation[:age]] }
+        actual.should == @expected.reverse
+      end
+    end
+
+    describe "by two attributes" do
+      it "works"
+    end
+  end
+
+  describe "#take" do
+    it "returns a relation" do
+      @relation.take(3).should be_a(Arel::Relation)
+    end
+
+    it "returns X items from the collection" do
+      length = @expected.length
+
+      @relation.take(3).each do |resource|
+        @expected.delete_if { |r| r.tuple == resource.tuple }
+      end
+
+      @expected.length.should == length - 3
+    end
+
+    it "works with ordering" do
+      expected = @expected.sort_by { |r| [r[@relation[:age]], r[@relation[:id]]] }.map { |r| r[@relation[:id]] }
+      actual   = @relation.order(@relation[:age].asc, @relation[:id].asc).take(3).map { |r| r[@relation[:id]] }
+
+      actual.should == expected[0,3]
+    end
+  end
+
+  describe "#skip" do
+    it "returns a relation" do
+      @relation.skip(3).should be_a(Arel::Relation)
+    end
+
+    it "skips X items from the collection" do
+      length = @expected.length
+
+      @relation.skip(3).each do |resource|
+        @expected.delete_if { |r| r.tuple == resource.tuple }
+      end
+
+      @expected.length.should == 3
+    end
+
+    it "works with ordering" do
+      expected = @expected.sort_by { |r| [r[@relation[:age]], r[@relation[:id]]] }.map { |r| r[@relation[:id]] }
+      actual   = @relation.order(@relation[:age].asc, @relation[:id].asc).skip(3).map { |r| r[@relation[:id]] }
+
+      actual.should == expected[3..-1]
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -7,58 +7,30 @@ require 'pp'
 require 'fileutils'
 require 'arel'
 
-[:matchers, :doubles].each do |helper|
-  Dir["#{dir}/#{helper}/*"].each { |m| require "#{dir}/#{helper}/#{File.basename(m)}" }
-end
-
-module AdapterGuards
-  def adapter_is(*names)
-    names = names.map(&:to_s)
-    names.each{|name| verify_adapter_name(name)}
-    yield if names.include? adapter_name
-  end
-
-  def adapter_is_not(*names)
-    names = names.map(&:to_s)
-    names.each{|name| verify_adapter_name(name)}
-    yield unless names.include? adapter_name
-  end
-
-  def adapter_name
-    name = ActiveRecord::Base.configurations["unit"][:adapter]
-    name = 'oracle' if name == 'oracle_enhanced'
-    verify_adapter_name(name)
-    name
-  end
-
-  def verify_adapter_name(name)
-    raise "Invalid adapter name: #{name}" unless valid_adapters.include?(name.to_s)
-  end
-
-  def valid_adapters
-    %w[mysql postgresql sqlite3 oracle]
-  end
+if adapter = ENV['ADAPTER']
+  require "support/connections/#{adapter}_connection.rb"
 end
 
-module Check
-  # This is used to eliminate Ruby warnings on some RSpec assertion lines
-  # See: https://rspec.lighthouseapp.com/projects/5645/tickets/504
-  def check(*args)
-  end
+Dir["#{dir}/{support,shared}/*.rb"].each do |file|
+  require file
 end
 
 Spec::Runner.configure do |config|
-  config.include BeLikeMatcher, HashTheSameAsMatcher, DisambiguateAttributesMatcher
+  config.include Matchers
   config.include AdapterGuards
   config.include Check
 
-  config.before do
-    Arel::Table.engine = Arel::Sql::Engine.new(ActiveRecord::Base)
-  end
-end
+  if defined?(ActiveRecord::Base)
+    tmp = File.expand_path('../../tmp', __FILE__)
 
-# load corresponding adapter using ADAPTER environment variable when running single *_spec.rb file
-if adapter = ENV['ADAPTER']
-  require "#{dir}/connections/#{adapter}_connection.rb"
-  require "#{dir}/schemas/#{adapter}_schema.rb"
+    FileUtils.mkdir_p(tmp)
+    ActiveRecord::Base.logger = Logger.new("#{tmp}/debug.log")
+    ActiveRecord::Base.establish_connection("unit")
+
+    require "support/schemas/#{ENV['ADAPTER']}_schema.rb"
+
+    config.before do
+      Arel::Table.engine = Arel::Sql::Engine.new(ActiveRecord::Base)
+    end
+  end
 end