RubyGems - contacts - Versions diffs - 1.0.1 → 1.0.2 - Mend

contacts 1.0.1 → 1.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

data/doc/classes/Contacts.html +1 -1
data/doc/classes/Contacts.src/M000001.html +1 -1
data/doc/classes/Contacts.src/M000002.html +1 -1
data/doc/classes/Contacts/Base.src/M000005.html +2 -1
data/doc/classes/Contacts/Base.src/M000006.html +1 -1
data/doc/classes/Contacts/Base.src/M000007.html +1 -1
data/doc/classes/Contacts/Base.src/M000008.html +2 -6
data/doc/classes/Contacts/Hotmail.html +10 -0
data/doc/classes/Contacts/Hotmail.src/M000011.html +1 -1
data/doc/created.rid +1 -1
data/doc/files/lib/contacts/base_rb.html +4 -1
data/doc/files/lib/contacts/hotmail_rb.html +1 -1
data/lib/contacts/base.rb +44 -16
data/lib/contacts/hotmail.rb +50 -4
metadata +2 -2

data/doc/classes/Contacts.html CHANGED Viewed

@@ -137,7 +137,7 @@ Class <a href="Contacts/Yahoo.html" class="link">Contacts::Yahoo</a><br />
         <tr class="top-aligned-row context-row">
           <td class="context-item-name">VERSION</td>
           <td>=</td>
-          <td class="context-item-value">&quot;1.0.1&quot;</td>
+          <td class="context-item-value">&quot;1.0.2&quot;</td>
         </tr>
         </table>
       </div>

data/doc/classes/Contacts.src/M000001.html CHANGED Viewed

@@ -10,7 +10,7 @@
   <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/contacts/base.rb, line 154</span>
+  <pre><span class="ruby-comment cmt"># File lib/contacts/base.rb, line 182</span>
   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">type</span>, <span class="ruby-identifier">login</span>, <span class="ruby-identifier">password</span>)
     <span class="ruby-keyword kw">if</span> <span class="ruby-constant">TYPES</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">type</span>.<span class="ruby-identifier">to_s</span>.<span class="ruby-identifier">intern</span>)
       <span class="ruby-constant">TYPES</span>[<span class="ruby-identifier">type</span>.<span class="ruby-identifier">to_s</span>.<span class="ruby-identifier">intern</span>].<span class="ruby-identifier">new</span>(<span class="ruby-identifier">login</span>, <span class="ruby-identifier">password</span>)

data/doc/classes/Contacts.src/M000002.html CHANGED Viewed

@@ -10,7 +10,7 @@
   <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/contacts/base.rb, line 162</span>
+  <pre><span class="ruby-comment cmt"># File lib/contacts/base.rb, line 190</span>
   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">guess</span>(<span class="ruby-identifier">login</span>, <span class="ruby-identifier">password</span>)
     <span class="ruby-constant">TYPES</span>.<span class="ruby-identifier">inject</span>([]) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">a</span>, <span class="ruby-identifier">t</span><span class="ruby-operator">|</span>
       <span class="ruby-keyword kw">begin</span>

data/doc/classes/Contacts/Base.src/M000005.html CHANGED Viewed

@@ -10,10 +10,11 @@
   <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/contacts/base.rb, line 11</span>
+  <pre><span class="ruby-comment cmt"># File lib/contacts/base.rb, line 14</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">login</span>, <span class="ruby-identifier">password</span>)
       <span class="ruby-ivar">@login</span>    = <span class="ruby-identifier">login</span>
       <span class="ruby-ivar">@password</span> = <span class="ruby-identifier">password</span>
+      <span class="ruby-ivar">@connections</span> = {}
       <span class="ruby-identifier">connect</span>
     <span class="ruby-keyword kw">end</span></pre>
 </body>

data/doc/classes/Contacts/Base.src/M000006.html CHANGED Viewed

@@ -10,7 +10,7 @@
   <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/contacts/base.rb, line 17</span>
+  <pre><span class="ruby-comment cmt"># File lib/contacts/base.rb, line 21</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">connect</span>
       <span class="ruby-identifier">raise</span> <span class="ruby-constant">AuthenticationError</span>, <span class="ruby-node">&quot;Login and password must not be nil, login: #{@login.inspect}, password: #{@password.inspect}&quot;</span> <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@login</span>.<span class="ruby-identifier">nil?</span> <span class="ruby-operator">||</span> <span class="ruby-ivar">@password</span>.<span class="ruby-identifier">nil?</span>
       <span class="ruby-identifier">real_connect</span>

data/doc/classes/Contacts/Base.src/M000007.html CHANGED Viewed

@@ -10,7 +10,7 @@
   <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/contacts/base.rb, line 22</span>
+  <pre><span class="ruby-comment cmt"># File lib/contacts/base.rb, line 26</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">connected?</span>
       <span class="ruby-ivar">@cookies</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-operator">!</span><span class="ruby-ivar">@cookies</span>.<span class="ruby-identifier">empty?</span>
     <span class="ruby-keyword kw">end</span></pre>

data/doc/classes/Contacts/Base.src/M000008.html CHANGED Viewed

@@ -10,16 +10,12 @@
   <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/contacts/base.rb, line 26</span>
+  <pre><span class="ruby-comment cmt"># File lib/contacts/base.rb, line 30</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">contacts</span>
       <span class="ruby-keyword kw">return</span> <span class="ruby-ivar">@contacts</span> <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@contacts</span>
       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">connected?</span>
         <span class="ruby-identifier">url</span> = <span class="ruby-constant">URI</span>.<span class="ruby-identifier">parse</span>(<span class="ruby-identifier">contact_list_url</span>)
-        <span class="ruby-identifier">http</span> = <span class="ruby-constant">Net</span><span class="ruby-operator">::</span><span class="ruby-constant">HTTP</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">url</span>.<span class="ruby-identifier">host</span>, <span class="ruby-identifier">url</span>.<span class="ruby-identifier">port</span>)
-        <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">url</span>.<span class="ruby-identifier">port</span> <span class="ruby-operator">==</span> <span class="ruby-value">443</span>
-          <span class="ruby-identifier">http</span>.<span class="ruby-identifier">use_ssl</span> = <span class="ruby-keyword kw">true</span>
-          <span class="ruby-identifier">http</span>.<span class="ruby-identifier">verify_mode</span> = <span class="ruby-constant">OpenSSL</span><span class="ruby-operator">::</span><span class="ruby-constant">SSL</span><span class="ruby-operator">::</span><span class="ruby-constant">VERIFY_NONE</span>
-        <span class="ruby-keyword kw">end</span>
+        <span class="ruby-identifier">http</span> = <span class="ruby-identifier">open_http</span>(<span class="ruby-identifier">url</span>)
         <span class="ruby-identifier">resp</span>, <span class="ruby-identifier">data</span> = <span class="ruby-identifier">http</span>.<span class="ruby-identifier">get</span>(<span class="ruby-node">&quot;#{url.path}?#{url.query}&quot;</span>,
           <span class="ruby-value str">&quot;Cookie&quot;</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-ivar">@cookies</span>
         )

data/doc/classes/Contacts/Hotmail.html CHANGED Viewed

@@ -115,6 +115,11 @@
           <td>=</td>
           <td class="context-item-value">&quot;http://%s/cgi-bin/addresses&quot;</td>
         </tr>
+        <tr class="top-aligned-row context-row">
+          <td class="context-item-name">COMPOSE_URL</td>
+          <td>=</td>
+          <td class="context-item-value">&quot;http://%s/cgi-bin/compose?&quot;</td>
+        </tr>
         <tr class="top-aligned-row context-row">
           <td class="context-item-name">PROTOCOL_ERROR</td>
           <td>=</td>
@@ -125,6 +130,11 @@
           <td>=</td>
           <td class="context-item-value">&quot;IfYouAreReadingThisYouHaveTooMuchFreeTime&quot;</td>
         </tr>
+        <tr class="top-aligned-row context-row">
+          <td class="context-item-name">MAX_HTTP_THREADS</td>
+          <td>=</td>
+          <td class="context-item-value">8</td>
+        </tr>
         </table>
       </div>
     </div>

data/doc/classes/Contacts/Hotmail.src/M000011.html CHANGED Viewed

@@ -10,7 +10,7 @@
   <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/contacts/hotmail.rb, line 8</span>
+  <pre><span class="ruby-comment cmt"># File lib/contacts/hotmail.rb, line 10</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">real_connect</span>
       <span class="ruby-identifier">data</span>, <span class="ruby-identifier">resp</span>, <span class="ruby-identifier">cookies</span>, <span class="ruby-identifier">forward</span> = <span class="ruby-identifier">get</span>(<span class="ruby-constant">URL</span>)
       <span class="ruby-identifier">data</span>, <span class="ruby-identifier">resp</span>, <span class="ruby-identifier">cookies</span>, <span class="ruby-identifier">forward</span> = <span class="ruby-identifier">get</span>(<span class="ruby-identifier">forward</span>, <span class="ruby-identifier">cookies</span>, <span class="ruby-constant">URL</span>)

data/doc/created.rid CHANGED Viewed

	@@ -1 +1 @@
1	- ~~Thu~~ ~~Dec~~ 07 13:33:56 ~~PST~~ ~~2006~~
1	+ Fri Mar 30 10:28:09 PDT 2007

data/doc/files/lib/contacts/base_rb.html CHANGED Viewed

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Thu Dec 07 10:27:59 PST 2006</td>
+      <td>Fri Mar 30 10:27:18 PDT 2007</td>
     </tr>
     </table>
   </div>
@@ -77,6 +77,9 @@
       net/http&nbsp;&nbsp;
       net/https&nbsp;&nbsp;
       uri&nbsp;&nbsp;
+      zlib&nbsp;&nbsp;
+      stringio&nbsp;&nbsp;
+      thread&nbsp;&nbsp;
       </div>
     </div>

data/doc/files/lib/contacts/hotmail_rb.html CHANGED Viewed

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Thu Dec 07 10:57:58 PST 2006</td>
+      <td>Fri Mar 30 10:23:35 PDT 2007</td>
     </tr>
     </table>
   </div>

data/lib/contacts/base.rb CHANGED Viewed

@@ -2,15 +2,19 @@ require "cgi"
 require "net/http"
 require "net/https"
 require "uri"
+require "zlib"
+require "stringio"
+require "thread"
 class Contacts
   TYPES = {}
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
   class Base
     def initialize(login, password)
       @login    = login
       @password = password
+      @connections = {}
       connect
     end
@@ -27,11 +31,7 @@ class Contacts
       return @contacts if @contacts
       if connected?
         url = URI.parse(contact_list_url)
-        http = Net::HTTP.new(url.host, url.port)
-        if url.port == 443
-          http.use_ssl = true
-          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        end
+        http = open_http(url)
         resp, data = http.get("#{url.path}?#{url.query}",
           "Cookie" => @cookies
         )
@@ -72,6 +72,21 @@ class Contacts
     def contact_list_url
       self.class.const_get(:CONTACT_LIST_URL)
     end
+    def open_http(url)
+      c = @connections[Thread.current.object_id] ||= {}
+      http = c["#{url.host}:#{url.port}"]
+      unless http
+        http = Net::HTTP.new(url.host, url.port)
+        if url.port == 443
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
+        c["#{url.host}:#{url.port}"] = http
+      end
+      http.start unless http.started?
+      http
+    end
     def parse_cookies(data, existing="")
       return existing if data.nil?
@@ -105,17 +120,15 @@ class Contacts
     def post(url, postdata, cookies="", referer="")
       url = URI.parse(url)
-      http = Net::HTTP.new(url.host, url.port)
-      if url.port == 443
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
+      http = open_http(url)
       resp, data = http.post(url.path, postdata,
         "User-Agent" => "Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1) Gecko/20061010 Firefox/2.0",
+        "Accept-Encoding" => "gzip",
         "Cookie" => cookies,
         "Referer" => referer,
         "Content-Type" => 'application/x-www-form-urlencoded'
       )
+      data = uncompress(resp, data)
       cookies = parse_cookies(resp.response['set-cookie'], cookies)
       forward = resp.response['Location']
       return data, resp, cookies, forward
@@ -123,20 +136,35 @@ class Contacts
     def get(url, cookies="", referer="")
       url = URI.parse(url)
-      http = Net::HTTP.new(url.host, url.port)
-      if url.port == 443
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
+      http = open_http(url)
       resp, data = http.get("#{url.path}?#{url.query}",
         "User-Agent" => "Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1) Gecko/20061010 Firefox/2.0",
+        "Accept-Encoding" => "gzip",
         "Cookie" => cookies,
         "Referer" => referer
       )
+      data = uncompress(resp, data)
       cookies = parse_cookies(resp.response['set-cookie'], cookies)
       forward = resp.response['Location']
       return data, resp, cookies, forward
     end
+    def uncompress(resp, data)
+      case resp.response['content-encoding']
+      when 'gzip':
+        gz = Zlib::GzipReader.new(StringIO.new(data))
+        data = gz.read
+        gz.close
+        resp.response['content-encoding'] = nil
+      # FIXME: Not sure what Hotmail was feeding me with their 'deflate',
+      #        but the headers definitely were not right
+      when 'deflate':
+        data = Zlib::Inflate.inflate(data)
+        resp.response['content-encoding'] = nil
+      end
+      data
+    end
   end
   class ContactsError < StandardError

data/lib/contacts/hotmail.rb CHANGED Viewed

@@ -2,8 +2,10 @@ class Contacts
   class Hotmail < Base
     URL                 = "http://www.hotmail.com/"
     CONTACT_LIST_URL    = "http://%s/cgi-bin/addresses"
+    COMPOSE_URL         = "http://%s/cgi-bin/compose?"
     PROTOCOL_ERROR      = "Hotmail has changed its protocols, please upgrade this library first. If that does not work, contact lucas@rufy.com with this error"
     PWDPAD = "IfYouAreReadingThisYouHaveTooMuchFreeTime"
+    MAX_HTTP_THREADS    = 8
     def real_connect
       data, resp, cookies, forward = get(URL)
@@ -60,15 +62,59 @@ class Contacts
       CONTACT_LIST_URL % @domain
     end
+    def follow_email(data, id, contacts_slot)
+      compose_url = COMPOSE_URL % @domain
+      postdata = "HrsTest=&to=#{id}&mailto=1&ref=addresses"
+      postdata += "&curmbox=00000000-0000-0000-0000-000000000001"
+      a = data.split(/>\s*<input\s+/i).grep(/\s+name="a"/i)
+      return nil if a.empty?
+      a = a[0].match(/\s+value="([a-f0-9]+)"/i) or return nil
+      postdata += "&a=#{a[1]}"
+      data, resp, @cookies, forward = post(compose_url, postdata, @cookies)
+      e = data.split(/>\s*<input\s+/i).grep(/\s+name="to"/i)
+      return nil if e.empty?
+      e = e[0].match(/\s+value="([^"]+)"/i) or return nil
+      @contacts[contacts_slot][1] = e[1] if e[1].match(/@/)
+    end
     def parse(data)
       chunks = data.split('id="hotmail"')
-      chunks.delete_at(0)
+      prev = chunks.delete_at(0)
-      @contacts = chunks.map do |chunk|
+      queue = Queue.new
+      threads = []
+      @contacts = []
+      chunks.each do |chunk|
         name = chunk.split('return false;">')[1].split('</a>')[0] rescue nil
         email = chunk.split('return false;">')[2].split('</a>')[0] rescue nil
-        [name, email] if email && email != "more"
-      end.compact
+        unless email && email != "more"
+          prev = chunk
+          next
+        end
+        next_slot = @contacts.size
+        @contacts[next_slot] = [name, email]
+        if email.match(/\.\.\.$/)
+          if m = prev.match(/\s+id="([A-Za-z0-9\-]+)"/)
+            queue.push([m[1], next_slot])
+            if threads.size < MAX_HTTP_THREADS
+              threads.push(Thread.new {
+                  while x = queue.pop
+                    follow_email(data, *x)
+                  end
+              })
+            end
+          end
+        end
+        prev = chunk
+      end
+      threads.each { queue.push(nil) }
+      threads.each { |t| t.join }
+      @contacts
     end
   end

metadata CHANGED Viewed

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: contacts
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-date: 2006-12-07 00:00:00 -08:00
+  version: 1.0.2
+date: 2007-03-30 00:00:00 -07:00
 summary: Ridiculously easy contact list information from various providers including Yahoo, Gmail, and Hotmail
 require_paths:
 - lib