ruby-measurement 1.2.0 → 1.3.0

data/lib/ruby-measurement/version.rb

@@ -1,3 +1,3 @@
 class Measurement
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

data/ruby-measurement.gemspec

@@ -11,12 +11,13 @@ Gem::Specification.new do |gem|
   gem.description   = 'Simple gem for calculating and converting measurements'
   gem.summary       = 'Simple gem for calculating and converting measurements'
   gem.homepage      = 'https://github.com/mhuggins/ruby-measurement'
-  
+  gem.license       = 'MIT'
+
   gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_path  = 'lib'
-  
+
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rspec', '~> 3.0'
 end

data/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

data/spec/ruby-measurement/core_ext/string_spec.rb

@@ -1,37 +1,37 @@
 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
       subject { '3 people' }
-      specify { expect { subject.to_measurement }.to raise_error }
+      specify { expect { subject.to_measurement }.to raise_error(ArgumentError, "Invalid unit: 'people'") }
     end
-    
+
     describe 'with invalid input' do
       subject { 'foobar' }
-      specify { expect { subject.to_measurement }.to raise_error }
+      specify { expect { subject.to_measurement }.to raise_error(ArgumentError, "Invalid unit: 'foobar'") }
     end
   end
-  
+
   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
       subject { 'person' }
-      specify { expect { subject.to_unit }.to raise_error }
+      specify { expect { subject.to_unit }.to raise_error(ArgumentError, "Invalid unit: 'person'") }
     end
   end
 end

data/spec/ruby-measurement/core_ext/symbol_spec.rb

@@ -1,15 +1,15 @@
 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
       subject { :person }
-      specify { expect { subject.to_unit }.to raise_error }
+      specify { expect { subject.to_unit }.to raise_error(ArgumentError, "Invalid unit: 'person'") }
     end
   end
 end

data/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

data/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

data/spec/ruby-measurement/definitions/metric/length_spec.rb

@@ -2,260 +2,260 @@
 
 require 'spec_helper'
 
-describe Measurement do
+RSpec.describe Measurement do
   describe 'kilometers' do
-    subject { Measurement.parse('1 km') }
-    
+    subject { described_class.parse('1 km') }
+
     it 'converts to hectometers' do
-      subject.convert_to(:hm).quantity.should eq 10
+      expect(subject.convert_to(:hm).quantity).to eq 10
     end
-    
+
     it 'converts to dekameters' do
-      subject.convert_to(:dam).quantity.should eq 100
+      expect(subject.convert_to(:dam).quantity).to eq 100
     end
-    
+
     it 'converts to meters' do
-      subject.convert_to(:m).quantity.should eq 1_000
+      expect(subject.convert_to(:m).quantity).to eq 1_000
     end
-    
+
     it 'converts to decimeters' do
-      subject.convert_to(:dm).quantity.should eq 10_000
+      expect(subject.convert_to(:dm).quantity).to eq 10_000
     end
-    
+
     it 'converts to centimeters' do
-      subject.convert_to(:cm).quantity.should eq 100_000
+      expect(subject.convert_to(:cm).quantity).to eq 100_000
     end
-    
+
     it 'converts to millimeters' do
-      subject.convert_to(:mm).quantity.should eq 1_000_000
+      expect(subject.convert_to(:mm).quantity).to eq 1_000_000
     end
-    
+
     it 'converts to micrometers' do
-      subject.convert_to(:µm).quantity.should eq 10_000_000
+      expect(subject.convert_to(:µm).quantity).to eq 10_000_000
     end
   end
-  
+
   describe 'hectometers' do
-    subject { Measurement.parse('10 hm') }
-    
+    subject { described_class.parse('10 hm') }
+
     it 'converts to kilometers' do
-      subject.convert_to(:km).quantity.should eq 1
+      expect(subject.convert_to(:km).quantity).to eq 1
     end
-    
+
     it 'converts to dekameters' do
-      subject.convert_to(:dam).quantity.should eq 100
+      expect(subject.convert_to(:dam).quantity).to eq 100
     end
-    
+
     it 'converts to meters' do
-      subject.convert_to(:m).quantity.should eq 1_000
+      expect(subject.convert_to(:m).quantity).to eq 1_000
     end
-    
+
     it 'converts to decimeters' do
-      subject.convert_to(:dm).quantity.should eq 10_000
+      expect(subject.convert_to(:dm).quantity).to eq 10_000
     end
-    
+
     it 'converts to centimeters' do
-      subject.convert_to(:cm).quantity.should eq 100_000
+      expect(subject.convert_to(:cm).quantity).to eq 100_000
     end
-    
+
     it 'converts to millimeters' do
-      subject.convert_to(:mm).quantity.should eq 1_000_000
+      expect(subject.convert_to(:mm).quantity).to eq 1_000_000
     end
-    
+
     it 'converts to micrometers' do
-      subject.convert_to(:µm).quantity.should eq 10_000_000
+      expect(subject.convert_to(:µm).quantity).to eq 10_000_000
     end
   end
-  
+
   describe 'dekameters' do
-    subject { Measurement.parse('100 dam') }
-    
+    subject { described_class.parse('100 dam') }
+
     it 'converts to kilometers' do
-      subject.convert_to(:km).quantity.should eq 1
+      expect(subject.convert_to(:km).quantity).to eq 1
     end
-    
+
     it 'converts to hectometers' do
-      subject.convert_to(:hm).quantity.should eq 10
+      expect(subject.convert_to(:hm).quantity).to eq 10
     end
-    
+
     it 'converts to meters' do
-      subject.convert_to(:m).quantity.should eq 1_000
+      expect(subject.convert_to(:m).quantity).to eq 1_000
     end
-    
+
     it 'converts to decimeters' do
-      subject.convert_to(:dm).quantity.should eq 10_000
+      expect(subject.convert_to(:dm).quantity).to eq 10_000
     end
-    
+
     it 'converts to centimeters' do
-      subject.convert_to(:cm).quantity.should eq 100_000
+      expect(subject.convert_to(:cm).quantity).to eq 100_000
     end
-    
+
     it 'converts to millimeters' do
-      subject.convert_to(:mm).quantity.should eq 1_000_000
+      expect(subject.convert_to(:mm).quantity).to eq 1_000_000
     end
-    
+
     it 'converts to micrometers' do
-      subject.convert_to(:µm).quantity.should eq 10_000_000
+      expect(subject.convert_to(:µm).quantity).to eq 10_000_000
     end
   end
-  
+
   describe 'meters' do
-    subject { Measurement.parse('1000 m') }
-    
+    subject { described_class.parse('1000 m') }
+
     it 'converts to kilometers' do
-      subject.convert_to(:km).quantity.should eq 1
+      expect(subject.convert_to(:km).quantity).to eq 1
     end
-    
+
     it 'converts to hectometers' do
-      subject.convert_to(:hm).quantity.should eq 10
+      expect(subject.convert_to(:hm).quantity).to eq 10
     end
-    
+
     it 'converts to dekameters' do
-      subject.convert_to(:dam).quantity.should eq 100
+      expect(subject.convert_to(:dam).quantity).to eq 100
     end
-    
+
     it 'converts to decimeters' do
-      subject.convert_to(:dm).quantity.should eq 10_000
+      expect(subject.convert_to(:dm).quantity).to eq 10_000
     end
-    
+
     it 'converts to centimeters' do
-      subject.convert_to(:cm).quantity.should eq 100_000
+      expect(subject.convert_to(:cm).quantity).to eq 100_000
     end
-    
+
     it 'converts to millimeters' do
-      subject.convert_to(:mm).quantity.should eq 1_000_000
+      expect(subject.convert_to(:mm).quantity).to eq 1_000_000
     end
-    
+
     it 'converts to micrometers' do
-      subject.convert_to(:µm).quantity.should eq 10_000_000
+      expect(subject.convert_to(:µm).quantity).to eq 10_000_000
     end
   end
-  
+
   describe 'decimeters' do
-    subject { Measurement.parse('10000 dm') }
-    
+    subject { described_class.parse('10000 dm') }
+
     it 'converts to kilometers' do
-      subject.convert_to(:km).quantity.should eq 1
+      expect(subject.convert_to(:km).quantity).to eq 1
     end
-    
+
     it 'converts to hectometers' do
-      subject.convert_to(:hm).quantity.should eq 10
+      expect(subject.convert_to(:hm).quantity).to eq 10
     end
-    
+
     it 'converts to dekameters' do
-      subject.convert_to(:dam).quantity.should eq 100
+      expect(subject.convert_to(:dam).quantity).to eq 100
     end
-    
+
     it 'converts to meters' do
-      subject.convert_to(:m).quantity.should eq 1_000
+      expect(subject.convert_to(:m).quantity).to eq 1_000
     end
-    
+
     it 'converts to centimeters' do
-      subject.convert_to(:cm).quantity.should eq 100_000
+      expect(subject.convert_to(:cm).quantity).to eq 100_000
     end
-    
+
     it 'converts to millimeters' do
-      subject.convert_to(:mm).quantity.should eq 1_000_000
+      expect(subject.convert_to(:mm).quantity).to eq 1_000_000
     end
-    
+
     it 'converts to micrometers' do
-      subject.convert_to(:µm).quantity.should eq 10_000_000
+      expect(subject.convert_to(:µm).quantity).to eq 10_000_000
     end
   end
-  
+
   describe 'centimeters' do
-    subject { Measurement.parse('100000 cm') }
-    
+    subject { described_class.parse('100000 cm') }
+
     it 'converts to kilometers' do
-      subject.convert_to(:km).quantity.should eq 1
+      expect(subject.convert_to(:km).quantity).to eq 1
     end
-    
+
     it 'converts to hectoliters' do
-      subject.convert_to(:hm).quantity.should eq 10
+      expect(subject.convert_to(:hm).quantity).to eq 10
     end
-    
+
     it 'converts to dekameters' do
-      subject.convert_to(:dam).quantity.should eq 100
+      expect(subject.convert_to(:dam).quantity).to eq 100
     end
-    
+
     it 'converts to meters' do
-      subject.convert_to(:m).quantity.should eq 1_000
+      expect(subject.convert_to(:m).quantity).to eq 1_000
     end
-    
+
     it 'converts to decimeters' do
-      subject.convert_to(:dm).quantity.should eq 10_000
+      expect(subject.convert_to(:dm).quantity).to eq 10_000
     end
-    
+
     it 'converts to millimeters' do
-      subject.convert_to(:mm).quantity.should eq 1_000_000
+      expect(subject.convert_to(:mm).quantity).to eq 1_000_000
     end
-    
+
     it 'converts to micrometers' do
-      subject.convert_to(:µm).quantity.should eq 10_000_000
+      expect(subject.convert_to(:µm).quantity).to eq 10_000_000
     end
   end
-  
+
   describe 'millimeters' do
-    subject { Measurement.parse('1000000 mm') }
-    
+    subject { described_class.parse('1000000 mm') }
+
     it 'converts to kilometers' do
-      subject.convert_to(:km).quantity.should eq 1
+      expect(subject.convert_to(:km).quantity).to eq 1
     end
-    
+
     it 'converts to hectometers' do
-      subject.convert_to(:hm).quantity.should eq 10
+      expect(subject.convert_to(:hm).quantity).to eq 10
     end
-    
+
     it 'converts to dekameters' do
-      subject.convert_to(:dam).quantity.should eq 100
+      expect(subject.convert_to(:dam).quantity).to eq 100
     end
-    
+
     it 'converts to meters' do
-      subject.convert_to(:m).quantity.should eq 1_000
+      expect(subject.convert_to(:m).quantity).to eq 1_000
     end
-    
+
     it 'converts to decimeters' do
-      subject.convert_to(:dm).quantity.should eq 10_000
+      expect(subject.convert_to(:dm).quantity).to eq 10_000
     end
-    
+
     it 'converts to centimeters' do
-      subject.convert_to(:cm).quantity.should eq 100_000
+      expect(subject.convert_to(:cm).quantity).to eq 100_000
     end
-    
+
     it 'converts to micrometers' do
-      subject.convert_to(:µm).quantity.should eq 10_000_000
+      expect(subject.convert_to(:µm).quantity).to eq 10_000_000
     end
   end
-  
+
   describe 'micrometers' do
-    subject { Measurement.parse('10000000 µm') }
-    
+    subject { described_class.parse('10000000 µm') }
+
     it 'converts to kilometers' do
-      subject.convert_to(:km).quantity.should eq 1
+      expect(subject.convert_to(:km).quantity).to eq 1
     end
-    
+
     it 'converts to hectometers' do
-      subject.convert_to(:hm).quantity.should eq 10
+      expect(subject.convert_to(:hm).quantity).to eq 10
     end
-    
+
     it 'converts to dekameters' do
-      subject.convert_to(:dam).quantity.should eq 100
+      expect(subject.convert_to(:dam).quantity).to eq 100
     end
-    
+
     it 'converts to meters' do
-      subject.convert_to(:m).quantity.should eq 1_000
+      expect(subject.convert_to(:m).quantity).to eq 1_000
     end
-    
+
     it 'converts to decimeters' do
-      subject.convert_to(:dm).quantity.should eq 10_000
+      expect(subject.convert_to(:dm).quantity).to eq 10_000
     end
-    
+
     it 'converts to centimeters' do
-      subject.convert_to(:cm).quantity.should eq 100_000
+      expect(subject.convert_to(:cm).quantity).to eq 100_000
     end
-    
+
     it 'converts to millimeters' do
-      subject.convert_to(:mm).quantity.should eq 1_000_000
+      expect(subject.convert_to(:mm).quantity).to eq 1_000_000
     end
   end
 end