graybook 1.1.0 → 1.1.1

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 1
-:patch: 0
+:patch: 1

data/VERSION_NAME

@@ -1 +1 @@
-Gray Grouper
+Gray Groundhog

data/lib/graybook/importer/aol.rb

@@ -29,17 +29,18 @@ class Graybook::Importer::Aol < Graybook::Importer::PageScraper
 
     case page.body
     when /Invalid Screen Name or Password. Please try again./
-      return Problem.new("Username and password were not accepted. Please check them and try again.")
+      return Graybook::Problem.new("Username and password were not accepted. Please check them and try again.")
     when /Terms of Service/
-      return Problem.new("Your AOL account is not setup for WebMail. Please signup: http://webmail.aol.com")
+      return Graybook::Problem.new("Your AOL account is not setup for WebMail. Please signup: http://webmail.aol.com")
     end
 
     # aol bumps to a wait page while logging in.  if we can't scrape out the js then its a bad login
     extractor = proc { |var_name| page.body.scan(/var\s*#{var_name}\s*=\s*\"(.*?)\"\s*;/).first.first }
 
     base_uri = extractor.call( 'gSuccessPath' )
-    return Problem.new("An error occurred. Please try again.") unless base_uri
+    return Graybook::Problem.new("An error occurred. Please try again.") unless base_uri
     page = agent.get base_uri
+    true
   end
 
   ##
@@ -56,7 +57,7 @@ class Graybook::Importer::Aol < Graybook::Importer::PageScraper
 
   def scrape_contacts
     unless auth_cookie = agent.cookies.find{|c| c.name =~ /^Auth/}
-      return Problem.new("An error occurred. Please try again.")
+      return Graybook::Problem.new("An error occurred. Please try again.")
     end
 
     # jump through the hoops of formulating a request to get printable contacts

data/lib/graybook/importer/gmail.rb

@@ -33,11 +33,12 @@ class Graybook::Importer::Gmail < Graybook::Importer::PageScraper
     form.Passwd = options[:password]
     page = agent.submit(form,form.buttons.first)
 
-    return Problem.new("Username and password were not accepted. Please check them and try again.") if page.body =~ /Username and password do not match/
+    return Graybook::Problem.new("Username and password were not accepted. Please check them and try again.") if page.body =~ /Username and password do not match/
 
     if page.search('//meta').first.attributes['content'] =~ /url='?(http.+?)'?$/i
       page = agent.get $1
     end
+    true
   end
 
   ##
@@ -54,7 +55,7 @@ class Graybook::Importer::Gmail < Graybook::Importer::PageScraper
     unless agent.cookies.find { |c|
         c.name == 'GAUSR' && c.value.match(/mail(.*?):#{options[:username]}/)
       }
-      return Problem.new("Username and password were not accepted. Please check them and try again.")
+      return Graybook::Problem.new("Username and password were not accepted. Please check them and try again.")
     end
 
     page = agent.get('http://mail.google.com/mail/h/?v=cl&pnl=a')

data/lib/graybook/importer/hotmail.rb

@@ -51,10 +51,11 @@ class Graybook::Importer::Hotmail < Graybook::Importer::PageScraper
     # Check for login success
     if page.body =~ /The e-mail address or password is incorrect/ ||
       page.body =~ /Sign in failed\./
-      return Problem.new("Username and password were not accepted. Please check them and try again.")
+      return Graybook::Problem.new("Username and password were not accepted. Please check them and try again.")
     end
     
     @first_page = agent.get( page.body.scan(/http\:\/\/[^"]+/).first )
+    true
   end
   
   ##
@@ -71,7 +72,7 @@ class Graybook::Importer::Hotmail < Graybook::Importer::PageScraper
 
   def scrape_contacts
     unless agent.cookies.find{|c| c.name == 'MSPPre' && c.value == options[:username]}
-      return Problem.new("Username and password were not accepted. Please check them and try again.")
+      return Graybook::Problem.new("Username and password were not accepted. Please check them and try again.")
     end
 
     page = agent.get('http://mail.live.com/')

data/lib/graybook/importer/page_scraper.rb

@@ -62,8 +62,7 @@ class Graybook::Importer::PageScraper < Graybook::Importer::Base
     create_agent
     prep = prepare
     return prep if prep.nil?
-    cont = scrape_contacts
-    return cont if cont.nil?
+    scrape_contacts
   end
   
   ##

data/lib/graybook/importer/yahoo.rb

@@ -24,7 +24,7 @@ class Graybook::Importer::Yahoo < Graybook::Importer::PageScraper
     page = agent.submit(form, form.buttons.first)
 
     if page.body =~ /Invalid ID or password./ || page.body =~ /This ID is not yet taken./
-      return Problem.new("Username and password were not accepted. Please check them and try again.")
+      return Graybook::Problem.new("Username and password were not accepted. Please check them and try again.")
     end
 
     true
@@ -43,7 +43,7 @@ class Graybook::Importer::Yahoo < Graybook::Importer::PageScraper
   def scrape_contacts
     page = agent.get("http://address.yahoo.com/?1=&VPC=import_export")
     if page.body =~ /To access Yahoo! Address Book\.\.\..*Sign in./m
-      return Problem.new("Username and password were not accepted. Please check them and try again.")
+      return Graybook::Problem.new("Username and password were not accepted. Please check them and try again.")
     end
     form = page.forms.last
     csv = agent.submit(form, form.buttons[2]) # third button is Yahoo-format CSV

data/lib/graybook.rb

@@ -4,7 +4,7 @@ require 'rubygems'
 
 class Graybook
   include ::Singleton
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 
   class Problem < Exception
     def nil?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: graybook
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - kojul