ppl 1.5.0 → 1.5.1

data/README.md

@@ -13,6 +13,7 @@ ppl if:
 * You prefer to keep your data stored in an open format
 
 [![Build Status](https://secure.travis-ci.org/h2s/ppl.png)](http://travis-ci.org/h2s/ppl)
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/h2s/ppl)
 
 Installation
 ------------

data/lib/ppl.rb

@@ -1,7 +1,7 @@
 
 module Ppl
 
-  Version = "1.5.0"
+  Version = "1.5.1"
 
   module Adapter
   end

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

@@ -5,72 +5,111 @@ class Ppl::Adapter::Vcard::Vpim
 
   def encode(contact)
     vcard = Vpim::Vcard::Maker.make2 do |maker|
+      encode_birthday(contact, maker)
+      encode_name(contact, maker)
+      encode_email_addresses(contact, maker)
+      encode_phone_number(contact, maker)
+      encode_organization(contact, maker)
+      encode_postal_address(contact, maker)
+      encode_email_addresses(contact, maker)
+    end
+    vcard.to_s
+  end
 
-      if !contact.birthday.nil?
-        maker.birthday = contact.birthday
-      end
+  def decode(string)
+    vcard   = Vpim::Vcard.decode(string).first
+    contact = Ppl::Entity::Contact.new
+    decode_birthday(vcard, contact)
+    decode_email_addresses(vcard, contact)
+    decode_phone_number(vcard, contact)
+    decode_postal_address(vcard, contact)
+    decode_organization(vcard, contact)
+    decode_name(vcard, contact)
+    return contact
+  end
 
-      maker.add_name do |name|
-        name.given    = contact.id   unless contact.id.nil?
-        name.fullname = contact.name unless contact.name.nil?
-      end
 
-      contact.email_addresses.each do |email_address|
-        maker.add_email(email_address)
-      end
+  private
 
-      if !contact.phone_number.nil?
-        maker.add_tel(contact.phone_number)
-      end
+  def encode_birthday(contact, vcard_maker)
+    if !contact.birthday.nil?
+      vcard_maker.birthday = contact.birthday
+    end
+  end
 
-      if !contact.organization.nil?
-        maker.org=(contact.organization)
-      end
+  def encode_name(contact, vcard_maker)
+    vcard_maker.add_name do |name|
+      name.given    = contact.id   unless contact.id.nil?
+      name.fullname = contact.name unless contact.name.nil?
+    end
+  end
+
+  def encode_email_addresses(contact, vcard_maker)
+    contact.email_addresses.each do |email_address|
+      vcard_maker.add_email(email_address)
+    end
+  end
+
+  def encode_phone_number(contact, vcard_maker)
+    if !contact.phone_number.nil?
+      vcard_maker.add_tel(contact.phone_number)
+    end
+  end
+
+  def encode_organization(contact, vcard_maker)
+    if !contact.organization.nil?
+      vcard_maker.org=(contact.organization)
+    end
+  end
 
-      if !contact.postal_address.nil?
-        maker.add_addr do |address|
-          if !contact.postal_address.street.nil?
-            address.street = contact.postal_address.street
-          end
-          if !contact.postal_address.postal_code.nil?
-            address.postalcode = contact.postal_address.postal_code
-          end
-          if !contact.postal_address.po_box.nil?
-            address.pobox = contact.postal_address.po_box
-          end
-          if !contact.postal_address.country.nil?
-            address.country = contact.postal_address.country
-          end
-          if !contact.postal_address.region.nil?
-            address.region = contact.postal_address.region
-          end
-          if !contact.postal_address.locality.nil?
-            address.locality = contact.postal_address.locality
-          end
+  def encode_postal_address(contact, vcard_maker)
+    if !contact.postal_address.nil?
+      vcard_maker.add_addr do |address|
+        if !contact.postal_address.street.nil?
+          address.street = contact.postal_address.street
+        end
+        if !contact.postal_address.postal_code.nil?
+          address.postalcode = contact.postal_address.postal_code
+        end
+        if !contact.postal_address.po_box.nil?
+          address.pobox = contact.postal_address.po_box
+        end
+        if !contact.postal_address.country.nil?
+          address.country = contact.postal_address.country
+        end
+        if !contact.postal_address.region.nil?
+          address.region = contact.postal_address.region
+        end
+        if !contact.postal_address.locality.nil?
+          address.locality = contact.postal_address.locality
         end
       end
-
     end
+  end
 
-    return vcard.to_s
+  def decode_birthday(vcard, contact)
+    contact.birthday = vcard.birthday unless vcard.birthday.nil?
   end
 
-  def decode(string)
-    vcard   = Vpim::Vcard.decode(string).first
-    contact = Ppl::Entity::Contact.new
+  def decode_name(vcard, contact)
+    if !vcard.name.nil?
+      contact.name = vcard.name.fullname
+    end
+  end
 
-    if !vcard.birthday.nil?
-      contact.birthday = vcard.birthday
+  def decode_organization(vcard, contact)
+    if !vcard.org.nil?
+      contact.organization = vcard.org.first
     end
+  end
 
+  def decode_email_addresses(vcard, contact)
     vcard.emails.each do |email|
       contact.email_addresses.push(email.to_s)
     end
+  end
 
-    if !vcard.telephones.empty?
-      contact.phone_number = vcard.telephones.first
-    end
-
+  def decode_postal_address(vcard, contact)
     if !vcard.address.nil?
       contact.postal_address             = Ppl::Entity::PostalAddress.new
       contact.postal_address.street      = vcard.address.street
@@ -80,19 +119,12 @@ class Ppl::Adapter::Vcard::Vpim
       contact.postal_address.region      = vcard.address.region
       contact.postal_address.country     = vcard.address.country
     end
+  end
 
-    if !vcard.org.nil?
-      contact.organization = vcard.org.first
-    end
-
-    name = nil
-    name = vcard.name
-
-    if !name.nil?
-      contact.name = name.fullname
+  def decode_phone_number(vcard, contact)
+    if !vcard.telephones.empty?
+      contact.phone_number = vcard.telephones.first
     end
-
-    return contact
   end
 
 end

data/lib/ppl/command/post.rb

@@ -72,14 +72,14 @@ class Ppl::Command::Post < Ppl::Application::Command
 
   def set_postal_address(input, output)
     contact = @storage.require_contact(input.arguments[0])
-    contact.set_postal_address do |address|
-      address.country     = input.options[:country]     unless input.options[:country].nil?
-      address.locality    = input.options[:locality]   unless input.options[:locality].nil?
-      address.region      = input.options[:region]      unless input.options[:region].nil?
-      address.po_box      = input.options[:po_box]      unless input.options[:po_box].nil?
-      address.postal_code = input.options[:postal_code] unless input.options[:postal_code].nil?
-      address.street      = input.options[:street]      unless input.options[:street].nil?
+
+    [:country, :locality, :region, :po_box, :postal_code, :street].each do |property|
+      next if input.options[property].nil?
+      contact.set_postal_address do |address|
+        address.send("#{property.to_s}=", input.options[property])
+      end
     end
+
     @storage.save_contact(contact)
   end
 

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

@@ -16,27 +16,27 @@ class Ppl::Format::AddressBook::PostalAddresses < Ppl::Format::AddressBook
   private
 
   def add_row(contact)
-    id             = sprintf("%s:", contact.id)
     postal_address = nil
-
     if !contact.postal_address.nil?
-      pieces = [
-        contact.postal_address.street,
-        contact.postal_address.locality,
-        contact.postal_address.region,
-        contact.postal_address.country,
-        contact.postal_address.postal_code,
-        contact.postal_address.po_box,
-      ].select { |property| property != "" && !property.nil? }
-      postal_address = pieces.join(", ")
+      postal_address = format_postal_address(contact.postal_address)
     end
-
     @table.add_row({
-      :id             => id,
+      :id             => sprintf("%s:", contact.id),
       :postal_address => postal_address,
     })
   end
 
+  def format_postal_address(postal_address)
+    pieces = [
+      postal_address.street,
+      postal_address.locality,
+      postal_address.region,
+      postal_address.country,
+      postal_address.postal_code,
+      postal_address.po_box,
+    ].select { |property| property != "" && !property.nil? }
+    pieces.join(", ")
+  end
 
 end
 

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

@@ -10,20 +10,22 @@ class Ppl::Format::Contact::PostalAddress < Ppl::Format::Contact
   def process(contact)
     address = contact.postal_address
 
-    {
-      :street      => "Street",
-      :postal_code => "Postal Code",
-      :po_box      => "PO box",
-      :locality    => "Locality",
-      :region      => "Region",
-      :country     => "Country",
-    }.each do |property, name|
-      value = address.send(property)
-      next if value.nil? || value == ""
-      @table.add_row({
-        :label => sprintf("%s:", name),
-        :value => address.send(property)
-      })
+    if !address.nil?
+      {
+        :street      => "Street",
+        :postal_code => "Postal Code",
+        :po_box      => "PO box",
+        :locality    => "Locality",
+        :region      => "Region",
+        :country     => "Country",
+      }.each do |property, name|
+        value = address.send(property)
+        next if value.nil? || value == ""
+        @table.add_row({
+          :label => sprintf("%s:", name),
+          :value => address.send(property)
+        })
+      end
     end
 
     return @table.to_s

data/ppl.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ppl
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.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: &5576920 !ruby/object:Gem::Requirement
+  requirement: &14299780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *5576920
+  version_requirements: *14299780
 - !ruby/object:Gem::Dependency
   name: rugged
-  requirement: &5576360 !ruby/object:Gem::Requirement
+  requirement: &14298340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.17.0.b6
   type: :runtime
   prerelease: false
-  version_requirements: *5576360
+  version_requirements: *14298340
 - !ruby/object:Gem::Dependency
   name: vpim
-  requirement: &5563160 !ruby/object:Gem::Requirement
+  requirement: &14297560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,7 +43,7 @@ dependencies:
         version: '0.695'
   type: :runtime
   prerelease: false
-  version_requirements: *5563160
+  version_requirements: *14297560
 description: CLI Address Book
 email: henry@henrysmith.org
 executables: