ppl 1.15.1 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7a6a79415d099361118edf8c6d6a55d588a8efb
-  data.tar.gz: fa7c00ded45c0a0ec2d3f97a161b06e40fec94ee
+  metadata.gz: e0078cdc91873e6cbc509e8ab7688372fef43c7b
+  data.tar.gz: 4c5005c26f11a26b11a6adf4e99195f358c8f438
 SHA512:
-  metadata.gz: f8c037f64e3016665e6f388be1ae411ed2a503a0adfc525bfbda5d6840a0c12e125120b1eb94b930d4a6dddef0035a833ad79a5eab046da7205c797ef895a87c
-  data.tar.gz: 08b7a136a3f7c60a45da397ddd972c7517259ed41d943e25f5a79c520f3339abb75745e0af2ac3bc0670c4fce5283afd19e20336ce6946db15ccc23ab6a05b17
+  metadata.gz: 814ba206fc2673082c196aceaea8cb26d9bbfb47e6b7db8d4784d8fd5c5c63fabfd0bdc0d9727ed5ad25313d1d7a276799f98e5df02ea66607c0719a3bbd5d65
+  data.tar.gz: 59952d9c2d48c6395290c922126c06fc958760ffd17fc4911a869dbc8d12829af7ca169a8edf1f7bde3b4e2d4daeadbcf8a1d60847986d60cb7ac618f7f9c4ef

data/lib/ppl/command/mutt.rb

@@ -8,9 +8,13 @@ class Ppl::Command::Mutt < Ppl::Application::Command
 
   def options(parser, options)
     parser.banner = "usage: ppl mutt <query>"
+    parser.on("-i", "--ignore-case", "Turn off case sensitivity") do |i|
+      options[:ignore_case] = i
+    end
   end
 
   def execute(input, output)
+    @options = input.options
     query = require_query(input)
     matches = mutt_search(query)
     output.line(describe_result(matches))
@@ -29,23 +33,43 @@ class Ppl::Command::Mutt < Ppl::Application::Command
 
   def mutt_search(query)
     @address_book = @storage.load_address_book
+    select_matching_contacts(@address_book, query)
+  end
+
+  def select_matching_contacts(address_book, query)
     matches = Ppl::Entity::AddressBook.new
+    address_book.contacts.each do |contact|
+      if contact.email_addresses.empty?
+        next
+      elsif match_by_name(contact, query)
+        matches.contacts << contact
+      elsif match_by_email_address(contact, query)
+        matches.contacts << contact
+      end
+    end
+    matches
+  end
 
-    @address_book.contacts.each do |contact|
-      next if contact.email_addresses.empty?
+  def match_by_name(contact, query)
+    if @options[:ignore_case]
+      contact.name.downcase.include? query.downcase
+    else
+      contact.name.include? query
+    end
+  end
 
-      matching_emails = contact.email_addresses.select do |email_address|
+  def match_by_email_address(contact, query)
+    matches = contact.email_addresses.select do |email_address|
+      if @options[:ignore_case]
+        email_address.downcase.include? query.downcase
+      else
         email_address.include? query
       end
-
-      if matching_emails.length > 0
-        matches.contacts.push(contact)
-      elsif !contact.name.nil? && contact.name.include?(query)
-        matches.contacts.push(contact)
-      end
     end
-
-    matches
+    if matches.length > 0
+      contact.email_addresses = matches
+      true
+    end
   end
 
   def describe_result(matches)

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

@@ -9,25 +9,24 @@ class Ppl::Format::AddressBook::MuttQuery < Ppl::Format::AddressBook
   end
 
   def process(address_book)
-    address_book.contacts.each { |contact| add_row(contact) }
+    address_book.contacts.each { |contact| add_contact(contact) }
     @table.to_s
   end
 
-
   private
 
-  def add_row(contact)
-    name = nil
-    if !contact.name.nil?
-      name = contact.name
+  def add_contact(contact)
+    contact.email_addresses.each do |email_address|
+      add_email_address(email_address, contact.name)
     end
+  end
 
+  def add_email_address(email_address, name)
     @table.add_row({
-      :email => contact.email_addresses.first,
+      :email => email_address,
       :name  => name,
     })
   end
 
-
 end
 

data/lib/ppl.rb

@@ -1,7 +1,7 @@
 
 module Ppl
 
-  Version = "1.15.1"
+  Version = "1.16.0"
 
   module Adapter
   end

data/ppl.gemspec

@@ -2,8 +2,8 @@
 Gem::Specification.new do |spec|
 
   spec.name        = "ppl"
-  spec.version     = "1.15.1"
-  spec.date        = "2013-04-11"
+  spec.version     = "1.16.0"
+  spec.date        = "2013-04-12"
 
   spec.required_ruby_version = ">= 1.9.3"
 

data/spec/ppl/command/mutt_spec.rb

@@ -51,6 +51,22 @@ describe Ppl::Command::Mutt do
       @command.execute(@input, @output).should eq true
     end
 
+    it "should only return matching email addresses" do
+      @input.arguments.push "prova"
+      @contact.name = "Test User"
+
+      @contact.email_addresses.push "test@test.org"
+      @contact.email_addresses.push "prova@prova.org"
+      @address_book.contacts.push(@contact)
+      @storage.stub(:load_address_book).and_return(@address_book)
+      @format.should_receive(:process) do |address_book|
+        address_book.contacts[0].email_addresses.length.should eq 1
+        address_book.contacts[0].email_addresses[0].should eq "prova@prova.org"
+      end
+      @output.stub(:line)
+      @command.execute(@input, @output)
+    end
+
     it "should return name matches" do
 
       @contact.name = "Test User"
@@ -68,6 +84,36 @@ describe Ppl::Command::Mutt do
       @command.execute(@input, @output).should eq true
     end
 
+  end
+
+  describe "#execute (case-insensitive)" do
+
+    before(:each) do
+      @input.options[:ignore_case] = true
+      @contact.name = "Joe Schmoe"
+      @contact.email_addresses.push "joe@somewhere.com"
+      @contact.email_addresses.push "LOUD@SHOUTING.COM"
+      @address_book.contacts << @contact
+      @storage.stub(:load_address_book).and_return(@address_book)
+      @output.stub(:line)
+    end
+
+    it "should ignore case when matching names" do
+      @input.arguments.push "joe schmoe"
+      @format.should_receive(:process) do |address_book|
+        address_book.contacts[0].email_addresses.length.should eq 2
+      end
+      @command.execute(@input, @output)
+    end
+
+    it "should ignore case when matching email addresses" do
+      @input.arguments.push "loud"
+      @format.should_receive(:process) do |address_book|
+        address_book.contacts[0].email_addresses.length.should eq 1
+        address_book.contacts[0].email_addresses[0].should eq "LOUD@SHOUTING.COM"
+      end
+      @command.execute(@input, @output)
+    end
 
   end
 

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

@@ -24,6 +24,19 @@ describe Ppl::Format::AddressBook::MuttQuery do
       @format.process(@address_book)
     end
 
+    it "should list all of each contact's email addresses" do
+      @contact.email_addresses.push "test2@example.com"
+      @table.should_receive(:add_row).with({
+        :email => "test@example.org",
+        :name  => "Test Contact",
+      })
+      @table.should_receive(:add_row).with({
+        :email => "test2@example.com",
+        :name  => "Test Contact",
+      })
+      @format.process(@address_book)
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ppl
 version: !ruby/object:Gem::Version
-  version: 1.15.1
+  version: 1.16.0
 platform: ruby
 authors:
 - Henry Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored