AddressBookImporter 0.0.12 → 0.0.13

data/lib/address_book_importer.rb

@@ -4,7 +4,7 @@ require 'cgi'
 require 'iconv'
 
 module AddressBookImporter
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 
   class EmptyEmailException < Exception ; end
   class LoginErrorException < Exception ; end
@@ -47,42 +47,29 @@ module AddressBookImporter
       raise LoginErrorException if page.body.match(/icon_err\.gif/)
       url = page.root.at('script').inner_html.match(%r{(http:[^"]+)})[0]
       p = @agent.get(url) # http://by132w.bay132.mail.live.com/mail/mail.aspx
-      if (match = p.body.match(/(http:\/\/[^"'\/\\]*\.mail\.live\.com)/))
-        @mode = :live
-      else
-        @mode = :normal
-      end
       p
     end 
 
     def fetch_contacts(page)
       rval = []
-      if @mode == :normal
-        params = page.body.match(/(curmbox=[^&]+)/)[1]
-        start = page.body.match(/(a=[^"]+)/)[1]
-        contact_page = @agent.get("/cgi-bin/AddressPicker?" + start+params + "&Context=InsertAddress&_HMaction=Edit&qF=to")
-        rval = get_email(contact_page.body)
+      link = page.links.select{|l|l.href.match(/Inbox/)}.first
+      p = @agent.click(link)
+      link = page.links.select{|l|l.href.match(/EditMessage/)}.first
+      if p.body.match(/NewMessageGo/)
+        if (match = p.body.match(/(\/mail\/ApplicationMainReach\.aspx\?Control=EditMessage[^"]+)/))
+          p = @agent.get(match[1])
+        end
+        form = p.forms.first
+        form.add_field!('ToContact.x', 9)
+        form.add_field!('ToContact.y', 11)   
+        p2 = form.submit
+        rval = get_email(p2.body)
       else
-        link = page.links.select{|l|l.href.match(/Inbox/)}.first
         p = @agent.click(link)
-        link = page.links.select{|l|l.href.match(/EditMessage/)}.first
-        if p.body.match(/NewMessageGo/)
-          if (match = p.body.match(/(\/mail\/ApplicationMainReach\.aspx\?Control=EditMessage[^"]+)/))
-            p = @agent.get(match[1])
-          end
-          form = p.forms.first
-          form.add_field!('ToContact.x', 9)
-          form.add_field!('ToContact.y', 11)   
-          p2 = form.submit
-          rval = get_email(p2.body)
-        else
-          p = @agent.click(link)
-          rval = get_email(p.body, /([_\-a-z0-9.A-Z]+(%|\\x)40((?:[-a-z0-9]+\.)+[a-z]{2,}))/)
-          rval.collect!{|a|a.gsub(/(%40|\\x40)/, '@')}
-        end
-        
-        rval.reject{|a|a == @login_email}
+        rval = get_email(p.body, /([_\-a-z0-9.A-Z]+(%|\\x)40((?:[-a-z0-9]+\.)+[a-z]{2,}))/)
+        rval.collect!{|a|a.gsub(/(%40|\\x40)/, '@')}
       end
+      rval.reject{|a|a == @login_email}
     end
 
     protected

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: AddressBookImporter
 version: !ruby/object:Gem::Version 
-  version: 0.0.12
-date: 2007-09-27 00:00:00 +02:00
+  version: 0.0.13
+date: 2007-11-20 00:00:00 +01:00
 summary: Mechanize scraper for address books
 require_paths: 
 - lib