axiom 0.1.1 → 0.2.0

data/spec/unit/axiom/algebra/projection/each_spec.rb

@@ -14,12 +14,12 @@ describe Algebra::Projection, '#each' do
 
   it 'yields only tuples' do
     subject
-    yields.each { |tuple| tuple.should be_instance_of(Tuple) }
+    yields.each { |tuple| expect(tuple).to be_instance_of(Tuple) }
   end
 
   it 'yields only tuples with the expected header' do
     subject
-    yields.each { |tuple| tuple.header.should be(object.header) }
+    yields.each { |tuple| expect(tuple.header).to be(object.header) }
   end
 
   it 'yields only tuples with the expected data' do

data/spec/unit/axiom/algebra/rename/directions_spec.rb

@@ -13,17 +13,17 @@ describe Algebra::Rename, '#directions' do
 
     it_should_behave_like 'an idempotent method'
 
-    it { should be_instance_of(Relation::Operation::Order::DirectionSet) }
+    it { should be_instance_of(Relation::Operation::Sorted::DirectionSet) }
 
     it { should be_empty }
   end
 
-  context 'containing an ordered relation' do
+  context 'containing a sorted relation' do
     let(:operand) { relation.sort_by { [relation[:id]] } }
 
     it_should_behave_like 'an idempotent method'
 
-    it { should be_instance_of(Relation::Operation::Order::DirectionSet) }
+    it { should be_instance_of(Relation::Operation::Sorted::DirectionSet) }
 
     it { should == [Attribute::Integer.new(:other_id).asc] }
   end

data/spec/unit/axiom/algebra/rename/each_spec.rb

@@ -13,12 +13,12 @@ describe Algebra::Rename, '#each' do
 
   it 'yields only tuples' do
     subject
-    yields.each { |tuple| tuple.should be_instance_of(Tuple) }
+    yields.each { |tuple| expect(tuple).to be_instance_of(Tuple) }
   end
 
   it 'yields only tuples with the expected header' do
     subject
-    yields.each { |tuple| tuple.header.should be(object.header) }
+    yields.each { |tuple| expect(tuple.header).to be(object.header) }
   end
 
   it 'yields only tuples with the expected data' do

data/spec/unit/axiom/algebra/restriction/delete_spec.rb

@@ -18,9 +18,9 @@ describe Algebra::Restriction, '#delete' do
 
     it 'passes expected relations into the deletion' do
       subject = self.subject.operand
-      subject.left.should be(operand)
-      subject.right.should be_kind_of(described_class)
-      subject.right.predicate.should be(predicate)
+      expect(subject.left).to be(operand)
+      expect(subject.right).to be_kind_of(described_class)
+      expect(subject.right.predicate).to be(predicate)
     end
 
     its(:predicate) { should be(predicate) }

data/spec/unit/axiom/algebra/restriction/each_spec.rb

@@ -5,9 +5,10 @@ require 'spec_helper'
 describe Algebra::Restriction, '#each' do
   subject { object.each { |tuple| yields << tuple } }
 
-  let(:object)   { described_class.new(relation, predicate) }
-  let(:relation) { Relation.new([[:id, Integer]], [[1]])    }
-  let(:yields)   { []                                       }
+  let(:object)    { described_class.new(relation, predicate) }
+  let(:relation)  { Relation.new([attribute], [[1]])         }
+  let(:attribute) { Attribute::Integer.new(:id)              }
+  let(:yields)    { []                                       }
 
   context 'when predicate is a Proc' do
     let(:predicate) { proc { true } }
@@ -16,12 +17,12 @@ describe Algebra::Restriction, '#each' do
 
     it 'yields only tuples' do
       subject
-      yields.each { |tuple| tuple.should be_instance_of(Tuple) }
+      yields.each { |tuple| expect(tuple).to be_instance_of(Tuple) }
     end
 
     it 'yields only tuples with the expected header' do
       subject
-      yields.each { |tuple| tuple.header.should be(object.header) }
+      yields.each { |tuple| expect(tuple.header).to be(object.header) }
     end
 
     it 'yields only tuples with the expected data' do
@@ -32,18 +33,18 @@ describe Algebra::Restriction, '#each' do
   end
 
   context 'when predicate is a Function' do
-    let(:predicate) { Function::Proposition::Tautology.instance }
+    let(:predicate) { attribute.eq(1) }
 
     it_should_behave_like 'an #each method'
 
     it 'yields only tuples' do
       subject
-      yields.each { |tuple| tuple.should be_instance_of(Tuple) }
+      yields.each { |tuple| expect(tuple).to be_instance_of(Tuple) }
     end
 
     it 'yields only tuples with the expected header' do
       subject
-      yields.each { |tuple| tuple.header.should be(object.header) }
+      yields.each { |tuple| expect(tuple.header).to be(object.header) }
     end
 
     it 'yields only tuples with the expected data' do
@@ -60,12 +61,12 @@ describe Algebra::Restriction, '#each' do
 
     it 'yields only tuples' do
       subject
-      yields.each { |tuple| tuple.should be_instance_of(Tuple) }
+      yields.each { |tuple| expect(tuple).to be_instance_of(Tuple) }
     end
 
     it 'yields only tuples with the expected header' do
       subject
-      yields.each { |tuple| tuple.header.should be(object.header) }
+      yields.each { |tuple| expect(tuple.header).to be(object.header) }
     end
 
     it 'yields only tuples with the expected data' do
@@ -82,7 +83,7 @@ describe Algebra::Restriction, '#each' do
 
     it 'yields no tuples' do
       subject
-      yields.should be_empty
+      expect(yields).to be_empty
     end
   end
 end

data/spec/unit/axiom/algebra/restriction/insert_spec.rb

@@ -18,9 +18,9 @@ describe Algebra::Restriction, '#insert' do
 
     it 'passes expected relations into the insertion' do
       subject = self.subject.operand
-      subject.left.should be(operand)
-      subject.right.should be_kind_of(described_class)
-      subject.right.predicate.should be(predicate)
+      expect(subject.left).to be(operand)
+      expect(subject.right).to be_kind_of(described_class)
+      expect(subject.right.predicate).to be(predicate)
     end
 
     its(:predicate) { should be(predicate) }

data/spec/unit/axiom/algebra/restriction/methods/restrict_spec.rb

@@ -17,7 +17,7 @@ describe Algebra::Restriction::Methods, '#restrict' do
     it { should be_instance_of(Algebra::Restriction) }
 
     it 'sets the predicate' do
-      subject.predicate.should be(predicate)
+      expect(subject.predicate).to be(predicate)
     end
 
     it 'behaves the same as Enumerable#select' do
@@ -33,7 +33,7 @@ describe Algebra::Restriction::Methods, '#restrict' do
     it { should be_instance_of(Algebra::Restriction) }
 
     it 'sets the predicate' do
-      subject.predicate.should eql(object[:id].eq(1))
+      expect(subject.predicate).to eql(object[:id].eq(1))
     end
 
     it 'behaves the same as Enumerable#select' do
@@ -49,7 +49,7 @@ describe Algebra::Restriction::Methods, '#restrict' do
     it { should be_instance_of(Algebra::Restriction) }
 
     it 'sets the predicate' do
-      subject.predicate.should eql(tautology.and(object[:id].eq(1).and(object[:name].eq('Dan Kubb'))))
+      expect(subject.predicate).to eql(tautology.and(object[:id].eq(1).and(object[:name].eq('Dan Kubb'))))
     end
 
     it 'behaves the same as Enumerable#select' do
@@ -65,7 +65,7 @@ describe Algebra::Restriction::Methods, '#restrict' do
     it { should be_instance_of(Algebra::Restriction) }
 
     it 'sets the predicate' do
-      subject.predicate.should eql(tautology.and(object[:id].eq(1).and(object[:name].eq('Dan Kubb'))))
+      expect(subject.predicate).to eql(tautology.and(object[:id].eq(1).and(object[:name].eq('Dan Kubb'))))
     end
 
     it 'behaves the same as Enumerable#select' do

data/spec/unit/axiom/algebra/summarization/each_spec.rb

@@ -14,12 +14,12 @@ describe Algebra::Summarization, '#each' do
 
   it 'yields only tuples' do
     subject
-    yields.each { |tuple| tuple.should be_instance_of(Tuple) }
+    yields.each { |tuple| expect(tuple).to be_instance_of(Tuple) }
   end
 
   it 'yields only tuples with the expected header' do
     subject
-    yields.each { |tuple| tuple.header.should eql(object.header) }
+    yields.each { |tuple| expect(tuple.header).to eql(object.header) }
   end
 
   it 'yields only tuples with the expected data' do

data/spec/unit/axiom/algebra/summarization/eql_spec.rb

@@ -55,7 +55,7 @@ describe Algebra::Summarization, '#eql?' do
 
   context 'with an object having a different summarize_by' do
     let(:other_operand)      { operand                                                                   }
-    let(:other_summarize_by) { operand.project([]).sort_by {}                                            }
+    let(:other_summarize_by) { operand.project([]).sort_by(&EMPTY_PROC)                                  }
     let(:other_summarizers)  { summarizers                                                               }
     let(:other)              { described_class.new(other_operand, other_summarize_by, other_summarizers) }
 

data/spec/unit/axiom/algebra/summarization/summaries/summarize_by_spec.rb

@@ -15,14 +15,14 @@ describe Algebra::Summarization::Summaries, '#summarize_by' do
   it_should_behave_like 'a command method'
 
   it 'passes the tuple to the aggregate function' do
-    summarizer.should_receive(:call).with(nil, tuple)
+    expect(summarizer).to receive(:call).with(nil, tuple)
     subject
   end
 
   it 'aggregates the value returned by the summarizer' do
     key, value = subject.to_hash.first
-    key.should eql(:count)
-    value.should be_instance_of(Algebra::Summarization::Summary)
-    value.call(tuple.project(header)).should eql(1)
+    expect(key).to eql(:count)
+    expect(value).to be_instance_of(Algebra::Summarization::Summary)
+    expect(value.call(tuple.project(header))).to eql(1)
   end
 end

data/spec/unit/axiom/algebra/summarization/summaries/to_hash_spec.rb

@@ -11,7 +11,7 @@ describe Algebra::Summarization::Summaries, '#to_hash' do
 
   it 'matches the expected value' do
     key, value = subject.first
-    key.should eql(:count)
-    value.should be_instance_of(Algebra::Summarization::Summary)
+    expect(key).to eql(:count)
+    expect(value).to be_instance_of(Algebra::Summarization::Summary)
   end
 end

data/spec/unit/axiom/algebra/summarization/summary/summarize_by_spec.rb

@@ -18,6 +18,6 @@ describe Algebra::Summarization::Summary, '#summarize_by' do
       subject
       __memoized.delete(:subject)  # bypass subject cache
     end
-    object.call(projection).should eql(2)
+    expect(object.call(projection)).to eql(2)
   end
 end

data/spec/unit/axiom/algebra/union/each_spec.rb

@@ -17,12 +17,12 @@ describe Algebra::Union, '#each' do
 
     it 'yields only tuples' do
       subject
-      yields.each { |tuple| tuple.should be_instance_of(Tuple) }
+      yields.each { |tuple| expect(tuple).to be_instance_of(Tuple) }
     end
 
     it 'yields only tuples with the expected header' do
       subject
-      yields.each { |tuple| tuple.header.should eql(object.header) }
+      yields.each { |tuple| expect(tuple.header).to eql(object.header) }
     end
 
     it 'yields only tuples with the expected data' do
@@ -39,12 +39,12 @@ describe Algebra::Union, '#each' do
 
     it 'yields only tuples' do
       subject
-      yields.each { |tuple| tuple.should be_instance_of(Tuple) }
+      yields.each { |tuple| expect(tuple).to be_instance_of(Tuple) }
     end
 
     it 'yields only tuples with the expected header' do
       subject
-      yields.each { |tuple| tuple.header.should eql(object.header) }
+      yields.each { |tuple| expect(tuple.header).to eql(object.header) }
     end
 
     it 'yields only tuples with the expected data' do

data/spec/unit/axiom/aliasable/fixtures/classes.rb

@@ -4,6 +4,8 @@ module AliasableSpecs
   class Object
     extend Aliasable
 
-    def test; end
+    def test(arguments, &block)
+    end
+
   end # class Object
 end # module AliasableSpecs

data/spec/unit/axiom/aliasable/inheritable_alias_spec.rb

@@ -6,45 +6,36 @@ require File.expand_path('../fixtures/classes', __FILE__)
 describe Aliasable, '#inheritable_alias' do
   subject { object.inheritable_alias(aliases) }
 
-  let(:aliases)   { { other: :test }                  }
   let(:object)    { Class.new(AliasableSpecs::Object) }
+  let(:aliases)   { { other: :test }                  }
   let(:aliasable) { object.new                        }
+  let(:arg)       { double('arg')                     }
 
   it_should_behave_like 'a command method'
 
-  it 'creates a method #other' do
-    expect { subject }.to change { aliasable.respond_to?(:other) }
-      .from(false)
-      .to(true)
+  it 'creates a method alias' do
+    expect { subject }
+      .to change { aliasable.respond_to?(:other) }.from(false).to(true)
   end
 
-  it 'aliases #other to #test' do
+  it 'forwards arguments to aliased method' do
     subject
-    retval = double('Return Value')
-    aliasable.should_receive(:test).and_return(retval)
-    aliasable.other.should be(retval)
+    expect(aliasable).to receive(:test).with(arg)
+    aliasable.other(arg)
   end
 
-  specification = proc do
-    object.class_eval do
-      def test
-        caller
-      end
-    end
-
+  it 'forwards the block to aliased method' do
     subject
-
-    file, line = aliasable.other.first.split(':')[0, 2]
-
-    File.expand_path(file).should eql(File.expand_path('../../../../../lib/axiom/support/aliasable.rb', __FILE__))
-    line.to_i.should be(38)
+    yieldparam = double('yieldparam')
+    expect(aliasable).to receive(:test).and_yield(yieldparam)
+    expect { |block| aliasable.other(arg, &block) }
+      .to yield_with_args(yieldparam)
   end
 
-  it 'sets the file and line number properly' do
-    if RUBY_PLATFORM.include?('java')
-      pending('Kernel#caller returns the incorrect line number in JRuby', &specification)
-    else
-      instance_eval(&specification)
-    end
+  it 'returns value from aliased method' do
+    subject
+    retval = double('retval')
+    expect(aliasable).to receive(:test).and_return(retval)
+    expect(aliasable.other(arg)).to be(retval)
   end
 end

data/spec/unit/axiom/attribute/call_spec.rb

@@ -11,7 +11,7 @@ describe Attribute, '#call' do
   let(:tuple)           { Tuple.new(header, [1])         }
 
   before do
-    described_class.stub(type: Types::Object)
+    allow(described_class).to receive(:type).and_return(Types::Object)
   end
 
   it { should == 1 }

data/spec/unit/axiom/attribute/class_methods/coerce_spec.rb

@@ -5,87 +5,93 @@ require 'spec_helper'
 describe Attribute, '.coerce' do
   subject { object.coerce(argument) }
 
-  let(:object) { described_class }
+  describe 'with the class' do
+    let(:object) { described_class }
 
-  context 'when the argument is an Attribute' do
-    let(:argument) { Attribute::Integer.new(:id) }
+    context 'when the argument is an Attribute' do
+      let(:argument) { Attribute::Integer.new(:id) }
 
-    it { should be(argument) }
-  end
+      it { should be(argument) }
+    end
 
-  context 'when the argument responds to #to_ary and does not include options' do
-    let(:argument) { [:id, Integer] }
+    context 'when the argument responds to #to_ary and does not include options' do
+      let(:argument) { [:id, Integer] }
 
-    it { should be_instance_of(Attribute::Integer) }
+      it { should be_instance_of(Attribute::Integer) }
 
-    its(:name) { should == :id }
-  end
+      its(:name) { should == :id }
+    end
 
-  context 'when the argument responds to #to_ary and includes options' do
-    let(:argument) { [:id, Integer, { required: false }] }
+    context 'when the argument responds to #to_ary and includes options' do
+      let(:argument) { [:id, Integer, { required: false }] }
 
-    it { should be_instance_of(Attribute::Integer) }
+      it { should be_instance_of(Attribute::Integer) }
 
-    its(:name) { should == :id }
+      its(:name) { should == :id }
 
-    its(:required?) { should be(false) }
-  end
+      its(:required?) { should be(false) }
+    end
 
-  context 'when the argument does not respond to #to_ary, but does respond to #to_sym' do
-    let(:argument) { :id }
+    context 'when the argument does not respond to #to_ary, but does respond to #to_sym' do
+      let(:argument) { :id }
 
-    it { should be_instance_of(Attribute::Object) }
+      it { should be_instance_of(Attribute::Object) }
 
-    its(:name) { should == :id }
-  end
+      its(:name) { should == :id }
+    end
 
-  context 'when the argument does not respond to #to_ary or #to_sym' do
-    let(:argument) { Integer }
+    context 'when the argument does not respond to #to_ary or #to_sym' do
+      let(:argument) { Integer }
 
-    specify { expect { subject }.to raise_error(NoMethodError) }
+      specify { expect { subject }.to raise_error(NoMethodError) }
+    end
   end
-end
 
-describe Attribute::Boolean, '.coerce' do
-  subject { object.coerce(argument) }
+  describe 'with a subclass' do
+    subject { object.coerce(argument) }
 
-  let(:object) { described_class }
+    let(:object) { Class.new(described_class) }
 
-  context 'when the argument is an Attribute' do
-    let(:argument) { Attribute::Integer.new(:id) }
+    context 'when the argument is an Attribute' do
+      let(:argument) { Attribute::Integer.new(:id) }
 
-    it { should be(argument) }
-  end
+      it { should be(argument) }
+    end
 
-  context 'when the argument responds to #to_ary and does not include options' do
-    let(:argument) { [:id, Integer] }
+    context 'when the argument responds to #to_ary and does not include options' do
+      let(:argument) { [:id, Integer] }
 
-    it { should be_instance_of(Attribute::Integer) }
+      it { should be_instance_of(Attribute::Integer) }
 
-    its(:name) { should == :id }
-  end
+      its(:name) { should == :id }
+    end
 
-  context 'when the argument responds to #to_ary and includes options' do
-    let(:argument) { [:id, Integer, { required: false }] }
+    context 'when the argument responds to #to_ary and includes options' do
+      let(:argument) { [:id, Integer, { required: false }] }
 
-    it { should be_instance_of(Attribute::Integer) }
+      it { should be_instance_of(Attribute::Integer) }
 
-    its(:name) { should == :id }
+      its(:name) { should == :id }
 
-    its(:required?) { should be(false) }
-  end
+      its(:required?) { should be(false) }
+    end
 
-  context 'when the argument does not respond to #to_ary, but does respond to #to_sym' do
-    let(:argument) { :id }
+    context 'when the argument does not respond to #to_ary, but does respond to #to_sym' do
+      let(:argument) { :id }
 
-    it { should be_instance_of(described_class) }
+      before do
+        allow(object).to receive(:type)
+      end
 
-    its(:name) { should == :id }
-  end
+      it { should be_instance_of(object) }
+
+      its(:name) { should == :id }
+    end
 
-  context 'when the argument does not respond to #to_ary or #to_sym' do
-    let(:argument) { Integer }
+    context 'when the argument does not respond to #to_ary or #to_sym' do
+      let(:argument) { Integer }
 
-    specify { expect { subject }.to raise_error(NoMethodError) }
+      specify { expect { subject }.to raise_error(NoMethodError) }
+    end
   end
 end