ppl 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95e88afd4d3b0aa9e6af8d3e5362b8826ff0a338
-  data.tar.gz: 4dd553d7deaeb6880d958c92c9797230c8a601d4
+  metadata.gz: 29ebfed69dcf001e746e48a71e7264a479c5a3cb
+  data.tar.gz: 76df48178f8096c31e4c425433798ebe21dd3138
 SHA512:
-  metadata.gz: 77825be6cccd5eda789c2ae779c94fccea8e19b703f880b22e13dd7c4acd68e26e57963feddd0e77a3bf48a8aa28d33f83973ad84075427d408570889216feab
-  data.tar.gz: 5d4b42a641b6c9f7fe3d048afcbed0009eaab79262495e6d0c944a05ebf6179802a508b6aac0308abe048d88915bebf862bd2789a45d44e0967554f2d77ed183
+  metadata.gz: 5e414fbc166fc1d3eef308a476bcbbd89315fa7276a42b19c28dbc993c9945bdd8c0ea362e31214f6be89e41ba1556fd33d2be9689771bfb6d6c942de952a60f
+  data.tar.gz: 4620b182ccea6549b53c4ee456f239fb167db7f336d4e8c1a323f4f9d6469f445289b3ebf312ab8750a553ddf462c826a238dc686148e32d0baf94ad83a75333

data/lib/ppl.rb

@@ -1,7 +1,7 @@
 
 module Ppl
 
-  Version = "2.1.0"
+  Version = "2.2.0"
 
   module Adapter
   end

data/lib/ppl/adapter/email_scraper/mail.rb

@@ -3,6 +3,8 @@ require "mail"
 
 class Ppl::Adapter::EmailScraper::Mail
 
+  attr_writer :storage_adapter
+
   def scrape_contacts(email)
     email = Mail.new(email)
     contacts = []
@@ -21,19 +23,31 @@ class Ppl::Adapter::EmailScraper::Mail
     from = email[:from]
     unless from.nil?
       sender = Ppl::Entity::Contact.new
-      sender.name = from.tree.addresses.first.display_name
-      sender.email_addresses << from.tree.addresses.first.address
+      sender.name = Ppl::Entity::Name.new
+      sender.name.full = from.tree.addresses.first.display_name
+      sender.email_addresses << Ppl::Entity::EmailAddress.new(from.tree.addresses.first.address)
       sender.id = generate_contact_id(sender)
       sender
     end
   end
 
   def generate_contact_id(contact)
-    if !contact.name.nil?
-      contact.name.downcase.tr(" ", "_")
+    if !contact.name.full.nil?
+      generate_contact_id_from_name(contact.name)
     elsif !contact.email_addresses.empty?
-      contact.email_addresses.first
+      contact.email_addresses.first.address
+    end
+  end
+
+  def generate_contact_id_from_name(name)
+    name = name.full.downcase.tr(" ", "_")
+    base = name
+    suffix = 0
+    until @storage_adapter.load_contact(name).nil?
+      suffix += 1
+      name = "#{base}_#{suffix}"
     end
+    name
   end
 
 end

data/lib/ppl/application/bootstrap.rb

@@ -370,7 +370,9 @@ class Ppl::Application::Bootstrap
   end
 
   register :email_scraper do
-    Ppl::Adapter::EmailScraper::Mail.new
+    email_scraper = Ppl::Adapter::EmailScraper::Mail.new
+    email_scraper.storage_adapter = storage_adapter
+    email_scraper
   end
 
   register :email_service do

data/ppl.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |spec|
 
   spec.name        = "ppl"
-  spec.version     = "2.1.0"
+  spec.version     = "2.2.0"
   spec.date        = "2013-07-20"
 
   spec.required_ruby_version = ">= 1.9.3"

data/spec/ppl/adapter/email_scraper/mail_spec.rb

@@ -3,6 +3,8 @@ describe Ppl::Adapter::EmailScraper::Mail do
 
   before(:each) do
     @adapter = Ppl::Adapter::EmailScraper::Mail.new
+    @storage = double(Ppl::Adapter::Storage)
+    @adapter.storage_adapter = @storage
   end
 
   describe "#scrape_contacts" do
@@ -23,8 +25,9 @@ describe Ppl::Adapter::EmailScraper::Mail do
         "This is a test email.",
         "Bye!",
       ].join("\n")
+      @storage.should_receive(:load_contact).and_return(nil)
       contacts = @adapter.scrape_contacts(email)
-      contacts.first.name.should eq "Test User"
+      contacts.first.name.full.should eq "Test User"
     end
 
     it "should scrape the sender's email address" do
@@ -39,8 +42,9 @@ describe Ppl::Adapter::EmailScraper::Mail do
         "This is a test email.",
         "Bye!",
       ].join("\n")
+      @storage.should_receive(:load_contact).and_return(nil)
       contacts = @adapter.scrape_contacts(email)
-      contacts.first.email_addresses.first.should eq "test@example.org"
+      contacts.first.email_addresses.first.address.should eq "test@example.org"
     end
 
     it "should generate an ID for the sender based on their name" do
@@ -55,6 +59,7 @@ describe Ppl::Adapter::EmailScraper::Mail do
         "This is a test email.",
         "Bye!",
       ].join("\n")
+      @storage.should_receive(:load_contact).and_return(nil)
       contacts = @adapter.scrape_contacts(email)
       contacts.first.id.should eq "test_user"
     end
@@ -75,6 +80,24 @@ describe Ppl::Adapter::EmailScraper::Mail do
       contacts.first.id.should eq "test@example.org"
     end
 
+    it "avoids overwriting an existing contact ID" do
+      email = [
+        "Date: Fri, 30 Nov 2012 17:09:33 +0000",
+        "From: Test User <test@example.org>",
+        "Message-ID: <qwertyuioasdfghjk@mail.example.org>",
+        "Subject: Test Email",
+        "To: henry@henrysmith.org",
+        "",
+        "Hey,",
+        "This is a test email.",
+        "Bye!",
+      ].join("\n")
+      @storage.should_receive(:load_contact).with("test_user").and_return(Ppl::Entity::Contact.new)
+      @storage.should_receive(:load_contact).with("test_user_1").and_return(nil)
+      contacts = @adapter.scrape_contacts(email)
+      contacts.first.id.should eq "test_user_1"
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ppl
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Henry Smith