ppl 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6751b47fc16bbbe1cf3f04a8c314f3c6fb54ff6
-  data.tar.gz: c44d7945c8b6994f0adfc8aadb59936e2a8bb5c3
+  metadata.gz: de5c3bfa9ec90c3aad5dace9f52e3ac33a24d53c
+  data.tar.gz: 0c3ecacd962b11facb97e41d8ec59b3b64350554
 SHA512:
-  metadata.gz: 0683f92143ecfbcb291ad7d8c341cf946652f74f563d765b738ae6a703aae324bf6818d5e20db394b5ed9cab89187d195e4842b3cd79246d3b1b05211b1bde4c
-  data.tar.gz: 56a3e71bfde3fbf4affbc1865239e84fd7a20b2767b83dcc4b776c3afd6d5f2f9b1c220785c9543bfde8c75bc074d3a37be229336fdaad846657b4855ae7119f
+  metadata.gz: 40fc44570b1d55fcd8fe915798ed6913cdfa932a00bf785288b5bbae76b5afcb85d39eb81d0b69c2b7e6d81983f7ef4edab9a0058f15b5c37b845cc4e548f763
+  data.tar.gz: 5eb285ac6574d192cb79f9a873c621b5f66ace980c6248703644d10ccb1d9d30df26d4cfa81f3e00870da9368355a07340390919fecdd8e714ec7bfa7ddb11ca

data/README.md

@@ -14,6 +14,7 @@ ppl if:
 
 [![Build Status](https://secure.travis-ci.org/h2s/ppl.png)](http://travis-ci.org/h2s/ppl)
 [![Code Climate](https://codeclimate.com/github/h2s/ppl.png)](https://codeclimate.com/github/h2s/ppl)
+[![Coverage Status](https://coveralls.io/repos/h2s/ppl/badge.png?branch=master)](https://coveralls.io/r/h2s/ppl?branch=master)
 
 Installation
 ------------

data/lib/ppl.rb

@@ -1,7 +1,7 @@
 
 module Ppl
 
-  Version = "2.2.0"
+  Version = "2.3.1"
 
   module Adapter
   end
@@ -81,6 +81,7 @@ require "ppl/entity/postal_address"
 require "ppl/error/completion_not_found"
 require "ppl/error/contact_not_found"
 require "ppl/error/incorrect_usage"
+require "ppl/error/invalid_vcard"
 require "ppl/error/postal_address_not_found"
 
 require "ppl/format/address_book"

data/lib/ppl/adapter/storage/git.rb

@@ -1,4 +1,3 @@
-
 require "rugged"
 require "socket"
 
@@ -40,17 +39,11 @@ class Ppl::Adapter::Storage::Git < Ppl::Adapter::Storage
   end
 
   def load_contact(id)
-    filename = id + ".vcf"
-    target   = @repository.head.target
-    vcard    = @repository.file_at(target, filename)
-    contact  = nil
-
-    if !vcard.nil?
-      contact    = @vcard_adapter.decode(vcard)
-      contact.id = id
+    begin
+      read_contact_from_disk id
+    rescue GreenCard::InvalidEncodingError
+      raise Ppl::Error::InvalidVcard, "#{id}.vcf contains invalid data"
     end
-
-    return contact
   end
 
   def save_contact(contact)
@@ -117,5 +110,20 @@ class Ppl::Adapter::Storage::Git < Ppl::Adapter::Storage
     @disk.path
   end
 
-end
+  private
 
+  def read_contact_from_disk(id)
+    filename = id + ".vcf"
+    target   = @repository.head.target
+    vcard    = @repository.file_at(target, filename)
+    contact  = nil
+
+    if !vcard.nil?
+      contact    = @vcard_adapter.decode(vcard)
+      contact.id = id
+    end
+
+    return contact
+  end
+
+end

data/lib/ppl/error/invalid_vcard.rb

@@ -0,0 +1,2 @@
+class Ppl::Error::InvalidVcard < StandardError
+end

data/lib/ppl/format/table.rb

@@ -46,7 +46,9 @@ class Ppl::Format::Table
 
   def format_row(row)
     string = ""
-    @columns.each { |column| string += format_cell(row, column) }
+    @columns.each do |column|
+      string += format_cell(row, column).force_encoding("UTF-8")
+    end
     return string
   end
 

data/ppl.gemspec

@@ -2,8 +2,8 @@
 Gem::Specification.new do |spec|
 
   spec.name        = "ppl"
-  spec.version     = "2.3.0"
-  spec.date        = "2013-10-12"
+  spec.version     = "2.3.1"
+  spec.date        = "2014-03-30"
 
   spec.required_ruby_version = ">= 1.9.3"
 
@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency("rugged", "0.17.0.b6")
   spec.add_dependency("greencard", "0.0.5")
 
+  spec.add_development_dependency("coveralls")
   spec.add_development_dependency("cucumber")
   spec.add_development_dependency("rspec")
   spec.add_development_dependency("rake")

data/spec/ppl/adapter/storage/git_spec.rb

@@ -93,6 +93,16 @@ describe Ppl::Adapter::Storage::Git do
       contact = @git.load_contact("test")
     end
 
+    it "handles encoding errors gracefully" do
+      head        = OpenStruct.new
+      head.target = "asdfg"
+
+      @repo.should_receive(:head).and_return(head)
+      @repo.should_receive(:file_at).and_return("vcard contents")
+      @vcard.should_receive(:decode).and_raise(GreenCard::InvalidEncodingError)
+      expect{ @git.load_contact("test") }.to raise_error(Ppl::Error::InvalidVcard)
+    end
+
   end
 
   describe "#save_contact" do

data/spec/ppl/format/table_spec.rb

@@ -96,6 +96,16 @@ describe Ppl::Format::Table do
       @table.to_s.should include "123    Luis Ignacio Lula da Silva  lula@planalto.biz"
     end
 
+    it "copes with mixed encodings" do
+      @table.add_row({
+        :id    => "franz_viehböck".force_encoding("ASCII-8BIT"),
+        :name  => "Franz Viehböck",
+        :email => "fv@example.org",
+      })
+      expect{ @table.to_s }.not_to raise_error()
+      @table.to_s.should include "franz_viehböck  Franz Viehböck  fv@example.org"
+    end
+
   end
 
   describe "#disable_colors!" do

data/spec/spec_helper.rb

@@ -5,5 +5,10 @@ require "pathname"
 bin_file = Pathname.new(__FILE__).realpath
 $:.unshift File.expand_path("../../lib", bin_file)
 
+if ENV['CI']
+  require "coveralls"
+  Coveralls.wear!
+end
+
 require "ppl"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ppl
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Henry Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-12 00:00:00.000000000 Z
+date: 2014-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -94,6 +94,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.5
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -236,6 +250,7 @@ files:
 - lib/ppl/error/completion_not_found.rb
 - lib/ppl/error/contact_not_found.rb
 - lib/ppl/error/incorrect_usage.rb
+- lib/ppl/error/invalid_vcard.rb
 - lib/ppl/error/postal_address_not_found.rb
 - lib/ppl/format/address_book.rb
 - lib/ppl/format/address_book/ages.rb