acts_as_unvlogable_fork 1.0.1 → 1.0.4

data/lib/acts_as_unvlogable/string_extend.rb

@@ -1,4 +1,3 @@
-
 class String
   def query_param(param_name)
     raise ArgumentError.new("param name can't be nil") if param_name.blank?

data/lib/acts_as_unvlogable/version.rb

@@ -1,3 +1,3 @@
 module ActsAsUnvlogable
-  VERSION = "1.0.1"
+  VERSION = "1.0.4"
 end

data/lib/acts_as_unvlogable/vg_11870.rb

@@ -7,17 +7,16 @@
 class Vg11870
   
   def initialize(url=nil, options={})
-    @url = url
-    @page = Hpricot(open(url))
-    @flashvars = CGI::parse(@page.to_s.split("flashvars="")[1].split(""")[0])
+    @url = url.sub "http:", "https:"
+    @page = Nokogiri::HTML(open(@url))
   end
   
   def title
-    CGI::unescapeHTML @page.search("//h1[@class='fn name']/a").first.inner_html
+    CGI::unescapeHTML @page.xpath("//span[@itemprop='name']").first.text.strip
   end
   
   def thumbnail
-    @flashvars['image']
+    @page.xpath("//img[@itemprop='image']").first["src"]
   end
   
   def duration
@@ -25,8 +24,7 @@ class Vg11870
   end
   
   def embed_url
-    query = @flashvars.map {|k,v| "&#{k}=#{v}"}
-    "http://11870.com/multimedia/flvplayer.swf?#{query}"
+    "https://s3-eu-west-1.amazonaws.com/static.11870.com/11870/player.swf?netstreambasepath=#{@url}&id=video&file=#{flv}&image=#{thumbnail}"
   end
 
   def embed_html(width=425, height=344, options={}, params={})
@@ -34,7 +32,7 @@ class Vg11870
   end
   
   def flv
-    @flashvars['file']
+    @page.xpath("//div[@id='video']/span").first.text.strip
   end
  
   def download_url

data/lib/acts_as_unvlogable/vg_blip.rb

@@ -17,7 +17,7 @@ class VgBlip
   end
   
   def thumbnail
-    REXML::XPath.first(@feed, "//blip:smallThumbnail")[0].to_s
+    REXML::XPath.first(@feed, "//media:thumbnail").attributes['url']
   end
   
   def duration
@@ -25,18 +25,13 @@ class VgBlip
   end
   
   def embed_url
-    emb = REXML::XPath.first(@feed, "//media:player")[0].to_s
-    emb.split("src=\"")[1].split("\"")[0]
+    emb = REXML::XPath.first(@feed, "//blip:embedUrl")[0].to_s
   end
 
   def embed_html(width=425, height=344, options={}, params={})
-    "<embed src='#{embed_url}' type='application/x-shockwave-flash' width='#{width}' height='#{height}' allowscriptaccess='always' allowfullscreen='true'></embed>"
+    "<iframe src='#{embed_url}.x?p=1' width='#{width}' height='#{height}' frameborder='0' allowfullscreen></iframe>"
   end
   
-  def flv
-    REXML::XPath.first(@feed, "//enclosure").attributes['url']
-  end
-
   def download_url
     nil
   end

data/lib/acts_as_unvlogable/vg_collegehumor.rb

@@ -22,17 +22,13 @@ class VgCollegehumor
   end
   
   def embed_url
-    "http://www.collegehumor.com/moogaloop/moogaloop.swf?clip_id=#{@video_id}&fullscreen=1"
+    "http://www.collegehumor.com/e/#{@video_id}"
   end
 
   def embed_html(width=425, height=344, options={}, params={})
-    "<object type='application/x-shockwave-flash' data='#{embed_url}' width='#{width}' height='#{height}'><param name='allowfullscreen' value='true'/><param name='wmode' value='transparent'/><param name='AllowScriptAccess' value='true'/><param name='movie' quality='best' value='#{embed_url}'/><embed src='#{embed_url}' type='application/x-shockwave-flash' wmode='transparent' width='#{width}' height='#{height}' allowScriptAccess='always'></embed></object>"
+    "<iframe src='#{embed_url}' width='#{width}' height='#{height}' frameborder='0' webkitAllowFullScreen allowFullScreen></iframe>"
   end
   
-  def flv
-    REXML::XPath.first(@feed, "//video/file")[0]
-  end
-
   def download_url
     nil
   end

data/lib/acts_as_unvlogable/vg_dailymotion.rb

@@ -22,18 +22,13 @@ class VgDailymotion
   end
   
   def embed_url
-    REXML::XPath.first(@feed, "//media:content[@type='application/x-shockwave-flash']").attributes['url']
+    REXML::XPath.first(@feed, "//media:content[@type='text/html']").attributes['url']
   end
 
   def embed_html(width=425, height=344, options={}, params={})
-    "<object width='#{width}' height='#{height}'><param name='movie' value='#{embed_url}&related=1'></param><param name='allowFullScreen' value='true'></param><param name='allowScriptAccess' value='always'></param><embed src='#{embed_url}&related=1' type='application/x-shockwave-flash' width='#{width}' height='#{height}' allowFullScreen='true' allowScriptAccess='always'></embed></object>"
+    "<iframe frameborder='0' width='#{width}' height='#{height}' src='#{embed_url}' allowfullscreen></iframe>"
   end
   
-  def flv
-    doc = URI::parse("http://dailymotion.com/embed/video/#{@video_id}").read
-    doc = URI::parse("#{doc.split("stream_h264_url\":\"")[1].split("\"")[0].gsub("\\", "")}&redirect=0").read
-  end 
-
   def download_url
     nil
   end

data/lib/acts_as_unvlogable/vg_dalealplay.rb

@@ -12,19 +12,19 @@ class VgDalealplay
   def initialize(url=nil, options={})
     @url = url
     @video_id = @url.query_param('con')
-    @page = open(url) {|f| Hpricot(f.read.encode("UTF-8")) }
+    @page = Nokogiri::HTML(open(@url))
   end
   
   def title
-    @page.search("//title").inner_html.split(" - Vídeo Online")[0].to_s
+    @page.xpath("//h1").first.text
   end
   
   def thumbnail
-    "http://images-00.dalealplay.com/contenidos2/#{@video_id}/captura.jpg"
+    @page.xpath("//meta[@itemprop='image']").first["content"]
   end
   
   def embed_url
-    @page.search("//link[@rel='video_src']").first.attributes["href"].sub("autoStart=true", "autoStart=false")
+    @page.xpath("//meta[@itemprop='embedUrl']").first["content"]
   end
 
   def duration
@@ -32,13 +32,9 @@ class VgDalealplay
   end
 
   def embed_html(width=425, height=344, options={}, params={})
-    "<object type='application/x-shockwave-flash' width='#{width}' height='#{height}' data='#{embed_url}'><param name='quality' value='best' />	<param name='allowfullscreen' value='true' /><param name='scale' value='showAll' /><param name='movie' value='http#{embed_url}' /></object>"
+    "<iframe frameborder='0' marginwidth='0' marginheight ='0' id='videodap' scrolling='no' width='#{width}' height='#{height}' src='#{embed_url}'></iframe>"
   end
   
-  def flv
-    "http://videos.dalealplay.com/contenidos3/#{CGI::parse(URI::parse(embed_url).query)['file']}"
-  end
-
   def download_url
     nil
   end

data/lib/acts_as_unvlogable/vg_flickr.rb

@@ -31,20 +31,6 @@ class VgFlickr
     "<object type='application/x-shockwave-flash' width='#{width}' height='#{height}' data='http://www.flickr.com/apps/video/stewart.swf?v=63881' classid='clsid:D27CDB6E-AE6D-11cf-96B8-444553540000'><param name='movie' value='#{embed_url}'></param> <param name='bgcolor' value='#000000'></param> <param name='allowFullScreen' value='true'></param><embed type='application/x-shockwave-flash' src='#{embed_url}' bgcolor='#000000' allowfullscreen='true' width='#{width}' height='#{height}'></embed></object>"
   end
   
-  
-  def flv
-   player_feed = "http://www.flickr.com/apps/video/video_mtl_xml.gne?v=x&photo_id=#{@video_id}&secret=#{@details.secret}&olang=en-us&noBuffer=null&bitrate=700&target=_blank"
-   res = Net::HTTP.get(URI::parse(player_feed))
-   player_feed_xml = REXML::Document.new(res)
-   data_id = REXML::XPath.first(player_feed_xml, "//Data/Item[@id='id']")[0].to_s
-   
-   video_feed = "http://www.flickr.com/video_playlist.gne?node_id=#{data_id}&tech=flash&mode=playlist&lq=j2CW2jbpqCLKRy_s4bTylH&bitrate=700&secret=#{@details.secret}&rd=video.yahoo.com-offsite&noad=1"
-   res = Net::HTTP.get(URI::parse(video_feed))
-   video_feed_xml = REXML::Document.new(res)
-   stream = REXML::XPath.first(video_feed_xml, "//DATA/SEQUENCE-ITEM/STREAM")
-   "#{stream.attributes['APP']}#{stream.attributes['FULLPATH']}"
-  end
-
   def download_url
     nil
   end

data/lib/acts_as_unvlogable/vg_metacafe.rb

@@ -9,10 +9,8 @@ class VgMetacafe
   def initialize(url=nil, options={})
     @url = url
     @args = parse_url(url)
-    
-    #is the video 'youtubed'?
     @youtubed = @args[1].index("yt-").nil? ? false : true
-    @yt = @youtubed ? VgYoutube.new("http://www.youtube.com/watch?v=#{@args[1].sub('yt-', '')}") : nil
+    @yt = @youtubed ? VgYoutube.new("http://www.youtube.com/watch?v=#{@args[1].sub('yt-', '')}", options) : nil
   end
   
   def title
@@ -28,29 +26,13 @@ class VgMetacafe
   end
 
   def embed_html(width=425, height=344, options={}, params={})
-    "<embed src='#{embed_url}' width='#{width}' height='#{height}' wmode='transparent' pluginspage='http://www.macromedia.com/go/getflashplayer' type='application/x-shockwave-flash'></embed>"
+    "<iframe src='#{embed_url}' width='#{width}' height='#{height}' allowFullScreen frameborder=0></iframe>"
   end
   
-  def flv
-    if @youtubed
-      @yt.flv
-    else
-      params = Hash.new
-      open(self.embed_url) {|f|
-        params = CGI::parse(f.base_uri.request_uri.split("?")[1])
-      }
-      CGI::unescape "#{ params['mediaURL']}?__gda__=#{params['gdaKey']}"
-    end
-  end
-
   def duration
     nil
   end
 
-  def download_url
-    nil
-  end
-
   def service
     "Metacafe"
   end
@@ -64,7 +46,6 @@ class VgMetacafe
       if path and path.split("/").size >=1
         @args = path.split("/")
         @args.delete("watch")
-        
         raise unless @args.size > 0
       else
         raise

data/lib/acts_as_unvlogable/vg_myspace.rb

@@ -8,17 +8,15 @@ class VgMyspace
   
   def initialize(url=nil, options={})
     @url = url
-    @video_id = @url.query_param('videoid').blank? ? @url.query_param('VideoID') : @url.query_param('videoid')
-    res = Net::HTTP.get(URI.parse("http://mediaservices.myspace.com/services/rss.ashx?type=video&videoID=#{@video_id}"))
-    @feed = REXML::Document.new(res)
+    @page = Nokogiri::HTML(open(@url))
   end
   
   def title
-    REXML::XPath.first(@feed, "//item/title")[0].to_s
+    @page.xpath("//meta[@property='og:title']").first["content"].split("Video by")[0].strip
   end
   
   def thumbnail
-    REXML::XPath.first(@feed, "//media:thumbnail").attributes['url']
+    @page.xpath("//meta[@property='og:image']").first["content"].strip
   end
   
   def duration
@@ -26,17 +24,13 @@ class VgMyspace
   end
   
   def embed_url
-    "http://lads.myspace.com/videos/vplayer.swf?m=#{REXML::XPath.first( @feed, "//myspace:itemID" )[0]}&v=2&type=video"
+    @page.xpath("//meta[@name='twitter:player']").first["content"].strip
   end
 
   def embed_html(width=425, height=344, options={}, params={})
-    "<embed src='#{embed_url}' type='application/x-shockwave-flash' width='#{width}' height='#{height}'></embed>"
+    "<iframe width='#{width}' height='#{height}' src='#{embed_url}' frameborder='0' allowtransparency='true' webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>"
   end
   
-  def flv
-    REXML::XPath.first(@feed, "//media:content").attributes['url']
-  end
-
   def download_url
     nil
   end

data/lib/acts_as_unvlogable/{vg_prostopleer.rb → vg_pleer.rb}

@@ -1,12 +1,4 @@
-# ----------------------------------------------
-#  Class for prostopleer.com
-#  http://prostopleer.com/tracks/401758bI6n
-# ----------------------------------------------
-
-require 'hpricot'
-
-class VgProstopleer
-  
+class VgPleer
   attr_accessor :track_id
   
   def initialize(url, options={})
@@ -21,18 +13,18 @@ class VgProstopleer
   end
 
   def embed_html(width=425, height=344, options={}, params={})
-    return "<object width=\"#{width}\" height=\"#{height}\"><param name=\"movie\" value=\"http://embed.prostopleer.com/track?id=#{track_id}\"></param><embed src=\"http://embed.prostopleer.com/track?id=#{track_id}\" type=\"application/x-shockwave-flash\" width=\"#{width}\" height=\"#{height}\"></embed></object>"
+    "<object width=\"#{width}\" height=\"#{height}\"><param name=\"movie\" value=\"http://embed.pleer.com/track?id=#{track_id}\"></param><embed src=\"http://embed.pleer.com/track?id=#{track_id}\" type=\"application/x-shockwave-flash\" width=\"#{width}\" height=\"#{height}\"></embed></object>"
   end
   
   def service
-    "ProstoPleer"
+    "Pleer"
   end
   
   private  
   def pp_data
     return @pp_data if defined? @pp_data
-    hp = Hpricot.parse(Net::HTTP.get(@uri))
-    info = (hp/'li[@singer]').first
+    page = Nokogiri::HTML(Net::HTTP.get(@uri))
+    info = page.xpath('//li[@singer]').first
     @pp_data = {
       :singer =>    info['singer'],   # artist name
       :song =>      info['song'],     # song title
@@ -43,4 +35,4 @@ class VgProstopleer
       :rate =>      info['rate']      # bit rate
     }
   end
-end
+end

data/lib/acts_as_unvlogable/vg_rutube.rb

@@ -2,45 +2,23 @@ class VgRutube
 
   def initialize(url=nil, options={})
     @url = url
-    parse_url(url)
+    @page = Nokogiri::HTML(open(@url)) rescue nil
+    raise ArgumentError.new("Unsuported url or service") if @page.xpath("//meta[@property='og:video:iframe']").blank?
   end
 
   def title
-    rt_info["movie"][0]["title"][0].strip
+    @page.xpath("//meta[@property='og:title']").first["content"].strip
   end
-
-  # this method of extraction is somewhat fragile to changes in RuTube urls
-  # more correct way would be using rt_info structure, like it was done in title()
   def thumbnail
-    # size=1 gives bigger thumbnail.
-    # I'm not sure how to add size parameter in compatible way
-    size = 2
-    "http://img.rutube.ru/thumbs/#{movie_hash[0,2]}/#{movie_hash[2,2]}/#{movie_hash}-#{size}.jpg"
+    @page.xpath("//meta[@property='og:image']").first["content"].strip
   end
 
   def embed_url
-    # path to swf
-    "http://video.rutube.ru/#{movie_hash}"
+    @page.xpath("//meta[@property='og:video:iframe']").first["content"].strip
   end
 
   def embed_html(width=425, height=344, options={}, params={})
-    # overridden cause we have to change default size if needed
-    return <<-"END"
-    <object width="#{width}" height="#{height}"><param
-      name="movie" value="#{embed_url}"></param><param
-      name="wmode" value="window"></param><param
-      name="allowFullScreen" value="true"></param><embed
-      src="#{embed_url}" type="application/x-shockwave-flash"
-      wmode="window" width="#{width}" height="#{height}"
-      allowFullScreen="true"></embed>
-    </object>
-    END
-  end
-
-  def flv
-    # Fragile, untested, issues one redirect to actual location
-    # can't be extracted from rt_info
-    "http://bl.rutube.ru/#{movie_hash}.iflv"
+    "<iframe width='#{width}' height='#{height}' src='#{embed_url}' frameborder='0' webkitAllowFullScreen mozallowfullscreen allowfullscreen></iframe>"
   end
 
   def download_url
@@ -55,26 +33,4 @@ class VgRutube
     "Rutube"
   end
 
-  private
-
-  attr_accessor :movie_id
-  RT_XML_API = "http://rutube.ru/cgi-bin/xmlapi.cgi"
-
-  def movie_hash
-    @movie_hash ||= rt_info["movie"][0]["playerLink"][0].match( %r{[a-f0-9]+$} )[0]
-  end
-
-  def rt_info
-    url = RT_XML_API + "?rt_movie_id=#{movie_id}&rt_mode=movie"
-    @rt_info ||= XmlSimple.xml_in( Net::HTTP.get_response( URI.parse(url) ).body )
-  end
-
-  def parse_url(url)
-    uri = URI.parse(url)
-    @movie_id = uri.path.match(/\d+/)[0]
-    # this doesn't work reliably:
-    # @movie_hash = uri.query.match(/(^|&)v=([^&]+)/)[2]
-    # we'll cut it from rt_info instead
-  end
-
 end

data/lib/acts_as_unvlogable/vg_ted.rb

@@ -8,20 +8,16 @@ class VgTed
   
   def initialize(url=nil, options={})
     @url = url
-    raise unless URI::parse(url).path.split("/").include? "talks"
-    @page = Hpricot(open(url))
-    id = @page.to_s.split("ted id=")[1].split("\]")[0]
-    @emb = Hpricot(open("http://www.ted.com/talks/embed/id/#{id}"))
-    @flashvars = CGI::unescapeHTML(@emb.to_s).split("param name=\"flashvars\" value=\"")[1].split("\"")[0]
-    @args = CGI::parse(@flashvars)
+    raise ArgumentError.new("Unsuported url or service") unless URI::parse(url).path.split("/").include? "talks"
+    @page = Nokogiri::HTML(open(@url))
   end
   
   def title
-    @page.search("//h1/span").first.inner_html.strip
+    @page.xpath("//meta[@property='og:title']").first["content"].strip
   end
   
   def thumbnail
-    "#{@args['su']}"
+    @page.xpath("//meta[@property='og:image']").first["content"].strip
   end
   
   def duration
@@ -29,15 +25,11 @@ class VgTed
   end
   
   def embed_url
-      "http://video.ted.com/assets/player/swf/EmbedPlayer.swf?#{@flashvars}"
+    @page.xpath("//link[@itemprop='embedURL']").first["href"].strip
   end
 
   def embed_html(width=425, height=344, options={}, params={})
-    "<object width='#{width}' height='#{height}'><param name='movie' value='#{embed_url}'></param><param name='allowFullScreen' value='true' /><param name='wmode' value='transparent'></param><param name='bgColor' value='#ffffff'></param><embed src='#{embed_url}' pluginspace='http://www.macromedia.com/go/getflashplayer' type='application/x-shockwave-flash' wmode='transparent' bgColor='#ffffff'  width='#{width}' height='#{height}' allowFullScreen='true'></embed></object>"
-  end
-  
-  def flv
-    "#{@args['vu'].to_s}"
+    "<iframe src='#{embed_url}' width='#{width}' height='#{height}' frameborder='0' scrolling='no' webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>"
   end
   
   def download_url

data/lib/acts_as_unvlogable/vg_vimeo.rb

@@ -10,16 +10,6 @@ class VgVimeo
     # general settings
     @url = url
     @video_id = parse_url(url)
-
-    if !(@vimeo_id =~ /^[0-9]+$/)
-      r = Net::HTTP.get_response(URI.parse(url))
-
-      if r.code == "301"
-        @url = "http://vimeo.com#{r.header['location']}"
-        @video_id = parse_url(@url)
-      end
-    end
-
     res = Net::HTTP.get(URI.parse("http://vimeo.com/api/v2/video/#{@video_id}.xml"))
     @feed = REXML::Document.new(res)
   end
@@ -41,24 +31,15 @@ class VgVimeo
   end
 
   def embed_url
-    "http://vimeo.com/moogaloop.swf?clip_id=#{@video_id}&force_embed=1&server=vimeo.com&show_title=1&show_byline=0&show_portrait=1&color=ffffff&fullscreen=1&autoplay=0&loop=0"
+    "http://http://player.vimeo.com/video/#{@video_id}"
   end
 
   def embed_html(width=425, height=344, options={}, params={})
-    "<object width='#{width}' height='#{height}'><param name='movie' value='#{embed_url}'></param><param name='allowFullScreen' value='true'></param><param name='allowscriptaccess' value='always'></param><embed src='#{embed_url}' type='application/x-shockwave-flash' allowscriptaccess='always' allowfullscreen='true' width='#{width}' height='#{height}'></embed></object>"
-  end
-
-  def flv
-    res = Net::HTTP.get(URI.parse("http://vimeo.com/42966264?action=download"))
-    request_signature = res.split("\"signature\":\"")[1].split("\"")[0]
-    request_cached_timestamp = res.split("\"cached_timestamp\":")[1].split(",")[0]
-    "http://player.vimeo.com/play_redirect?clip_id=#{@video_id}&sig=#{request_signature}&time=#{request_cached_timestamp}&quality=sd&codecs=H264,VP8,VP6&type=moogaloop&embed_location="
+    "<iframe src='#{embed_url}' width='#{width}' height='#{height}' frameborder='0' webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>" 
   end
   
   def download_url
-    request_signature = REXML::XPath.first( @feed, "//request_signature" )[0]
-    request_signature_expires = REXML::XPath.first( @feed, "//request_signature_expires" )[0]
-    "http://www.vimeo.com/moogaloop/play/clip:#{@video_id}/#{request_signature}/#{request_signature_expires}/?q=hd"
+    nil
   end
 
   def service