axiom-optimizer 0.1.0 → 0.1.1

data/spec/unit/axiom/optimizer/function/binary/constant_operands/optimize_spec.rb

@@ -11,7 +11,7 @@ describe Optimizer::Function::Binary::ConstantOperands, '#optimize' do
 
   before do
     described_class.class_eval { include Optimizer::Function::Binary::ConstantOperands }
-    object.should be_optimizable
+    expect(object).to be_optimizable
   end
 
   it { should be(4) }

data/spec/unit/axiom/optimizer/function/binary/left_spec.rb

@@ -13,13 +13,13 @@ describe Optimizer::Function::Binary, '#left' do
   context 'when left operand is frozen' do
     let(:left) { 'Left'.freeze }
 
-    it { should equal(left) }
+    it { should be(left) }
   end
 
   context 'when left operand is not frozen' do
     let(:left) { 'Left' }
 
-    it { should_not equal(left) }
+    it { should_not be(left) }
 
     it { should be_frozen }
 

data/spec/unit/axiom/optimizer/function/binary/right_spec.rb

@@ -13,13 +13,13 @@ describe Optimizer::Function::Binary, '#right' do
   context 'when right operand is frozen' do
     let(:right) { 'Right'.freeze }
 
-    it { should equal(right) }
+    it { should be(right) }
   end
 
   context 'when right operand is not frozen' do
     let(:right) { 'Right' }
 
-    it { should_not equal(right) }
+    it { should_not be(right) }
 
     it { should be_frozen }
 

data/spec/unit/axiom/optimizer/function/binary/unoptimized_operands/optimizable_predicate_spec.rb

@@ -15,15 +15,15 @@ describe Optimizer::Function::Binary::UnoptimizedOperands, '#optimizable?' do
   end
 
   context 'when left is optimizable' do
-    let(:left)  { attribute.include([ 1 ]) }
-    let(:right) { attribute.ne(2)          }
+    let(:left)  { attribute.include([1]) }
+    let(:right) { attribute.ne(2)        }
 
     it { should be(true) }
   end
 
   context 'when right is optimizable' do
-    let(:left)  { attribute.eq(1)          }
-    let(:right) { attribute.exclude([ 2 ]) }
+    let(:left)  { attribute.eq(1)        }
+    let(:right) { attribute.exclude([2]) }
 
     it { should be(true) }
   end

data/spec/unit/axiom/optimizer/function/binary/unoptimized_operands/optimize_spec.rb

@@ -7,14 +7,14 @@ describe Optimizer::Function::Binary::UnoptimizedOperands, '#optimize' do
 
   let(:described_class) { Class.new(Optimizer) { include Optimizer::Function::Binary }      }
   let(:attribute)       { Attribute::Integer.new(:id)                                       }
-  let(:left)            { attribute.include([ 1 ])                                          }
-  let(:right)           { attribute.exclude([ 2 ])                                          }
+  let(:left)            { attribute.include([1])                                            }
+  let(:right)           { attribute.exclude([2])                                            }
   let(:function)        { Class.new(Function) { include Function::Binary }.new(left, right) }
   let(:object)          { described_class.new(function)                                     }
 
   before do
     described_class.class_eval { include Optimizer::Function::Binary::UnoptimizedOperands }
-    object.should be_optimizable
+    expect(object).to be_optimizable
   end
 
   its(:left) { should eql(attribute.eq(1)) }

data/spec/unit/axiom/optimizer/function/class_methods/optimize_functions_spec.rb

@@ -6,12 +6,12 @@ describe Optimizer::Function, '.optimize_functions' do
   subject { object.optimize_functions(functions) }
 
   let(:object)    { described_class           }
-  let(:attribute) { mock('Attribute')         }
+  let(:attribute) { double('Attribute')       }
   let(:functions) { { attribute => function } }
 
   context 'when optimizable' do
-    let(:optimized) { mock('Optimized')                           }
-    let(:function)  { mock('Optimizable', :optimize => optimized) }
+    let(:optimized) { double('Optimized')                        }
+    let(:function)  { double('Optimizable', optimize: optimized) }
 
     it { should be_frozen }
 
@@ -19,7 +19,7 @@ describe Optimizer::Function, '.optimize_functions' do
   end
 
   context 'when not optimizable' do
-    let(:function) { mock('Not Optimizable') }
+    let(:function) { double('Not Optimizable') }
 
     it { should == functions }
   end

data/spec/unit/axiom/optimizer/function/class_methods/optimize_operand_spec.rb

@@ -8,15 +8,15 @@ describe Optimizer::Function, '.optimize_operand' do
   let(:object) { described_class }
 
   context 'when optimizable' do
-    let(:optimized) { mock('Optimized')                           }
-    let(:function)  { mock('Optimizable', :optimize => optimized) }
+    let(:optimized) { double('Optimized')                        }
+    let(:function)  { double('Optimizable', optimize: optimized) }
 
-    it { should equal(optimized) }
+    it { should be(optimized) }
   end
 
   context 'when not optimizable' do
-    let(:function) { mock('Not Optimizable') }
+    let(:function) { double('Not Optimizable') }
 
-    it { should equal(function) }
+    it { should be(function) }
   end
 end

data/spec/unit/axiom/optimizer/function/connective/binary/constant_operands/optimize_spec.rb

@@ -9,8 +9,8 @@ describe Optimizer::Function::Connective::Binary::ConstantOperands, '#optimize'
   let(:object)     { described_class.new(connective)                   }
 
   before do
-    object.should be_optimizable
+    expect(object).to be_optimizable
   end
 
-  it { should equal(Function::Proposition::Tautology.instance) }
+  it { should be(Function::Proposition::Tautology.instance) }
 end

data/spec/unit/axiom/optimizer/function/connective/binary/equal_operands/optimizable_predicate_spec.rb

@@ -10,7 +10,7 @@ describe Optimizer::Function::Connective::Binary::EqualOperands, '#optimizable?'
   let(:object)     { described_class.new(connective) }
 
   before do
-    object.operation.should be_kind_of(Function::Connective::Binary)
+    expect(object.operation).to be_kind_of(Function::Connective::Binary)
   end
 
   context 'when left and right are equivalent' do

data/spec/unit/axiom/optimizer/function/connective/binary/equal_operands/optimize_spec.rb

@@ -12,8 +12,8 @@ describe Optimizer::Function::Connective::Binary::EqualOperands, '#optimize' do
   let(:object)     { described_class.new(connective) }
 
   before do
-    object.should be_optimizable
+    expect(object).to be_optimizable
   end
 
-  it { should equal(left) }
+  it { should be(left) }
 end

data/spec/unit/axiom/optimizer/function/connective/binary/left_spec.rb

@@ -5,12 +5,12 @@ require 'spec_helper'
 describe Optimizer::Function::Connective::Binary, '#left' do
   subject { object.left }
 
-  let(:optimized_left)  { mock('Optimized Left')                             }
-  let(:optimized_right) { mock('Optimized Right')                            }
-  let(:left)            { mock('Left',  :optimize => optimized_left)         }
-  let(:right)           { mock('Right', :optimize => optimized_right)        }
-  let(:connective)      { mock('Connective', :left => left, :right => right) }
-  let(:object)          { described_class.new(connective)                    }
+  let(:optimized_left)  { double('Optimized Left')                       }
+  let(:optimized_right) { double('Optimized Right')                      }
+  let(:left)            { double('Left', optimize: optimized_left)       }
+  let(:right)           { double('Right', optimize: optimized_right)     }
+  let(:connective)      { double('Connective', left: left, right: right) }
+  let(:object)          { described_class.new(connective)                }
 
-  it { should equal(optimized_left) }
+  it { should be(optimized_left) }
 end

data/spec/unit/axiom/optimizer/function/connective/binary/redundant_left/optimizable_predicate_spec.rb

@@ -6,12 +6,12 @@ describe Optimizer::Function::Connective::Binary::RedundantLeft, '#optimizable?'
   subject { object.optimizable? }
 
   let(:attribute)  { Attribute::Integer.new(:id)     }
-  let(:left)       { attribute.include([ 1 ])        }
-  let(:right)      { attribute.exclude([ 2 ])        }
+  let(:left)       { attribute.include([1])          }
+  let(:right)      { attribute.exclude([2])          }
   let(:object)     { described_class.new(connective) }
 
   before do
-    object.operation.should be_kind_of(Function::Connective::Binary)
+    expect(object.operation).to be_kind_of(Function::Connective::Binary)
   end
 
   context 'when the left operand is redundant' do

data/spec/unit/axiom/optimizer/function/connective/binary/redundant_left/optimize_spec.rb

@@ -6,13 +6,13 @@ describe Optimizer::Function::Connective::Binary::RedundantLeft, '#optimize' do
   subject { object.optimize }
 
   let(:attribute)  { Attribute::Integer.new(:id)     }
-  let(:left)       { attribute.include([ 1 ])        }
-  let(:right)      { attribute.exclude([ 2 ])        }
+  let(:left)       { attribute.include([1])          }
+  let(:right)      { attribute.exclude([2])          }
   let(:connective) { left.and(right).and(right)      }
   let(:object)     { described_class.new(connective) }
 
   before do
-    object.should be_optimizable
+    expect(object).to be_optimizable
   end
 
   it { should be_kind_of(Function::Connective::Conjunction) }

data/spec/unit/axiom/optimizer/function/connective/binary/redundant_right/optimizable_predicate_spec.rb

@@ -6,12 +6,12 @@ describe Optimizer::Function::Connective::Binary::RedundantRight, '#optimizable?
   subject { object.optimizable? }
 
   let(:attribute) { Attribute::Integer.new(:id)     }
-  let(:left)      { attribute.include([ 1 ])        }
-  let(:right)     { attribute.exclude([ 2 ])        }
+  let(:left)      { attribute.include([1])          }
+  let(:right)     { attribute.exclude([2])          }
   let(:object)    { described_class.new(connective) }
 
   before do
-    object.operation.should be_kind_of(Function::Connective::Binary)
+    expect(object.operation).to be_kind_of(Function::Connective::Binary)
   end
 
   context 'when the right operand is redundant' do

data/spec/unit/axiom/optimizer/function/connective/binary/redundant_right/optimize_spec.rb

@@ -6,13 +6,13 @@ describe Optimizer::Function::Connective::Binary::RedundantRight, '#optimize' do
   subject { object.optimize }
 
   let(:attribute)  { Attribute::Integer.new(:id)     }
-  let(:left)       { attribute.include([ 1 ])        }
-  let(:right)      { attribute.exclude([ 2 ])        }
+  let(:left)       { attribute.include([1])          }
+  let(:right)      { attribute.exclude([2])          }
   let(:connective) { left.and(left.and(right))       }
   let(:object)     { described_class.new(connective) }
 
   before do
-    object.should be_optimizable
+    expect(object).to be_optimizable
   end
 
   it { should be_kind_of(Function::Connective::Conjunction) }

data/spec/unit/axiom/optimizer/function/connective/binary/right_spec.rb

@@ -5,12 +5,12 @@ require 'spec_helper'
 describe Optimizer::Function::Connective::Binary, '#right' do
   subject { object.right }
 
-  let(:optimized_left)  { mock('Optimized Left')                             }
-  let(:optimized_right) { mock('Optimized Right')                            }
-  let(:left)            { mock('Left',  :optimize => optimized_left)         }
-  let(:right)           { mock('Right', :optimize => optimized_right)        }
-  let(:connective)      { mock('Connective', :left => left, :right => right) }
-  let(:object)          { described_class.new(connective)                    }
+  let(:optimized_left)  { double('Optimized Left')                       }
+  let(:optimized_right) { double('Optimized Right')                      }
+  let(:left)            { double('Left', optimize: optimized_left)       }
+  let(:right)           { double('Right', optimize: optimized_right)     }
+  let(:connective)      { double('Connective', left: left, right: right) }
+  let(:object)          { described_class.new(connective)                }
 
-  it { should equal(optimized_right) }
+  it { should be(optimized_right) }
 end

data/spec/unit/axiom/optimizer/function/connective/conjunction/contradiction/optimizable_predicate_spec.rb

@@ -10,7 +10,7 @@ describe Optimizer::Function::Connective::Conjunction::Contradiction, '#optimiza
   let(:object)     { described_class.new(connective)                    }
 
   before do
-    object.operation.should be_kind_of(Function::Connective::Conjunction)
+    expect(object.operation).to be_kind_of(Function::Connective::Conjunction)
   end
 
   context 'when left is a contradiction' do

data/spec/unit/axiom/optimizer/function/connective/conjunction/contradiction/optimize_spec.rb

@@ -12,8 +12,8 @@ describe Optimizer::Function::Connective::Conjunction::Contradiction, '#optimize
   let(:object)     { described_class.new(connective)                    }
 
   before do
-    object.should be_optimizable
+    expect(object).to be_optimizable
   end
 
-  it { should equal(Function::Proposition::Contradiction.instance) }
+  it { should be(Function::Proposition::Contradiction.instance) }
 end

data/spec/unit/axiom/optimizer/function/connective/conjunction/optimizable_to_exclusion/optimizable_predicate_spec.rb

@@ -10,7 +10,7 @@ describe Optimizer::Function::Connective::Conjunction::OptimizableToExclusion, '
   let(:object)     { described_class.new(connective) }
 
   before do
-    object.operation.should be_kind_of(Function::Connective::Conjunction)
+    expect(object.operation).to be_kind_of(Function::Connective::Conjunction)
   end
 
   context 'when the operands are optimizable' do
@@ -22,22 +22,22 @@ describe Optimizer::Function::Connective::Conjunction::OptimizableToExclusion, '
     end
 
     context 'when the left is an equality predicate and the right is an inclusion predicate' do
-      let(:left)  { attribute.ne(2)             }
-      let(:right) { attribute.exclude([ 1, 3 ]) }
+      let(:left)  { attribute.ne(2)           }
+      let(:right) { attribute.exclude([1, 3]) }
 
       it { should be(true) }
     end
 
     context 'when the left is an inclusion predicate and the right is an equality predicate' do
-      let(:left)  { attribute.exclude([ 2, 3 ]) }
-      let(:right) { attribute.ne(1)             }
+      let(:left)  { attribute.exclude([2, 3]) }
+      let(:right) { attribute.ne(1)           }
 
       it { should be(true) }
     end
 
     context 'when the left and right are inclusion predicatess' do
-      let(:left)  { attribute.exclude([ 2, 3 ]) }
-      let(:right) { attribute.exclude([ 1, 3 ]) }
+      let(:left)  { attribute.exclude([2, 3]) }
+      let(:right) { attribute.exclude([1, 3]) }
 
       it { should be(true) }
     end
@@ -52,8 +52,8 @@ describe Optimizer::Function::Connective::Conjunction::OptimizableToExclusion, '
     end
 
     context 'when the left is an exclusion predicate and the right is an equality predicate' do
-      let(:left)  { attribute.exclude([ 1, 3 ]) }
-      let(:right) { attribute.eq(2)             }
+      let(:left)  { attribute.exclude([1, 3]) }
+      let(:right) { attribute.eq(2)           }
 
       it { should be(false) }
     end

data/spec/unit/axiom/optimizer/function/connective/conjunction/optimizable_to_exclusion/optimize_spec.rb

@@ -10,7 +10,7 @@ describe Optimizer::Function::Connective::Conjunction::OptimizableToExclusion, '
   let(:object)     { described_class.new(connective) }
 
   before do
-    object.should be_optimizable
+    expect(object).to be_optimizable
   end
 
   context 'when the right operands are optimizable' do
@@ -20,46 +20,46 @@ describe Optimizer::Function::Connective::Conjunction::OptimizableToExclusion, '
 
       it { should be_kind_of(Function::Predicate::Exclusion) }
 
-      its(:left) { should equal(attribute) }
+      its(:left) { should be(attribute) }
 
       # enumerable order is normalized
-      its(:right) { should == [ 1, 2 ] }
+      its(:right) { should == [1, 2] }
     end
 
     context 'when the left is an equality predicate and the right is an inclusion predicate' do
-      let(:left)  { attribute.ne(2)          }
-      let(:right) { attribute.exclude([ 1 ]) }
+      let(:left)  { attribute.ne(2)        }
+      let(:right) { attribute.exclude([1]) }
 
       it { should be_kind_of(Function::Predicate::Exclusion) }
 
-      its(:left) { should equal(attribute) }
+      its(:left) { should be(attribute) }
 
       # enumerable order is normalized
-      its(:right) { should == [ 1, 2 ] }
+      its(:right) { should == [1, 2] }
     end
 
     context 'when the left is an inclusion predicate and the right is an equality predicate' do
-      let(:left)  { attribute.exclude([ 2 ]) }
-      let(:right) { attribute.ne(1)          }
+      let(:left)  { attribute.exclude([2]) }
+      let(:right) { attribute.ne(1)        }
 
       it { should be_kind_of(Function::Predicate::Exclusion) }
 
-      its(:left) { should equal(attribute) }
+      its(:left) { should be(attribute) }
 
       # enumerable order is normalized
-      its(:right) { should == [ 1, 2 ] }
+      its(:right) { should == [1, 2] }
     end
 
     context 'when the left and right are inclusion predicatess' do
-      let(:left)  { attribute.exclude([ 2 ]) }
-      let(:right) { attribute.exclude([ 1 ]) }
+      let(:left)  { attribute.exclude([2]) }
+      let(:right) { attribute.exclude([1]) }
 
       it { should be_kind_of(Function::Predicate::Exclusion) }
 
-      its(:left) { should equal(attribute) }
+      its(:left) { should be(attribute) }
 
       # enumerable order is normalized
-      its(:right) { should == [ 1, 2 ] }
+      its(:right) { should == [1, 2] }
     end
   end
 
@@ -69,8 +69,8 @@ describe Optimizer::Function::Connective::Conjunction::OptimizableToExclusion, '
 
     it { should be_kind_of(Function::Predicate::Exclusion) }
 
-    its(:left) { should equal(attribute) }
+    its(:left) { should be(attribute) }
 
-    its(:right) { should == [ 1, 2 ] }
+    its(:right) { should == [1, 2] }
   end
 end

data/spec/unit/axiom/optimizer/function/connective/conjunction/tautology_left/optimizable_predicate_spec.rb

@@ -10,7 +10,7 @@ describe Optimizer::Function::Connective::Conjunction::TautologyLeft, '#optimiza
   let(:object)     { described_class.new(connective)                    }
 
   before do
-    object.operation.should be_kind_of(Function::Connective::Conjunction)
+    expect(object.operation).to be_kind_of(Function::Connective::Conjunction)
   end
 
   context 'when right is a tautology' do

data/spec/unit/axiom/optimizer/function/connective/conjunction/tautology_left/optimize_spec.rb

@@ -12,8 +12,8 @@ describe Optimizer::Function::Connective::Conjunction::TautologyLeft, '#optimize
   let(:object)     { described_class.new(connective)                    }
 
   before do
-    object.should be_optimizable
+    expect(object).to be_optimizable
   end
 
-  it { should equal(right) }
+  it { should be(right) }
 end