fb_video_url_converter 0.1.2 → 0.1.3

data/README.md

@@ -66,14 +66,18 @@ or without migrations:
 ## Example
 
     url = 'http://www.facebook.com/home.php?#!/video/video.php?v=SOME_ID'
-    p FacebookVideo.video_url(url)
+    p FacebookVideo.get(url).url
 
     => 'http://video.ak.fbcdn.net/cfs-ak-ash4/214...long_long_url'
 
-    p FacebookVideo.video_name(url)
+    p FacebookVideo.get(url).name
 
     => 'video_name'
 
+you can use also `working?` to determine if object you have got is a valid
+Facebook movie object. If not - use `object.error` to determine what type of
+error has occurred.
+
 ## Setup
 
 When you create table required by Facebook Video URL Converter, you need to do

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('fb_video_url_converter', '0.1.2') do |p|
+Echoe.new('fb_video_url_converter', '0.1.3') 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,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fb_video_url_converter}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Maciej Mensfeld"]
   s.cert_chain = ["/home/mencio/.cert_keys/gem-public_cert.pem"]
-  s.date = %q{2011-05-03}
+  s.date = %q{2011-05-05}
   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 = ["CHANGELOG.rdoc", "README.md", "lib/facebook_bot.rb", "lib/facebook_video.rb", "lib/fb_video_url_converter.rb"]

data/lib/facebook_video.rb

@@ -13,33 +13,50 @@ end
 
 class FacebookVideo < ActiveRecord::Base
 
+  attr_accessor :error
+
   class << self
     attr_accessor :cache
   end
 
-  VIDEO_ERROR_MSG = 'video_id_error'
-  FB_ERROR_MSG = 'fb_account_error'
+  VIDEO_ERROR_MSG = :video_id_error
+  FB_ERROR_MSG = :fb_account_error
 
-  before_create :set_cached_at_time
+  # Dummy video object containing info about error
+  # We will not return (or raise) errors - it is not deseable
+  class NotWorkingVideo
 
-  validates_uniqueness_of :video_id
-  validate :working?
+    attr_accessor :error
 
-  def self.video_url(v_id)
-    v = self.video_data(v_id)
-     case v
-      when 'video_error' then VIDEO_ERROR_MSG
-      when 'fb_error' then FB_ERROR_MSG
-      else v.url
+    def initialize(error)
+      @error = error
+    end
+    
+    def url
+      @error
+    end
+
+    def name
+      @error
     end
+
+    def working?
+      false
+    end
+    
   end
 
-  def self.video_name(v_id)
+  before_create :set_cached_at_time
+
+  validates_uniqueness_of :video_id
+  validate :working?
+
+  def self.get(v_id)
     v = self.video_data(v_id)
     case v
-      when 'video_error' then VIDEO_ERROR_MSG
-      when 'fb_error' then FB_ERROR_MSG
-      else v.name
+      when 'video_error' then NotWorkingVideo.new(VIDEO_ERROR_MSG)
+      when 'fb_error' then NotWorkingVideo.new(FB_ERROR_MSG)
+      else v
     end
   end
 

data/spec/facebook_video_spec.rb

@@ -14,24 +14,24 @@ describe FacebookVideo do
 
   context "when we obtain valid video for the first time" do
     it "should fetch it and return url" do
-      FacebookVideo.video_url('111449252268656').should_not eql 'video_id_error'
+      FacebookVideo.get('111449252268656').name.should_not eql :video_id_error
       url = 'http://www.facebook.com/video/video.php?v=119040278176220&comments'
-      FacebookVideo.video_url(url).should_not eql 'video_id_error'
+      FacebookVideo.get(url).name.should_not eql :video_id_error
     end
 
     it "should fetch it and return name" do
-      FacebookVideo.video_name('111449252268656').should eql 'Naruto Shippuuden #203 Part2 [HD]'
+      FacebookVideo.get('111449252268656').name.should eql 'Naruto Shippuuden #203 Part2 [HD]'
       url = 'http://www.facebook.com/video/video.php?v=111449252268656&comments'
-      FacebookVideo.video_name(url).should eql 'Naruto Shippuuden #203 Part2 [HD]'
+      FacebookVideo.get(url).name.should eql 'Naruto Shippuuden #203 Part2 [HD]'
     end
   end
 
   context "when we obtain video for n times" do
     it "should increase views counter" do
-      FacebookVideo.video_name('111449252268656')
+      FacebookVideo.get('111449252268656')
       v = FacebookVideo.find_by_video_id('111449252268656').views
       10.times do
-        FacebookVideo.video_name('111449252268656')
+        FacebookVideo.get('111449252268656')
       end
       FacebookVideo.find_by_video_id('111449252268656').views.should == v+10
     end
@@ -40,11 +40,11 @@ describe FacebookVideo do
   context "when video is too old" do
     it "should rerequest it and refresh cache time" do
       t = Time.now
-      FacebookVideo.video_name('111449252268656')
+      FacebookVideo.get('111449252268656')
       v = FacebookVideo.find_by_video_id('111449252268656')
       v.cached_at = Time.at(946702800)
       v.save!
-      FacebookVideo.video_name('111449252268656')
+      FacebookVideo.get('111449252268656')
       v.reload
       v.cached_at.should > t
     end
@@ -52,8 +52,8 @@ describe FacebookVideo do
 
   context "when we obtain invalid video" do
     it "should return warning" do
-      FacebookVideo.video_name('').should eql 'video_id_error'
-      FacebookVideo.video_url('').should eql 'video_id_error'
+      FacebookVideo.get('').url.should eql :video_id_error
+      FacebookVideo.get('').name.should eql :video_id_error
     end
   end
 
@@ -61,7 +61,7 @@ describe FacebookVideo do
     it "should return incorrect video ID info" do
       l = FacebookBot.email
       FacebookBot.email = 'aaa@aaa.pl'
-      FacebookVideo.video_url('120641554682759').should eql 'fb_account_error'
+      FacebookVideo.get('120641554682759').url.should eql :fb_account_error
       remove_cookie
       FacebookBot.email = l
     end

metadata

@@ -2,7 +2,7 @@
 name: fb_video_url_converter
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Maciej Mensfeld
@@ -31,7 +31,7 @@ cert_chain:
   BH3YFsdk
   -----END CERTIFICATE-----
 
-date: 2011-05-03 00:00:00 +02:00
+date: 2011-05-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency