liangzan-contacts 1.2.16 → 1.2.17

data/lib/contacts.rb

@@ -15,4 +15,4 @@ require 'web_de'
 require 'seznam'
 require 'onelt'
 require 'inbox_lt'
-require 'tmobile_de'
+require 'tonline_de'

data/lib/contacts/aol.rb

@@ -2,6 +2,7 @@ class Contacts
   require 'hpricot' if RUBY_VERSION < '1.9'
   require 'csv'
   class Aol < Base
+    DETECTED_DOMAINS    = [ /aol.com/i ]
     URL                 = "http://www.aol.com/"
     LOGIN_URL           = "https://my.screenname.aol.com/_cqr/login/login.psp"
     LOGIN_REFERER_URL   = "http://webmail.aol.com/"

data/lib/contacts/base.rb

@@ -11,6 +11,8 @@ class Contacts
   TYPES = {}
 
   class Base
+    DETECTED_DOMAINS = []
+
     def initialize(login, password, options={})
       @login = login
       @password = password
@@ -212,18 +214,36 @@ class Contacts
     end
   end
 
-  def self.guess(login, password, options={})
+  def self.get_email_domain(email)
+    name, domain = email.split('@')
+    domain
+  end
+
+  def self.guess_importer(email, options={})
     if keys = options[:types]
       types = TYPES.select{|k, v| keys.include?(k)}
-    end
+    end    
     types ||= TYPES
 
-    types.inject([]) do |a, t|
-      begin
-        a + t[1].new(login, password, options).contacts
-      rescue AuthenticationError
-        a
-      end
-    end.uniq
+    email_domain = get_email_domain(email)
+
+    types.values.find do |klass|
+      klass::DETECTED_DOMAINS.any? { |m| email_domain.match(m) }
+    end
+  end
+
+  def self.guess(email, password, options={})
+    klass = guess_importer(email, options)
+
+    return if klass.nil?
+
+    a = []
+
+    begin
+      a = klass.new(email, password, options).contacts
+    rescue AuthenticationError
+    end
+
+    return a
   end
 end

data/lib/contacts/gmail.rb

@@ -3,6 +3,7 @@ require 'gdata'
 class Contacts
   class Gmail < Base
     
+    DETECTED_DOMAINS = [ /gmail.com/i, /googlemail.com/i ]
     CONTACTS_SCOPE = 'http://www.google.com/m8/feeds/'
     CONTACTS_FEED = CONTACTS_SCOPE + 'contacts/default/full/?max-results=1000'
     

data/lib/contacts/gmx.rb

@@ -1,5 +1,6 @@
 class Contacts
   class Gmx < Base
+    DETECTED_DOMAINS = [ /gmx.de/i, /gmx.at/i, /gmx.ch/i, /gmx.net/i ]
     LOGIN_URL = "https://service.gmx.net/de/cgi/login"
     ADDRESS_BOOK_URL = "https://service.gmx.net/de/cgi/g.fcgi/addressbook/cab?cc=subnavi_adressbuch&sid="
     EXPORT_URL = "https://adressbuch.gmx.net/exportcontacts"

data/lib/contacts/hotmail.rb

@@ -4,6 +4,7 @@ require 'nokogiri'
 
 class Contacts
   class Hotmail < Base
+    DETECTED_DOMAINS = [ /hotmail/i, /live/i, /msn/i, /chaishop/i ]
     URL = "https://login.live.com/login.srf?id=2"
     CONTACT_LIST_URL = "https://mail.live.com/mail/GetContacts.aspx"
     PROTOCOL_ERROR = "Hotmail has changed its protocols, please upgrade this library first. If that does not work, report this error at http://rubyforge.org/forum/?group_id=2693"

data/lib/contacts/inbox_lt.rb

@@ -1,5 +1,6 @@
 class Contacts
   class InboxLt < Base
+    DETECTED_DOMAINS = [ /inbox\.lt/i ]
     URL = "http://www.inbox.lt/?language=lt"
     LOGIN_URL = "https://login.inbox.lt/redirect.php"
     ADDRESS_BOOK_URL = "http://mail.inbox.lt/horde/turba/?char=&sort=name&page=%d"

data/lib/contacts/mailru.rb

@@ -2,6 +2,7 @@ require 'csv'
 
 class Contacts
   class Mailru < Base
+    DETECTED_DOMAINS = [ /list\.ru/i, /inbox\.ru/i, /bk\.ru/i, /mail\.ru/i ]
     LOGIN_URL = "https://auth.mail.ru/cgi-bin/auth"
     ADDRESS_BOOK_URL = "http://e.mail.ru/cgi-bin/abexport/addressbook.csv"
 

data/lib/contacts/onelt.rb

@@ -1,5 +1,6 @@
 class Contacts
   class Onelt < Base
+    DETECTED_DOMAINS = [ /one\.lt/i ]
     LOGIN_URL = "http://w33.one.lt/logonSubsite.do?subsite=pastas"
     EMAIL_URL = "http://email.one.lt/"
     ADDRESS_BOOK_URL = "http://email.one.lt/index.html?screen=RedirectServer&pane=contacts"

data/lib/contacts/seznam.rb

@@ -1,5 +1,6 @@
 class Contacts
   class Seznam < Base
+    DETECTED_DOMAINS = [ /seznam\.cz/i, /email\.cz/i, /post\.cz/i, /spoluzaci\.cz/i, /stream\.cz/i, /firmy\.cz/i, ]
     LOGIN_URL = "https://login.szn.cz/loginProcess"
     ADDRESS_BOOK_URL = "http://email.seznam.cz/abookCsvExport?sessionId=&charset=utf-8&eof=windows&export=nameLast&export=nameFirst&export=nick&export=email"
 

data/lib/contacts/{tmobile_de.rb → tonline_de.rb}

@@ -1,8 +1,9 @@
 class Contacts
-  class TmobileDe < Base
+  class TonlineDe < Base
+    DETECTED_DOMAINS = [ /t-mobile\.de/i, /t-online\.de/i ]
     URL = "https://email.t-online.de/V4-0-4-0/srv-bin/aaa?method=deliverLoginBox"
     ADDRESS_BOOK_URL = "https://email.t-online.de/V4-0-4-0/srv-bin/addressbook?method=exportAdressbook&p%5Bformat%5D=CSV&p%5Bliid%5D="
-    PROTOCOL_ERROR = "t-mobile.de has changed its protocols"
+    PROTOCOL_ERROR = "t-online.de has changed its protocols"
 
     attr_accessor :cookies, :tid
 
@@ -74,5 +75,5 @@ class Contacts
     end
   end
 
-  TYPES[:tmobile_de] = TmobileDe
+  TYPES[:tonline_de] = TonlineDe
 end

data/lib/contacts/web_de.rb

@@ -1,5 +1,6 @@
 class Contacts
   class WebDe < Base
+    DETECTED_DOMAINS = [ /web\.de/i ]
     LOGIN_URL = "https://uas2.uilogin.de/centrallogin-3.1/login"
     ADDRESS_BOOK_URL = "https://mm.web.de/contacts"
 

data/lib/contacts/yahoo.rb

@@ -1,5 +1,6 @@
 class Contacts
   class Yahoo < Base
+    DETECTED_DOMAINS    = [ /yahoo/i, /ymail/i, /rocketmail/i ]    
     URL                 = "http://mail.yahoo.com/"
     LOGIN_URL           = "https://login.yahoo.com/config/login"
     ADDRESS_BOOK_URL    = "http://address.mail.yahoo.com/?.rand=430244936"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liangzan-contacts
 version: !ruby/object:Gem::Version
-  version: 1.2.16
+  version: 1.2.17
   prerelease: 
 platform: ruby
 authors:
@@ -13,11 +13,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-20 00:00:00.000000000Z
+date: 2012-03-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &8908780 !ruby/object:Gem::Requirement
+  requirement: &10538000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -25,10 +25,10 @@ dependencies:
         version: 1.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *8908780
+  version_requirements: *10538000
 - !ruby/object:Gem::Dependency
   name: gdata_19
-  requirement: &8907780 !ruby/object:Gem::Requirement
+  requirement: &10536780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -36,10 +36,10 @@ dependencies:
         version: 1.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *8907780
+  version_requirements: *10536780
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &8906900 !ruby/object:Gem::Requirement
+  requirement: &10535740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -47,22 +47,22 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *8906900
+  version_requirements: *10535740
 description: A universal interface to grab contact list information from Yahoo, AOL,
-  Gmail, Hotmail, Plaxo, GMX.net, Web.de, inbox.it, sezname.cz, tmobile.de. Now supporting
+  Gmail, Hotmail, Plaxo, GMX.net, Web.de, inbox.lt, seznam.cz, t-online.de. Now supporting
   Ruby 1.9.
 email: zan@liangzan.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/contacts/tonline_de.rb
 - lib/contacts/inbox_lt.rb
 - lib/contacts/base.rb
 - lib/contacts/web_de.rb
 - lib/contacts/gmail.rb
 - lib/contacts/plaxo.rb
 - lib/contacts/onelt.rb
-- lib/contacts/tmobile_de.rb
 - lib/contacts/yahoo.rb
 - lib/contacts/seznam.rb
 - lib/contacts/hotmail.rb
@@ -98,6 +98,6 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: grab contacts from Yahoo, AOL, Gmail, Hotmail, Plaxo, GMX.net, Web.de, inbox.it,
-  seznam.cz, tmobile.de
+summary: grab contacts from Yahoo, AOL, Gmail, Hotmail, Plaxo, GMX.net, Web.de, inbox.lt,
+  seznam.cz, t-online.de
 test_files: []