pupa 0.1.11 → 0.2.0

data/spec/models/concerns/nameable_spec.rb

@@ -15,20 +15,20 @@ describe Pupa::Concerns::Nameable do
   describe '#other_names' do
     it 'should symbolize keys' do
       object.other_names = [{'name' => 'Mr. Ziggy Q. Public, Esq.', 'note' => 'Birth name'}]
-      object.other_names.should == [{name: 'Mr. Ziggy Q. Public, Esq.', note: 'Birth name'}]
+      expect(object.other_names).to eq([{name: 'Mr. Ziggy Q. Public, Esq.', note: 'Birth name'}])
     end
   end
 
   describe '#add_name' do
     it 'should add a name' do
       object.add_name('Mr. Ziggy Q. Public, Esq.', start_date: '1920-01', end_date: '1949-12-31', note: 'Birth name', family_name: 'Public', given_name: 'John', additional_name: 'Quinlan', honorific_prefix: 'Mr.', honorific_suffix: 'Esq.')
-      object.other_names.should == [{name: 'Mr. Ziggy Q. Public, Esq.', start_date: '1920-01', end_date: '1949-12-31', note: 'Birth name', family_name: 'Public', given_name: 'John', additional_name: 'Quinlan', honorific_prefix: 'Mr.', honorific_suffix: 'Esq.'}]
+      expect(object.other_names).to eq([{name: 'Mr. Ziggy Q. Public, Esq.', start_date: '1920-01', end_date: '1949-12-31', note: 'Birth name', family_name: 'Public', given_name: 'John', additional_name: 'Quinlan', honorific_prefix: 'Mr.', honorific_suffix: 'Esq.'}])
     end
 
     it 'should not add a name without a name' do
       object.add_name(nil)
       object.add_name('')
-      object.other_names.blank?.should == true
+      expect(object.other_names.blank?).to eq(true)
     end
   end
 end

data/spec/models/concerns/sourceable_spec.rb

@@ -15,20 +15,20 @@ describe Pupa::Concerns::Sourceable do
   describe '#sources' do
     it 'should symbolize keys' do
       object.sources = [{'url' => 'http://example.com', 'note' => 'homepage'}]
-      object.sources.should == [{url: 'http://example.com', note: 'homepage'}]
+      expect(object.sources).to eq([{url: 'http://example.com', note: 'homepage'}])
     end
   end
 
   describe '#add_source' do
     it 'should add a source' do
       object.add_source('http://example.com', note: 'homepage')
-      object.sources.should == [{url: 'http://example.com', note: 'homepage'}]
+      expect(object.sources).to eq([{url: 'http://example.com', note: 'homepage'}])
     end
 
     it 'should not add a source without a url' do
       object.add_source(nil)
       object.add_source('')
-      object.sources.blank?.should == true
+      expect(object.sources.blank?).to eq(true)
     end
   end
 end

data/spec/models/concerns/timestamps_spec.rb

@@ -20,14 +20,14 @@ describe Pupa::Concerns::Timestamps do
   it 'should set created_at and updated_at on create' do
     object = klass.new
     object.save
-    object.created_at.should be_within(1).of(Time.now.utc)
-    object.updated_at.should be_within(1).of(Time.now.utc)
+    expect(object.created_at).to be_within(1).of(Time.now.utc)
+    expect(object.updated_at).to be_within(1).of(Time.now.utc)
   end
 
   it 'should set updated_at on save' do
     object = klass.new(created_at: Time.new(2000))
     object.save
-    object.created_at.should == Time.new(2000)
-    object.updated_at.should be_within(1).of(Time.now.utc)
+    expect(object.created_at).to eq(Time.new(2000))
+    expect(object.updated_at).to be_within(1).of(Time.now.utc)
   end
 end

data/spec/models/contact_detail_list_spec.rb

@@ -28,31 +28,31 @@ describe Pupa::ContactDetailList do
 
   describe '#address' do
     it 'should return the first postal address' do
-      object.address.should == 'first'
+      expect(object.address).to eq('first')
     end
 
     it 'should return nil if no postal addresses' do
-      Pupa::ContactDetailList.new.address.should == nil
+      expect(Pupa::ContactDetailList.new.address).to eq(nil)
     end
   end
 
   describe '#email' do
     it 'should return the first email address' do
-      object.email.should == 'first'
+      expect(object.email).to eq('first')
     end
 
     it 'should return nil if no email addresses' do
-      Pupa::ContactDetailList.new.email.should == nil
+      expect(Pupa::ContactDetailList.new.email).to eq(nil)
     end
   end
 
   describe '#find_by_type' do
     it 'should return the value of the first contact detail matching the type' do
-      object.find_by_type('custom').should == 'content'
+      expect(object.find_by_type('custom')).to eq('content')
     end
 
     it 'should return nil if no contact detail matches the type' do
-      Pupa::ContactDetailList.new.find_by_type('custom').should == nil
+      expect(Pupa::ContactDetailList.new.find_by_type('custom')).to eq(nil)
     end
   end
 end

data/spec/models/identifier_list_spec.rb

@@ -16,11 +16,11 @@ describe Pupa::IdentifierList do
 
   describe '#find_by_scheme' do
     it 'should return the first identifier matching the scheme' do
-      object.find_by_scheme('ISIN').should == 'US0123456789'
+      expect(object.find_by_scheme('ISIN')).to eq('US0123456789')
     end
 
     it 'should return nil if no identifier matches the scheme' do
-      Pupa::IdentifierList.new.find_by_scheme('ISIN').should == nil
+      expect(Pupa::IdentifierList.new.find_by_scheme('ISIN')).to eq(nil)
     end
   end
 end

data/spec/models/membership_spec.rb

@@ -13,18 +13,18 @@ describe Pupa::Membership do
 
   describe '#to_s' do
     it 'should return a human-readable string' do
-      object.to_s.should == 'john-q-public in abc-inc'
+      expect(object.to_s).to eq('john-q-public in abc-inc')
     end
   end
 
   describe '#fingerprint' do
     it 'should return the fingerprint' do
-      object.fingerprint.should == {
+      expect(object.fingerprint).to eq({
         '$or' => [
           {label: "Kitchen assistant at Joe's Diner", person_id: 'john-q-public', organization_id: 'abc-inc', end_date: '1971-12-31'},
           {person_id: 'john-q-public', organization_id: 'abc-inc', post_id: 'abc-inc-kitchen-assistant', end_date: '1971-12-31'},
         ],
-      }
+      })
     end
   end
 end

data/spec/models/model_spec.rb

@@ -39,20 +39,20 @@ describe Pupa::Model do
   describe '.dump' do
     it 'should add properties' do
       [:_id, :_type, :extras, :name, :label, :founding_date, :inactive, :label_id, :manager_id, :links].each do |property|
-        Music::Band.properties.to_a.should include(property)
+        expect(Music::Band.properties.to_a).to include(property)
       end
     end
   end
 
   describe '.foreign_key' do
     it 'should add foreign keys' do
-      Music::Band.foreign_keys.to_a.should == [:label_id, :manager_id]
+      expect(Music::Band.foreign_keys.to_a).to eq([:label_id, :manager_id])
     end
   end
 
   describe '.foreign_object' do
     it 'should add foreign objects' do
-      Music::Band.foreign_objects.to_a.should == [:label]
+      expect(Music::Band.foreign_objects.to_a).to eq([:label])
     end
   end
 
@@ -72,7 +72,7 @@ describe Pupa::Model do
     end
 
     it 'should accept a hash' do
-      Music::Band.json_schema.should == {
+      expect(Music::Band.json_schema).to eq({
         '$schema' => 'http://json-schema.org/draft-03/schema#',
         'properties' => {
           'links' => {
@@ -86,41 +86,41 @@ describe Pupa::Model do
             },
           },
         },
-      }
+      })
     end
 
     it 'should accept an absolute path' do
-      File.should_receive(:read).and_return('{}')
-      klass_with_absolute_path.json_schema.should == {}
+      expect(File).to receive(:read).and_return('{}')
+      expect(klass_with_absolute_path.json_schema).to eq({})
     end
 
     it 'should accept a relative path' do
-      File.should_receive(:read).and_return('{}')
-      klass_with_relative_path.json_schema.should == {}
+      expect(File).to receive(:read).and_return('{}')
+      expect(klass_with_relative_path.json_schema).to eq({})
     end
   end
 
   describe '#initialize' do
     it 'should set the _type' do
-      object._type.should == 'music/band'
+      expect(object._type).to eq('music/band')
     end
 
     it 'should set the _id' do
-      object._id.should match(/\A[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}\z/)
+      expect(object._id).to match(/\A[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}\z/)
     end
 
     it 'should set properties' do
-      object.name.should == 'Moderat'
-      object.label.should == {name: 'Mute'}
-      object.inactive.should == false
-      object.manager_id.should == '1'
-      object.links.should == [{url: 'http://moderat.fm/'}]
+      expect(object.name).to eq('Moderat')
+      expect(object.label).to eq({name: 'Mute'})
+      expect(object.inactive).to eq(false)
+      expect(object.manager_id).to eq('1')
+      expect(object.links).to eq([{url: 'http://moderat.fm/'}])
     end
   end
 
   describe '#[]' do
     it 'should get a property' do
-      object[:name].should == 'Moderat'
+      expect(object[:name]).to eq('Moderat')
     end
 
     it 'should raise an error if the class is missing the property' do
@@ -131,7 +131,7 @@ describe Pupa::Model do
   describe '#[]=' do
     it 'should set a property' do
       object[:name] = 'Apparat'
-      object[:name].should == 'Apparat'
+      expect(object[:name]).to eq('Apparat')
     end
 
     it 'should raise an error if the class is missing the property' do
@@ -142,38 +142,38 @@ describe Pupa::Model do
   describe '#_id=' do
     it 'should set the _id' do
       object._id = '1'
-      object._id.should == '1'
+      expect(object._id).to eq('1')
     end
 
     it 'should coerce the _id to a string' do
       object._id = BSON::ObjectId.new
-      object._id.should be_a(String)
+      expect(object._id).to be_a(String)
     end
   end
 
   describe '#links' do
     it 'should symbolize keys' do
       object.extras = {'age' => 10}
-      object.extras.should == {age: 10}
+      expect(object.extras).to eq({age: 10})
     end
   end
 
   describe '#add_extra' do
     it 'should add an extra property' do
       object.add_extra(:age, 10)
-      object.extras.should == {age: 10}
+      expect(object.extras).to eq({age: 10})
     end
   end
 
   describe '#fingerprint' do
     it 'should return the fingerprint' do
-      object.fingerprint.should == {_type: 'music/band', name: 'Moderat', inactive: false, manager_id: '1', links: [{url: 'http://moderat.fm/'}]}
+      expect(object.fingerprint).to eq({_type: 'music/band', name: 'Moderat', inactive: false, manager_id: '1', links: [{url: 'http://moderat.fm/'}]})
     end
   end
 
   describe '#foreign_properties' do
     it 'should return the foreign keys and foreign objects' do
-      object.foreign_properties.should == {label: {name: 'Mute'}, manager_id: '1'}
+      expect(object.foreign_properties).to eq({label: {name: 'Mute'}, manager_id: '1'})
     end
   end
 
@@ -185,11 +185,11 @@ describe Pupa::Model do
     end
 
     it 'should do nothing if the schema is not set' do
-      klass_without_schema.new.validate!.should == nil
+      expect(klass_without_schema.new.validate!).to eq(nil)
     end
 
     it 'should return true if the object is valid' do
-      object.validate!.should == true
+      expect(object.validate!).to eq(true)
     end
 
     it 'should raise an error if the object is invalid' do
@@ -200,29 +200,29 @@ describe Pupa::Model do
 
   describe '#to_h' do
     it 'should include all properties by default' do
-      object.to_h.should == {_id: object._id, _type: 'music/band', name: 'Moderat', label: {name: 'Mute'}, inactive: false, manager_id: '1', links: [{url: 'http://moderat.fm/'}]}
+      expect(object.to_h).to eq({_id: object._id, _type: 'music/band', name: 'Moderat', label: {name: 'Mute'}, inactive: false, manager_id: '1', links: [{url: 'http://moderat.fm/'}]})
     end
 
     it 'should exclude foreign objects if persisting' do
-      object.to_h(persist: true).should == {_id: object._id, _type: 'music/band', name: 'Moderat', inactive: false, manager_id: '1', links: [{url: 'http://moderat.fm/'}]}
+      expect(object.to_h(persist: true)).to eq({_id: object._id, _type: 'music/band', name: 'Moderat', inactive: false, manager_id: '1', links: [{url: 'http://moderat.fm/'}]})
     end
 
     it 'should not include blank properties' do
-      object.to_h.should_not have_key(:founding_date)
+      expect(object.to_h).not_to have_key(:founding_date)
     end
 
     it 'should include false properties' do
-      object.to_h.should have_key(:inactive)
+      expect(object.to_h).to have_key(:inactive)
     end
   end
 
   describe '#==' do
     it 'should return true if two objects are equal' do
-      object.should == Music::Band.new(properties)
+      expect(object).to eq(Music::Band.new(properties))
     end
 
     it 'should return false if two objects are unequal' do
-      object.should_not == Music::Band.new(properties.merge(name: 'Apparat'))
+      expect(object).not_to eq(Music::Band.new(properties.merge(name: 'Apparat')))
     end
   end
 end

data/spec/models/motion_spec.rb

@@ -7,7 +7,7 @@ describe Pupa::Motion do
 
   describe '#to_s' do
     it 'should return a human-readable string' do
-      object.to_s.should == 'That the Bill is to be read a second time. in house-of-commons'
+      expect(object.to_s).to eq('That the Bill is to be read a second time. in house-of-commons')
     end
   end
 end

data/spec/models/organization_spec.rb

@@ -7,18 +7,18 @@ describe Pupa::Organization do
 
   describe '#to_s' do
     it 'should return a human-readable string' do
-      object.to_s.should == 'ABC, Inc.'
+      expect(object.to_s).to eq('ABC, Inc.')
     end
   end
 
   describe '#fingerprint' do
     it 'should return the fingerprint' do
-      object.fingerprint.should == {
+      expect(object.fingerprint).to eq({
         '$or' => [
           {'name' => 'ABC, Inc.', classification: 'Corporation', parent_id: 'holding-company-corp'},
           {'other_names.name' => 'ABC, Inc.', classification: 'Corporation', parent_id: 'holding-company-corp'},
         ],
-      }
+      })
     end
   end
 end

data/spec/models/person_spec.rb

@@ -7,18 +7,18 @@ describe Pupa::Person do
 
   describe '#to_s' do
     it 'should return a human-readable string' do
-      object.to_s.should == 'Mr. John Q. Public, Esq.'
+      expect(object.to_s).to eq('Mr. John Q. Public, Esq.')
     end
   end
 
   describe '#fingerprint' do
     it 'should return the fingerprint' do
-      object.fingerprint.should == {
+      expect(object.fingerprint).to eq({
         '$or' => [
           {'name' => 'Mr. John Q. Public, Esq.'},
           {'other_names.name' => 'Mr. John Q. Public, Esq.'},
         ],
-      }
+      })
     end
   end
 end

data/spec/models/post_spec.rb

@@ -7,13 +7,13 @@ describe Pupa::Post do
 
   describe '#to_s' do
     it 'should return a human-readable string' do
-      object.to_s.should == 'Chef in abc-inc'
+      expect(object.to_s).to eq('Chef in abc-inc')
     end
   end
 
   describe '#fingerprint' do
     it 'should return the fingerprint' do
-      object.fingerprint.should == {label: 'Chef', organization_id: 'abc-inc', end_date: '2010'}
+      expect(object.fingerprint).to eq({label: 'Chef', organization_id: 'abc-inc', end_date: '2010'})
     end
   end
 end

data/spec/models/vote_event_spec.rb

@@ -7,53 +7,53 @@ describe Pupa::VoteEvent do
 
   describe '#to_s' do
     it 'should return a human-readable string' do
-      object.to_s.should == '1 in legislative-council-of-hong-kong'
+      expect(object.to_s).to eq('1 in legislative-council-of-hong-kong')
     end
   end
 
   describe '#group_results' do
     it 'should symbolize keys' do
       object.group_results = [{'result' => 'pass', 'group' => {'name' => 'Functional constituencies'}}]
-      object.group_results.should == [{result: 'pass', group: {name: 'Functional constituencies'}}]
+      expect(object.group_results).to eq([{result: 'pass', group: {name: 'Functional constituencies'}}])
     end
   end
 
   describe '#add_group_result' do
     it 'should add a group result' do
       object.add_group_result('pass', group: {name: 'Functional constituencies'})
-      object.group_results.should == [{result: 'pass', group: {name: 'Functional constituencies'}}]
+      expect(object.group_results).to eq([{result: 'pass', group: {name: 'Functional constituencies'}}])
     end
 
     it 'should not add a group result without a result' do
       object.add_group_result(nil)
       object.add_group_result('')
-      object.group_results.blank?.should == true
+      expect(object.group_results.blank?).to eq(true)
     end
   end
 
   describe '#counts' do
     it 'should symbolize keys' do
       object.counts = [{'option' => 'yes', 'value' => 9, 'group' => {'name' => 'Functional constituencies'}}]
-      object.counts.should == [{option: 'yes', value: 9, group: {name: 'Functional constituencies'}}]
+      expect(object.counts).to eq([{option: 'yes', value: 9, group: {name: 'Functional constituencies'}}])
     end
   end
 
   describe '#add_count' do
     it 'should add a count' do
       object.add_count('yes', 9, group: {name: 'Functional constituencies'})
-      object.counts.should == [{option: 'yes', value: 9, group: {name: 'Functional constituencies'}}]
+      expect(object.counts).to eq([{option: 'yes', value: 9, group: {name: 'Functional constituencies'}}])
     end
 
     it 'should not add a contact detail without an option' do
       object.add_count(nil, 9)
       object.add_count('', 9)
-      object.counts.blank?.should == true
+      expect(object.counts.blank?).to eq(true)
     end
 
     it 'should not add a contact detail without a value' do
       object.add_count('yes', nil)
       object.add_count('yes', '')
-      object.counts.blank?.should == true
+      expect(object.counts.blank?).to eq(true)
     end
   end
 end