ppl 1.6.0 → 1.7.0

data/lib/ppl.rb

@@ -1,7 +1,7 @@
 
 module Ppl
 
-  Version = "1.6.0"
+  Version = "1.7.0"
 
   module Adapter
   end
@@ -80,6 +80,8 @@ require "ppl/format/contact/name"
 require "ppl/format/contact/organization"
 require "ppl/format/contact/phone_number"
 require "ppl/format/contact/postal_address"
+require "ppl/format/postal_address"
+require "ppl/format/postal_address/one_line"
 require "ppl/format/table"
 
 class String

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

@@ -4,31 +4,28 @@ class Ppl::Format::Contact::Full < Ppl::Format::Contact
   attr_writer :postal_address_format
 
   def initialize
-    @postal_address_format = Ppl::Format::Contact::PostalAddress.new
+    @postal_address_format = Ppl::Format::PostalAddress::OneLine.new
   end
 
   def process(contact)
-    lines = []
+    @lines = []
 
     first_line = first_line(contact)
     if first_line != ""
-      lines.push(first_line)
+      @lines.push(first_line)
     end
 
     vitals = vitals(contact)
     if vitals != ""
-      lines.push("")
-      lines.push(vitals)
-      lines.push("")
-      lines.push("")
+      @lines.push("")
+      @lines.push(vitals)
     end
 
-    if !contact.postal_address.nil?
-      lines.push("Postal Address:")
-      lines.push(@postal_address_format.process(contact))
-    end
+    format_email_addresses(contact)
+    format_phone_numbers(contact)
+    format_postal_addresses(contact)
 
-    return lines.join("\n")
+    return @lines.join("\n")
   end
 
   private
@@ -49,9 +46,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.phone_number.nil?
-      vitals.push(format_vital("Telephone", contact.phone_number))
-    end
     if !contact.organization.nil?
       vitals.push(format_vital("Organization", contact.organization))
     end
@@ -62,5 +56,29 @@ class Ppl::Format::Contact::Full < Ppl::Format::Contact
     return sprintf("  %-12s %s", name, value)
   end
 
+  def format_email_addresses(contact)
+    if !contact.email_addresses.empty?
+      @lines.push("")
+      @lines.push("Email Addresses:")
+      contact.email_addresses.each { |email_address| @lines.push("  " + email_address) }
+    end
+  end
+
+  def format_phone_numbers(contact)
+    if !contact.phone_number.nil?
+      @lines.push("")
+      @lines.push("Phone Numbers:")
+      @lines.push("  #{contact.phone_number}")
+    end
+  end
+
+  def format_postal_addresses(contact)
+    if !contact.postal_address.nil?
+      @lines.push("")
+      @lines.push("Postal Address:")
+      @lines.push("  " + @postal_address_format.process(contact.postal_address))
+    end
+  end
+
 end
 

data/lib/ppl/format/postal_address.rb

@@ -0,0 +1,9 @@
+
+class Ppl::Format::PostalAddress
+
+  def process(postal_address)
+    raise NotImplementedError
+  end
+
+end
+

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

@@ -0,0 +1,18 @@
+
+class Ppl::Format::PostalAddress::OneLine < Ppl::Format::AddressBook
+
+  def process(postal_address)
+    pieces = []
+
+    pieces.push(postal_address.street)      unless postal_address.street.nil?
+    pieces.push(postal_address.locality)    unless postal_address.locality.nil?
+    pieces.push(postal_address.region)      unless postal_address.region.nil?
+    pieces.push(postal_address.country)     unless postal_address.country.nil?
+    pieces.push(postal_address.postal_code) unless postal_address.postal_code.nil?
+    pieces.push(postal_address.po_box)      unless postal_address.po_box.nil?
+
+    pieces.join(", ")
+  end
+
+end
+

data/ppl.gemspec

@@ -2,8 +2,8 @@
 Gem::Specification.new do |spec|
 
   spec.name        = "ppl"
-  spec.version     = "1.6.0"
-  spec.date        = "2012-12-27"
+  spec.version     = "1.7.0"
+  spec.date        = "2012-12-29"
 
   spec.required_ruby_version = ">= 1.9.3"
 

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

@@ -24,7 +24,16 @@ describe Ppl::Format::Contact::Full do
     it "should include their email address in brackets" do
       @contact.name = "John Doe"
       @contact.email_addresses.push "john@example.org"
-      @format.process(@contact).should eq "John Doe <john@example.org>"
+      @format.process(@contact).should include "John Doe <john@example.org>"
+    end
+
+    it "should show all their email addresses" do
+      @contact.email_addresses.push "john@example.org"
+      @contact.email_addresses.push "john@example.com"
+      @contact.email_addresses.push "john@example.net"
+      @format.process(@contact).should include "john@example.org"
+      @format.process(@contact).should include "john@example.com"
+      @format.process(@contact).should include "john@example.net"
     end
 
     it "should show their birthday if available" do
@@ -44,7 +53,7 @@ describe Ppl::Format::Contact::Full do
 
     it "should show their postal address if available" do
       @contact.postal_address = @address
-      @postal_address_format.should_receive(:process).with(@contact)
+      @postal_address_format.should_receive(:process).and_return("")
       @format.process(@contact)
     end
 

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

@@ -0,0 +1,44 @@
+
+describe Ppl::Format::PostalAddress::OneLine do
+
+  before(:each) do
+    @format  = Ppl::Format::PostalAddress::OneLine.new
+    @address = Ppl::Entity::PostalAddress.new
+  end
+
+  describe "#process" do
+
+    it "should include the country if available" do
+      @address.country = "UK"
+      @format.process(@address).should include "UK"
+    end
+
+    it "should include the locality if available" do
+      @address.locality = "Liverpool"
+      @format.process(@address).should include "Liverpool"
+    end
+
+    it "should include the street if available" do
+      @address.street = "1 Test Road"
+      @format.process(@address).should include "1 Test Road"
+    end
+
+    it "should include the po box if available" do
+      @address.po_box = "123456"
+      @format.process(@address).should include "123456"
+    end
+
+    it "should include the postal code if available" do
+      @address.postal_code = "L1 9AA"
+      @format.process(@address).should include "L1 9AA"
+    end
+
+    it "should include the region if available" do
+      @address.region = "Merseyside"
+      @format.process(@address).should include "Merseyside"
+    end
+
+  end
+
+end
+

data/spec/ppl/format/postal_address_spec.rb

@@ -0,0 +1,18 @@
+
+describe Ppl::Format::PostalAddress do
+
+  before(:each) do
+    @format = Ppl::Format::PostalAddress.new
+  end
+
+  describe "#process" do
+
+    it "should raise a NotImplementedError" do
+      expect{@format.process(nil)}.to raise_error(NotImplementedError)
+    end
+
+  end
+
+end
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ppl
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-27 00:00:00.000000000 Z
+date: 2012-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
-  requirement: &17793580 !ruby/object:Gem::Requirement
+  requirement: &7003600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *17793580
+  version_requirements: *7003600
 - !ruby/object:Gem::Dependency
   name: rugged
-  requirement: &17792360 !ruby/object:Gem::Requirement
+  requirement: &7002340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.17.0.b6
   type: :runtime
   prerelease: false
-  version_requirements: *17792360
+  version_requirements: *7002340
 - !ruby/object:Gem::Dependency
   name: vpim
-  requirement: &17791520 !ruby/object:Gem::Requirement
+  requirement: &7001560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,7 +43,7 @@ dependencies:
         version: '0.695'
   type: :runtime
   prerelease: false
-  version_requirements: *17791520
+  version_requirements: *7001560
 description: CLI Address Book
 email: henry@henrysmith.org
 executables:
@@ -111,6 +111,8 @@ files:
 - lib/ppl/format/contact/organization.rb
 - lib/ppl/format/contact/phone_number.rb
 - lib/ppl/format/contact/postal_address.rb
+- lib/ppl/format/postal_address.rb
+- lib/ppl/format/postal_address/one_line.rb
 - lib/ppl/format/table.rb
 - ppl.gemspec
 - spec/ppl/adapter/output_spec.rb
@@ -162,6 +164,8 @@ files:
 - spec/ppl/format/contact/phone_number_spec.rb
 - spec/ppl/format/contact/postal_address_spec.rb
 - spec/ppl/format/contact_spec.rb
+- spec/ppl/format/postal_address/one_line_spec.rb
+- spec/ppl/format/postal_address_spec.rb
 - spec/ppl/format/table_spec.rb
 - spec/spec_helper.rb
 homepage: http://ppladdressbook.org