Update rspec syntax, and fix unit equality test

Author: mhuggins

lib/ruby-measurement/unit.rb

@@ -45,7 +45,9 @@ def to_s
     end
 
     def ==(obj)
-      obj.kind_of?(self.class) && hash == obj.hash
+      obj.kind_of?(self.class) && name == obj.name && aliases == obj.aliases && conversions.all? do |key, proc|
+        [-2.5, -1, 0, 1, 2.5].all? { |n| proc.call(n) == obj.conversions[key].call(n) }
+      end
     end
 
     def self.define(unit_name, &block)

ruby-measurement.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |gem|
   gem.require_path  = 'lib'
 
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rspec', '~> 3.0'
 end

spec/ruby-measurement/core_ext/numeric_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe Numeric do
+RSpec.describe Numeric do
   describe '#to_measurement' do
     subject { 20 }
-    specify { subject.to_measurement.should eq Measurement.new(20) }
+    specify { expect(subject.to_measurement).to eq Measurement.new(20) }
   end
 end

spec/ruby-measurement/core_ext/string_spec.rb

@@ -1,15 +1,15 @@
 require 'spec_helper'
 
-describe String do
+RSpec.describe String do
   describe '#to_measurement' do
     describe 'with valid quantity' do
       subject { '3' }
-      specify { subject.to_measurement.should eq Measurement.new(3) }
+      specify { expect(subject.to_measurement).to eq Measurement.new(3) }
     end
 
     describe 'with valid quantity and unit' do
       subject { '3 dozen' }
-      specify { subject.to_measurement.should eq Measurement.new(3, :dozen) }
+      specify { expect(subject.to_measurement).to eq Measurement.new(3, :dozen) }
     end
 
     describe 'with valid quantity and invalid unit' do
@@ -26,7 +26,7 @@
   describe '#to_unit' do
     describe 'with valid unit' do
       subject { 'dozen' }
-      specify { subject.to_unit.should eq Measurement::Unit[:dozen] }
+      specify { expect(subject.to_unit).to eq Measurement::Unit[:dozen] }
     end
 
     describe 'with invalid unit' do

spec/ruby-measurement/core_ext/symbol_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Symbol do
+RSpec.describe Symbol do
   describe '#to_unit' do
     describe 'with valid unit' do
       subject { :dozen }
-      specify { subject.to_unit.should eq Measurement::Unit[:dozen] }
+      specify { expect(subject.to_unit).to eq Measurement::Unit[:dozen] }
     end
 
     describe 'with invalid unit' do

spec/ruby-measurement/definitions/metric/area_spec.rb

@@ -2,68 +2,68 @@
 
 require 'spec_helper'
 
-describe Measurement do
+RSpec.describe Measurement do
   describe 'square kilometers' do
-    subject { Measurement.parse('10 km²') }
+    subject { described_class.parse('10 km²') }
 
     it 'converts to hectares' do
-      subject.convert_to(:ha).quantity.should eq 1_000
+      expect(subject.convert_to(:ha).quantity).to eq 1_000
     end
 
     it 'converts to ares' do
-      subject.convert_to(:a).quantity.should eq 100_000
+      expect(subject.convert_to(:a).quantity).to eq 100_000
     end
 
     it 'converts to square centimeters' do
-      subject.convert_to(:cm2).quantity.should eq 100_000_000_000
+      expect(subject.convert_to(:cm2).quantity).to eq 100_000_000_000
     end
   end
 
   describe 'hectares' do
-    subject { Measurement.parse('10 ha') }
+    subject { described_class.parse('10 ha') }
 
     it 'converts to square kilometers' do
-      subject.convert_to(:km2).quantity.should eq 0.1
+      expect(subject.convert_to(:km2).quantity).to eq 0.1
     end
 
     it 'converts to ares' do
-      subject.convert_to(:a).quantity.should eq 1_000
+      expect(subject.convert_to(:a).quantity).to eq 1_000
     end
 
     it 'converts to square centimeters' do
-      subject.convert_to(:cm2).quantity.should eq 1_000_000_000
+      expect(subject.convert_to(:cm2).quantity).to eq 1_000_000_000
     end
   end
 
   describe 'ares' do
-    subject { Measurement.parse('1000 a') }
+    subject { described_class.parse('1000 a') }
 
     it 'converts to square kilometers' do
-      subject.convert_to(:km2).quantity.should eq 0.1
+      expect(subject.convert_to(:km2).quantity).to eq 0.1
     end
 
     it 'converts to hectares' do
-      subject.convert_to(:ha).quantity.should eq 10
+      expect(subject.convert_to(:ha).quantity).to eq 10
     end
 
     it 'converts to square centimeters' do
-      subject.convert_to(:cm2).quantity.should eq 1_000_000_000
+      expect(subject.convert_to(:cm2).quantity).to eq 1_000_000_000
     end
   end
 
   describe 'square centimeters' do
-    subject { Measurement.parse('10000000000 cm²') }
+    subject { described_class.parse('10000000000 cm²') }
 
     it 'converts to square kilometers' do
-      subject.convert_to(:km2).quantity.should eq 1
+      expect(subject.convert_to(:km2).quantity).to eq 1
     end
 
     it 'converts to hectares' do
-      subject.convert_to(:ha).quantity.should eq 100
+      expect(subject.convert_to(:ha).quantity).to eq 100
     end
 
     it 'converts to ares' do
-      subject.convert_to(:a).quantity.should eq 10_000
+      expect(subject.convert_to(:a).quantity).to eq 10_000
     end
   end
 end

spec/ruby-measurement/definitions/metric/capacity_spec.rb

@@ -2,40 +2,40 @@
 
 require 'spec_helper'
 
-describe Measurement do
+RSpec.describe Measurement do
   describe 'cubic meters' do
-    subject { Measurement.parse('1 m³') }
+    subject { described_class.parse('1 m³') }
 
     it 'converts to cubic decimeters' do
-      subject.convert_to(:dm3).quantity.should eq 1_000
+      expect(subject.convert_to(:dm3).quantity).to eq 1_000
     end
 
     it 'converts to cubic centimeters' do
-      subject.convert_to(:cm3).quantity.should eq 1_000_000
+      expect(subject.convert_to(:cm3).quantity).to eq 1_000_000
     end
   end
 
   describe 'cubic decimeters' do
-    subject { Measurement.parse('1000 dm³') }
+    subject { described_class.parse('1000 dm³') }
 
     it 'converts to cubic meters' do
-      subject.convert_to(:m3).quantity.should eq 1
+      expect(subject.convert_to(:m3).quantity).to eq 1
     end
 
     it 'converts to cubic centimeters' do
-      subject.convert_to(:cm3).quantity.should eq 1_000_000
+      expect(subject.convert_to(:cm3).quantity).to eq 1_000_000
     end
   end
 
   describe 'cubic centimeters' do
-    subject { Measurement.parse('1000000 cm³') }
+    subject { described_class.parse('1000000 cm³') }
 
     it 'converts to cubic meters' do
-      subject.convert_to(:m3).quantity.should eq 1
+      expect(subject.convert_to(:m3).quantity).to eq 1
     end
 
     it 'converts to cubic decimeters' do
-      subject.convert_to(:dm3).quantity.should eq 1_000
+      expect(subject.convert_to(:dm3).quantity).to eq 1_000
     end
   end
 end