ppl 1.20.0 → 1.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2c1a083b23b90a24e6f81e381593c1ed37150e1
-  data.tar.gz: e8477cde9b1eec569179e8695c65da79878f5925
+  metadata.gz: 23ea84dcda4441890c0bb20f27fa04e5c6235706
+  data.tar.gz: 609844a6af38ff976f7e4a1167b5ef581d755587
 SHA512:
-  metadata.gz: 6526a4a9e7a9aebfb8172736570852731ec890e15c5d74be9851a89c9a4f34c3599d0c10368252a038aafa6a7e4a8b6ca127821dd3e035b16af2cbc4d12969a0
-  data.tar.gz: a8abdf21b1ef7faea30160279c1fcf0e7ebf1e71138e1c8232ffdd2ea9b893a1b1773655e773cf7b77009cd653357a28e85cbe6dbf49ff5da4f839cb84600a47
+  metadata.gz: 3df8d5dc16d1ba121e314fb70d80448f1394c6e4779a63f5b6f9f29450ed3a8d3115ce5854f752c7386d4614c88adc5f8c42da850be996c525db5d7bdd599482
+  data.tar.gz: faf4b9f89b5892f3352a33a4818bb91b754ea526345b078df272658147fa549122ebe6175e5c8be295d03e0446a044de00571bf9cf73ea9e23baf94eb5f81cd9

data/lib/ppl.rb

@@ -1,7 +1,7 @@
 
 module Ppl
 
-  Version = "1.20.0"
+  Version = "1.21.0"
 
   module Adapter
   end
@@ -70,6 +70,7 @@ require "ppl/command/scrape"
 
 require "ppl/entity/address_book"
 require "ppl/entity/contact"
+require "ppl/entity/phone_number"
 require "ppl/entity/postal_address"
 
 require "ppl/error/completion_not_found"

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

@@ -64,7 +64,9 @@ class Ppl::Adapter::Vcard::GreenCard
 
   def encode_phone_numbers(contact, vcard_maker)
     contact.phone_numbers.each do |phone_number|
-      vcard_maker.add_tel(phone_number)
+      vcard_maker.add_tel(phone_number.number) do |tel|
+        tel.location = phone_number.type
+      end
     end
   end
 
@@ -131,7 +133,12 @@ class Ppl::Adapter::Vcard::GreenCard
   end
 
   def decode_phone_numbers(vcard, contact)
-    vcard.telephones.each { |number| contact.phone_numbers.push(number) }
+    vcard.telephones.each do |tel|
+      phone_number = Ppl::Entity::PhoneNumber.new
+      phone_number.number = tel.to_s
+      phone_number.type = (tel.location | tel.nonstandard).join
+      contact.phone_numbers << phone_number
+    end
   end
 
   def decode_urls(vcard, contact)

data/lib/ppl/command/phone.rb

@@ -13,6 +13,42 @@ class Ppl::Command::Phone < Ppl::Command::Attribute
     parser.on("-d", "--delete", "delete phone number") do
       options[:delete] = true
     end
+    parser.on("-t", "--type <type>") do |type|
+      options[:type] = type
+    end
+  end
+
+  def add_attribute(input, output)
+    contact = @storage.require_contact(input.arguments.shift)
+    if new_number?(contact, input.arguments[0])
+      add_new_number(contact, input)
+    else
+      update_existing_number(contact, input)
+    end
+    @storage.save_contact(contact)
+    true
+  end
+
+  def new_number?(contact, input_number)
+    matching_numbers = contact.phone_numbers.select do |pn|
+      pn.number == input_number
+    end
+    matching_numbers.length < 1
+  end
+
+  def add_new_number(contact, input)
+    phone_number = Ppl::Entity::PhoneNumber.new
+    phone_number.number = input.arguments[0]
+    phone_number.type = input.options[:type]
+    contact.phone_numbers << phone_number
+  end
+
+  def update_existing_number(contact, input)
+    contact.phone_numbers.each do |pn|
+      if pn.number == input.arguments[0]
+        pn.type = input.options[:type]
+      end
+    end
   end
 
 end

data/lib/ppl/entity/phone_number.rb

@@ -0,0 +1,13 @@
+
+class Ppl::Entity::PhoneNumber
+
+  attr_accessor :number
+  attr_accessor :type
+
+  def initialize(number = nil, type = nil)
+    @number = number
+    @type = type
+  end
+
+end
+

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

@@ -18,9 +18,13 @@ class Ppl::Format::AddressBook::PhoneNumbers < Ppl::Format::AddressBook
   def add_row(contact)
     @table.add_row({
       :id            => sprintf("%s:", contact.id),
-      :phone_numbers => contact.phone_numbers.join(", "),
+      :phone_numbers => stringify_phone_numbers(contact.phone_numbers)
     })
   end
 
+  def stringify_phone_numbers(phone_numbers)
+    phone_numbers.map { |pn| pn.number }.join(", ")
+  end
+
 end
 

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

@@ -1,25 +1,29 @@
 
 class Ppl::Format::Contact::PhoneNumber < Ppl::Format::Contact
 
-  attr_writer :color_adapter
-  attr_writer :colors
+  attr_writer :table
 
   def initialize(colors={})
-    @colors = colors
-    @color_adapter = Ppl::Adapter::Color::Colored.new
+    @table = Ppl::Format::Table.new([:phone_numbers, :type], colors)
   end
 
   def process(contact)
-    colorize_output(contact.phone_numbers.join("\n"))
+    contact.phone_numbers.each { |pn| add_row(pn) }
+    @table.to_s
   end
 
   private
 
-  def colorize_output(string)
-    if @colors["phone_numbers"]
-      @color_adapter.colorize(string, @colors["phone_numbers"])
-    else
-      string
+  def add_row(phone_number)
+    @table.add_row({
+      :phone_numbers => phone_number.number,
+      :type          => format_type(phone_number.type),
+    })
+  end
+
+  def format_type(type)
+    unless type.nil? || type == ""
+      "(#{type})"
     end
   end
 

data/ppl.gemspec

@@ -2,8 +2,8 @@
 Gem::Specification.new do |spec|
 
   spec.name        = "ppl"
-  spec.version     = "1.20.0"
-  spec.date        = "2013-04-19"
+  spec.version     = "1.21.0"
+  spec.date        = "2013-04-20"
 
   spec.required_ruby_version = ">= 1.9.3"
 

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

@@ -24,10 +24,15 @@ describe Ppl::Adapter::Vcard::GreenCard, "#encode" do
   end
 
   it "should encode the contact's phone number" do
-    @contact.phone_numbers.push("01234567890")
+    @contact.phone_numbers << Ppl::Entity::PhoneNumber.new("01234567890")
     @adapter.encode(@contact).should include("TEL:01234567890")
   end
 
+  it "should encode the contact's phone number's type" do
+    @contact.phone_numbers << Ppl::Entity::PhoneNumber.new("01234567890", "cell")
+    @adapter.encode(@contact).should include("TEL;TYPE=cell:01234567890")
+  end
+
   it "should encode the contact's organization" do
     @contact.organizations.push("Example Ltd")
     @adapter.encode(@contact).should include("ORG:Example Ltd")
@@ -144,7 +149,34 @@ describe Ppl::Adapter::Vcard::GreenCard, "#decode" do
       "END:VCARD",
     ].join("\n")
     contact = @adapter.decode(vcard)
-    contact.phone_numbers.first.should eq "01234567890"
+    phone_number = contact.phone_numbers.first
+    phone_number.number.should eq "01234567890"
+  end
+
+  it "should decode the contact's phone number's type" do
+    vcard = [
+      "BEGIN:VCARD",
+      "N:,test",
+      "VERSION:3.0",
+      "TEL;TYPE=cell:01234567890",
+      "END:VCARD",
+    ].join("\n")
+    contact = @adapter.decode(vcard)
+    phone_number = contact.phone_numbers.first
+    phone_number.type.should eq "cell"
+  end
+
+  it "should decode the contact's phone number's nonstandard type" do
+    vcard = [
+      "BEGIN:VCARD",
+      "N:,test",
+      "VERSION:3.0",
+      "TEL;TYPE=testing:01234567890",
+      "END:VCARD",
+    ].join("\n")
+    contact = @adapter.decode(vcard)
+    phone_number = contact.phone_numbers.first
+    phone_number.type.should eq "testing"
   end
 
   it "should decode the contact's organization" do

data/spec/ppl/command/phone_spec.rb

@@ -11,5 +11,49 @@ describe Ppl::Command::Phone do
     end
   end
 
+  describe "#execute" do
+
+    before(:each) do
+      @contact = Ppl::Entity::Contact.new
+      @storage = double(Ppl::Adapter::Storage)
+      @input = Ppl::Application::Input.new
+      @input.arguments = ["jdoe", "01234567"]
+      @storage.stub(:require_contact).and_return(@contact)
+      @storage.stub(:save_contact)
+      @command.storage = @storage
+    end
+
+    it "should save phone numbers as instances of Ppl::Entity::PhoneNumber" do
+      @storage.should_receive(:save_contact) do |c|
+        c.phone_numbers.first.should be_a(Ppl::Entity::PhoneNumber)
+      end
+      @command.execute(@input, @output)
+    end
+
+    it "should save the given number as an attribute of the PhoneNumber" do
+      @storage.should_receive(:save_contact) do |c|
+        c.phone_numbers.first.number.should eq "01234567"
+      end
+      @command.execute(@input, @output)
+    end
+
+    it "should save the given type alongside the number" do
+      @input.options[:type] = "cell"
+      @storage.should_receive(:save_contact) do |c|
+        c.phone_numbers.first.type.should eq "cell"
+      end
+      @command.execute(@input, @output)
+    end
+
+    it "shouldn't duplicate the number if the contact already has it" do
+      @contact.phone_numbers << Ppl::Entity::PhoneNumber.new("01234567")
+      @storage.should_receive(:save_contact) do |c|
+        c.phone_numbers.length.should eq 1
+      end
+      @command.execute(@input, @output)
+    end
+
+  end
+
 end
 

data/spec/ppl/entity/phone_number_spec.rb

@@ -0,0 +1,32 @@
+
+describe Ppl::Entity::PhoneNumber do
+
+  before(:each) do
+    @phone_number = Ppl::Entity::PhoneNumber.new
+  end
+
+  describe "#number" do
+    it "should return a value" do
+      @phone_number.number.should eq nil
+    end
+  end
+
+  describe "#type" do
+    it "should return a value" do
+      @phone_number.type.should eq nil
+    end
+  end
+
+  describe "#initialize" do
+    it "should accept a number" do
+      phone = Ppl::Entity::PhoneNumber.new(12345)
+      phone.number.should eq 12345
+    end
+    it "should accept a type" do
+      phone = Ppl::Entity::PhoneNumber.new(nil, "cell")
+      phone.type.should eq "cell"
+    end
+  end
+
+end
+

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

@@ -34,7 +34,7 @@ describe Ppl::Format::AddressBook::PhoneNumbers do
     end
 
     it "should show the phone number if it's available" do
-      @contact.phone_numbers.push("01234567890")
+      @contact.phone_numbers << Ppl::Entity::PhoneNumber.new("01234567890")
       @table.should_receive(:add_row).with({
         :id            => "test:",
         :phone_numbers => "01234567890",

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

@@ -1,31 +1,44 @@
 
 describe Ppl::Format::Contact::PhoneNumber do
 
-  before(:each) do
-    @format  = Ppl::Format::Contact::PhoneNumber.new
-    @contact = Ppl::Entity::Contact.new
-    @color   = double(Ppl::Adapter::Color)
-    @format.color_adapter = @color
+  describe "#initialize" do
+    it "should pass the colors through to the table" do
+      colors = {"number" => "blue"}
+      Ppl::Format::Table.should_receive(:new).with([:phone_numbers, :type], colors)
+      format = Ppl::Format::Contact::PhoneNumber.new(colors)
+    end
   end
 
   describe "#process" do
 
-    it "should return an empty string if the contact lacks a phone number" do
-      @format.process(Ppl::Entity::Contact.new).should eq ""
+    before(:each) do
+      @contact = Ppl::Entity::Contact.new
+      @number  = Ppl::Entity::PhoneNumber.new("01234567890")
+      @format  = Ppl::Format::Contact::PhoneNumber.new
+      @table   = double(Ppl::Format::Table)
+      @format.table = @table
+      @contact.phone_numbers << @number
     end
 
-    it "should return the contact's phone number if it is set" do
-      @contact.phone_numbers.push("0123456789")
-      @format.process(@contact).should eq "0123456789"
+    it "should always include the phone number" do
+      @table.should_receive(:add_row).with({
+        :phone_numbers => "01234567890",
+        :type          => nil,
+      })
+      @format.process(@contact)
     end
 
-    it "should colorize the string if configured to do so" do
-      @format.colors = { "phone_numbers" => "blue" }
-      @color.should_receive(:colorize).and_return("phone numbers in blue")
-      @format.process(@contact).should eq "phone numbers in blue"
+    it "should put the type in parentheses" do
+      @number.type = "work"
+      @table.should_receive(:add_row).with({
+        :phone_numbers => "01234567890",
+        :type          => "(work)",
+      })
+      @format.process(@contact)
     end
 
   end
 
 end
 
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ppl
 version: !ruby/object:Gem::Version
-  version: 1.20.0
+  version: 1.21.0
 platform: ruby
 authors:
 - Henry Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -214,6 +214,7 @@ files:
 - lib/ppl/command/version.rb
 - lib/ppl/entity/address_book.rb
 - lib/ppl/entity/contact.rb
+- lib/ppl/entity/phone_number.rb
 - lib/ppl/entity/postal_address.rb
 - lib/ppl/error/completion_not_found.rb
 - lib/ppl/error/contact_not_found.rb
@@ -288,6 +289,7 @@ files:
 - spec/ppl/command/version_spec.rb
 - spec/ppl/entity/address_book_spec.rb
 - spec/ppl/entity/contact_spec.rb
+- spec/ppl/entity/phone_number_spec.rb
 - spec/ppl/entity/postal_address_spec.rb
 - spec/ppl/format/address_book/ages_spec.rb
 - spec/ppl/format/address_book/birthdays_spec.rb