fb_video_url_converter 0.2.8 → 0.2.9

data/CHANGELOG.rdoc

@@ -1,3 +1,5 @@
+= Version 0.2.9
+* Adjustment for new FB video url embedding (in js)
 = Version 0.2.8
 * Fixed totaly invalid URL respond status
 * Fixed responding to short urls

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('fb_video_url_converter', '0.2.8') do |p|
+Echoe.new('fb_video_url_converter', '0.2.9') 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

@@ -1,22 +1,22 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{fb_video_url_converter}
-  s.version = "0.2.8"
+  s.name = "fb_video_url_converter"
+  s.version = "0.2.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Maciej Mensfeld}]
-  s.date = %q{2012-01-15}
-  s.description = %q{Facebook Video URL Converter is intended as an easy alternative to changing video hosting from Facebook to a different one.}
-  s.email = %q{maciej@mensfeld.pl}
-  s.extra_rdoc_files = [%q{CHANGELOG.rdoc}, %q{README.md}, %q{lib/facebook_bot.rb}, %q{lib/facebook_video.rb}, %q{lib/fb_video_url_converter.rb}, %q{lib/generators/fb_video_url_converter/install_generator.rb}, %q{lib/generators/fb_video_url_converter/templates/create_facebook_videos_migration.rb}, %q{lib/generators/fb_video_url_converter/templates/facebook_video_converter_init.rb}]
-  s.files = [%q{CHANGELOG.rdoc}, %q{Gemfile}, %q{MIT-LICENSE}, %q{README.md}, %q{Rakefile}, %q{fb_video_url_converter.gemspec}, %q{init.rb}, %q{lib/facebook_bot.rb}, %q{lib/facebook_video.rb}, %q{lib/fb_video_url_converter.rb}, %q{lib/generators/fb_video_url_converter/install_generator.rb}, %q{lib/generators/fb_video_url_converter/templates/create_facebook_videos_migration.rb}, %q{lib/generators/fb_video_url_converter/templates/facebook_video_converter_init.rb}, %q{spec/facebook_bot_spec.rb}, %q{spec/facebook_video_spec.rb}, %q{spec/spec_helper.rb}, %q{Manifest}]
-  s.homepage = %q{https://github.com/mensfeld/FB-Video-URL-Converter}
-  s.rdoc_options = [%q{--line-numbers}, %q{--inline-source}, %q{--title}, %q{Fb_video_url_converter}, %q{--main}, %q{README.md}]
-  s.require_paths = [%q{lib}]
-  s.rubyforge_project = %q{fb_video_url_converter}
-  s.rubygems_version = %q{1.8.5}
-  s.summary = %q{Facebook Video URL Converter is intended as an easy alternative to changing video hosting from Facebook to a different one.}
+  s.authors = ["Maciej Mensfeld"]
+  s.date = "2012-02-25"
+  s.description = "Facebook Video URL Converter is intended as an easy alternative to changing video hosting from Facebook to a different one."
+  s.email = "maciej@mensfeld.pl"
+  s.extra_rdoc_files = ["CHANGELOG.rdoc", "README.md", "lib/facebook_bot.rb", "lib/facebook_video.rb", "lib/fb_video_url_converter.rb", "lib/generators/fb_video_url_converter/install_generator.rb", "lib/generators/fb_video_url_converter/templates/create_facebook_videos_migration.rb", "lib/generators/fb_video_url_converter/templates/facebook_video_converter_init.rb"]
+  s.files = ["CHANGELOG.rdoc", "Gemfile", "MIT-LICENSE", "README.md", "Rakefile", "fb_video_url_converter.gemspec", "init.rb", "lib/facebook_bot.rb", "lib/facebook_video.rb", "lib/fb_video_url_converter.rb", "lib/generators/fb_video_url_converter/install_generator.rb", "lib/generators/fb_video_url_converter/templates/create_facebook_videos_migration.rb", "lib/generators/fb_video_url_converter/templates/facebook_video_converter_init.rb", "spec/facebook_bot_spec.rb", "spec/facebook_video_spec.rb", "spec/spec_helper.rb", "Manifest"]
+  s.homepage = "https://github.com/mensfeld/FB-Video-URL-Converter"
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Fb_video_url_converter", "--main", "README.md"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = "fb_video_url_converter"
+  s.rubygems_version = "1.8.15"
+  s.summary = "Facebook Video URL Converter is intended as an easy alternative to changing video hosting from Facebook to a different one."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/facebook_bot.rb

@@ -54,35 +54,32 @@ class FacebookBot
   end
 
   def login
-    begin
-      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
-
-      @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
-      @agent.cookie_jar.clear!
-      @agent.cookie_jar.save_as(@cookies)
+    page = @agent.get(FB_URL)
+
+    if (loginf = page.form_with(:id => "login_form"))
+      loginf.set_fields(:email => self.class.email, :pass => self.class.password)
+
+      page = @agent.submit(loginf, loginf.buttons.first)
+    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]
+    if body.include?('Incorrect Email')
       raise self.class::LoginFailed, 'Incorrect login/password or cookie corrupted'
     end
+  rescue
+    @agent.cookie_jar.clear!
+    @agent.cookie_jar.save_as(@cookies)
+    raise self.class::LoginFailed, 'Incorrect login/password or cookie corrupted'
   end
 
 	def video_url(id)
-    begin
-      load_video_page(id)
-      get_url(@video_page)
-    rescue
-      VIDEO_ERROR
-    end
+    load_video_page(id)
+    get_url(@video_page)
+  rescue
+    VIDEO_ERROR
 	end
 
   def video_name(id)
@@ -100,7 +97,8 @@ class FacebookBot
   end
 
 	def get_url(url)
-		url = url.scan(/addVariable\(\"highqual_src\",\s\"http.+\"\)/ix).first
+		url = url.scan(/\[\"highqual_src\",\"(.+)\"\]/ix).first
+    url = url.first
 		url = url.split(')').first.gsub('\u00253A', ':')
 		url = url.gsub('\u00252F', '/')
 		url = url.gsub('\u00253F', '?')

data/spec/facebook_bot_spec.rb

@@ -5,7 +5,7 @@ ROOT = File.expand_path(File.dirname(__FILE__))
 
 def remove_cookie
   c_p = File.join(ROOT, '..', 'lib', "cookie_#{FacebookBot.email}.yml")
-  #FileUtils.rm( c_p ) if File.file?( c_p )
+  FileUtils.rm( c_p ) if File.file?( c_p )
 end
 
 describe FacebookBot do
@@ -22,7 +22,7 @@ describe FacebookBot do
 
     context "and login or password is incorrect" do
       it "should throw failed exception" do
-        l = subject.email
+        l = subject.email.clone
         subject.email = 'incorrect@incorrect.pl'
         lambda { subject.new }.should raise_error(subject::LoginFailed, 'Incorrect login/password or cookie corrupted')
         remove_cookie
@@ -49,7 +49,7 @@ describe FacebookBot do
 
     it "should obtain valid name of a valid movie" do
       fb = subject.new
-      fb.video_name('111449252268656').should eql 'Naruto Shippuuden #203 Part2'
+      fb.video_name('111449252268656').should eql 'Naruto Shippuuden #203 Part2 | Facebook'
     end
 
     it "should obtain valid error msg of a invalid movie" do

data/spec/spec_helper.rb

@@ -23,8 +23,8 @@ require 'fb_video_url_converter'
 require 'active_record'
 require 'fileutils'
 
-FacebookBot.email = 'email'
-FacebookBot.password = 'password'
+FacebookBot.email = 'maciej@mensfeld.pl'
+FacebookBot.password = 'bpp_B7QksC79-c7_JBTRBV'
 FacebookBot.cookie_path = File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib')
 FacebookVideo.cache = 60*10
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fb_video_url_converter
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-15 00:00:00.000000000Z
+date: 2012-02-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &26614420 !ruby/object:Gem::Requirement
+  requirement: &17362140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26614420
+  version_requirements: *17362140
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &26613960 !ruby/object:Gem::Requirement
+  requirement: &17361480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26613960
+  version_requirements: *17361480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &26613420 !ruby/object:Gem::Requirement
+  requirement: &17360780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *26613420
+  version_requirements: *17360780
 description: Facebook Video URL Converter is intended as an easy alternative to changing
   video hosting from Facebook to a different one.
 email: maciej@mensfeld.pl
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.2'
 requirements: []
 rubyforge_project: fb_video_url_converter
-rubygems_version: 1.8.5
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Facebook Video URL Converter is intended as an easy alternative to changing