fb_video_url_converter 0.2.5 → 0.2.6

data/CHANGELOG.rdoc

@@ -1,5 +1,7 @@
+= Version 0.2.6
+* Fix for undefined each for nil class - when cookiejar is corrupted - will clear corrupted cookiejar - so in next request - will relogin
 = Version 0.2.5
-* Removed errors login. Reraising different errors than FacebookBot::LoginFailed so will log automatically. Inserted all cookie_jar operations into begin-rescue blocks because it sometimes raises "undefined method expired? 4 nil class"
+* Removed errors login. Reraising different errors than FacebookBot::LoginFailed so will log automatically. Inserted all cookie_jar operations into begin-rescue blocks because it sometimes raises 'undefined method expired? 4 nil class'
 = Version 0.2.4
 * Experimental Rails errors loggin
 = Version 0.2.3

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('fb_video_url_converter', '0.2.5') do |p|
+Echoe.new('fb_video_url_converter', '0.2.6') do |p|
   p.description    = "Facebook Video URL Converter is intended as an easy alternative to changing video hosting from Facebook to a different one."
   p.url            = "https://github.com/mensfeld/FB-Video-URL-Converter"
   p.author         = "Maciej Mensfeld"

data/fb_video_url_converter.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fb_video_url_converter}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Maciej Mensfeld"]

data/lib/facebook_bot.rb

@@ -54,29 +54,25 @@ class FacebookBot
   end
 
   def login
-    page = @agent.get(FB_URL)
-
-    if (loginf = page.form_id("login_form"))
-      loginf.set_fields(:email => self.class.email, :pass => self.class.password)
-      page = @agent.submit(loginf, loginf.buttons.first)
-      # When we login (successfully) we will be redirected in a not so "gracefull"
-      # way - so we need to "skip" redirecting page
-      page = @agent.get(FB_URL) if page.root.to_html.include?('<title>Redirecting')
-    end
-
-    # Donno why but sometimes cookiejar gets crazy - so better be prepared ;)
     begin
-      @agent.cookie_jar.save_as(@cookies)
-    rescue
-    end
-    
-    body = page.root.to_html
+      page = @agent.get(FB_URL)
 
-    # This is a token we need to submit forms.
-    begin
+      if (loginf = page.form_id("login_form"))
+        loginf.set_fields(:email => self.class.email, :pass => self.class.password)
+        page = @agent.submit(loginf, loginf.buttons.first)
+        # When we login (successfully) we will be redirected in a not so "gracefull"
+        # way - so we need to "skip" redirecting page
+        page = @agent.get(FB_URL) if page.root.to_html.include?('<title>Redirecting')
+      end
+
+      @agent.cookie_jar.save_as(@cookies)
+      
+      body = page.root.to_html
       @post_form_id = %r{<input type="hidden" .* name="post_form_id" value="([^"]+)}.match(body)[1]
     rescue
-      raise self.class::LoginFailed, 'Incorrect login or password'
+      @agent.cookie_jar.clear!
+      @agent.cookie_jar.save_as(@cookies)
+      raise self.class::LoginFailed, 'Incorrect login/password or cookie corrupted'
     end
   end
 

metadata

@@ -2,7 +2,7 @@
 name: fb_video_url_converter
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Maciej Mensfeld