fb_video_url_converter 0.2.9 → 0.3.0

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+= Version 0.3.0
+* Quick adjustment for new FB embedding, tests aren't updated :(
+* Works for HD and SD
 = Version 0.2.9
 * Adjustment for new FB video url embedding (in js)
 = Version 0.2.8

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('fb_video_url_converter', '0.2.9') do |p|
+Echoe.new('fb_video_url_converter', '0.3.0') 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,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fb_video_url_converter"
-  s.version = "0.2.9"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Maciej Mensfeld"]
-  s.date = "2012-02-25"
+  s.date = "2012-12-22"
   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"]
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   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.rubygems_version = "1.8.10"
   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

data/lib/facebook_bot.rb

@@ -6,6 +6,7 @@ require 'mechanize'
 require 'uri'
 require 'cgi'
 require 'time'
+require 'json'
 
 class Mechanize::Page
   def form_id(formId)
@@ -35,51 +36,13 @@ class FacebookBot
     @video_page = nil
     @agent = Mechanize.new
     @agent.user_agent_alias = USER_AGENT
-
-    begin
-      @@root = File.join(Rails.root, 'tmp')
-    rescue
-      raise CookiePathNotInitialized, 'Specify cookie_path' if self.class.cookie_path.nil?
-      @@root = self.class.cookie_path
-    end
-
-    @cookies = File.join(@@root, "cookie_#{self.class.email}.yml")
-
-    begin
-      @agent.cookie_jar.load(@cookies)
-    rescue
-    end if (File.file?(@cookies) && File.size(@cookies) > 10)
-
-    self.login
-  end
-
-  def login
-    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)
     load_video_page(id)
     get_url(@video_page)
-  rescue
-    VIDEO_ERROR
+  #rescue
+  #  VIDEO_ERROR
 	end
 
   def video_name(id)
@@ -96,21 +59,45 @@ class FacebookBot
     end
   end
 
-	def get_url(url)
+	def get_url(page)
+    url ||= extract_url_hd(page)
+    url ||= extract_url_sd(page)
+    url ||= extract_url_old(page)
+    url.nil? ? raise(RuntimeError) : url
+	end
+
+  def get_name(site)
+    name = site.scan(/title>(.+)<\/title>/ix).first
+    name ? name.first : VIDEO_ERROR
+  end
+
+  def extract_url_old(url)
 		url = url.scan(/\[\"highqual_src\",\"(.+)\"\]/ix).first
     url = url.first
-		url = url.split(')').first.gsub('\u00253A', ':')
+		url = url.gsub('\u00253A', ':')
 		url = url.gsub('\u00252F', '/')
 		url = url.gsub('\u00253F', '?')
 		url = url.gsub('\u00253D', '=')
 		url = url.gsub('\u002526', '&')
+    url = url.gsub('\u00255C', '\\')
 		url = "http://#{url.split('http://')[1]}".split('"').first
 		CGI.unescapeHTML(url)
-	end
+  rescue
+    nil
+  end
 
-  def get_name(site)
-    name = site.scan(/title>(.+)<\/title>/ix).first
-    name ? name.first : VIDEO_ERROR
+  def extract_url_hd(page)
+    url = page.scan(/hd_src.*(http.*?)(\\u002522)/ix).last.first
+    URI.decode(JSON('["'+url+'"]').first).gsub('\\', '')
+  #rescue
+  #  nil
+  end
+
+  def extract_url_sd(page)
+    url = page.scan(/sd_src.*(http.*?)(\\u002522)/ix).last.first
+    URI.decode(JSON('["'+url+'"]').first).gsub('\\', '')
+  rescue
+    nil
   end
 
 end

data/spec/spec_helper.rb

@@ -23,8 +23,8 @@ require 'fb_video_url_converter'
 require 'active_record'
 require 'fileutils'
 
-FacebookBot.email = 'maciej@mensfeld.pl'
-FacebookBot.password = 'bpp_B7QksC79-c7_JBTRBV'
+FacebookBot.email = 'email'
+FacebookBot.password = 'password'
 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.9
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-25 00:00:00.000000000Z
+date: 2012-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &17362140 !ruby/object:Gem::Requirement
+  requirement: &15952360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17362140
+  version_requirements: *15952360
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &17361480 !ruby/object:Gem::Requirement
+  requirement: &15951100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17361480
+  version_requirements: *15951100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &17360780 !ruby/object:Gem::Requirement
+  requirement: &15950400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *17360780
+  version_requirements: *15950400
 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.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Facebook Video URL Converter is intended as an easy alternative to changing