fb_video_url_converter 0.2.4 → 0.2.5

data/CHANGELOG.rdoc

@@ -1,3 +1,5 @@
+= 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"
 = 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.4') do |p|
+Echoe.new('fb_video_url_converter', '0.2.5') 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.4"
+  s.version = "0.2.5"
 
   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

@@ -38,10 +38,7 @@ class FacebookBot
 
     begin
       @@root = File.join(Rails.root, 'tmp')
-      @@rails = true
-    rescue Exception => e
-      @@rails = false
-      log e
+    rescue
       raise CookiePathNotInitialized, 'Specify cookie_path' if self.class.cookie_path.nil?
       @@root = self.class.cookie_path
     end
@@ -50,9 +47,7 @@ class FacebookBot
 
     begin
       @agent.cookie_jar.load(@cookies)
-    rescue Exception => e
-      log e
-      @agent.cookie_jar.clear!
+    rescue
     end if (File.file?(@cookies) && File.size(@cookies) > 10)
 
     self.login
@@ -69,24 +64,18 @@ class FacebookBot
       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
-
+    # Donno why but sometimes cookiejar gets crazy - so better be prepared ;)
     begin
-      # This is a UID given to each Facebook user.
-      @uid = %r{\\"user\\":(\d+),\\"hide\\"}.match(body)[1]
-    rescue Exception => e
-      log e
-      @uid = nil
+      @agent.cookie_jar.save_as(@cookies)
+    rescue
     end
+    
+    body = page.root.to_html
 
     # This is a token we need to submit forms.
     begin
       @post_form_id = %r{<input type="hidden" .* name="post_form_id" value="([^"]+)}.match(body)[1]
-    rescue Exception => e
-      log e
-      File.open(@cookies, 'w') {|f| f.write('') }
-      @agent.cookie_jar.clear!
+    rescue
       raise self.class::LoginFailed, 'Incorrect login or password'
     end
   end
@@ -95,8 +84,7 @@ class FacebookBot
     begin
       load_video_page(id)
       get_url(@video_page)
-    rescue Exception => e
-      log e
+    rescue
       VIDEO_ERROR
     end
 	end
@@ -108,11 +96,6 @@ class FacebookBot
 
 	private
 
-  # We log stuff only when using rails (to lazy to write diff logger not for rails)
-  def log(e)
-    Rails.logger.error "[FB_Video_Url_Converter] #{e}" if @@rails
-  end
-
   def load_video_page(id)
     if @video_page.nil?
       pa = @agent.get("#{FB_URL}video/video.php?v=#{id}")

data/lib/facebook_video.rb

@@ -54,8 +54,8 @@ class FacebookVideo < ActiveRecord::Base
   def self.get(v_id)
     v = self.video_data(v_id)
     case v
-      when 'video_error' then NotWorkingVideo.new(VIDEO_ERROR_MSG)
-      when 'fb_error' then NotWorkingVideo.new(FB_ERROR_MSG)
+      when :video_error then NotWorkingVideo.new(VIDEO_ERROR_MSG)
+      when :fb_error    then NotWorkingVideo.new(FB_ERROR_MSG)
       else v
     end
   end
@@ -100,14 +100,14 @@ class FacebookVideo < ActiveRecord::Base
       v_id = v_id.scan(/[0-9]+/).first
     end
 
-    return 'video_error' if v_id.nil? || v_id.length < 12
+    return :video_error if v_id.nil? || v_id.length < 12
 
     video = self.find_by_video_id(v_id)
     unless video && video.valid?
       begin
         fb = FacebookBot.new
       rescue FacebookBot::LoginFailed
-        return 'fb_error'
+        return :fb_error
       end
       url = fb.video_url(v_id)
       name = fb.video_name(v_id)

metadata

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

metadata.gz.sig

@@ -1 +1 @@
-��������L�K��x8�s����ĩ�
+cp�6�AK�7�|#O�<a�~:l�P�d�g�b���`�g��S�r�R�K���*8�8fsu�4r�w,�w�f�3<�!��Z��m՘�(1p���~=a�.�F@��<�_��6��2�����
�#�n;�S�G\9p�c��˽Ҭt� ����u�ogm;�g-�l� A��K�Ҝ�D�J�Uzu�Ұ��⼻B<Ԅ��e�� �lCBQ�8��sWl'�b��6���#�[��T-�����m�t}�lH�