cardmagic-contacts 1.0.13 → 1.0.14

data/lib/contacts/gmail.rb

@@ -1,4 +1,14 @@
-require "json/add/rails"
+begin
+  # If the json gem is available, use it
+  require "json/add/rails"
+rescue MissingSourceFile
+  # Otherwise wrap the ActiveSupport JSON implementation for our simple use case
+  class JSON
+    def self.parse(i)
+      ActiveSupport::JSON.decode(i)
+    end
+  end
+end
 
 class Contacts
   class Gmail < Base
@@ -28,9 +38,11 @@ class Contacts
       data, resp, cookies, forward, old_url = post(LOGIN_URL, postdata, cookie, LOGIN_REFERER_URL) + [LOGIN_URL]
       
       cookies = remove_cookie("GMAIL_LOGIN", cookies)
-      
+
       if data.index("Username and password do not match")
         raise AuthenticationError, "Username and password do not match"
+      elsif data.index("The username or password you entered is incorrect")
+        raise AuthenticationError, "Username and password do not match"
       elsif data.index("Required field must not be blank")
         raise AuthenticationError, "Login and password must not be blank"
       elsif data.index("errormsg_0_logincaptcha")

data/lib/contacts/plaxo.rb

@@ -34,8 +34,8 @@ class Contacts
       elsif code == '200'
         @contacts = []
         doc.elements.each('//contact') do |cont|
-          name  = cont.elements['fullName'].text   #rescue nil
-          email = cont.elements['email1'].text #rescue nil
+          name  = cont.elements['fullName'].nil? ? cont.elements['displayName'].text : cont.elements['fullName'].text
+          email = cont.elements['email1'].text
           @contacts << [name, email]
         end.compact
         @contacts

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cardmagic-contacts
 version: !ruby/object:Gem::Version 
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors: 
 - Lucas Carlson
@@ -9,17 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-10 00:00:00 -07:00
+date: 2009-05-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.0
+        version: 1.1.1
     version: 
 description: A universal interface to grab contact list information from various providers including Yahoo, Gmail, Hotmail, and Plaxo.
 email: lucas@rufy.com