ruby-measurement 1.2.1 → 1.2.2

data/spec/ruby-measurement/unit_builder_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe Measurement::Unit::Builder do
-  subject { Measurement::Unit::Builder.new(name, &block) }
+RSpec.describe Measurement::Unit::Builder do
+  subject { described_class.new(name, &block) }
   
   let(:name) { :hour }
   let(:block) { proc {} }
@@ -14,8 +14,8 @@ describe Measurement::Unit::Builder do
       
       it 'should evaluate the block' do
         unit = subject.to_unit
-        unit.aliases.should include 'hr'
-        unit.aliases.should include 'hrs'
+        expect(unit.aliases).to include 'hr'
+        expect(unit.aliases).to include 'hrs'
       end
     end
     
@@ -24,37 +24,37 @@ describe Measurement::Unit::Builder do
       
       it 'should not evaluate the block' do
         unit = subject.to_unit
-        unit.aliases.should_not include 'hr'
+        expect(unit.aliases).to_not include 'hr'
       end
     end
   end
   
   describe '#to_unit' do
     it 'should return a matching unit' do
-      subject.to_unit.should be_a Measurement::Unit
-      subject.to_unit.name.should eq 'hour'
-      subject.to_unit.aliases.should eq %w(hour).to_set
+      expect(subject.to_unit).to be_a Measurement::Unit
+      expect(subject.to_unit.name).to eq 'hour'
+      expect(subject.to_unit.aliases).to eq %w(hour).to_set
     end
   end
   
   describe '#alias' do
     describe 'with a new alias' do
       before do
-        subject.to_unit.aliases.should_not include 'hr'
+        expect(subject.to_unit.aliases).to_not include 'hr'
       end
       
       it 'should append the new alias' do
         aliases = subject.to_unit.aliases.dup
         subject.alias :hr
-        subject.to_unit.aliases.size.should eq aliases.size + 1
-        subject.to_unit.aliases.should include 'hr'
+        expect(subject.to_unit.aliases.size).to eq aliases.size + 1
+        expect(subject.to_unit.aliases).to include 'hr'
       end
     end
     
     describe 'with multiple new aliases' do
       before do
-        subject.to_unit.aliases.should_not include 'hr'
-        subject.to_unit.aliases.should_not include 'hrs'
+        expect(subject.to_unit.aliases).to_not include 'hr'
+        expect(subject.to_unit.aliases).to_not include 'hrs'
       end
     end
     
@@ -66,7 +66,7 @@ describe Measurement::Unit::Builder do
       it 'should not affect the list of aliases' do
         aliases = subject.to_unit.aliases.dup
         subject.alias :hour
-        subject.to_unit.aliases.should eq aliases
+        expect(subject.to_unit.aliases).to eq aliases
       end
     end
   end
@@ -74,28 +74,28 @@ describe Measurement::Unit::Builder do
   describe '#convert_to' do
     describe 'with a new target alias' do
       before do
-        subject.to_unit.conversions['min'].should be nil
+        expect(subject.to_unit.conversions['min']).to be_nil
       end
       
       it 'should add the conversion' do
         conversion = proc { |value| value * 60.0 }
-        subject.to_unit.aliases.should_not include 'hr'
+        expect(subject.to_unit.aliases).to_not include 'hr'
         subject.convert_to(:min, &conversion)
-        subject.to_unit.conversions['min'].should eq conversion
+        expect(subject.to_unit.conversions['min']).to eq conversion
       end
     end
     
     describe 'with an existing target alias' do
       before do
         subject.convert_to(:min) { |value| value + 3 }
-        subject.to_unit.conversions['min'].should_not be nil
+        expect(subject.to_unit.conversions['min']).to_not be_nil
       end
       
       it 'should replace the conversion' do
         conversion = proc { |value| value * 60.0 }
-        subject.to_unit.aliases.should_not include 'hr'
+        expect(subject.to_unit.aliases).to_not include 'hr'
         subject.convert_to(:min, &conversion)
-        subject.to_unit.conversions['min'].should eq conversion
+        expect(subject.to_unit.conversions['min']).to eq conversion
       end
     end
   end

data/spec/ruby-measurement/unit_spec.rb

@@ -1,26 +1,26 @@
 require 'spec_helper'
 
-describe Measurement::Unit do
-  subject { Measurement::Unit.new(name) }
+RSpec.describe Measurement::Unit do
+  subject { described_class.new(name) }
   
   let(:name) { :hour }
   
   describe '#name' do
     it 'returns the name' do
-      subject.name.should eq 'hour'
+      expect(subject.name).to eq 'hour'
     end
   end
   
   describe '#add_alias' do
     it 'adds new aliases' do
       subject.add_alias :hr, :hrs
-      subject.aliases.should eq %w(hour hr hrs).to_set
+      expect(subject.aliases).to eq %w(hour hr hrs).to_set
     end
     
     it 'does not add aliases that already exist' do
       subject.add_alias :hr, :hrs
       expect { subject.add_alias :hr, :hrs }.to_not raise_error
-      subject.aliases.should eq %w(hour hr hrs).to_set
+      expect(subject.aliases).to eq %w(hour hr hrs).to_set
     end
   end
   
@@ -32,46 +32,46 @@ describe Measurement::Unit do
     it 'adds new conversions' do
       conversion = proc { |value| value * 60.0 }
       subject.add_conversion(:min, &conversion)
-      subject.conversions['min'].should be conversion
+      expect(subject.conversions['min']).to be conversion
     end
     
     it 'replaces existing conversions' do
       conversion = proc { |value| value * 60.0 }
       subject.add_conversion(:sec, &conversion)
-      subject.conversions['sec'].should be conversion
+      expect(subject.conversions['sec']).to be conversion
     end
   end
   
   describe '#aliases' do
     it 'returns the set of aliases' do
-      subject.aliases.should eq %w(hour).to_set
+      expect(subject.aliases).to eq %w(hour).to_set
     end
   end
   
   describe '#conversion' do
     before do
-      Measurement::Unit.define(:min)
+      described_class.define(:min)
       subject.add_conversion(:min) { |value| value * 60.0 }
     end
     
     it 'returns conversion if it exists' do
-      subject.conversion(:min).should_not be_nil
+      expect(subject.conversion(:min)).to_not be_nil
     end
     
     it 'returns nil if it does not exist' do
-      subject.conversion(:sec).should be_nil
+      expect(subject.conversion(:sec)).to be_nil
     end
   end
   
   describe '#inspect' do
     it 'returns name' do
-      subject.inspect.should eq subject.name
+      expect(subject.inspect).to eq subject.name
     end
   end
   
   describe '#to_s' do
     it 'returns name' do
-      subject.inspect.should eq subject.name
+      expect(subject.inspect).to eq subject.name
     end
   end
   
@@ -83,80 +83,80 @@ describe Measurement::Unit do
     
     describe 'other object is a Unit' do
       it 'returns true when name, aliases, and conversions match' do
-        other = Measurement::Unit.new(:hour)
+        other = described_class.new(:hour)
         other.add_alias(:hours, :hr, :hrs)
         other.add_conversion(:min) { |value| value * 60.0 }
-        #(subject == other).should be_true
+        expect(subject == other).to be true
       end
       
       it "returns false when the name doesn't match" do
-        other = Measurement::Unit.new(:hoooour)
+        other = described_class.new(:hoooour)
         other.add_alias(:hours, :hr, :hrs)
         other.add_conversion(:min) { |value| value * 60.0 }
-        (subject == other).should be_false
+        expect(subject == other).to be false
       end
       
       it "returns false when the aliases don't match" do
-        other = Measurement::Unit.new(:hour)
+        other = described_class.new(:hour)
         other.add_alias(:hoooours, :hr, :hrs)
         other.add_conversion(:min) { |value| value * 60.0 }
-        (subject == other).should be_false
+        expect(subject == other).to be false
       end
       
       it "returns false when the conversions don't match" do
-        other = Measurement::Unit.new(:hour)
+        other = described_class.new(:hour)
         other.add_alias(:hours, :hr, :hrs)
         other.add_conversion(:min) { |value| value * 60000.0 }
-        (subject == other).should be_false
+        expect(subject == other).to be false
       end
     end
     
     describe 'other object is not a Unit' do
       it 'returns false' do
-        (subject == :hour).should be_false
+        expect(subject == :hour).to be false
       end
     end
   end
   
   describe '.names' do
-    subject { Measurement::Unit }
+    subject { described_class }
     
     it 'returns all defined unit names' do
       unit_names = subject.names
-      unit_names.should be_kind_of Array
-      unit_names.should include 'count'
+      expect(unit_names).to be_an Array
+      expect(unit_names).to include 'count'
     end
   end
   
   describe '.define' do
-    subject { Measurement::Unit }
+    subject { described_class }
     
     it 'returns a unit builder' do
       builder = subject.define(:count)
-      builder.should be_a Measurement::Unit::Builder
+      expect(builder).to be_a Measurement::Unit::Builder
     end
     
     it 'accepts a block' do
       builder = subject.define(:count) { |b| b.alias :ct }
-      builder.should be_a Measurement::Unit::Builder
+      expect(builder).to be_a Measurement::Unit::Builder
     end
   end
   
   describe '.[]' do
-    subject { Measurement::Unit }
+    subject { described_class }
     
     describe 'for a unit name that is defined' do
       it 'returns the unit' do
         unit = subject[:dozen]
-        unit.should be_a Measurement::Unit
-        unit.name.should eq 'doz'
-        unit.aliases.should eq %w(doz dozen).to_set
+        expect(unit).to be_a described_class
+        expect(unit.name).to eq 'doz'
+        expect(unit.aliases).to eq %w(doz dozen).to_set
       end
     end
     
     describe 'for a unit name that is not defined' do
       it 'returns nil' do
-        subject[:potato].should be_nil
+        expect(subject[:potato]).to be nil
       end
     end
   end

metadata

@@ -1,56 +1,51 @@
 --- !ruby/object:Gem::Specification
 name: ruby-measurement
 version: !ruby/object:Gem::Version
-  version: 1.2.1
-  prerelease: 
+  version: 1.2.2
 platform: ruby
 authors:
 - Matt Huggins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-27 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: Simple gem for calculating and converting measurements
 email: matt.huggins@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -98,34 +93,28 @@ files:
 - tasks/debug.rake
 - tasks/rspec.rake
 homepage: https://github.com/mhuggins/ruby-measurement
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4225981439654296545
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4225981439654296545
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple gem for calculating and converting measurements
 test_files:
 - spec/ruby-measurement/core_ext/numeric_spec.rb