yehezkielbs-contacts 1.2.13 → 1.2.14

data/lib/contacts/aol.rb

@@ -136,17 +136,24 @@ class Contacts
   private
 
     def parse(data, options={})
-      parsed = []
+      @contacts = []
+
+      first_line = true
       data.split("\n").each do |line|
         begin
-          parsed << FasterCSV.parse_line(line)
+          if first_line
+            first_line = false
+          else
+            person = FasterCSV.parse_line(line)
+            if person[4] && !person[4].empty?
+              @contacts << ["#{person[0]} #{person[1]}", person[4]]
+            end
+          end
         rescue
         end
       end
-      col_names = parsed.shift
-      @contacts = parsed.map do |person|
-        ["#{person[0]} #{person[1]}", person[4]] if person[4] && !person[4].empty?
-      end.compact
+
+      @contacts = @contacts.compact
     end
  
     def h_to_query_string(hash)

data/lib/contacts/gmail.rb

@@ -11,10 +11,10 @@ class Contacts
     end
     
     def real_connect
-      @client = GData::Client::Contacts.new
-      @client.clientlogin(@login, @password, @captcha_token, @captcha_response)
+      gclient = GData::Client::Contacts.new
+      gclient.clientlogin(@login, @password, @captcha_token, @captcha_response)
       
-      feed = @client.get(CONTACTS_FEED).to_xml
+      feed = gclient.get(CONTACTS_FEED).to_xml
       
       @contacts = feed.elements.to_a('entry').collect do |entry|
         title, email = entry.elements['title'].text, nil
@@ -22,18 +22,10 @@ class Contacts
           email = e.attribute('address').value if e.attribute('primary')
         end
 
-        avatar = nil
-        begin
-          avatar_el = entry.elements['link[@type="image/*"]']
-          if avatar_el
-            avatar_response = @client.get(avatar_el.attribute('href').to_s)
-            avatar = avatar_response.body if avatar_response.status_code == 200
-          end
-        rescue
-          avatar = nil
-        end
+        avatar_el = entry.elements['link[@type="image/*"]']
+        avatar_url = avatar_el ? avatar_el.attribute('href').to_s : nil
 
-        [title, email, avatar] unless email.nil?
+        [title, email, avatar_url] unless email.nil?
       end
       @contacts.compact!
     rescue GData::Client::AuthorizationError => e

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: yehezkielbs-contacts
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 1
   - 2
-  - 13
-  version: 1.2.13
+  - 14
+  version: 1.2.14
 platform: ruby
 authors: 
 - Lucas Carlson
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-23 00:00:00 Z
+date: 2012-04-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json