ppl 1.9.0 → 1.10.0

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

@@ -17,8 +17,8 @@ class Ppl::Adapter::Vcard::Vpim
       encode_birthday(contact, maker)
       encode_name(contact, maker)
       encode_email_addresses(contact, maker)
-      encode_phone_number(contact, maker)
-      encode_organization(contact, maker)
+      encode_phone_numbers(contact, maker)
+      encode_organizations(contact, maker)
       encode_postal_address(contact, maker)
       encode_urls(contact, maker)
     end
@@ -30,9 +30,9 @@ class Ppl::Adapter::Vcard::Vpim
     contact = Ppl::Entity::Contact.new
     decode_birthday(vcard, contact)
     decode_email_addresses(vcard, contact)
-    decode_phone_number(vcard, contact)
+    decode_phone_numbers(vcard, contact)
     decode_postal_address(vcard, contact)
-    decode_organization(vcard, contact)
+    decode_organizations(vcard, contact)
     decode_name(vcard, contact)
     decode_urls(vcard, contact)
     return contact
@@ -60,15 +60,15 @@ class Ppl::Adapter::Vcard::Vpim
     end
   end
 
-  def encode_phone_number(contact, vcard_maker)
-    if !contact.phone_number.nil?
-      vcard_maker.add_tel(contact.phone_number)
+  def encode_phone_numbers(contact, vcard_maker)
+    contact.phone_numbers.each do |phone_number|
+      vcard_maker.add_tel(phone_number)
     end
   end
 
-  def encode_organization(contact, vcard_maker)
-    if !contact.organization.nil?
-      vcard_maker.org=(contact.organization)
+  def encode_organizations(contact, vcard_maker)
+    if !contact.organizations.empty?
+      vcard_maker.org = contact.organizations
     end
   end
 
@@ -99,9 +99,11 @@ class Ppl::Adapter::Vcard::Vpim
     end
   end
 
-  def decode_organization(vcard, contact)
-    if !vcard.org.nil?
-      contact.organization = vcard.org.first
+  def decode_organizations(vcard, contact)
+    if vcard.org.is_a?(Array)
+      contact.organizations = vcard.org
+    elsif !vcard.org.nil?
+      contact.organizations.push(vcard.org)
     end
   end
 
@@ -122,10 +124,8 @@ class Ppl::Adapter::Vcard::Vpim
     end
   end
 
-  def decode_phone_number(vcard, contact)
-    if !vcard.telephones.empty?
-      contact.phone_number = vcard.telephones.first
-    end
+  def decode_phone_numbers(vcard, contact)
+    vcard.telephones.each { |number| contact.phone_numbers.push(number) }
   end
 
   def decode_urls(vcard, contact)

data/lib/ppl/command/attribute.rb

@@ -0,0 +1,56 @@
+
+class Ppl::Command::Attribute < Ppl::Application::Command
+
+  attr_writer :attribute
+  attr_writer :list_format
+  attr_writer :show_format
+
+  def execute(input, output)
+    action = determine_action(input)
+    send(action, input, output)
+  end
+
+
+  private
+
+  def determine_action(input)
+    if input.arguments[0].nil?
+      :list_attribute
+    elsif input.arguments[1].nil?
+      :show_attribute
+    elsif input.options[:delete]
+      :remove_attribute
+    else
+      :add_attribute
+    end
+  end
+
+  def list_attribute(input, output)
+    address_book = @storage.load_address_book
+    output.line(@list_format.process(address_book))
+    true
+  end
+
+  def show_attribute(input, output)
+    contact = @storage.require_contact(input.arguments[0])
+    output.line(@show_format.process(contact))
+    true
+  end
+
+  def add_attribute(input, output)
+    contact = @storage.require_contact(input.arguments[0])
+    values = contact.send(@attribute)
+    values.push(input.arguments[1].dup)
+    @storage.save_contact(contact)
+    true
+  end
+
+  def remove_attribute(input, output)
+    contact = @storage.require_contact(input.arguments[0])
+    values = contact.send(@attribute)
+    values.delete(input.arguments[1])
+    @storage.save_contact(contact)
+  end
+
+end
+

data/lib/ppl/command/email.rb

@@ -1,83 +1,21 @@
 
-class Ppl::Command::Email < Ppl::Application::Command
+class Ppl::Command::Email < Ppl::Command::Attribute
 
   name        "email"
   description "Show or change a contact's email address"
 
-  attr_writer :show_format
-  attr_writer :list_format
-
   def initialize
+    @attribute   = :email_addresses
     @show_format = Ppl::Format::Contact::EmailAddresses.new
     @list_format = Ppl::Format::AddressBook::EmailAddresses.new
   end
 
   def options(parser, options)
     parser.banner = "usage: ppl email <contact> [<email-address>]"
-
     parser.on("-d", "--delete", "delete email address") do
       options[:delete] = true
     end
   end
 
-  def execute(input, output)
-    action = determine_action(input)
-    send(action, input, output)
-  end
-
-
-  private
-
-  def determine_action(input)
-    if input.arguments[0].nil?
-      :list_email_addresses
-    elsif input.arguments[1].nil?
-      :show_email_addresses
-    elsif input.options[:delete]
-      :delete_email_address
-    else
-      :set_email_address
-    end
-  end
-
-  def list_email_addresses(input, output)
-    address_book = @storage.load_address_book
-    email_list   = @list_format.process(address_book)
-    output.line(email_list)
-  end
-
-  def show_email_addresses(input, output)
-    contact       = @storage.require_contact(input.arguments[0])
-    email_address = @show_format.process(contact)
-    if email_address != ""
-      output.line(email_address)
-      true
-    else
-      false
-    end
-  end
-
-  def delete_email_address(input, output)
-    contact = @storage.require_contact(input.arguments[0])
-    email_address = input.arguments[1].dup
-    contact.email_addresses.delete(email_address) do
-      message = sprintf("%s has no such email address %s", contact.id, email_address)
-      raise Ppl::Error::IncorrectUsage, message
-    end
-    @storage.save_contact(contact)
-  end
-
-  def set_email_address(input, output)
-    contact = @storage.require_contact(input.arguments[0])
-    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
-
 end
 

data/lib/ppl/command/org.rb

@@ -1,61 +1,21 @@
 
-class Ppl::Command::Org < Ppl::Application::Command
+class Ppl::Command::Org < Ppl::Command::Attribute
 
   name        "org"
   description "List, show or change organizations"
 
-  attr_writer :show_format
-  attr_writer :list_format
-
   def initialize
+    @attribute   = :organizations
     @show_format = Ppl::Format::Contact::Organization.new
     @list_format = Ppl::Format::AddressBook::Organizations.new
   end
 
   def options(parser, options)
     parser.banner = "usage: ppl org <contact> [<organization>]"
-  end
-
-  def execute(input, output)
-    action = determine_action(input)
-    send(action, input, output)
-  end
-
-
-  private
-
-  def determine_action(input)
-    if input.arguments[0].nil?
-      :list_organizations
-    elsif input.arguments[1].nil?
-      :show_organization
-    else
-      :set_organization
+    parser.on("-d", "--delete", "delete organization") do
+      options[:delete] = true
     end
   end
 
-  def list_organizations(input, output)
-    address_book = @storage.load_address_book
-    org_list     = @list_format.process(address_book)
-    output.line(org_list)
-  end
-
-  def show_organization(input, output)
-    contact      = @storage.require_contact(input.arguments[0])
-    organization = @show_format.process(contact)
-    if organization != ""
-      output.line(organization)
-      true
-    else
-      false
-    end
-  end
-
-  def set_organization(input, output)
-    contact = @storage.require_contact(input.arguments[0])
-    contact.organization = input.arguments[1].dup
-    @storage.save_contact(contact)
-  end
-
 end
 

data/lib/ppl/command/phone.rb

@@ -1,61 +1,21 @@
 
-class Ppl::Command::Phone < Ppl::Application::Command
+class Ppl::Command::Phone < Ppl::Command::Attribute
 
   name        "phone"
   description "List, show or change phone numbers"
 
-  attr_writer :show_format
-  attr_writer :list_format
-
   def initialize
+    @attribute   = :phone_numbers
     @show_format = Ppl::Format::Contact::PhoneNumber.new
     @list_format = Ppl::Format::AddressBook::PhoneNumbers.new
   end
 
   def options(parser, options)
     parser.banner = "usage: ppl phone <contact> [<number>]"
-  end
-
-  def execute(input, output)
-    action = determine_action(input)
-    send(action, input, output)
-  end
-
-
-  private
-
-  def determine_action(input)
-    if input.arguments[0].nil?
-      :list_phone_numbers
-    elsif input.arguments[1].nil?
-      :show_phone_number
-    else
-      :set_phone_number
+    parser.on("-d", "--delete", "delete phone number") do
+      options[:delete] = true
     end
   end
 
-  def list_phone_numbers(input, output)
-    address_book = @storage.load_address_book
-    number_list  = @list_format.process(address_book)
-    output.line(number_list)
-  end
-
-  def show_phone_number(input, output)
-    contact = @storage.require_contact(input.arguments[0])
-    number  = @show_format.process(contact)
-    if number != ""
-      output.line(number)
-      true
-    else
-      false
-    end
-  end
-
-  def set_phone_number(input, output)
-    contact = @storage.require_contact(input.arguments[0])
-    contact.phone_number = input.arguments[1]
-    @storage.save_contact(contact)
-  end
-
 end
 

data/lib/ppl/command/url.rb

@@ -1,13 +1,11 @@
 
-class Ppl::Command::Url < Ppl::Application::Command
+class Ppl::Command::Url < Ppl::Command::Attribute
 
   name        "url"
   description "List, show or change URLs"
 
-  attr_writer :show_format
-  attr_writer :list_format
-
   def initialize
+    @attribute   = :urls
     @show_format = Ppl::Format::Contact::Urls.new
     @list_format = Ppl::Format::AddressBook::Urls.new
   end
@@ -19,64 +17,5 @@ class Ppl::Command::Url < Ppl::Application::Command
     end
   end
 
-  def execute(input, output)
-    action = determine_action(input)
-    send(action, input, output)
-  end
-
-
-  private
-
-  def determine_action(input)
-    if input.arguments[0].nil?
-      :list_urls
-    elsif input.arguments[1].nil?
-      :show_urls
-    elsif input.options[:delete]
-      :delete_url
-    else
-      :set_url
-    end
-  end
-
-  def list_urls(input, output)
-    address_book = @storage.load_address_book
-    url_list     = @list_format.process(address_book)
-    output.line(url_list)
-  end
-
-  def show_urls(input, output)
-    contact = @storage.require_contact(input.arguments[0])
-    urls    = @show_format.process(contact)
-    if urls != ""
-      output.line(urls)
-      true
-    else
-      false
-    end
-  end
-
-  def delete_url(input, output)
-    contact = @storage.require_contact(input.arguments[0])
-    old_url = input.arguments[1].dup
-    contact.urls.delete(old_url) do
-      message = sprintf("%s has no such url %s", contact.id, old_url)
-      raise Ppl::Error::IncorrectUsage, message
-    end
-    @storage.save_contact(contact)
-  end
-
-  def set_url(input, output)
-    contact = @storage.require_contact(input.arguments[0])
-    new_url = input.arguments[1].dup
-    if contact.urls.include?(new_url)
-      message = sprintf("%s already has url %s", contact.id, new_url)
-      raise Ppl::Error::IncorrectUsage, message
-    else
-      contact.urls.push(new_url)
-    end
-    @storage.save_contact(contact)
-  end
-
 end
 

data/lib/ppl/entity/contact.rb

@@ -5,13 +5,15 @@ class Ppl::Entity::Contact
   attr_accessor :name
   attr_accessor :email_addresses
   attr_accessor :birthday
-  attr_accessor :phone_number
-  attr_accessor :organization
+  attr_accessor :phone_numbers
+  attr_accessor :organizations
   attr_accessor :postal_address
   attr_accessor :urls
 
   def initialize
     @email_addresses = []
+    @organizations = []
+    @phone_numbers = []
     @urls = []
   end
 

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

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

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

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

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

@@ -21,6 +21,7 @@ class Ppl::Format::Contact::Full < Ppl::Format::Contact
       @lines.push(vitals)
     end
 
+    format_organizations(contact)
     format_email_addresses(contact)
     format_phone_numbers(contact)
     format_postal_addresses(contact)
@@ -47,9 +48,6 @@ class Ppl::Format::Contact::Full < Ppl::Format::Contact
     if !contact.birthday.nil?
       vitals.push(format_vital("Birthday", contact.birthday.strftime("%Y-%m-%d")))
     end
-    if !contact.organization.nil?
-      vitals.push(format_vital("Organization", contact.organization))
-    end
     return vitals.join("\n")
   end
 
@@ -57,14 +55,16 @@ class Ppl::Format::Contact::Full < Ppl::Format::Contact
     return sprintf("  %-12s %s", name, value)
   end
 
+  def format_organizations(contact)
+    push_list("Organizations", contact.organizations)
+  end
+
   def format_email_addresses(contact)
     push_list("Email Addresses", contact.email_addresses)
   end
 
   def format_phone_numbers(contact)
-    if !contact.phone_number.nil?
-      push_list("Phone Numbers", contact.phone_number)
-    end
+    push_list("Phone Numbers", contact.phone_numbers)
   end
 
   def format_postal_addresses(contact)

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

@@ -2,11 +2,7 @@
 class Ppl::Format::Contact::Organization < Ppl::Format::Contact
 
   def process(contact)
-    output = ""
-    if !contact.organization.nil?
-      output += contact.organization
-    end
-    return output
+    contact.organizations.join("\n")
   end
 
 end

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

@@ -2,11 +2,7 @@
 class Ppl::Format::Contact::PhoneNumber < Ppl::Format::Contact
 
   def process(contact)
-    output = ""
-    if !contact.phone_number.nil?
-      output += contact.phone_number
-    end
-    return output
+    contact.phone_numbers.join("\n")
   end
 
 end

data/lib/ppl.rb

@@ -1,7 +1,7 @@
 
 module Ppl
 
-  Version = "1.9.0"
+  Version = "1.10.0"
 
   module Adapter
   end
@@ -40,6 +40,7 @@ require "ppl/application/output"
 require "ppl/application/router"
 require "ppl/application/shell"
 
+require "ppl/command/attribute"
 require "ppl/command/init"
 require "ppl/command/bday"
 require "ppl/command/ls"

data/ppl.gemspec

@@ -2,8 +2,8 @@
 Gem::Specification.new do |spec|
 
   spec.name        = "ppl"
-  spec.version     = "1.9.0"
-  spec.date        = "2013-01-06"
+  spec.version     = "1.10.0"
+  spec.date        = "2013-01-10"
 
   spec.required_ruby_version = ">= 1.9.3"
 

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

@@ -23,12 +23,12 @@ describe Ppl::Adapter::Vcard::Vpim, "#encode" do
   end
 
   it "should encode the contact's phone number" do
-    @contact.phone_number = "01234567890"
+    @contact.phone_numbers.push("01234567890")
     @adapter.encode(@contact).should include("TEL:01234567890")
   end
 
   it "should encode the contact's organization" do
-    @contact.organization = "Example Ltd"
+    @contact.organizations.push("Example Ltd")
     @adapter.encode(@contact).should include("ORG:Example Ltd")
   end
 
@@ -138,7 +138,7 @@ describe Ppl::Adapter::Vcard::Vpim, "#decode" do
       "END:VCARD",
     ].join("\n")
     contact = @adapter.decode(vcard)
-    contact.phone_number.should eq "01234567890"
+    contact.phone_numbers.first.should eq "01234567890"
   end
 
   it "should decode the contact's organization" do
@@ -150,7 +150,7 @@ describe Ppl::Adapter::Vcard::Vpim, "#decode" do
       "END:VCARD",
     ].join("\n")
     contact = @adapter.decode(vcard)
-    contact.organization.should eq "Example Ltd"
+    contact.organizations.first.should eq "Example Ltd"
   end
 
   it "should decode the contact's street address" do

data/spec/ppl/command/attribute_spec.rb

@@ -0,0 +1,62 @@
+
+describe Ppl::Command::Attribute do
+
+  before(:each) do
+    @attribute = :phone_numbers
+    @command = Ppl::Command::Attribute.new
+    @input = Ppl::Application::Input.new
+    @output = double(Ppl::Application::Output)
+    @storage = double(Ppl::Adapter::Storage)
+    @list_format = double(Ppl::Format::AddressBook)
+    @show_format = double(Ppl::Format::Contact)
+    @address_book = double(Ppl::Entity::AddressBook)
+    @contact = double(Ppl::Entity::Contact)
+
+    @command.attribute = @attribute
+    @command.list_format = @list_format
+    @command.show_format = @show_format
+    @command.storage = @storage
+  end
+
+
+  describe "#execute" do
+
+    it "should list all the contacts and the value of the attribute for each" do
+      @storage.should_receive(:load_address_book).and_return(@address_book)
+      @list_format.should_receive(:process).and_return("imagine this is a list")
+      @output.should_receive(:line).with("imagine this is a list")
+      @command.execute(@input, @output).should eq true
+    end
+
+    it "should show the full list of attributes for the given contact" do
+      @input.arguments.push("jdoe")
+      @storage.should_receive(:require_contact).and_return(@contact)
+      @show_format.should_receive(:process).and_return("all the info")
+      @output.should_receive(:line).with("all the info")
+      @command.execute(@input, @output).should eq true
+    end
+
+    it "should add the given value to the contact's attributes" do
+      @input.arguments.push("jdoe", "anyvalue")
+      @storage.should_receive(:require_contact).and_return(@contact)
+      @contact.should_receive(:phone_numbers).and_return([])
+      @storage.should_receive(:save_contact)
+      @command.execute(@input, @output).should eq true
+    end
+
+    it "should delete the given value from the contact's attributes" do
+      phone_numbers = double(Array)
+      phone_numbers.should_receive(:delete)
+
+      @storage.should_receive(:require_contact).and_return(@contact)
+      @contact.should_receive(:phone_numbers).and_return(phone_numbers)
+      @storage.should_receive(:save_contact).and_return(true)
+      @input.arguments = ["jdoe", "somevalue"]
+      @input.options   = { :delete => true }
+      @command.execute(@input, @output).should eq true
+    end
+
+  end
+
+end
+

data/spec/ppl/command/email_spec.rb

@@ -2,19 +2,7 @@
 describe Ppl::Command::Email do
 
   before(:each) do
-    @input   = Ppl::Application::Input.new
-    @output  = Ppl::Application::Output.new(nil, nil)
-    @contact = Ppl::Entity::Contact.new
     @command = Ppl::Command::Email.new
-    @storage = double(Ppl::Adapter::Storage)
-
-    @list_format = double(Ppl::Format::Contact)
-    @show_format = double(Ppl::Format::Contact)
-
-    @command.storage     = @storage
-    @command.show_format = @show_format
-    @command.list_format = @list_format
-    @contact.id = "jim"
   end
 
   describe "#name" do
@@ -23,69 +11,5 @@ describe Ppl::Command::Email do
     end
   end
 
-  describe "#execute" do
-
-    it "should list all email addresses if no contact ID is given" do
-      @storage.should_receive(:load_address_book).and_return(@address_book)
-      @list_format.should_receive(:process).and_return("all the email addresses")
-      @output.should_receive(:line).with("all the email addresses")
-      @input.arguments = []
-      @command.execute(@input, @output)
-    end
-
-    it "should show the current address if no new address is given" do
-      @storage.should_receive(:require_contact).and_return(@contact)
-      @show_format.should_receive(:process).and_return("jdoe@example.org")
-      @output.should_receive(:line).with("jdoe@example.org")
-      @input.arguments = ["jim"]
-      @command.execute(@input, @output).should eq true
-    end
-
-    it "should not output anything if there's nothing to show" do
-      @storage.should_receive(:require_contact).and_return(@contact)
-      @show_format.should_receive(:process).and_return("")
-      @input.arguments = ["jim"]
-      @command.execute(@input, @output).should eq false
-    end
-
-    it "should delete the given address to the contact if requested" do
-      @contact.email_addresses.push("jim@example.org")
-      @contact.email_addresses.push("jim@example.com")
-      @storage.should_receive(:require_contact).and_return(@contact)
-      @storage.should_receive(:save_contact) do |contact|
-        contact.email_addresses.should eq ["jim@example.com"]
-      end
-      @input.arguments = ["jim", "jim@example.org"]
-      @input.options   = { :delete => true }
-      @command.execute(@input, @output)
-    end
-
-    it "should raise an error when deleting a non-existent email address" do
-      @contact.email_addresses.push("jim@example.org")
-      @contact.email_addresses.push("jim@example.com")
-      @storage.should_receive(:require_contact).and_return(@contact)
-      @input.arguments = ["jim", "jim@example.net"]
-      @input.options   = { :delete => true }
-      expect{@command.execute(@input, nil)}.to raise_error(Ppl::Error::IncorrectUsage)
-    end
-
-    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_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/org_spec.rb

@@ -3,19 +3,6 @@ describe Ppl::Command::Org do
 
   before(:each) do
     @command = Ppl::Command::Org.new
-    @input   = Ppl::Application::Input.new
-    @output  = Ppl::Application::Output.new(nil, nil)
-    @contact = Ppl::Entity::Contact.new
-    @storage = double(Ppl::Adapter::Storage)
-
-    @show_format = double(Ppl::Format::Contact)
-    @list_format = double(Ppl::Format::Contact)
-
-    @command.storage     = @storage
-    @command.show_format = @show_format
-    @command.list_format = @list_format
-
-    @contact.id = "tim"
   end
 
   describe "#name" do
@@ -24,41 +11,5 @@ describe Ppl::Command::Org do
     end
   end
 
-  describe "#execute" do
-
-    it "should list all organizations if no contact ID is given" do
-      @storage.should_receive(:load_address_book).and_return(@address_book)
-      @list_format.should_receive(:process).and_return("all the organizations")
-      @output.should_receive(:line).with("all the organizations")
-      @input.arguments = []
-      @command.execute(@input, @output)
-    end
-
-    it "should show the contact's organization if no new organization is given" do
-      @storage.should_receive(:require_contact).and_return(@contact)
-      @show_format.should_receive(:process).and_return("Example Ltd")
-      @output.should_receive(:line).with("Example Ltd")
-      @input.arguments = ["jim"]
-      @command.execute(@input, @output).should eq true
-    end
-
-    it "should not output anything if there's nothing to show" do
-      @storage.should_receive(:require_contact).and_return(@contact)
-      @show_format.should_receive(:process).and_return("")
-      @input.arguments = ["jim"]
-      @command.execute(@input, @output).should eq false
-    end
-
-    it "should change the contact's organization if one is given" do
-      @storage.should_receive(:require_contact).and_return(@contact)
-      @storage.should_receive(:save_contact) do |contact|
-        contact.organization.should eq "Example Ltd"
-      end
-      @input.arguments = ["jim", "Example Ltd"]
-      @command.execute(@input, @output)
-    end
-
-  end
-
 end
 

data/spec/ppl/command/phone_spec.rb

@@ -3,17 +3,6 @@ describe Ppl::Command::Phone do
 
   before(:each) do
     @command = Ppl::Command::Phone.new
-    @input   = Ppl::Application::Input.new
-    @output  = Ppl::Application::Output.new(nil, nil)
-    @contact = Ppl::Entity::Contact.new
-    @storage = double(Ppl::Adapter::Storage)
-
-    @show_format = double(Ppl::Format::Contact)
-    @list_format = double(Ppl::Format::Contact)
-
-    @command.storage     = @storage
-    @command.show_format = @show_format
-    @command.list_format = @list_format
   end
 
   describe "#name" do
@@ -22,41 +11,5 @@ describe Ppl::Command::Phone do
     end
   end
 
-  describe "#execute" do
-
-    it "should list all phone numbers if no contact ID is given" do
-      @storage.should_receive(:load_address_book).and_return(@address_book)
-      @list_format.should_receive(:process).and_return("all the numbers")
-      @output.should_receive(:line).with("all the numbers")
-      @input.arguments = []
-      @command.execute(@input, @output)
-    end
-
-    it "should show the contact's phone number if no new number is given" do
-      @storage.should_receive(:require_contact).and_return(@contact)
-      @show_format.should_receive(:process).and_return("0123456789")
-      @output.should_receive(:line).with("0123456789")
-      @input.arguments = ["jim"]
-      @command.execute(@input, @output).should eq true
-    end
-
-    it "should not output anything if there's nothing to show" do
-      @storage.should_receive(:require_contact).and_return(@contact)
-      @show_format.should_receive(:process).and_return("")
-      @input.arguments = ["jim"]
-      @command.execute(@input, @output).should eq false
-    end
-
-    it "should change the contact's phone number if a number is given" do
-      @storage.should_receive(:require_contact).and_return(@contact)
-      @storage.should_receive(:save_contact) do |contact|
-        contact.phone_number.should eq "01234567890"
-      end
-      @input.arguments = ["jim", "01234567890"]
-      @command.execute(@input, @output)
-    end
-
-  end
-
 end
 

data/spec/ppl/command/url_spec.rb

@@ -3,18 +3,6 @@ describe Ppl::Command::Url do
 
   before(:each) do
     @command = Ppl::Command::Url.new
-    @input   = Ppl::Application::Input.new
-    @output  = Ppl::Application::Output.new(nil, nil)
-    @contact = Ppl::Entity::Contact.new
-    @storage = double(Ppl::Adapter::Storage)
-
-    @list_format = double(Ppl::Format::Contact)
-    @show_format = double(Ppl::Format::Contact)
-
-    @command.storage     = @storage
-    @command.show_format = @show_format
-    @command.list_format = @list_format
-    @contact.id = "jim"
   end
 
   describe "#name" do
@@ -23,69 +11,5 @@ describe Ppl::Command::Url do
     end
   end
 
-  describe "#execute" do
-
-    it "should list all URLs if no contact ID is given" do
-      @storage.should_receive(:load_address_book).and_return(@address_book)
-      @list_format.should_receive(:process).and_return("all the URLs")
-      @output.should_receive(:line).with("all the URLs")
-      @input.arguments = []
-      @command.execute(@input, @output)
-    end
-
-    it "should show the current URLs if no new URL is given" do
-      @storage.should_receive(:require_contact).and_return(@contact)
-      @show_format.should_receive(:process).and_return("http://example.org/~jdoe")
-      @output.should_receive(:line).with("http://example.org/~jdoe")
-      @input.arguments = ["jim"]
-      @command.execute(@input, @output).should eq true
-    end
-
-    it "should not output anything if there's nothing to show" do
-      @storage.should_receive(:require_contact).and_return(@contact)
-      @show_format.should_receive(:process).and_return("")
-      @input.arguments = ["jim"]
-      @command.execute(@input, @output).should eq false
-    end
-
-    it "should delete the given URL from the contact if requested" do
-      @contact.urls.push("http://example.org/~jdoe")
-      @contact.urls.push("http://example.com/~jdoe")
-      @storage.should_receive(:require_contact).and_return(@contact)
-      @storage.should_receive(:save_contact) do |contact|
-        contact.urls.should eq ["http://example.com/~jdoe"]
-      end
-      @input.arguments = ["jim", "http://example.org/~jdoe"]
-      @input.options   = { :delete => true }
-      @command.execute(@input, @output)
-    end
-
-    it "should raise an error when deleting a non-existent URL" do
-      @contact.urls.push("http://example.org/~jdoe")
-      @contact.urls.push("http://example.com/~jdoe")
-      @storage.should_receive(:require_contact).and_return(@contact)
-      @input.arguments = ["jim", "http://example.net/~jdoe"]
-      @input.options   = { :delete => true }
-      expect{@command.execute(@input, nil)}.to raise_error(Ppl::Error::IncorrectUsage)
-    end
-
-    it "should add the given URL to the contact if it's new" do
-      @storage.should_receive(:require_contact).and_return(@contact)
-      @storage.should_receive(:save_contact) do |contact|
-        contact.urls.first.should eq "http://example.org/~jdoe"
-      end
-      @input.arguments = ["jim", "http://example.org/~jdoe"]
-      @command.execute(@input, @output)
-    end
-
-    it "should raise an error if the user is adding a duplicate address" do
-      @contact.urls.push "http://example.org/~jdoe"
-      @storage.should_receive(:require_contact).and_return(@contact)
-      @input.arguments = ["jim", "http://example.org/~jdoe"]
-      expect{@command.execute(@input, nil)}.to raise_error(Ppl::Error::IncorrectUsage)
-    end
-
-  end
-
 end
 

data/spec/ppl/entity/contact_spec.rb

@@ -52,5 +52,17 @@ describe Ppl::Entity::Contact do
     end
   end
 
+  describe "#organizations" do
+    it "should return an array" do
+      @contact.organizations.should be_a(Array)
+    end
+  end
+
+  describe "#phone_numbers" do
+    it "should return an array" do
+      @contact.phone_numbers.should be_a(Array)
+    end
+  end
+
 end
 

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

@@ -17,17 +17,17 @@ describe Ppl::Format::AddressBook::Organizations do
 
     it "should at least show the contact's id" do
       @table.should_receive(:add_row).with({
-        :id           => "test:",
-        :organization => nil,
+        :id            => "test:",
+        :organizations => "",
       })
       @format.process(@address_book)
     end
 
     it "should show the organization if it's available" do
-      @contact.organization = "Example Ltd"
+      @contact.organizations.push("Example Ltd")
       @table.should_receive(:add_row).with({
-        :id          => "test:",
-        :organization => "Example Ltd",
+        :id            => "test:",
+        :organizations => "Example Ltd",
       })
       @format.process(@address_book)
     end

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

@@ -17,17 +17,17 @@ describe Ppl::Format::AddressBook::PhoneNumbers do
 
     it "should at least show the contact's id" do
       @table.should_receive(:add_row).with({
-        :id           => "test:",
-        :phone_number => nil,
+        :id            => "test:",
+        :phone_numbers => "",
       })
       @format.process(@address_book)
     end
 
     it "should show the phone number if it's available" do
-      @contact.phone_number = "01234567890"
+      @contact.phone_numbers.push("01234567890")
       @table.should_receive(:add_row).with({
-        :id           => "test:",
-        :phone_number => "01234567890",
+        :id            => "test:",
+        :phone_numbers => "01234567890",
       })
       @format.process(@address_book)
     end

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

@@ -42,12 +42,12 @@ describe Ppl::Format::Contact::Full do
     end
 
     it "should show their phone number if available" do
-      @contact.phone_number = "01234567890"
+      @contact.phone_numbers.push("01234567890")
       @format.process(@contact).should include "01234567890"
     end
 
-    it "should show their organization if available" do
-      @contact.organization = "Example Ltd"
+    it "should show all their organizations" do
+      @contact.organizations.push("Example Ltd")
       @format.process(@contact).should include "Example Ltd"
     end
 

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

@@ -13,7 +13,7 @@ describe Ppl::Format::Contact::Organization do
     end
 
     it "should return the contact's organization if it is set" do
-      @contact.organization = "Example Ltd"
+      @contact.organizations.push("Example Ltd")
       @format.process(@contact).should eq "Example Ltd"
     end
 

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

@@ -13,7 +13,7 @@ describe Ppl::Format::Contact::PhoneNumber do
     end
 
     it "should return the contact's phone number if it is set" do
-      @contact.phone_number = "0123456789"
+      @contact.phone_numbers.push("0123456789")
       @format.process(@contact).should eq "0123456789"
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ppl
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-06 00:00:00.000000000 Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
-  requirement: &18641320 !ruby/object:Gem::Requirement
+  requirement: &3232880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *18641320
+  version_requirements: *3232880
 - !ruby/object:Gem::Dependency
   name: rugged
-  requirement: &18640600 !ruby/object:Gem::Requirement
+  requirement: &3230760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.17.0.b6
   type: :runtime
   prerelease: false
-  version_requirements: *18640600
+  version_requirements: *3230760
 - !ruby/object:Gem::Dependency
   name: vpim
-  requirement: &18640020 !ruby/object:Gem::Requirement
+  requirement: &3228280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,7 +43,7 @@ dependencies:
         version: '0.695'
   type: :runtime
   prerelease: false
-  version_requirements: *18640020
+  version_requirements: *3228280
 description: CLI Address Book
 email: henry@henrysmith.org
 executables:
@@ -75,6 +75,7 @@ files:
 - lib/ppl/application/router.rb
 - lib/ppl/application/shell.rb
 - lib/ppl/command/add.rb
+- lib/ppl/command/attribute.rb
 - lib/ppl/command/bday.rb
 - lib/ppl/command/email.rb
 - lib/ppl/command/help.rb
@@ -134,6 +135,7 @@ files:
 - spec/ppl/application/router_spec.rb
 - spec/ppl/application/shell_spec.rb
 - spec/ppl/command/add_spec.rb
+- spec/ppl/command/attribute_spec.rb
 - spec/ppl/command/bday_spec.rb
 - spec/ppl/command/email_spec.rb
 - spec/ppl/command/help_spec.rb