ruby-measurement 1.2.1 → 1.2.2

data/spec/ruby-measurement/definitions/us_customary/volume_spec.rb

@@ -2,200 +2,200 @@
 
 require 'spec_helper'
 
-describe Measurement do
+RSpec.describe Measurement do
   describe 'gallons' do
-    subject { Measurement.parse('1 gal') }
+    subject { described_class.parse('1 gal') }
     
     it 'converts to quarts' do
-      subject.convert_to(:qt).quantity.should eq 4
+      expect(subject.convert_to(:qt).quantity).to eq 4
     end
     
     it 'converts to pints' do
-      subject.convert_to(:pt).quantity.should eq 8
+      expect(subject.convert_to(:pt).quantity).to eq 8
     end
     
     it 'converts to cups' do
-      subject.convert_to(:c).quantity.should eq 16
+      expect(subject.convert_to(:c).quantity).to eq 16
     end
     
     it 'converts to fluid ounces' do
-      subject.convert_to(:'fl oz').quantity.should eq 128
+      expect(subject.convert_to(:'fl oz').quantity).to eq 128
     end
     
     it 'converts to tablespoons' do
-      subject.convert_to(:tbsp).quantity.should eq 256
+      expect(subject.convert_to(:tbsp).quantity).to eq 256
     end
     
     it 'converts to teaspoons' do
-      subject.convert_to(:tsp).quantity.should eq 768
+      expect(subject.convert_to(:tsp).quantity).to eq 768
     end
   end
   
   describe 'quarts' do
-    subject { Measurement.parse('4 qt') }
+    subject { described_class.parse('4 qt') }
     
     it 'converts to gallons' do
-      subject.convert_to(:gal).quantity.should eq 1
+      expect(subject.convert_to(:gal).quantity).to eq 1
     end
     
     it 'converts to pints' do
-      subject.convert_to(:pt).quantity.should eq 8
+      expect(subject.convert_to(:pt).quantity).to eq 8
     end
     
     it 'converts to cups' do
-      subject.convert_to(:c).quantity.should eq 16
+      expect(subject.convert_to(:c).quantity).to eq 16
     end
     
     it 'converts to fluid ounces' do
-      subject.convert_to(:'fl oz').quantity.should eq 128
+      expect(subject.convert_to(:'fl oz').quantity).to eq 128
     end
     
     it 'converts to tablespoons' do
-      subject.convert_to(:tbsp).quantity.should eq 256
+      expect(subject.convert_to(:tbsp).quantity).to eq 256
     end
     
     it 'converts to teaspoons' do
-      subject.convert_to(:tsp).quantity.should eq 768
+      expect(subject.convert_to(:tsp).quantity).to eq 768
     end
   end
   
   describe 'pints' do
-    subject { Measurement.parse('8 pt') }
+    subject { described_class.parse('8 pt') }
     
     it 'converts to gallons' do
-      subject.convert_to(:gal).quantity.should eq 1
+      expect(subject.convert_to(:gal).quantity).to eq 1
     end
     
     it 'converts to quarts' do
-      subject.convert_to(:qt).quantity.should eq 4
+      expect(subject.convert_to(:qt).quantity).to eq 4
     end
     
     it 'converts to cups' do
-      subject.convert_to(:c).quantity.should eq 16
+      expect(subject.convert_to(:c).quantity).to eq 16
     end
     
     it 'converts to fluid ounces' do
-      subject.convert_to(:'fl oz').quantity.should eq 128
+      expect(subject.convert_to(:'fl oz').quantity).to eq 128
     end
     
     it 'converts to tablespoons' do
-      subject.convert_to(:tbsp).quantity.should eq 256
+      expect(subject.convert_to(:tbsp).quantity).to eq 256
     end
     
     it 'converts to teaspoons' do
-      subject.convert_to(:tsp).quantity.should eq 768
+      expect(subject.convert_to(:tsp).quantity).to eq 768
     end
   end
   
   describe 'cups' do
-    subject { Measurement.parse('16 c') }
+    subject { described_class.parse('16 c') }
     
     it 'converts to gallons' do
-      subject.convert_to(:gal).quantity.should eq 1
+      expect(subject.convert_to(:gal).quantity).to eq 1
     end
     
     it 'converts to quarts' do
-      subject.convert_to(:qt).quantity.should eq 4
+      expect(subject.convert_to(:qt).quantity).to eq 4
     end
     
     it 'converts to pints' do
-      subject.convert_to(:pt).quantity.should eq 8
+      expect(subject.convert_to(:pt).quantity).to eq 8
     end
     
     it 'converts to fluid ounces' do
-      subject.convert_to(:'fl oz').quantity.should eq 128
+      expect(subject.convert_to(:'fl oz').quantity).to eq 128
     end
     
     it 'converts to tablespoons' do
-      subject.convert_to(:tbsp).quantity.should eq 256
+      expect(subject.convert_to(:tbsp).quantity).to eq 256
     end
     
     it 'converts to teaspoons' do
-      subject.convert_to(:tsp).quantity.should eq 768
+      expect(subject.convert_to(:tsp).quantity).to eq 768
     end
   end
   
   describe 'fluid ounces' do
-    subject { Measurement.parse('128 fl oz') }
+    subject { described_class.parse('128 fl oz') }
     
     it 'converts to gallons' do
-      subject.convert_to(:gal).quantity.should eq 1
+      expect(subject.convert_to(:gal).quantity).to eq 1
     end
     
     it 'converts to quarts' do
-      subject.convert_to(:qt).quantity.should eq 4
+      expect(subject.convert_to(:qt).quantity).to eq 4
     end
     
     it 'converts to pints' do
-      subject.convert_to(:pt).quantity.should eq 8
+      expect(subject.convert_to(:pt).quantity).to eq 8
     end
     
     it 'converts to cups' do
-      subject.convert_to(:c).quantity.should eq 16
+      expect(subject.convert_to(:c).quantity).to eq 16
     end
     
     it 'converts to tablespoons' do
-      subject.convert_to(:tbsp).quantity.should eq 256
+      expect(subject.convert_to(:tbsp).quantity).to eq 256
     end
     
     it 'converts to teaspoons' do
-      subject.convert_to(:tsp).quantity.should eq 768
+      expect(subject.convert_to(:tsp).quantity).to eq 768
     end
   end
   
   describe 'tablespoons' do
-    subject { Measurement.parse('256 tbsp') }
+    subject { described_class.parse('256 tbsp') }
     
     it 'converts to gallons' do
-      subject.convert_to(:gal).quantity.should eq 1
+      expect(subject.convert_to(:gal).quantity).to eq 1
     end
     
     it 'converts to quarts' do
-      subject.convert_to(:qt).quantity.should eq 4
+      expect(subject.convert_to(:qt).quantity).to eq 4
     end
     
     it 'converts to pints' do
-      subject.convert_to(:pt).quantity.should eq 8
+      expect(subject.convert_to(:pt).quantity).to eq 8
     end
     
     it 'converts to cups' do
-      subject.convert_to(:c).quantity.should eq 16
+      expect(subject.convert_to(:c).quantity).to eq 16
     end
     
     it 'converts to fluid ounces' do
-      subject.convert_to(:'fl oz').quantity.should eq 128
+      expect(subject.convert_to(:'fl oz').quantity).to eq 128
     end
     
     it 'converts to teaspoons' do
-      subject.convert_to(:tsp).quantity.should eq 768
+      expect(subject.convert_to(:tsp).quantity).to eq 768
     end
   end
   
   describe 'teaspoons' do
-    subject { Measurement.parse('768 tsp') }
+    subject { described_class.parse('768 tsp') }
     
     it 'converts to gallons' do
-      subject.convert_to(:gal).quantity.should eq 1
+      expect(subject.convert_to(:gal).quantity).to eq 1
     end
     
     it 'converts to quarts' do
-      subject.convert_to(:qt).quantity.should eq 4
+      expect(subject.convert_to(:qt).quantity).to eq 4
     end
     
     it 'converts to pints' do
-      subject.convert_to(:pt).quantity.should eq 8
+      expect(subject.convert_to(:pt).quantity).to eq 8
     end
     
     it 'converts to cups' do
-      subject.convert_to(:c).quantity.should eq 16
+      expect(subject.convert_to(:c).quantity).to eq 16
     end
     
     it 'converts to fluid ounces' do
-      subject.convert_to(:'fl oz').quantity.should eq 128
+      expect(subject.convert_to(:'fl oz').quantity).to eq 128
     end
     
     it 'converts to tablespoons' do
-      subject.convert_to(:tbsp).quantity.should eq 256
+      expect(subject.convert_to(:tbsp).quantity).to eq 256
     end
   end
 end

data/spec/ruby-measurement/definitions/us_customary/weight_spec.rb

@@ -2,148 +2,148 @@
 
 require 'spec_helper'
 
-describe Measurement do
+RSpec.describe Measurement do
   describe 'tons' do
-    subject { Measurement.parse('1 ton') }
+    subject { described_class.parse('1 ton') }
     
     it 'converts to hundredweights' do
-      subject.convert_to(:cwt).quantity.should eq 20
+      expect(subject.convert_to(:cwt).quantity).to eq 20
     end
     
     it 'converts to pounds' do
-      subject.convert_to(:lbs).quantity.should eq 2_000
+      expect(subject.convert_to(:lbs).quantity).to eq 2_000
     end
     
     it 'converts to ounces' do
-      subject.convert_to(:oz).quantity.should eq 32_000
+      expect(subject.convert_to(:oz).quantity).to eq 32_000
     end
     
     it 'converts to drams' do
-      subject.convert_to(:dr).quantity.should eq 512_000
+      expect(subject.convert_to(:dr).quantity).to eq 512_000
     end
     
     it 'converts to grains' do
-      subject.convert_to(:gr).quantity.should eq 14_000_000
+      expect(subject.convert_to(:gr).quantity).to eq 14_000_000
     end
   end
   
   describe 'hundredweights' do
-    subject { Measurement.parse('20 cwt') }
+    subject { described_class.parse('20 cwt') }
     
     it 'converts to tons' do
-      subject.convert_to(:ton).quantity.should eq 1
+      expect(subject.convert_to(:ton).quantity).to eq 1
     end
     
     it 'converts to pounds' do
-      subject.convert_to(:lbs).quantity.should eq 2_000
+      expect(subject.convert_to(:lbs).quantity).to eq 2_000
     end
     
     it 'converts to ounces' do
-      subject.convert_to(:oz).quantity.should eq 32_000
+      expect(subject.convert_to(:oz).quantity).to eq 32_000
     end
     
     it 'converts to drams' do
-      subject.convert_to(:dr).quantity.should eq 512_000
+      expect(subject.convert_to(:dr).quantity).to eq 512_000
     end
     
     it 'converts to grains' do
-      subject.convert_to(:gr).quantity.should eq 14_000_000
+      expect(subject.convert_to(:gr).quantity).to eq 14_000_000
     end
   end
   
   describe 'pounds' do
-    subject { Measurement.parse('2000 lbs') }
+    subject { described_class.parse('2000 lbs') }
     
     it 'converts to tons' do
-      subject.convert_to(:ton).quantity.should eq 1
+      expect(subject.convert_to(:ton).quantity).to eq 1
     end
     
     it 'converts to hundredweights' do
-      subject.convert_to(:cwt).quantity.should eq 20
+      expect(subject.convert_to(:cwt).quantity).to eq 20
     end
     
     it 'converts to ounces' do
-      subject.convert_to(:oz).quantity.should eq 32_000
+      expect(subject.convert_to(:oz).quantity).to eq 32_000
     end
     
     it 'converts to drams' do
-      subject.convert_to(:dr).quantity.should eq 512_000
+      expect(subject.convert_to(:dr).quantity).to eq 512_000
     end
     
     it 'converts to grains' do
-      subject.convert_to(:gr).quantity.should eq 14_000_000
+      expect(subject.convert_to(:gr).quantity).to eq 14_000_000
     end
   end
   
   describe 'ounces' do
-    subject { Measurement.parse('32000 oz') }
+    subject { described_class.parse('32000 oz') }
     
     it 'converts to tons' do
-      subject.convert_to(:ton).quantity.should eq 1
+      expect(subject.convert_to(:ton).quantity).to eq 1
     end
     
     it 'converts to hundredweights' do
-      subject.convert_to(:cwt).quantity.should eq 20
+      expect(subject.convert_to(:cwt).quantity).to eq 20
     end
     
     it 'converts to pounds' do
-      subject.convert_to(:lbs).quantity.should eq 2_000
+      expect(subject.convert_to(:lbs).quantity).to eq 2_000
     end
     
     it 'converts to drams' do
-      subject.convert_to(:dr).quantity.should eq 512_000
+      expect(subject.convert_to(:dr).quantity).to eq 512_000
     end
     
     it 'converts to grains' do
-      subject.convert_to(:gr).quantity.should eq 14_000_000
+      expect(subject.convert_to(:gr).quantity).to eq 14_000_000
     end
   end
   
   describe 'drams' do
-    subject { Measurement.parse('512000 dr') }
+    subject { described_class.parse('512000 dr') }
     
     it 'converts to tons' do
-      subject.convert_to(:ton).quantity.should eq 1
+      expect(subject.convert_to(:ton).quantity).to eq 1
     end
     
     it 'converts to hundredweights' do
-      subject.convert_to(:cwt).quantity.should eq 20
+      expect(subject.convert_to(:cwt).quantity).to eq 20
     end
     
     it 'converts to pounds' do
-      subject.convert_to(:lbs).quantity.should eq 2_000
+      expect(subject.convert_to(:lbs).quantity).to eq 2_000
     end
     
     it 'converts to ounces' do
-      subject.convert_to(:oz).quantity.should eq 32_000
+      expect(subject.convert_to(:oz).quantity).to eq 32_000
     end
     
     it 'converts to grains' do
-      subject.convert_to(:gr).quantity.should eq 14_000_000
+      expect(subject.convert_to(:gr).quantity).to eq 14_000_000
     end
   end
   
   describe 'grains' do
-    subject { Measurement.parse('14000000 gr') }
+    subject { described_class.parse('14000000 gr') }
     
     it 'converts to tons' do
-      subject.convert_to(:ton).quantity.should eq 1
+      expect(subject.convert_to(:ton).quantity).to eq 1
     end
     
     it 'converts to hundredweights' do
-      subject.convert_to(:cwt).quantity.should eq 20
+      expect(subject.convert_to(:cwt).quantity).to eq 20
     end
     
     it 'converts to pounds' do
-      subject.convert_to(:lbs).quantity.should eq 2_000
+      expect(subject.convert_to(:lbs).quantity).to eq 2_000
     end
     
     it 'converts to ounces' do
-      subject.convert_to(:oz).quantity.should eq 32_000
+      expect(subject.convert_to(:oz).quantity).to eq 32_000
     end
     
     it 'converts to drams' do
-      subject.convert_to(:dr).quantity.should eq 512_000
+      expect(subject.convert_to(:dr).quantity).to eq 512_000
     end
   end
 end

data/spec/ruby-measurement/measurement_spec.rb

@@ -1,36 +1,36 @@
 require 'spec_helper'
 
-describe Measurement do
-  subject { Measurement }
+RSpec.describe Measurement do
+  subject { described_class }
   
   describe '.new' do
     describe 'with valid quantity' do
       it 'sets the quantity' do
-        subject.new(3).quantity.should eq 3
+        expect(subject.new(3).quantity).to eq 3
       end
       
       it 'sets the default unit' do
-        subject.new(3).unit.should eq subject::Unit[:count]
+        expect(subject.new(3).unit).to eq subject::Unit[:count]
       end
     end
     
     describe 'with valid quantity and unit name' do
       it 'sets the quantity' do
-        subject.new(2, :dozen).quantity.should eq 2
+        expect(subject.new(2, :dozen).quantity).to eq 2
       end
       
       it 'sets the unit' do
-        subject.new(2, :dozen).unit.should eq subject::Unit[:dozen]
+        expect(subject.new(2, :dozen).unit).to eq subject::Unit[:dozen]
       end
     end
     
     describe 'with valid quantity and unit' do
       it 'sets the quantity' do
-        subject.new(2, subject::Unit[:dozen]).quantity.should eq 2
+        expect(subject.new(2, subject::Unit[:dozen]).quantity).to eq 2
       end
       
       it 'sets the unit' do
-        subject.new(2, subject::Unit[:dozen]).unit.should eq subject::Unit[:dozen]
+        expect(subject.new(2, subject::Unit[:dozen]).unit).to eq subject::Unit[:dozen]
       end
     end
     
@@ -51,64 +51,64 @@ describe Measurement do
     describe 'quantity' do
       it 'parses scientific notation' do
         m = subject.parse('4.3e12')
-        m.quantity.should eq 4.3e12
-        m.unit.should eq subject::Unit[:count]
+        expect(m.quantity).to eq 4.3e12
+        expect(m.unit).to eq Measurement::Unit[:count]
         
         m = subject.parse('4.3e12 dozen')
-        m.quantity.should eq 4.3e12
-        m.unit.should eq subject::Unit[:dozen]
+        expect(m.quantity).to eq 4.3e12
+        expect(m.unit).to eq Measurement::Unit[:dozen]
         
         m = subject.parse('4.3e12doz')
-        m.quantity.should eq 4.3e12
-        m.unit.should eq subject::Unit[:dozen]
+        expect(m.quantity).to eq 4.3e12
+        expect(m.unit).to eq Measurement::Unit[:dozen]
       end
       
       it 'parses fractions' do
         m = subject.parse('1/4')
-        m.quantity.should eq 0.25
-        m.unit.should eq subject::Unit[:count]
+        expect(m.quantity).to eq 0.25
+        expect(m.unit).to eq Measurement::Unit[:count]
         
         m = subject.parse('1/4 dozen')
-        m.quantity.should eq 0.25
-        m.unit.should eq subject::Unit[:dozen]
+        expect(m.quantity).to eq 0.25
+        expect(m.unit).to eq Measurement::Unit[:dozen]
         
         m = subject.parse('1/4doz')
-        m.quantity.should eq 0.25
-        m.unit.should eq subject::Unit[:dozen]
+        expect(m.quantity).to eq 0.25
+        expect(m.unit).to eq Measurement::Unit[:dozen]
       end
       
       it 'parses mixed fractions' do
         m = subject.parse('3 2/5')
-        m.quantity.should eq 3.4
-        m.unit.should eq subject::Unit[:count]
+        expect(m.quantity).to eq 3.4
+        expect(m.unit).to eq Measurement::Unit[:count]
         
         m = subject.parse('3 2/5 dozen')
-        m.quantity.should eq 3.4
-        m.unit.should eq subject::Unit[:dozen]
+        expect(m.quantity).to eq 3.4
+        expect(m.unit).to eq Measurement::Unit[:dozen]
         
         m = subject.parse('3 2/5')
-        m.quantity.should eq 3.4
-        m.unit.should eq subject::Unit[:count]
+        expect(m.quantity).to eq 3.4
+        expect(m.unit).to eq Measurement::Unit[:count]
       end
       
       it 'parses decimals' do
         m = subject.parse('2.1')
-        m.quantity.should eq 2.1
-        m.unit.should eq subject::Unit[:count]
+        expect(m.quantity).to eq 2.1
+        expect(m.unit).to eq Measurement::Unit[:count]
         
         m = subject.parse('2.1 dozen')
-        m.quantity.should eq 2.1
-        m.unit.should eq subject::Unit[:dozen]
+        expect(m.quantity).to eq 2.1
+        expect(m.unit).to eq Measurement::Unit[:dozen]
         
         m = subject.parse('2.1doz')
-        m.quantity.should eq 2.1
-        m.unit.should eq subject::Unit[:dozen]
+        expect(m.quantity).to eq 2.1
+        expect(m.unit).to eq Measurement::Unit[:dozen]
       end
     end
     
     describe 'unit' do
       it 'converts when defined' do
-        subject.parse('3 dozen').unit.should eq subject::Unit[:dozen]
+        expect(subject.parse('3 dozen').unit).to eq Measurement::Unit[:dozen]
       end
       
       it 'raises exception when undefined' do
@@ -119,7 +119,7 @@ describe Measurement do
   
   describe '.define' do
     it 'delegates to Unit.define' do
-      subject::Unit.should_receive(:define)
+      expect(Measurement::Unit).to receive(:define)
       subject.define(:something)
     end
   end
@@ -129,14 +129,14 @@ describe Measurement do
     
     it 'returns copy of self when target unit matches current unit' do
       result = measurement.convert_to(:count)
-      result.should_not be measurement
-      result.should eq measurement
+      expect(result).to_not be measurement
+      expect(result).to eq measurement
     end
     
     it 'returns target unit if it exists and is convertable' do
       result = measurement.convert_to(:dozen)
-      result.quantity.should eq 0.25
-      result.unit.should eq subject::Unit[:dozen]
+      expect(result.quantity).to eq 0.25
+      expect(result.unit).to eq Measurement::Unit[:dozen]
     end
     
     it 'raises exception if unit exists and is not convertable' do
@@ -153,8 +153,8 @@ describe Measurement do
     
     it 'modifies the object' do
       measurement.convert_to!(:dozen)
-      measurement.quantity.should eq 0.25
-      measurement.unit.should eq subject::Unit[:dozen]
+      expect(measurement.quantity).to eq 0.25
+      expect(measurement.unit).to eq Measurement::Unit[:dozen]
     end
   end
   
@@ -163,31 +163,31 @@ describe Measurement do
     
     it 'adds numeric values' do
       result = measurement + 4
-      result.quantity.should eq 7
-      result.unit.should eq measurement.unit
+      expect(result.quantity).to eq 7
+      expect(result.unit).to eq measurement.unit
     end
     
     it 'adds units of the same type' do
       other = subject.new(4)
-      other.unit.should eq measurement.unit
+      expect(other.unit).to eq measurement.unit
       
       result = measurement + other
-      result.quantity.should eq 7
-      result.unit.should eq measurement.unit
+      expect(result.quantity).to eq 7
+      expect(result.unit).to eq measurement.unit
     end
     
     it 'adds units of a convertable type' do
       other = subject.new(2, :dozen)
-      other.unit.should_not eq measurement.unit
+      expect(other.unit).to_not eq measurement.unit
       
       result = measurement + other
-      result.quantity.should eq 27
-      result.unit.should eq measurement.unit
+      expect(result.quantity).to eq 27
+      expect(result.unit).to eq measurement.unit
     end
     
     it 'raises exception for incompatible units' do
       other = subject.new(4, :inches)
-      other.unit.should_not eq measurement.unit
+      expect(other.unit).to_not eq measurement.unit
       expect { measurement + other }.to raise_error
     end
   end
@@ -197,31 +197,31 @@ describe Measurement do
     
     it 'subtracts numeric values' do
       result = measurement - 4
-      result.quantity.should eq -1
-      result.unit.should eq measurement.unit
+      expect(result.quantity).to eq -1
+      expect(result.unit).to eq measurement.unit
     end
     
     it 'subtracts units of the same type' do
       other = subject.new(4)
-      other.unit.should eq measurement.unit
+      expect(other.unit).to eq measurement.unit
       
       result = measurement - other
-      result.quantity.should eq -1
-      result.unit.should eq measurement.unit
+      expect(result.quantity).to eq -1
+      expect(result.unit).to eq measurement.unit
     end
     
     it 'subtracts units of a convertable type' do
       other = subject.new(2, :dozen)
-      other.unit.should_not eq measurement.unit
+      expect(other.unit).to_not eq measurement.unit
       
       result = measurement - other
-      result.quantity.should eq -21
-      result.unit.should eq measurement.unit
+      expect(result.quantity).to eq -21
+      expect(result.unit).to eq measurement.unit
     end
     
     it 'raises exception for incompatible units' do
       other = subject.new(4, :inches)
-      other.unit.should_not eq measurement.unit
+      expect(other.unit).to_not eq measurement.unit
       expect { measurement - other }.to raise_error
     end
   end
@@ -231,31 +231,31 @@ describe Measurement do
     
     it 'multiplies numeric values' do
       result = measurement * 4
-      result.quantity.should eq 12
-      result.unit.should eq measurement.unit
+      expect(result.quantity).to eq 12
+      expect(result.unit).to eq measurement.unit
     end
     
     it 'multiplies units of the same type' do
       other = subject.new(4)
-      other.unit.should eq measurement.unit
+      expect(other.unit).to eq measurement.unit
       
       result = measurement * other
-      result.quantity.should eq 12
-      result.unit.should eq measurement.unit
+      expect(result.quantity).to eq 12
+      expect(result.unit).to eq measurement.unit
     end
     
     it 'multiplies units of a convertable type' do
       other = subject.new(2, :dozen)
-      other.unit.should_not eq measurement.unit
+      expect(other.unit).to_not eq measurement.unit
       
       result = measurement * other
-      result.quantity.should eq 72
-      result.unit.should eq measurement.unit
+      expect(result.quantity).to eq 72
+      expect(result.unit).to eq measurement.unit
     end
     
     it 'raises exception for incompatible units' do
       other = subject.new(4, :inches)
-      other.unit.should_not eq measurement.unit
+      expect(other.unit).to_not eq measurement.unit
       expect { measurement * other }.to raise_error
     end
   end
@@ -265,31 +265,31 @@ describe Measurement do
     
     it 'divides numeric values' do
       result = measurement / 4
-      result.quantity.should eq 3
-      result.unit.should eq measurement.unit
+      expect(result.quantity).to eq 3
+      expect(result.unit).to eq measurement.unit
     end
     
     it 'divides units of the same type' do
       other = subject.new(4)
-      other.unit.should eq measurement.unit
+      expect(other.unit).to eq measurement.unit
       
       result = measurement / other
-      result.quantity.should eq 3
-      result.unit.should eq measurement.unit
+      expect(result.quantity).to eq 3
+      expect(result.unit).to eq measurement.unit
     end
     
     it 'divides units of a convertable type' do
       other = subject.new(1, :dozen)
-      other.unit.should_not eq measurement.unit
+      expect(other.unit).to_not eq measurement.unit
       
       result = measurement / other
-      result.quantity.should eq 1
-      result.unit.should eq measurement.unit
+      expect(result.quantity).to eq 1
+      expect(result.unit).to eq measurement.unit
     end
     
     it 'raises exception for incompatible units' do
       other = subject.new(4, :inches)
-      other.unit.should_not eq measurement.unit
+      expect(other.unit).to_not eq measurement.unit
       expect { measurement / other }.to raise_error
     end
   end
@@ -298,7 +298,7 @@ describe Measurement do
     let(:measurement) { subject.new(3) }
     
     it 'raises to the power of numeric values' do
-      (measurement ** 3).quantity.should eq 27
+      expect((measurement ** 3).quantity).to eq 27
     end
     
     it 'raises exception for non-numeric values' do
@@ -310,33 +310,33 @@ describe Measurement do
     let(:measurement) { subject.new(3) }
     
     it 'returns true for measurements with same quantity and unit' do
-      (measurement == subject.new(3)).should be_true
+      expect(measurement == subject.new(3)).to be true
     end
     
     it 'returns false for measurements with same quantity and different unit' do
-      (measurement == subject.new(3, :dozen)).should be_false
+      expect(measurement == subject.new(3, :dozen)).to be false
     end
     
     it 'returns false for measurements with same unit and different quantity' do
-      (measurement == subject.new(4)).should be_false
+      expect(measurement == subject.new(4)).to be false
     end
     
     it 'returns false for non-measurement objects' do
-      (measurement == 3).should be_false
+      expect(measurement == 3).to be false
     end
   end
   
   describe '#to_s' do
     it 'returns the quantity and unit' do
-      subject.new(3.5).to_s.should eq '3.5 count'
-      subject.new(2, :dozen).to_s.should eq '2 doz'
+      expect(subject.new(3.5).to_s).to eq '3.5 count'
+      expect(subject.new(2, :dozen).to_s).to eq '2 doz'
     end
   end
   
   describe '#inspect' do
     it 'returns the quantity and unit' do
-      subject.new(3.5).inspect.should eq '3.5 count'
-      subject.new(2, :dozen).inspect.should eq '2 doz'
+      expect(subject.new(3.5).inspect).to eq '3.5 count'
+      expect(subject.new(2, :dozen).inspect).to eq '2 doz'
     end
   end
 end