email2face 0.0.2 → 0.0.3

data/Gemfile

@@ -1,6 +1,5 @@
 source "http://rubygems.org"
 
-gem 'json', :require => 'json'
 gem 'capybara', :require => 'capybara'
 gem 'capybara-webkit', :require => 'capybara/webkit'
 gem 'headless', :require => "headless"

data/Gemfile.lock

@@ -62,7 +62,6 @@ DEPENDENCIES
   capybara-webkit
   headless
   jeweler (~> 1.8.3)
-  json
   rdoc (~> 3.12)
   shoulda
   simplecov

data/README.md

@@ -4,7 +4,7 @@ You give it an email. It gives you their face.
 
 ## Dependencies & Warnings
 
-It needs a Facebook account to work. I *do not* recommend using your own Facebook, and, to demotivate you from doing that, it stores the Facebook account you give it in plaintext. In other words, if you give it your Facebook account, then it's going to be *very* easy for other people to get access to your Facebook, so make a fake Facebook for using this.
+It needs a Facebook account to work. I *do not* recommend using your own Facebook because it stores the Facebook account in plaintext. So, make a fake Facebook for it. I've included a default one, but it'll probably be banned by the time you get to it.
 
 ### Before jumping in
 
@@ -29,8 +29,6 @@ $ sudo pacman -S xorg-server-xvfb qtwebkit
 $ sudo apt-get install xvfb libqtwebkit4 libqtwebkit4-dev
 ```
 
-**You need to make a fake Facebook account to use this!**
-
 ## Using it
 
 Start off by installing the gem:
@@ -39,17 +37,29 @@ Start off by installing the gem:
 gem install 'email2face'
 ```
 
-Then, we pass in the email, with the Facebook account in a hash:
+Then, we just give Email2Face the email we want a face for:
 
 ```ruby
 require 'email2face'
 Email2Face.face("my.email@facebook.com")
 ```
-I've included a fake Facebook by default. However, it could be disabled at any time.
 
-When you want to change the Facebook account, just run
+### Changing the Facebook Account
+It's unlikely the included Facebook account will work for long. So, you may need to make a fake Facebook for it. Do not use your own because it's possible that Facebook may ban it.
+
+#### With Ruby on Rails:
+
+* Create a new file in `config/initializers` called `facebook.rb`
+
+* Open that file in a text editor, and drop in the following:
 
 ```ruby
-require 'email2face'
-Email2Face.face("my.email@facebook.com", { :username => "fb_account@example.com", :password => "fbpassword" })
-```
+Email2Face.username = "FAKE_FACEBOOK_USERNAME"
+Email2Face.password = "FAKE_FACEBOOK_PASSWORD"
+```
+
+You'll need to restart your application server for it to have any affect.
+
+#### Without Ruby on Rails:
+
+The code above wasn't specific to Ruby on Rails. Just set ```Email2Face.username``` and ```Email2Face.password``` to what you want.

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/email2face.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "email2face"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jarred Sumner"]
@@ -39,7 +39,6 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<capybara>, [">= 0"])
       s.add_runtime_dependency(%q<capybara-webkit>, [">= 0"])
       s.add_runtime_dependency(%q<headless>, [">= 0"])
@@ -49,7 +48,6 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
-      s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<capybara>, [">= 0"])
       s.add_dependency(%q<capybara-webkit>, [">= 0"])
       s.add_dependency(%q<headless>, [">= 0"])
@@ -60,7 +58,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<capybara>, [">= 0"])
     s.add_dependency(%q<capybara-webkit>, [">= 0"])
     s.add_dependency(%q<headless>, [">= 0"])

data/lib/email2face.rb

@@ -1,54 +1,45 @@
 require 'capybara/dsl'
 require 'capybara-webkit'
 require 'headless'
-require 'json'
+
+FAKE_FACEBOOK_USERNAME = "anmail@email2face.net"
+FAKE_FACEBOOK_PASSWORD = "thisisapassword"
 
 class Email2Face
-  attr_accessor :username, :password, :verbose
+  # This is why you should make a fake Facebook account.
+  @@username = FAKE_FACEBOOK_USERNAME
+  @@password = FAKE_FACEBOOK_PASSWORD
 
-  def self.filepath
-    "#{ENV["HOME"]}/.sandvich"
+  def self.username
+    @@username
   end
 
-  CHROME_USER_AGENT = "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/536.5 (KHTML, like Gecko) Chrome/19.0.1084.41 Safari/536.5
-"
+  def self.username=(username)
+    @@username = username
+  end
 
-  def self.face(email, options = {}, from_thor = false)
-    user = Email2Face.new
-    if options[:username].nil? || options[:password].nil?
-      user.load_auth_from_disk(options)
-    else
-      user.username = options[:username]
-      user.password = options[:password]
-      user.verbose  = options[:verbose]
-    end
-      if user.username.nil? || user.username == "" || user.password.nil? || user.password == ""
-        user.no_login_details(email)
-      end
-      html = user.face_html(email)
-      return user.face(html)
+  def self.password
+    @@password
+  end
+
+  def self.password=(password)
+    @@password = password
   end
 
-  def load_auth_from_disk(options)
-    if File.exists?(Email2Face.filepath)
-      json = JSON.parse(File.open(Email2Face.filepath, "r").read) 
-      self.username = json["username"]
-      self.password = json["password"]
-      self.verbose  = options["verbose"]
+  def self.face(email)
+    if @@username == FAKE_FACEBOOK_USERNAME
+      no_login_details(email)
     end
+    html = face_html(email)
+    return get_face(html)
   end
 
-  def no_login_details(email)
-    options = {}
-    options[:username] = 'anmail@email2face.net'
-    options[:password] = 'thisisapassword'
-    puts "You didn't specify a Facebook account, so I set you up with a fake Facebook account that might not work. When it stops working, just open up \"#{Email2Face.filepath}\" and change it there"
-    Email2Face.face(email, options)
+  def self.no_login_details(email)
+    puts "You didn't specify a Facebook account, so I set you up with a fake Facebook account that might not work."
   end
 
-  def face_html(email)
+  def self.face_html(email)
     configure_capybara
-    puts "Logging in..." if self.verbose
     Headless.ly do
       browser = Capybara::Session.new(:webkit, browser)
       #self.driver.header("User-Agent", CHROME_USER_AGENT)
@@ -59,8 +50,6 @@ class Email2Face
         browser.click_button "Log In"
       end
       if browser.driver.cookies["c_user", ".facebook.com"]
-        login_success!
-        puts "Login Successful! Getting Face URL" if self.verbose
         url = "https://www.facebook.com/search/results.php?o=2048&init=s%3Aemail&q=#{ email.sub("@", "%40") }"
         browser.visit url
         return browser.html
@@ -70,30 +59,12 @@ class Email2Face
     end
   end
 
-  def login_success!
-    if File.exists?(Email2Face.filepath)
-      File.delete(Email2Face.filepath)
-    else
-      File.new(Email2Face.filepath, "w") 
-    end
-    File.open(Email2Face.filepath, "w") do |f|
-      f.write(self.to_json)
-    end
-  end
-
-  def to_json
-    hash = Hash.new
-    hash[:username] = self.username
-    hash[:password] = self.password
-    hash.to_json
-  end
-
-  def login_failed!
+  def self.login_failed!
     puts "Couldn't login to Facebook. Maybe you misspelled your username or password?"
     exit(0)
   end
 
-  def face(html)
+  def self.get_face(html)
     parser    = Nokogiri::HTML(html)
     element   = parser.xpath("//*[@id='pagelet_search_results_objects']/div/div/div/div/div[2]/div[1]/a") || parser.xpath('//*[@id="js_0"]')
     href      = element.attribute("href")
@@ -101,11 +72,11 @@ class Email2Face
     uri.host  = "graph.facebook.com"
     uri.path  = uri.path + "/picture"
     uri.to_s
-  rescue Exception
+  rescue
     "I couldn't find a face for that email :("
   end
 
-  def configure_capybara
+  def self.configure_capybara
     Capybara.app = self
     Capybara.javascript_driver = :webkit
     Capybara.current_driver = :webkit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: email2face
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,22 +11,6 @@ bindir: bin
 cert_chain: []
 date: 2012-05-06 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -15428611
+      hash: -83936141
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: