ppl 4.0.1 → 4.0.2

data/spec/ppl/format/custom/email_address_spec.rb

@@ -9,7 +9,7 @@ describe Ppl::Format::Custom::EmailAddress do
     it "should output the address" do
       @address.address = "test@example.org"
       @format.format = "<%a>"
-      @format.process(@address).should eq "<test@example.org>"
+      expect(@format.process(@address)).to eq "<test@example.org>"
     end
   end
 
@@ -19,11 +19,11 @@ describe Ppl::Format::Custom::EmailAddress do
     end
     it "should output a star if the address is preferred" do
       @address.preferred = true
-      @format.process(@address).should eq "*"
+      expect(@format.process(@address)).to eq "*"
     end
     it "should output nothing if the address is not preferred" do
       @address.preferred = false
-      @format.process(@address).should eq ""
+      expect(@format.process(@address)).to eq ""
     end
   end
 

data/spec/ppl/format/custom/phone_number_spec.rb

@@ -9,7 +9,7 @@ describe Ppl::Format::Custom::PhoneNumber do
     it "should output the number itself" do
       @number.number = "1234567890"
       @format.format = "tel: %n"
-      @format.process(@number).should eq "tel: 1234567890"
+      expect(@format.process(@number)).to eq "tel: 1234567890"
     end
   end
 
@@ -17,7 +17,7 @@ describe Ppl::Format::Custom::PhoneNumber do
     it "should output the type of the number" do
       @number.type = "cell"
       @format.format = "(%t)"
-      @format.process(@number).should eq "(cell)"
+      expect(@format.process(@number)).to eq "(cell)"
     end
   end
 
@@ -27,11 +27,11 @@ describe Ppl::Format::Custom::PhoneNumber do
     end
     it "should output a star if the number is preferred" do
       @number.preferred = true
-      @format.process(@number).should eq "*"
+      expect(@format.process(@number)).to eq "*"
     end
     it "should output nothing if the number is not preferred" do
       @number.preferred = false
-      @format.process(@number).should eq ""
+      expect(@format.process(@number)).to eq ""
     end
   end
 

data/spec/ppl/format/custom_spec.rb

@@ -8,13 +8,13 @@ describe "Ppl::Format::Custom" do
 
   describe "::process" do
     it "should use the block passed to ::format to process the object" do
-      Ppl::Format::Custom::process(:N, {:name => "jdoe"}).should eq "jdoe"
+      expect(Ppl::Format::Custom::process(:N, {:name => "jdoe"})).to eq "jdoe"
     end
   end
 
   describe "#initialize" do
     it "should accept a format string" do
-      Ppl::Format::Custom.new("%N").format.should eq "%N"
+      expect(Ppl::Format::Custom.new("%N").format).to eq "%N"
     end
   end
 
@@ -22,17 +22,17 @@ describe "Ppl::Format::Custom" do
     it "should convert the given object into a string based on the format" do
       custom = Ppl::Format::Custom.new("%N %N %N")
       object = { :name => "jdoe" }
-      custom.process(object).should eq "jdoe jdoe jdoe"
+      expect(custom.process(object)).to eq "jdoe jdoe jdoe"
     end
     it "should pad with leading spaces if a positive width is given" do
       custom = Ppl::Format::Custom.new("%10N")
       object = { :name => "jdoe" }
-      custom.process(object).should eq "      jdoe"
+      expect(custom.process(object)).to eq "      jdoe"
     end
     it "should pad with trailing spaces if a negative width is given" do
       custom = Ppl::Format::Custom.new("%-10N")
       object = { :name => "jdoe" }
-      custom.process(object).should eq "jdoe      "
+      expect(custom.process(object)).to eq "jdoe      "
     end
   end
 
@@ -41,7 +41,7 @@ describe "Ppl::Format::Custom" do
       custom = Ppl::Format::Custom.new
       custom.preset_formats = { "example" => "%N (%N)" }
       custom.use_preset "example"
-      custom.process({:name => "a"}).should eq "a (a)"
+      expect(custom.process({:name => "a"})).to eq "a (a)"
     end
   end
 

data/spec/ppl/format/name/full_only_spec.rb

@@ -10,18 +10,18 @@ describe Ppl::Format::Name::FullOnly do
   describe "#process" do
 
     it "should return an empty string if the contact lacks a name" do
-      @format.process(@name).should eq ""
+      expect(@format.process(@name)).to eq ""
     end
 
     it "should return just the full name" do
       @name.full = "John Doe"
-      @format.process(@name).should eq "John Doe"
+      expect(@format.process(@name)).to eq "John Doe"
     end
 
     it "should colorize the string if configured to do so" do
       @format.colors = { "name" => "blue" }
-      @color.should_receive(:colorize).and_return("name in blue")
-      @format.process(@name).should eq "name in blue"
+      expect(@color).to receive(:colorize).and_return("name in blue")
+      expect(@format.process(@name)).to eq "name in blue"
     end
 
   end

data/spec/ppl/format/postal_address/multi_line_spec.rb

@@ -21,12 +21,12 @@ describe Ppl::Format::PostalAddress::MultiLine do
 
       it "outputs each address attribute on its own line" do
         @lines = @format.process(@address).split "\n"
-        @lines[0].should eq "123 Happy Lane"
-        @lines[1].should eq "Bristol"
-        @lines[2].should eq "A very nice region indeed"
-        @lines[3].should eq "United Kingdom"
-        @lines[4].should eq "12345"
-        @lines[5].should eq "BS1 1SB"
+        expect(@lines[0]).to eq "123 Happy Lane"
+        expect(@lines[1]).to eq "Bristol"
+        expect(@lines[2]).to eq "A very nice region indeed"
+        expect(@lines[3]).to eq "United Kingdom"
+        expect(@lines[4]).to eq "12345"
+        expect(@lines[5]).to eq "BS1 1SB"
       end
 
     end
@@ -42,10 +42,10 @@ describe Ppl::Format::PostalAddress::MultiLine do
 
       it "doesn't output superfluous blank lines" do
         @lines = @format.process(@address).split "\n"
-        @lines.length.should eq 3
-        @lines[0].should eq "123 Happy Lane"
-        @lines[1].should eq "Bristol"
-        @lines[2].should eq "United Kingdom"
+        expect(@lines.length).to eq 3
+        expect(@lines[0]).to eq "123 Happy Lane"
+        expect(@lines[1]).to eq "Bristol"
+        expect(@lines[2]).to eq "United Kingdom"
       end
 
     end

data/spec/ppl/format/postal_address/one_line_spec.rb

@@ -19,35 +19,35 @@ describe Ppl::Format::PostalAddress::OneLine do
     end
 
     it "inserts a blank 'star' column" do
-      @table.should_receive(:add_row) { |r| r[:star].should eq " " }
+      expect(@table).to receive(:add_row) { |r| expect(r[:star]).to eq " " }
     end
 
     it "marks preferred addresses with a star" do
       @address.preferred = true
-      @table.should_receive(:add_row) { |r| r[:star].should eq "*" }
+      expect(@table).to receive(:add_row) { |r| expect(r[:star]).to eq "*" }
     end
 
     it "puts the ID in its own column" do
-      @table.should_receive(:add_row) { |r| r[:address_id].should eq "home" }
+      expect(@table).to receive(:add_row) { |r| expect(r[:address_id]).to eq "home" }
     end
 
     it "concatenates the rest of the address in its own column" do
       @address.country = nil
-      @table.should_receive(:add_row) do |row|
-        row[:address_text].should eq "123 Happy Lane"
+      expect(@table).to receive(:add_row) do |row|
+        expect(row[:address_text]).to eq "123 Happy Lane"
       end
     end
 
     it "separates address elements with commas" do
-      @table.should_receive(:add_row) do |row|
-        row[:address_text].should eq "123 Happy Lane, United Kingdom"
+      expect(@table).to receive(:add_row) do |row|
+        expect(row[:address_text]).to eq "123 Happy Lane, United Kingdom"
       end
     end
 
     it "prunes elements that are empty" do
       @address.country = ""
-      @table.should_receive(:add_row) do |row|
-        row[:address_text].should eq "123 Happy Lane"
+      expect(@table).to receive(:add_row) do |row|
+        expect(row[:address_text]).to eq "123 Happy Lane"
       end
     end
 

data/spec/ppl/format/table_spec.rb

@@ -9,7 +9,7 @@ describe Ppl::Format::Table do
         :name,
         :email,
       ])
-      @table.columns.length.should eq 3
+      expect(@table.columns.length).to eq 3
     end
   end
 
@@ -27,7 +27,7 @@ describe Ppl::Format::Table do
 
   describe "#colors" do
     it "should be a hash" do
-      @table.colors.should be_a(Hash)
+      expect(@table.colors).to be_a(Hash)
     end
   end
 
@@ -38,14 +38,14 @@ describe Ppl::Format::Table do
         :name  => "John Doe",
         :email => "jdoe@example.org",
       })
-      @table.rows.length.should eq 1
+      expect(@table.rows.length).to eq 1
     end
   end
 
   describe "#to_s" do
 
     it "should return an empty string if the table is empty" do
-      @table.to_s.should eq ""
+      expect(@table.to_s).to eq ""
     end
 
     it "should return a string represenation of its rows" do
@@ -54,7 +54,7 @@ describe Ppl::Format::Table do
         :name  => "John Doe",
         :email => "jdoe@example.org",
       })
-      @table.to_s.should eq "12345  John Doe  jdoe@example.org"
+      expect(@table.to_s).to eq "12345  John Doe  jdoe@example.org"
     end
 
     it "should use tabs if requested" do
@@ -64,7 +64,7 @@ describe Ppl::Format::Table do
         :email => "jdoe@example.org",
       })
       @table.separator = Ppl::Format::Table::SEPARATOR_TABS
-      @table.to_s.should eq "12345\tJohn Doe\tjdoe@example.org"
+      expect(@table.to_s).to eq "12345\tJohn Doe\tjdoe@example.org"
     end
 
     it "should colorize columns if requested" do
@@ -78,7 +78,7 @@ describe Ppl::Format::Table do
         :name  => "John Doe",
         :email => "jdoe@example.org",
       })
-      @table.to_s.should eq "\e[31m12345  \e[0m\e[33mJohn Doe  \e[0m\e[34mjdoe@example.org  \e[0m"
+      expect(@table.to_s).to eq "\e[31m12345  \e[0m\e[33mJohn Doe  \e[0m\e[34mjdoe@example.org  \e[0m"
     end
 
     it "should align multiple rows into neat columns" do
@@ -93,8 +93,8 @@ describe Ppl::Format::Table do
         :email => "lula@planalto.biz",
       })
 
-      @table.to_s.should include "12345  John Doe                    jdoe@example.org"
-      @table.to_s.should include "123    Luis Ignacio Lula da Silva  lula@planalto.biz"
+      expect(@table.to_s).to include "12345  John Doe                    jdoe@example.org"
+      expect(@table.to_s).to include "123    Luis Ignacio Lula da Silva  lula@planalto.biz"
     end
 
     it "copes with mixed encodings" do
@@ -104,7 +104,7 @@ describe Ppl::Format::Table do
         :email => "fv@example.org",
       })
       expect{ @table.to_s }.not_to raise_error()
-      @table.to_s.should include "franz_viehböck  Franz Viehböck  fv@example.org"
+      expect(@table.to_s).to include "franz_viehböck  Franz Viehböck  fv@example.org"
     end
 
   end
@@ -122,7 +122,7 @@ describe Ppl::Format::Table do
         :email => "jdoe@example.org",
       })
       @table.disable_colors!
-      @table.to_s.should eq "12345  John Doe  jdoe@example.org"
+      expect(@table.to_s).to eq "12345  John Doe  jdoe@example.org"
     end
   end
 

data/spec/ppl/service/email_address_spec.rb

@@ -4,7 +4,7 @@ describe Ppl::Service::EmailAddress do
     @service = Ppl::Service::EmailAddress.new
     @contact = Ppl::Entity::Contact.new
     @storage = double(Ppl::Adapter::Storage)
-    @storage.stub(:save_contact)
+    allow(@storage).to receive(:save_contact)
     @service.storage = @storage
     @contact.email_addresses << Ppl::Entity::EmailAddress.new("one@example.org")
   end
@@ -12,19 +12,19 @@ describe Ppl::Service::EmailAddress do
   describe "#add" do
 
     it "should add the email address to the contact" do
-      @storage.stub(:save_contact) do |contact|
-        contact.email_addresses[1].address.should eq "two@example.org"
+      allow(@storage).to receive(:save_contact) do |contact|
+        expect(contact.email_addresses[1].address).to eq "two@example.org"
       end
       @service.add(@contact, "two@example.org", {})
     end
 
     it "should set the new address as preferred if asked" do
       @service.add(@contact, "two@example.org", {:preferred => true})
-      @contact.email_addresses[1].preferred.should eq true
+      expect(@contact.email_addresses[1].preferred).to eq true
     end
 
     it "should store the contact" do
-      @storage.should_receive(:save_contact).with(@contact)
+      expect(@storage).to receive(:save_contact).with(@contact)
       @service.add(@contact, "", {})
     end
 
@@ -32,21 +32,21 @@ describe Ppl::Service::EmailAddress do
 
   describe "#update" do
     it "should store the updated contact" do
-      @storage.should_receive(:save_contact).with(@contact)
+      expect(@storage).to receive(:save_contact).with(@contact)
       @service.update(@contact, "", {})
     end
 
     it "should mark the address as preferred if asked to" do
-      @storage.stub(:save_contact) do |contact|
-        contact.email_addresses.first.preferred.should eq true
+      allow(@storage).to receive(:save_contact) do |contact|
+        expect(contact.email_addresses.first.preferred).to eq true
       end
       @service.update(@contact, "one@example.org", {:preferred => true})
     end
 
     it "should mark the address as not preferred if asked to" do
       @contact.email_addresses.first.preferred = true
-      @storage.stub(:save_contact) do |contact|
-        contact.email_addresses.first.preferred.should eq false
+      allow(@storage).to receive(:save_contact) do |contact|
+        expect(contact.email_addresses.first.preferred).to eq false
       end
       @service.update(@contact, "one@example.org", {:preferred => false})
     end
@@ -55,14 +55,14 @@ describe Ppl::Service::EmailAddress do
   describe "#remove" do
 
     it "should remove the email address from the contact" do
-      @storage.stub(:save_contact) do |contact|
-        contact.email_addresses.length.should eq 0
+      allow(@storage).to receive(:save_contact) do |contact|
+        expect(contact.email_addresses.length).to eq 0
       end
       @service.remove(@contact, "one@example.org")
     end
 
     it "should store the contact" do
-      @storage.should_receive(:save_contact).with(@contact)
+      expect(@storage).to receive(:save_contact).with(@contact)
       @service.remove(@contact, "")
     end
 

data/spec/ppl/service/name_spec.rb

@@ -8,15 +8,15 @@ describe Ppl::Service::Name do
   describe "#parse" do
 
     it "uses the whole string for the full name" do
-      @service.parse("John Smith").full.should eq "John Smith"
+      expect(@service.parse("John Smith").full).to eq "John Smith"
     end
 
     it "uses the first word for the given name" do
-      @service.parse("John Smith").given.should eq "John"
+      expect(@service.parse("John Smith").given).to eq "John"
     end
 
     it "uses the rest of the string for the family names" do
-      @service.parse("John Fitzgerald Donald Smith").family.should eq "Fitzgerald Donald Smith"
+      expect(@service.parse("John Fitzgerald Donald Smith").family).to eq "Fitzgerald Donald Smith"
     end
 
   end
@@ -25,32 +25,32 @@ describe Ppl::Service::Name do
 
     it "updates the full name" do
       @service.update(@name, {:full => "Abc Def"})
-      @name.full.should eq "Abc Def"
+      expect(@name.full).to eq "Abc Def"
     end
 
     it "updates the given names" do
       @service.update(@name, {:given => "John"})
-      @name.given.should eq "John"
+      expect(@name.given).to eq "John"
     end
 
     it "updates the family names" do
       @service.update(@name, {:family => "Smith"})
-      @name.family.should eq "Smith"
+      expect(@name.family).to eq "Smith"
     end
 
     it "updates the middle names" do
       @service.update(@name, {:middle => "Arnold"})
-      @name.middle.should eq "Arnold"
+      expect(@name.middle).to eq "Arnold"
     end
 
     it "updates the name prefix" do
       @service.update(@name, {:prefix => "Mr"})
-      @name.prefix.should eq "Mr"
+      expect(@name.prefix).to eq "Mr"
     end
 
     it "updates the name suffix" do
       @service.update(@name, {:suffix => "BSc"})
-      @name.suffix.should eq "BSc"
+      expect(@name.suffix).to eq "BSc"
     end
 
   end

data/spec/ppl/service/phone_number_spec.rb

@@ -4,7 +4,7 @@ describe Ppl::Service::PhoneNumber do
     @service = Ppl::Service::PhoneNumber.new
     @contact = Ppl::Entity::Contact.new
     @storage = double(Ppl::Adapter::Storage)
-    @storage.stub(:save_contact)
+    allow(@storage).to receive(:save_contact)
     @service.storage = @storage
     @contact.phone_numbers << Ppl::Entity::PhoneNumber.new("01234567890")
   end
@@ -13,16 +13,16 @@ describe Ppl::Service::PhoneNumber do
 
     it "should add the phone number to the contact" do
       @service.add(@contact, "10987654321", {})
-      @contact.phone_numbers[1].number.should eq "10987654321"
+      expect(@contact.phone_numbers[1].number).to eq "10987654321"
     end
 
     it "should process the input options against the new contact" do
       @service.add(@contact, "10987654321", {:preferred => true})
-      @contact.phone_numbers[1].preferred.should eq true
+      expect(@contact.phone_numbers[1].preferred).to eq true
     end
 
     it "should store the contact" do
-      @storage.should_receive(:save_contact).with(@contact)
+      expect(@storage).to receive(:save_contact).with(@contact)
       @service.add(@contact, "", {})
     end
 
@@ -32,25 +32,25 @@ describe Ppl::Service::PhoneNumber do
     
     it "should update the number's type" do
       @service.update(@contact, "01234567890", {:type => "cell"})
-      @contact.phone_numbers.first.type.should eq "cell"
+      expect(@contact.phone_numbers.first.type).to eq "cell"
     end
 
     it "should update the number's preferred status" do
       @contact.phone_numbers << Ppl::Entity::PhoneNumber.new("109876543210")
       @contact.phone_numbers[1].preferred = true
       @service.update(@contact, "01234567890", {:preferred => true})
-      @contact.phone_numbers[0].preferred.should eq true
-      @contact.phone_numbers[1].preferred.should eq false
+      expect(@contact.phone_numbers[0].preferred).to eq true
+      expect(@contact.phone_numbers[1].preferred).to eq false
     end
 
     it "should mark numbers as not preferred" do
       @contact.phone_numbers[0].preferred = true
       @service.update(@contact, "01234567890", {:preferred => false})
-      @contact.phone_numbers[0].preferred.should eq false
+      expect(@contact.phone_numbers[0].preferred).to eq false
     end
 
     it "should store the contact" do
-      @storage.should_receive(:save_contact).with(@contact)
+      expect(@storage).to receive(:save_contact).with(@contact)
       @service.update(@contact, "", {})
     end
 
@@ -60,11 +60,11 @@ describe Ppl::Service::PhoneNumber do
 
     it "should remove the phone number from the contact" do
       @service.remove(@contact, "01234567890")
-      @contact.phone_numbers.length.should eq 0
+      expect(@contact.phone_numbers.length).to eq 0
     end
 
     it "should store the contact" do
-      @storage.should_receive(:save_contact).with(@contact)
+      expect(@storage).to receive(:save_contact).with(@contact)
       @service.remove(@contact, "")
     end