ppl 1.3.0 → 1.4.1

data/lib/ppl.rb

@@ -1,7 +1,7 @@
 
 module Ppl
 
-  Version = "1.3.0"
+  Version = "1.4.1"
 
   module Adapter
   end
@@ -73,7 +73,7 @@ require "ppl/format/address_book/phone_numbers"
 require "ppl/format/address_book/postal_addresses"
 require "ppl/format/contact"
 require "ppl/format/contact/birthday"
-require "ppl/format/contact/email_address"
+require "ppl/format/contact/email_addresses"
 require "ppl/format/contact/full"
 require "ppl/format/contact/name"
 require "ppl/format/contact/organization"

data/lib/ppl/adapter/vcard/vpim.rb

@@ -15,8 +15,8 @@ class Ppl::Adapter::Vcard::Vpim
         name.fullname = contact.name unless contact.name.nil?
       end
 
-      if !contact.email_address.nil?
-        maker.add_email(contact.email_address)
+      contact.email_addresses.each do |email_address|
+        maker.add_email(email_address)
       end
 
       if !contact.phone_number.nil?
@@ -64,7 +64,7 @@ class Ppl::Adapter::Vcard::Vpim
     end
 
     vcard.emails.each do |email|
-      contact.email_address = email.to_s
+      contact.email_addresses.push(email.to_s)
     end
 
     if !vcard.telephones.empty?

data/lib/ppl/command/email.rb

@@ -7,7 +7,7 @@ class Ppl::Command::Email < Ppl::Application::Command
   def initialize
     @name        = "email"
     @description = "Show or change a contact's email address"
-    @show_format = Ppl::Format::Contact::EmailAddress.new
+    @show_format = Ppl::Format::Contact::EmailAddresses.new
     @list_format = Ppl::Format::AddressBook::EmailAddresses.new
   end
 
@@ -27,7 +27,7 @@ class Ppl::Command::Email < Ppl::Application::Command
     if input.arguments[0].nil?
       :list_email_addresses
     elsif input.arguments[1].nil?
-      :show_email_address
+      :show_email_addresses
     else
       :set_email_address
     end
@@ -39,7 +39,7 @@ class Ppl::Command::Email < Ppl::Application::Command
     output.line(email_list)
   end
 
-  def show_email_address(input, output)
+  def show_email_addresses(input, output)
     contact       = @storage.require_contact(input.arguments[0])
     email_address = @show_format.process(contact)
     if email_address != ""
@@ -52,7 +52,14 @@ class Ppl::Command::Email < Ppl::Application::Command
 
   def set_email_address(input, output)
     contact = @storage.require_contact(input.arguments[0])
-    contact.email_address = input.arguments[1].dup
+    email_address = input.arguments[1].dup
+
+    if contact.has_email_address?(email_address)
+      message = sprintf("%s already has email address %s", contact.id, email_address)
+      raise Ppl::Error::IncorrectUsage, message
+    else
+      contact.email_addresses.push(email_address)
+    end
     @storage.save_contact(contact)
   end
 

data/lib/ppl/command/mutt.rb

@@ -52,9 +52,13 @@ class Ppl::Command::Mutt < Ppl::Application::Command
     matches = Ppl::Entity::AddressBook.new
 
     address_book.each do |contact|
-      next if contact.email_address.nil?
+      next if contact.email_addresses.empty?
 
-      if contact.email_address.include?(query)
+      matching_emails = contact.email_addresses.select do |email_address|
+        email_address.include? query
+      end
+
+      if matching_emails.length > 0
         matches.add_contact(contact)
       elsif !contact.name.nil? && contact.name.include?(query)
         matches.add_contact(contact)

data/lib/ppl/entity/contact.rb

@@ -3,12 +3,16 @@ class Ppl::Entity::Contact
 
   attr_accessor :id
   attr_accessor :name
-  attr_accessor :email_address
+  attr_accessor :email_addresses
   attr_accessor :birthday
   attr_accessor :phone_number
   attr_accessor :organization
   attr_accessor :postal_address
 
+  def initialize
+    @email_addresses = []
+  end
+
   def set_postal_address
     if @postal_address.nil?
       @postal_address = Ppl::Entity::PostalAddress.new
@@ -16,5 +20,9 @@ class Ppl::Entity::Contact
     yield @postal_address
   end
 
+  def has_email_address?(email_address)
+    @email_addresses.include? email_address
+  end
+
 end
 

data/lib/ppl/format/address_book/email_addresses.rb

@@ -4,7 +4,7 @@ class Ppl::Format::AddressBook::EmailAddresses < Ppl::Format::AddressBook
   attr_writer :table
 
   def initialize
-    @table = Ppl::Format::Table.new([:id, :email_address])
+    @table = Ppl::Format::Table.new([:id, :email_addresses])
   end
 
   def process(address_book)
@@ -16,16 +16,16 @@ class Ppl::Format::AddressBook::EmailAddresses < Ppl::Format::AddressBook
   private
 
   def add_row(contact)
-    id            = sprintf("%s:", contact.id)
-    email_address = nil
+    id = sprintf("%s:", contact.id)
+    email_addresses = nil
 
-    if !contact.email_address.nil?
-      email_address = contact.email_address
+    if !contact.email_addresses.empty?
+      email_addresses = contact.email_addresses.join(", ")
     end
 
     @table.add_row({
       :id            => id,
-      :email_address => email_address,
+      :email_addresses => email_addresses,
     })
   end
 

data/lib/ppl/format/address_book/mutt_query.rb

@@ -23,7 +23,7 @@ class Ppl::Format::AddressBook::MuttQuery < Ppl::Format::AddressBook
     end
 
     @table.add_row({
-      :email => contact.email_address,
+      :email => contact.email_addresses.first,
       :name  => name,
     })
   end

data/lib/ppl/format/address_book/one_line.rb

@@ -19,8 +19,8 @@ class Ppl::Format::AddressBook::OneLine < Ppl::Format::AddressBook
     name  = contact.name
     email = nil
 
-    if !contact.email_address.nil?
-      email = sprintf("<%s>", contact.email_address)
+    if !contact.email_addresses.empty?
+      email = sprintf("<%s>", contact.email_addresses.first)
     end
 
     @table.add_row({

data/lib/ppl/format/contact/email_addresses.rb

@@ -0,0 +1,13 @@
+
+class Ppl::Format::Contact::EmailAddresses < Ppl::Format::Contact
+
+  def process(contact)
+    lines = []
+    contact.email_addresses.each do |email_address|
+      lines.push email_address
+    end
+    lines.join("\n")
+  end
+
+end
+

data/lib/ppl/format/contact/full.rb

@@ -38,8 +38,8 @@ class Ppl::Format::Contact::Full < Ppl::Format::Contact
     if !contact.name.nil?
       line += contact.name
     end
-    if !contact.email_address.nil?
-      line += " <#{contact.email_address}>"
+    if !contact.email_addresses.empty?
+      line += " <#{contact.email_addresses.first}>"
     end
     return line
   end

data/ppl.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |spec|
 
   spec.name        = "ppl"
-  spec.version     = "1.3.0"
+  spec.version     = "1.4.1"
   spec.date        = "2012-12-20"
 
   spec.required_ruby_version = ">= 1.9.3"

data/spec/ppl/adapter/vcard/vpim_spec.rb

@@ -18,7 +18,7 @@ describe Ppl::Adapter::Vcard::Vpim, "#encode" do
   end
 
   it "should encode the contact's email address" do
-    @contact.email_address = "john@example.org"
+    @contact.email_addresses = ["john@example.org"]
     @adapter.encode(@contact).should include("EMAIL:john@example.org")
   end
 
@@ -121,7 +121,7 @@ describe Ppl::Adapter::Vcard::Vpim, "#decode" do
       "END:VCARD",
     ].join("\n")
     contact = @adapter.decode(vcard)
-    contact.email_address.should eq "home@example.org"
+    contact.email_addresses.first.should eq "home@example.org"
   end
 
   it "should decode the contact's phone number" do

data/spec/ppl/command/email_spec.rb

@@ -48,15 +48,22 @@ describe Ppl::Command::Email do
       @command.execute(@input, @output).should eq false
     end
 
-    it "should change the contact's email address if an address is given" do
+    it "should add the given address to the contact if it's new" do
       @storage.should_receive(:require_contact).and_return(@contact)
       @storage.should_receive(:save_contact) do |contact|
-        contact.email_address.should eq "jim@example.org"
+        contact.email_addresses.first.should eq "jim@example.org"
       end
       @input.arguments = ["jim", "jim@example.org"]
       @command.execute(@input, @output)
     end
 
+    it "should raise an error if the user is adding a duplicate address" do
+      @contact.email_addresses.push "jim@example.org"
+      @storage.should_receive(:require_contact).and_return(@contact)
+      @input.arguments = ["jim", "jim@example.org"]
+      expect{@command.execute(@input, nil)}.to raise_error(Ppl::Error::IncorrectUsage)
+    end
+
   end
 
 end

data/spec/ppl/command/mutt_spec.rb

@@ -36,7 +36,7 @@ describe Ppl::Command::Mutt do
     it "should return email address matches" do
 
       @contact.name = "Test User"
-      @contact.email_address = "test@example.org"
+      @contact.email_addresses.push "test@example.org"
       @address_book.add_contact(@contact)
 
       @input.arguments.push "example"
@@ -50,7 +50,7 @@ describe Ppl::Command::Mutt do
     it "should return name matches" do
 
       @contact.name = "Test User"
-      @contact.email_address = "test@example.org"
+      @contact.email_addresses.push "test@example.org"
       @address_book.add_contact(@contact)
 
       @input.arguments.push "User"

data/spec/ppl/entity/contact_spec.rb

@@ -18,9 +18,9 @@ describe Ppl::Entity::Contact do
     end
   end
 
-  describe "#email_address" do
-    it "should return a value" do
-      @contact.email_address.should eq nil
+  describe "#email_addresses" do
+    it "should return an array" do
+      @contact.email_addresses.should be_a(Array)
     end
   end
 
@@ -36,5 +36,15 @@ describe Ppl::Entity::Contact do
     end
   end
 
+  describe "#has_email_address?" do
+    it "should know if the contact has the given email address" do
+      @contact.email_addresses.push "test@example.org"
+      @contact.has_email_address?("test@example.org").should eq true
+    end
+    it "should know if the contact lacks the given email address" do
+      @contact.has_email_address?("test@example.org").should eq false
+    end
+  end
+
 end
 

data/spec/ppl/format/address_book/email_addresses_spec.rb

@@ -17,17 +17,17 @@ describe Ppl::Format::AddressBook::EmailAddresses do
 
     it "should at least show the contact's id" do
       @table.should_receive(:add_row).with({
-        :id            => "test:",
-        :email_address => nil,
+        :id              => "test:",
+        :email_addresses => nil,
       })
       @format.process(@address_book)
     end
 
-    it "should show the email address if it's available" do
-      @contact.email_address = "jdoe@example.org"
+    it "should show an email address if it's available" do
+      @contact.email_addresses.push "jdoe@example.org"
       @table.should_receive(:add_row).with({
-        :id            => "test:",
-        :email_address => "jdoe@example.org",
+        :id              => "test:",
+        :email_addresses => "jdoe@example.org",
       })
       @format.process(@address_book)
     end

data/spec/ppl/format/address_book/mutt_query_spec.rb

@@ -7,8 +7,8 @@ describe Ppl::Format::AddressBook::MuttQuery do
     @contact      = Ppl::Entity::Contact.new
     @table        = double(Ppl::Format::Table)
 
-    @contact.email_address = "test@example.org"
-    @contact.name          = "Test Contact"
+    @contact.email_addresses.push "test@example.org"
+    @contact.name = "Test Contact"
 
     @format.table = @table
     @address_book.add_contact(@contact)

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

@@ -26,7 +26,7 @@ describe Ppl::Format::AddressBook::OneLine do
 
     it "should show all the info if it's available" do
       @contact.name = "John Doe"
-      @contact.email_address = "jdoe@example.org"
+      @contact.email_addresses.push "jdoe@example.org"
       @table.should_receive(:add_row).with({
         :id    => "test:",
         :name  => "John Doe",

data/spec/ppl/format/contact/{email_address_spec.rb → email_addresses_spec.rb}

@@ -1,8 +1,8 @@
 
-describe Ppl::Format::Contact::EmailAddress do
+describe Ppl::Format::Contact::EmailAddresses do
 
   before(:each) do
-    @format  = Ppl::Format::Contact::EmailAddress.new
+    @format  = Ppl::Format::Contact::EmailAddresses.new
     @contact = Ppl::Entity::Contact.new
   end
 
@@ -13,7 +13,7 @@ describe Ppl::Format::Contact::EmailAddress do
     end
 
     it "should return the contact's email address if it is set" do
-      @contact.email_address = "jdoe@example.org"
+      @contact.email_addresses.push "jdoe@example.org"
       @format.process(@contact).should eq "jdoe@example.org"
     end
 

data/spec/ppl/format/contact/full_spec.rb

@@ -22,8 +22,8 @@ describe Ppl::Format::Contact::Full do
     end
 
     it "should include their email address in brackets" do
-      @contact.name          = "John Doe"
-      @contact.email_address = "john@example.org"
+      @contact.name = "John Doe"
+      @contact.email_addresses.push "john@example.org"
       @format.process(@contact).should eq "John Doe <john@example.org>"
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ppl
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
-  requirement: &16554540 !ruby/object:Gem::Requirement
+  requirement: &15422560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *16554540
+  version_requirements: *15422560
 - !ruby/object:Gem::Dependency
   name: rugged
-  requirement: &16542760 !ruby/object:Gem::Requirement
+  requirement: &15420820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.17.0.b6
   type: :runtime
   prerelease: false
-  version_requirements: *16542760
+  version_requirements: *15420820
 - !ruby/object:Gem::Dependency
   name: vpim
-  requirement: &16542000 !ruby/object:Gem::Requirement
+  requirement: &15420120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,7 +43,7 @@ dependencies:
         version: '0.695'
   type: :runtime
   prerelease: false
-  version_requirements: *16542000
+  version_requirements: *15420120
 description: CLI Address Book
 email: henry@henrysmith.org
 executables:
@@ -104,7 +104,7 @@ files:
 - lib/ppl/format/address_book/postal_addresses.rb
 - lib/ppl/format/contact.rb
 - lib/ppl/format/contact/birthday.rb
-- lib/ppl/format/contact/email_address.rb
+- lib/ppl/format/contact/email_addresses.rb
 - lib/ppl/format/contact/full.rb
 - lib/ppl/format/contact/name.rb
 - lib/ppl/format/contact/organization.rb
@@ -153,7 +153,7 @@ files:
 - spec/ppl/format/address_book/postal_addresses_spec.rb
 - spec/ppl/format/address_book_spec.rb
 - spec/ppl/format/contact/birthday_spec.rb
-- spec/ppl/format/contact/email_address_spec.rb
+- spec/ppl/format/contact/email_addresses_spec.rb
 - spec/ppl/format/contact/full_spec.rb
 - spec/ppl/format/contact/name_spec.rb
 - spec/ppl/format/contact/organization_spec.rb

data/lib/ppl/format/contact/email_address.rb

@@ -1,13 +0,0 @@
-
-class Ppl::Format::Contact::EmailAddress < Ppl::Format::Contact
-
-  def process(contact)
-    output = ""
-    if !contact.email_address.nil?
-      output += contact.email_address
-    end
-    return output
-  end
-
-end
-