muri 0.0.4 → 0.0.5

data/README.textile

@@ -0,0 +1,103 @@
+h2. Media URI Parser - MURI
+
+A simple to use media URI Parser. Pass a URI in, get helpful information out.
+
+MURI Currently supports:
+* Youtube (Single videos and Playlists)
+** "API documentation":http://code.google.com/apis/youtube/2.0/developers_guide_protocol_audience.html
+* Vimeo (single videos and albums)
+** "API documentation":http://vimeo.com/api/docs/simple-api
+* Flickr (single images and sets)
+** "API documentation":http://www.flickr.com/services/api/
+* Imageshack
+* Photobucket
+** "API documentation":http://photobucket.com/developer/documentation
+* Facebook
+** "API documentation":http://wiki.developers.facebook.com/index.php/API
+
+h3. Installation & basic usage
+
+Install muri as a ruby gem (you might need to run this command as root by prepending @sudo@ to it):
+
+<pre>
+<code>
+  $ gem install muri
+</code>
+</pre>
+
+Using muri is just as easy!
+
+<pre>
+<code>
+  a = Muri.parse('http://www.youtube.com/watch?v=blahblahblah&feature=rec-LGOUT-exp_fresh+div-1r-1-HM')
+</code>
+</pre>
+
+If @a.valid?@ you are good to go. If not, either the URI host was not recognized, or the path/parameters provided along with a known URI host were not recognized. When these two types of errors are encountered, an exception is caught and returned in @a.errors@ as either "Muri::NoParser" or "Muri::UnrecognizedURI". If you don't care about the type of error, just that the URI was not parsed, @a.valid?@ will give you a boolean answer.
+
+Assuming the URI was successfully parsed (thus @a.valid? == true@), all media types share several common attributes:
+
+<pre>
+<code>
+  a.service         # 'Youtube'
+  a.media_id        # 'blahblahblah'
+  a.original_url    # 'http://www.youtube.com/watch?v=blahblahblah&feature=rec-LGOUT-exp_fresh+div-1r-1-HM'
+  a.uri             # URI object for 'http://www.youtube.com/watch?v=blahblahblah&feature=rec-LGOUT-exp_fresh+div-1r-1-HM'
+</code>
+</pre>
+
+*Due to variations in information which can be gathered from a uri, some services provide more information than others. For example:*
+
+* All but Imageshack have a @media_api_id@, which is the ID which can be used in API calls to the related services. Typically the same as @media_id@.
+
+<pre>
+<code>  
+  a.media_api_id     # 'blahblahblah'
+</code>
+</pre>
+
+*NOTE: Facebook photos return a hash for @media_api_id@, keyed with @pid@ (the ID for the photo) and @user_id@ (the ID for the user)*
+
+* Services with a @media_api_id@ also have a @media_api_type@, which indicates what sort of API call should be made (be it 'photo', 'video', 'media', 'set', 'album', or 'playlist', depending on URI type)
+
+* A direct media url for Youtube, Photobucket, and Imageshack (@http://img#{num}.imageshack.us/img#{num}/#{NUMBER}/#{IMAGENAME}@ format)
+
+<pre>
+<code>
+  a.media_url         # 'http://www.youtube.com/v/blahblahblah'
+</code>
+</pre>
+
+* A media landing website url for Youtube, Photobucket, Imageshack, Vimeo, and Flickr (flickr media_url's provide the @http://flic.kr/p/#{ID}@ short url)
+
+<pre>
+<code>
+  a.website           # 'http://www.youtube.com/watch?v=blahblahblah' 
+</code>
+</pre>
+
+* Content type for Imageshack, Photobucket and Flickr URI's (flickr in the @http://farm#{num}.static.flickr.com/@ format)
+
+<pre>
+<code>
+  a.content_type      # 'jpg' (Content Type also for Imageshack and Photobucket)
+</code>
+</pre>
+
+* Thumbnails URL for Youtube Photobucket, and Flickr (flickr in the @http://farm#{num}.static.flickr.com/@ format)
+
+<pre>
+<code>
+  a.media_thumbnail   # 'http://i.ytimg.com/vi/4CYDFoEz8rg/default.jpg'
+</code>
+</pre>
+
+*Some additional information may be provided, which can be determined by looking through each filters code.*
+
+
+If an attribute is not present, muri returns @nil@.
+
+
+h3. Contact
+
+If you would like to get in contact with me, my email is bananastalktome@gmail.com. I appreciate any information or assistance reverse-engineering media website URI's. I plan on including more services _and_ more parse information with updates. That being said, MURI is currently not production quality. Please use with caution and in development only. Thank you.

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 4
+:patch: 5

data/lib/muri/base.rb

@@ -15,6 +15,7 @@ class Muri
   include Filter::Vimeo
   include Filter::Imageshack
   include Filter::Photobucket
+  include Filter::Facebook
 
   def self.parse(url)
     self.new(url)
@@ -33,7 +34,7 @@ class Muri
     @info.to_s
   end
   
-  def parsed?
+  def valid?
     @info[:media_id].nil? ? false : true
   end
   
@@ -50,21 +51,22 @@ class Muri
   private
   
   def _parse(raw_url)
-    @url = URI.parse(raw_url)
-    if @url.scheme.nil?
-      raw_url = "http://#{raw_url}"
+    begin
       @url = URI.parse(raw_url)
+      if @url.scheme.nil?
+        raw_url = "http://#{raw_url}"
+        @url = URI.parse(raw_url)
+      end
+      if parser = determine_feed_parser
+        @info[:uri] = @url
+        @info[:original_url] = raw_url
+        send(PARSERS[parser])
+      else
+        raise NoParser
+      end
+    rescue NoParser, UnsupportedURI => e
+      @info[:errors] = "#{e}"
     end
-    if parser = determine_feed_parser
-      @info[:uri] = @url
-      @info[:original_url] = raw_url
-      send(PARSERS[parser])
-    else
-      raise NoParser.new("No Transformer found for URL")
-    end
-    
-  #rescue => e
-    #raise "failed #{e}"
   end
   
   def determine_feed_parser
@@ -72,11 +74,7 @@ class Muri
   end
       
   def method_missing(func, args = nil)
-    #if @info[func.to_sym] != nil
-      @info[func.to_sym].nil? ? nil : @info[func.to_sym]
-    #else
-    #  nil #super(func,args)
-    #end
+    @info[func.to_sym].nil? ? nil : @info[func.to_sym]
   end
   
   protected

data/lib/muri/filters/facebook.rb

@@ -0,0 +1,68 @@
+require 'cgi'
+## Best way I have been able to find to use the facebook API to fetch photo information is as follows:
+## First, get a list of all user photos (using media_id). Parse each resulting <photo> element until you 
+## find one where <link> equals 
+## 'http://www.facebook.com/photo.php?pid=#{media_api_id[:pid]}&amp;id=#{media_api_id[:user_id]}'
+## 
+## Sucks a whole lot, but facebook seems to no longer allow API calls using the PID from the query string.
+class Muri
+  module Filter
+    module Facebook
+      
+      FACEBOOK_PHOTO = "photo"
+      FACEBOOK_VIDEO = "video"
+      
+      def self.included(base)
+        base.class_eval do
+          self::PARSERS[Muri::Filter::Facebook] = "facebook_parse"
+        end
+      end
+      
+      def facebook_parse
+        @info[:service] = 'Facebook'
+        params = @url.query.nil? ? {} : CGI::parse(@url.query)
+        url_common = "http://www.facebook.com"
+        
+        if @url.path =~ /^\/v\/([0-9]+)/
+          @info[:media_id] = $1
+          @info[:media_url] = "#{url_common}/v/#{@info[:media_id]}"
+          
+          # Currently no API for video, but media_id is best guess value for such content
+          @info[:media_api_id] = @info[:media_id]
+          @info[:media_api_type] = FACEBOOK_VIDEO
+        elsif (@url.path =~ /^\/photo\.php/i)
+          if params.include?("pid") && params.include?("id") && params.include?("l")
+            @info[:media_api_type] = FACEBOOK_PHOTO
+            @info[:media_id] = params["pid"].first if (params["pid"].first =~ /([0-9]*)/)
+            media_creator = params["id"].first if (params["id"].first =~ /([0-9]*)/)
+            share_key = params["l"].first
+            
+            @info[:website] = "#{url_common}/photo.php?pid=#{@info[:media_id]}&l=#{share_key}&id=#{media_creator}"
+            @info[:media_api_id] = { :pid => @info[:media_id], :user_id => media_creator }
+          end
+        end
+        
+        #if self.valid?
+          #@info[:media_api_id] = @info[:media_id]
+        #else
+        if !self.valid?
+          raise UnsupportedURI
+        end
+        
+        self
+      end            
+ 
+      def self.parsable?(uri)
+        uri.host =~ /^(www\.)?facebook\.com$/i
+      end
+      
+    end
+  end
+end
+
+# http://www.facebook.com/photo.php?pid=34929102&l=a1abf8cd37&id=15201063 (preview)
+#   pid = photo id
+#   id = user id
+#   l = photo share key
+# http://www.facebook.com/v/614695029223 (full)
+# http://www.facebook.com/album.php?aid=2149275&id=15201063&l=99900807c3

data/lib/muri/filters/flickr.rb

@@ -1,7 +1,10 @@
 class Muri
   module Filter
     module Flickr
-
+    
+      FLICKR_PHOTO = "photo"
+      FLICKR_SET = "set"
+      
       def self.included(base)
         base.class_eval do
           self::PARSERS[Muri::Filter::Flickr] = "flickr_parse"
@@ -11,13 +14,15 @@ class Muri
       def flickr_parse
         @info[:service] = 'Flickr'
         
-        if @url.path =~ /^\/photos\/([a-z0-9\@]*?)\/([^(?:sets)][0-9]*)/i
-          #@info[:media_creator] = $1
-          @info[:media_id] = $2
+        if @url.path =~ /^\/photos\/([a-z0-9\-\_\@]*?)\/(sets\/)?([0-9]*)/i
+          media_creator = $1
+          @info[:media_id] = $3
+          @info[:media_api_type] = $2.nil? ? FLICKR_PHOTO : FLICKR_SET
         elsif (@url.host + @url.path) =~ /^farm([1-3])\.static.flickr.com\/([0-9]*?)\/([0-9]*?)\_([a-z0-9]*?)(\_[a-z]){0,1}\.([a-z]*)/i
           farm = $1
           server_id = $2
           @info[:media_id] = $3
+          @info[:media_api_type] = FLICKR_PHOTO
           media_secret = $4
 #           if !$5.nil?
 #             @info[:media_size] = case $5.downcase
@@ -32,20 +37,25 @@ class Muri
             @info[:media_thumbnail] = "http://farm#{farm}.static.flickr.com/#{server_id}/#{@info[:media_id]}_#{media_secret}_t.jpg"
         elsif (@url.host + @url.path) =~ /^flic\.kr\/p\/([a-z0-9]*)/i
           @info[:media_id] = self.class.decode58($1)
+          @info[:media_api_type] = FLICKR_PHOTO
         end
         
-        if self.parsed?
+        if self.valid?
           @info[:media_api_id] = @info[:media_id]
-          @info[:website] = "http://flic.kr/p/" + self.class.encode58(@info[:media_id].to_i)
+          if @info[:media_api_type] == FLICKR_PHOTO 
+            @info[:website] = "http://flic.kr/p/" + self.class.encode58(@info[:media_id].to_i)
+          elsif @info[:media_api_type] == FLICKR_SET
+            @info[:website] = "http://www.flickr.com/photos/#{media_creator}/sets/#{@info[:media_id]}"
+          end
         else
-          raise UnsupportedURI          
+          raise UnsupportedURI
         end
         
         self
       end
       
       def self.parsable?(uri)
-        uri.host =~ /^(www\.|)(flic\.kr|(farm[0-9]\.static\.|)(flickr)\.com)/i
+        uri.host =~ /^(www\.)?(flic\.kr|(farm[0-9]\.static\.|)(flickr)\.com)/i
       end  
   
       
@@ -60,4 +70,5 @@ end
 #   photo-id: 2088436532
 #   secret: ee07b4474e
 #   size: m
-# * add _d before .jpg in url to create a download URL
+# * add _d before .jpg in url to create a download URL
+# http://www.flickr.com/photos/bananastalktome/sets/72157623467777820/ (set preview)

data/lib/muri/filters/imageshack.rb

@@ -26,7 +26,7 @@ class Muri
         end
         
         # imageshack does not currently have API for retrieving individual video information
-        if self.parsed?
+        if self.valid?
           @info[:website] = "#{url_common}/i/#{@info[:media_id]}.#{@info[:content_type]}/"
         else
           raise UnsupportedURI          

data/lib/muri/filters/photobucket.rb

@@ -2,6 +2,8 @@ class Muri
   module Filter
     module Photobucket
 
+      PHOTOBUCKET_MEDIA = "media"
+
       def self.included(base)
         base.class_eval do
           self::PARSERS[Muri::Filter::Photobucket] = "photobucket_parse"
@@ -37,7 +39,8 @@ class Muri
           @info[:website] = "http://gs#{url_common}/?action=view&current=#{@info[:media_id]}.#{@info[:content_type]}"
         end
         
-        if self.parsed?
+        if self.valid?
+          @info[:media_api_type] = PHOTOBUCKET_MEDIA
           @info[:media_api_id] = @info[:media_url]
           @info[:media_thumbnail] = "http://mobth#{direct_url_suffix}"
         else

data/lib/muri/filters/vimeo.rb

@@ -2,7 +2,10 @@ require 'cgi'
 class Muri
   module Filter
     module Vimeo
-            
+      
+      VIMEO_VIDEO = "video"
+      VIMEO_ALBUM = "album"
+      
       def self.included(base)
         base.class_eval do
           self::PARSERS[Muri::Filter::Vimeo] = "vimeo_parse"
@@ -11,17 +14,20 @@ class Muri
       
       def vimeo_parse
         @info[:service] = 'Vimeo'
-        params = CGI::parse(@url.query) if !@url.query.nil?
-        
-        if @url.path =~ /^\/([0-9]+)/
-          @info[:media_id] = $1
+        params = @url.query.nil? ? {} : CGI::parse(@url.query)
+                
+        if @url.path =~ /^\/(album\/)?([0-9]+)(\/)?$/i
+          @info[:media_id] = $2
+          @info[:media_api_type] = $1.nil? ? VIMEO_VIDEO : VIMEO_ALBUM
         elsif ((@url.path =~ /^\/moogaloop\.swf/i) && (params.include?("clip_id")))
           @info[:media_id] = params["clip_id"].first if (params["clip_id"].first =~ /([0-9]*)/)
+          @info[:media_api_type] = VIMEO_VIDEO
         end
         
-        if self.parsed?
+        if self.valid?
           @info[:media_api_id] = @info[:media_id]
-          @info[:website] = "http://vimeo.com/#{@info[:media_id]}"
+          album = (@info[:media_api_type] == VIMEO_ALBUM) ? "album/" : ""
+          @info[:website] = "http://vimeo.com/#{album}#{@info[:media_id]}"
         else
           raise UnsupportedURI
         end
@@ -37,4 +43,5 @@ class Muri
   end
 end
 # http://vimeo.com/moogaloop.swf?clip_id=7312128&server=vimeo.com&show_title=1&show_byline=1&show_portrait=0&color=&fullscreen=1" 
-# http://vimeo.com/7312128
+# http://vimeo.com/7312128
+# http://vimeo.com/album/89702

data/lib/muri/filters/youtube.rb

@@ -3,6 +3,9 @@ class Muri
   module Filter
     module Youtube
 
+      YOUTUBE_VIDEO = "video"
+      YOUTUBE_PLAYLIST = "playlist"
+
       def self.included(base)
         base.class_eval do 
           self::PARSERS[Muri::Filter::Youtube] = "youtube_parse"
@@ -12,30 +15,47 @@ class Muri
       def youtube_parse
         @info[:service] = 'Youtube'
         url_common = "http://www.youtube.com"
+        params = @url.query.nil? ? {} : CGI::parse(@url.query)
         
-        if (@url.path == "/watch") && !@url.query.nil?
-          params = CGI::parse(@url.query)
+        if (@url.path =~ /\/watch$/i) && params.include?("v")
           @info[:media_id] = params["v"].first
+          @info[:media_api_type] = YOUTUBE_VIDEO
         elsif (@url.path =~ /\/v\/([a-z0-9\-\_]*)/i)
           @info[:media_id] = $1
+          @info[:media_api_type] = YOUTUBE_VIDEO
+        elsif (@url.path =~ /\/p\/([a-z0-9\-\_]*)/i)
+          @info[:media_id] = $1
+          @info[:media_api_type] = YOUTUBE_PLAYLIST
+        elsif (@url.path =~ /^\/view\_play\_list/i) && (params.include?('p'))
+          @info[:media_id] = params['p'].first
+          @info[:media_api_type] = YOUTUBE_PLAYLIST
         end
         
-        if self.parsed?
-          @info[:website] = "#{url_common}/watch?v=#{@info[:media_id]}"
-          @info[:media_url] = "#{url_common}/v/#{@info[:media_id]}"
+        if self.valid?
+          if @info[:media_api_type] == YOUTUBE_VIDEO
+            @info[:website] = "#{url_common}/watch?v=#{@info[:media_id]}"
+            @info[:media_url] = "#{url_common}/v/#{@info[:media_id]}"
+            @info[:media_thumbnail] = "http://i.ytimg.com/vi/#{@info[:media_id]}/default.jpg"
+          elsif @info[:media_api_type] == YOUTUBE_PLAYLIST
+            @info[:website] = "#{url_common}/view_play_list?p=#{@info[:media_id]}"
+            @info[:media_url] = "#{url_common}/p/#{@info[:media_id]}"
+          end
           @info[:media_api_id] = @info[:media_id]
-          @info[:media_thumbnail] = "http://i.ytimg.com/vi/#{@info[:media_id]}/default.jpg"
         else
-          raise UnsupportedURI        
+          raise UnsupportedURI
         end
         
         self
       end     
       def self.parsable?(uri)
-        uri.host =~ /^(www\.|)youtube\.com$/i
+        uri.host =~ /^(www\.)?youtube\.com$/i
       end      
     end
   end
 end
 # http://www.youtube.com/v/4CYDFoEz8rg&hl=en_US&fs=1& (direct)
-# http://www.youtube.com/watch?v=l983Uob0Seo&feature=rec-LGOUT-exp_fresh+div-1r-1-HM (preview)
+# http://www.youtube.com/watch?v=l983Uob0Seo&feature=rec-LGOUT-exp_fresh+div-1r-1-HM (preview)
+
+# PLAYLISTS
+# http://www.youtube.com/p/57633EC69B4A10A2&hl=en_US&fs=1 (direct)
+# http://www.youtube.com/view_play_list?p=57633EC69B4A10A2 (preview)

data/lib/muri.rb

@@ -1,10 +1,10 @@
 # Register built-in filters
-#
 Dir["#{File.dirname(__FILE__) + '/muri/filters'}/**/*"].each do |filter|
   require "#{filter}"
 end
 
+# Just base now..more later(?)
 %w(base).each do |f|
   require File.dirname(__FILE__) + "/muri/#{f}"
 end
- 
+ 

data/muri.gemspec

@@ -5,24 +5,25 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muri}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["William Schneider"]
-  s.date = %q{2010-03-02}
+  s.date = %q{2010-03-05}
   s.description = %q{Automatically get media information from the URL.}
   s.email = %q{bananastalktome@gmail.com}
   s.extra_rdoc_files = [
-    "README.rdoc"
+    "README.textile"
   ]
   s.files = [
     ".gitignore",
-     "README.rdoc",
+     "README.textile",
      "Rakefile",
      "VERSION.yml",
      "lib/muri.rb",
      "lib/muri/base.rb",
      "lib/muri/filter.rb",
+     "lib/muri/filters/facebook.rb",
      "lib/muri/filters/flickr.rb",
      "lib/muri/filters/imageshack.rb",
      "lib/muri/filters/photobucket.rb",
@@ -30,6 +31,7 @@ Gem::Specification.new do |s|
      "lib/muri/filters/youtube.rb",
      "muri.gemspec",
      "test/error_test.rb",
+     "test/facebook_test.rb",
      "test/flickr_test.rb",
      "test/imageshack_test.rb",
      "test/photobucket_test.rb",
@@ -42,11 +44,12 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Media URI Parser}
   s.test_files = [
-    "test/photobucket_test.rb",
-     "test/vimeo_test.rb",
-     "test/imageshack_test.rb",
-     "test/error_test.rb",
+    "test/error_test.rb",
+     "test/facebook_test.rb",
      "test/flickr_test.rb",
+     "test/imageshack_test.rb",
+     "test/photobucket_test.rb",
+     "test/vimeo_test.rb",
      "test/youtube_test.rb"
   ]
 

data/test/error_test.rb

@@ -13,14 +13,20 @@ describe "Parse Errors" do
                  "http://vimeo.com/moogaloop.swf?server=vimeo.com&show_title=1&show_byline=1&show_portrait=0&color=&fullscreen=1"]
   
   @no_parser.each do |a|
-    it "#{a} should raise NoParser" do
-      lambda { Muri.parse a }.should raise_exception(Muri::NoParser)
+    it "#{a} should return NoParser" do
+      #lambda { Muri.parse a }.should raise_exception(Muri::NoParser)
+      m = Muri.parse a
+      m.valid? == false
+      m.errors == "Muri::NoParser"
     end
   end
   
   @unsupported.each do |b|
-    it "#{b} should raise UnsupportedURI" do
-      lambda { Muri.parse b }.should raise_exception(Muri::UnsupportedURI)
+    it "#{b} should return UnsupportedURI" do
+      #lambda { Muri.parse b }.should raise_exception(Muri::UnsupportedURI)
+      m = Muri.parse b
+      m.valid? == false
+      m.errors == "Muri::UnsupportedURI"
     end
   end
   

data/test/facebook_test.rb

@@ -0,0 +1,62 @@
+require 'lib/muri.rb'
+
+shared_examples_for "Facebook parse" do
+  it "should be Facebook service" do
+    @a.service == 'Facebook'
+  end
+
+  it "should be valid" do
+    @a.valid? == true
+  end
+end
+shared_examples_for "Facebook parse photo" do
+  it_should_behave_like "Facebook parse"
+  it "should have media api type = FACEBOOK_PHOTO" do
+    @a.media_api_type == Muri::FACEBOOK_PHOTO
+  end
+end
+
+shared_examples_for "Facebook parse video" do
+  it_should_behave_like "Facebook parse"
+  it "should have media api type = FACEBOOK_VIDEO" do
+    @a.media_api_type == Muri::FACEBOOK_VIDEO
+  end
+end
+
+describe "Facebook parse first" do
+  before(:all) do
+    @a = Muri.parse 'http://www.facebook.com/v/614695029223'
+  end
+  it_should_behave_like "Facebook parse video"
+  
+  it "should have media id" do
+    @a.media_id == '614695029223'
+  end
+  
+  it "should have a media_url" do
+    @a.website == 'http://www.facebook.com/v/614695029223'
+  end
+   
+  it "should have media api id" do
+    @a.media_api_id == '614695029223'
+  end
+end
+
+describe "Facebook parse second" do
+  before(:all) do
+    @a = Muri.parse 'http://www.facebook.com/photo.php?pid=34929102&l=a1abf8cd37&id=15201063'
+  end
+  it_should_behave_like "Facebook parse photo"
+
+  it "should have media id" do
+    @a.media_id == '34929102'
+  end
+  
+  it "should have a website" do
+    @a.website == 'http://www.facebook.com/photo.php?pid=34929102&l=a1abf8cd37&id=15201063'
+  end
+   
+  it "should have media api id" do
+    @a.media_api_id == { :pid => '34929102', :user_id => '15201063' }
+  end  
+end

data/test/flickr_test.rb

@@ -1,10 +1,32 @@
 require 'lib/muri.rb'
-
 shared_examples_for "Flickr parse" do
   it "should be Flickr service" do
     @a.service == 'Flickr'
   end
-  
+  it "should be valid" do
+    @a.valid? == true
+  end
+end
+
+shared_examples_for "Flickr parse photo" do
+  it_should_behave_like "Flickr parse"
+  it "should have media api type = FLICKR_PHOTO" do
+    @a.media_api_type == Muri::FLICKR_PHOTO
+  end  
+end
+
+shared_examples_for "Flickr parse set" do
+  it_should_behave_like "Flickr parse"
+  it "should have media api type = FLICKR_SET" do
+    @a.media_api_type == Muri::FLICKR_SET
+  end    
+end
+
+describe "Flickr parse first" do
+  before(:all) do
+    @a = Muri.parse 'http://www.flickr.com/photos/bananastalktome/2088436532/'
+  end
+  it_should_behave_like "Flickr parse photo"
   it "should have media id" do
     @a.media_id == '2088436532'
   end
@@ -15,21 +37,45 @@ shared_examples_for "Flickr parse" do
    
   it "should have media api id" do
     @a.media_api_id == '2088436532'
-  end
-end
-describe "Flickr parse first" do
-  before(:all) do
-    @a = Muri.parse 'http://www.flickr.com/photos/bananastalktome/2088436532/'
-  end
-  it_should_behave_like "Flickr parse"
+  end  
 end
 describe "Flickr parse second" do
   before(:all) do
     @a = Muri.parse 'http://farm3.static.flickr.com/2178/2088436532_ee07b4474e_m.jpg'
   end
-  it_should_behave_like "Flickr parse"
+  it_should_behave_like "Flickr parse photo"
+  it "should have media id" do
+    @a.media_id == '2088436532'
+  end
   
+  it "should have a website" do
+    @a.website == 'http://flic.kr/p/4bxMqq'
+  end
+   
+  it "should have media api id" do
+    @a.media_api_id == '2088436532'
+  end  
   it "should have media thumbnail" do
     @a.media_thumbnail == 'http://farm3.static.flickr.com/2178/2088436532_ee07b4474e_t.jpg'
   end
-end
+end
+
+describe "Flickr parse set first" do
+  before(:all) do
+    @a = Muri.parse 'http://www.flickr.com/photos/bananastalktome/sets/72157623467777820/'
+  end
+  it_should_behave_like "Flickr parse set"
+  
+  it "should have media id" do
+    @a.media_id == '72157623467777820'
+  end
+  
+  it "should have a website" do
+    @a.website == 'http://www.flickr.com/photos/bananastalktome/sets/72157623467777820'
+  end
+   
+  it "should have media api id" do
+    @a.media_api_id == '72157623467777820'
+  end
+end
+

data/test/imageshack_test.rb

@@ -4,24 +4,28 @@ shared_examples_for "Imageshack parse" do
   it "should be Imageshack service" do
     @a.service == 'Imageshack'
   end
+  it "should be valid" do
+    @a.valid? == true
+  end
+end
+
+describe "Imageshack parse first" do
+  before(:all) do
+    @a = Muri.parse 'http://img178.imageshack.us/i/dsc01576lo7.jpg/'
+  end
+  it_should_behave_like "Imageshack parse"
   
   it "should have media id" do
     @a.media_id == 'dsc01576lo7'
   end
   
-  it "should have media url" do
+  it "should have website" do
     @a.website == 'http://img178.imageshack.us/i/dsc01576lo7.jpg/'
   end
    
   it "should have content_type" do
     @a.content_type == 'jpg'
-  end
-end
-describe "Imageshack parse first" do
-  before(:all) do
-    @a = Muri.parse 'http://img178.imageshack.us/i/dsc01576lo7.jpg/'
-  end
-  it_should_behave_like "Imageshack parse"
+  end  
 end
 describe "Imageshack parse second" do
   before(:all) do
@@ -29,6 +33,18 @@ describe "Imageshack parse second" do
   end
   it_should_behave_like "Imageshack parse"
   
+  it "should have media id" do
+    @a.media_id == 'dsc01576lo7'
+  end
+  
+  it "should have website" do
+    @a.website == 'http://img178.imageshack.us/i/dsc01576lo7.jpg/'
+  end
+   
+  it "should have content_type" do
+    @a.content_type == 'jpg'
+  end  
+  
   it "should have website" do
     @a.media_url == 'http://img178.imageshack.us/img178/773/dsc01576lo7.jpg'
   end

data/test/photobucket_test.rb

@@ -4,7 +4,16 @@ shared_examples_for "Photobucket parse" do
   it "should be Photobucket service" do
     @a.service == 'Photobucket'
   end
+  
+  it "should be valid" do
+    @a.valid? == true
+  end
+  
+  it "should have media api type = PHOTOBUCKET_MEDIA" do
+    @a.api_media_type == Muri::PHOTOBUCKET_MEDIA
+  end
 end
+
 describe "Photobucket parse first" do
   before(:all) do
     @a = Muri.parse 'http://i244.photobucket.com/albums/gg17/pbapi/file.jpg'
@@ -35,6 +44,7 @@ describe "Photobucket parse first" do
     @a.media_thumbnail == 'http://mobth244.photobucket.com/albums/gg17/pbapi/file.jpg'
   end
 end
+
 describe "Photobucket parse second" do
   before(:all) do
     @a = Muri.parse 'http://gi0006.photobucket.com/groups/0006/G5PAK3TBQS/DSCF0015-1-1.jpg'

data/test/vimeo_test.rb

@@ -5,6 +5,33 @@ shared_examples_for "Vimeo parse" do
     @a.service == 'Vimeo'
   end
   
+  it "should be valid" do
+    @a.valid? == true
+  end
+
+end
+
+shared_examples_for "Vimeo parse video" do
+  it_should_behave_like "Vimeo parse"
+  
+  it "should have media api type = VIMEO_VIDEO" do
+    @a.media_api_type == Muri::VIMEO_VIDEO
+  end   
+end
+shared_examples_for "Vimeo parse album" do
+  it_should_behave_like "Vimeo parse"
+  
+  it "should have media api type = VIMEO_ALBUM" do
+    @a.media_api_type == Muri::VIMEO_ALBUM
+  end   
+end
+
+describe "Vimeo parse first" do
+  before(:all) do
+    @a = Muri.parse 'http://vimeo.com/moogaloop.swf?clip_id=7312128&server=vimeo.com&show_title=1&show_byline=1&show_portrait=0&color=&fullscreen=1'
+  end
+  it_should_behave_like "Vimeo parse video"
+  
   it "should have media id" do
     @a.media_id == '7312128'
   end
@@ -17,15 +44,41 @@ shared_examples_for "Vimeo parse" do
     @a.media_api_id == '7312128'
   end
 end
-describe "Vimeo parse first" do
+
+describe "Vimeo parse second" do
   before(:all) do
-    @a = Muri.parse 'http://vimeo.com/moogaloop.swf?clip_id=7312128&server=vimeo.com&show_title=1&show_byline=1&show_portrait=0&color=&fullscreen=1'
+    @a = Muri.parse 'http://vimeo.com/7312128'
+  end
+  it_should_behave_like "Vimeo parse video"
+  
+  it "should have media id" do
+    @a.media_id == '7312128'
+  end
+  
+  it "should have a website" do
+    @a.website == 'http://vimeo.com/7312128'
+  end
+   
+  it "should have media api id" do
+    @a.media_api_id == '7312128'
   end
-  it_should_behave_like "Vimeo parse"
 end
-describe "Vimeo parse second" do
+
+describe "Vimeo parse album first" do
   before(:all) do
-    @a = Muri.parse 'http://vimeo.com/7312128'
+    @a = Muri.parse 'http://vimeo.com/album/89702'
   end
-  it_should_behave_like "Vimeo parse"
-end
+  it_should_behave_like "Vimeo parse album"
+  
+  it "should have media id" do
+    @a.media_id == '89702'
+  end
+
+  it "should have a website" do
+    @a.website == 'http://vimeo.com/album/89702'
+  end
+   
+  it "should have media api id" do
+    @a.media_api_id == '89702'
+  end  
+end

data/test/youtube_test.rb

@@ -1,10 +1,36 @@
 require 'lib/muri.rb'
-
 shared_examples_for "Youtube parse" do
   it "should be Youtube service" do
     @a.service == 'Youtube'
   end
   
+  it "should be valid" do
+    @a.valid? == true
+  end
+end
+
+shared_examples_for "Youtube parse single" do
+  it_should_behave_like "Youtube parse"
+  
+  it "should have media api type = YOUTUBE_VIDEO" do
+    @a.media_api_type == Muri::YOUTUBE_VIDEO
+  end
+end
+
+shared_examples_for "Youtube parse playlist" do
+  it_should_behave_like "Youtube parse"
+  
+  it "should have media api type = YOUTUBE_PLAYLIST" do
+    @a.media_api_type == Muri::YOUTUBE_PLAYLIST
+  end  
+end
+
+describe "Youtube parse first" do
+  before(:all) do
+    @a = Muri.parse 'http://www.youtube.com/v/4CYDFoEz8rg&hl=en_US&fs=1&'
+  end
+  it_should_behave_like "Youtube parse single"
+
   it "should have media id" do
     @a.media_id == '4CYDFoEz8rg'
   end
@@ -23,17 +49,75 @@ shared_examples_for "Youtube parse" do
   
   it "should have thumbnail" do
     @a.media_thumbnail == 'http://i.ytimg.com/vi/4CYDFoEz8rg/default.jpg'
+  end  
+end
+describe "Youtube parse second" do
+  before(:all) do
+    @a = Muri.parse 'http://www.youtube.com/watch?v=4CYDFoEz8rg'
+  end
+  it_should_behave_like "Youtube parse single"
+
+  it "should have media id" do
+    @a.media_id == '4CYDFoEz8rg'
+  end
+  
+  it "should have media api id" do
+    @a.media_api_id == '4CYDFoEz8rg'
+  end
+  
+  it "should have media url" do
+    @a.website == 'http://www.youtube.com/watch?v=4CYDFoEz8rg'
+  end
+  
+  it "should have website" do
+    @a.media_url == 'http://www.youtube.com/v/4CYDFoEz8rg'
   end
+  
+  it "should have thumbnail" do
+    @a.media_thumbnail == 'http://i.ytimg.com/vi/4CYDFoEz8rg/default.jpg'
+  end  
 end
-describe "Youtube parse first" do
+
+describe "Youtube parse playlist first" do
   before(:all) do
-    @a = Muri.parse 'http://www.youtube.com/v/4CYDFoEz8rg&hl=en_US&fs=1&'
+    @a = Muri.parse 'http://www.youtube.com/p/57633EC69B4A10A2&hl=en_US&fs=1'
   end
-  it_should_behave_like "Youtube parse"
+  it_should_behave_like "Youtube parse playlist"
+  it "should have media id" do
+    @a.media_id == '57633EC69B4A10A2'
+  end
+  
+  it "should have media api id" do
+    @a.media_api_id == '57633EC69B4A10A2'
+  end
+  
+  it "should have media url" do
+    @a.website == 'http://www.youtube.com/view_play_list?p=57633EC69B4A10A2'
+  end
+  
+  it "should have website" do
+    @a.media_url == 'http://www.youtube.com/p/57633EC69B4A10A2'
+  end  
 end
-describe "Youtube parse second" do
+
+describe "Youtube parse playlist second" do
   before(:all) do
-    @a = Muri.parse 'http://www.youtube.com/watch?v=4CYDFoEz8rg'
+    @a = Muri.parse 'http://www.youtube.com/view_play_list?p=57633EC69B4A10A2'
   end
-  it_should_behave_like "Youtube parse"
-end
+  it_should_behave_like "Youtube parse playlist"
+  it "should have media id" do
+    @a.media_id == '57633EC69B4A10A2'
+  end
+  
+  it "should have media api id" do
+    @a.media_api_id == '57633EC69B4A10A2'
+  end
+  
+  it "should have media url" do
+    @a.website == 'http://www.youtube.com/view_play_list?p=57633EC69B4A10A2'
+  end
+  
+  it "should have website" do
+    @a.media_url == 'http://www.youtube.com/p/57633EC69B4A10A2'
+  end  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muri
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - William Schneider
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-02 00:00:00 -05:00
+date: 2010-03-05 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -20,15 +20,16 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
+- README.textile
 files: 
 - .gitignore
-- README.rdoc
+- README.textile
 - Rakefile
 - VERSION.yml
 - lib/muri.rb
 - lib/muri/base.rb
 - lib/muri/filter.rb
+- lib/muri/filters/facebook.rb
 - lib/muri/filters/flickr.rb
 - lib/muri/filters/imageshack.rb
 - lib/muri/filters/photobucket.rb
@@ -36,6 +37,7 @@ files:
 - lib/muri/filters/youtube.rb
 - muri.gemspec
 - test/error_test.rb
+- test/facebook_test.rb
 - test/flickr_test.rb
 - test/imageshack_test.rb
 - test/photobucket_test.rb
@@ -70,9 +72,10 @@ signing_key:
 specification_version: 3
 summary: Media URI Parser
 test_files: 
-- test/photobucket_test.rb
-- test/vimeo_test.rb
-- test/imageshack_test.rb
 - test/error_test.rb
+- test/facebook_test.rb
 - test/flickr_test.rb
+- test/imageshack_test.rb
+- test/photobucket_test.rb
+- test/vimeo_test.rb
 - test/youtube_test.rb

data/README.rdoc

@@ -1,56 +0,0 @@
-= Media URI Parser - MURI
-
-A simple to use media URI Parser. Pass a URI in, get helpful information out.
-
-MURI Currently supports:
-* Youtube
-* Vimeo
-* Flickr
-* Imageshack
-* Photobucket
-
-== Installation & basic usage
-
-Install muri as a ruby gem (you might need to run this command as root by prepending +sudo+ to it):
-
-  $ gem install muri
-
-Using muri is just as easy!
-
-  a = Muri.parse('http://www.youtube.com/watch?v=blahblahblah&feature=rec-LGOUT-exp_fresh+div-1r-1-HM')
-  a.service         # 'Youtube'
-  a.media_id        # 'blahblahblah'
-  a.original_url    # 'http://www.youtube.com/watch?v=blahblahblah&feature=rec-LGOUT-exp_fresh+div-1r-1-HM'
-  a.uri             # URI object for 'http://www.youtube.com/watch?v=blahblahblah&feature=rec-LGOUT-exp_fresh+div-1r-1-HM'
-
-Due to variations in information which can be gathered from a uri, some services provide more information than others. For example:
-* All but Imageshack have a +media_api_id+, which is the ID which can be used in API calls to the related services. Typically the same as +media_id+.
-  
-    a.media_api_id     # 'blahblahblah'
-
-* A direct media url for Youtube, Photobucket, and Imageshack (img#{num}.imageshack.us/img#{num}/#{NUMBER}/#{IMAGENAME} format)
-
-    a.media_url         # 'http://www.youtube.com/v/blahblahblah'
-
-* A media landing website url for Youtube, Photobucket, Imageshack, Vimeo, and Flickr (flickr media_url's provide the flic.kr/p/ID short url)
-
-    a.website           # 'http://www.youtube.com/watch?v=blahblahblah' 
-
-* Content type for Imageshack, Photobucket and Flickr URI's (flickr in the farm#{num}.static.flickr.com/ format)
-
-    a.content_type      # 'jpg' (Content Type also for Imageshack and Photobucket)
-
-* Thumbnails URL for Youtube Photobucket, and Flickr (flickr in the farm#{num}.static.flickr.com/ format)
-
-    a.media_thumbnail   # 'http://i.ytimg.com/vi/4CYDFoEz8rg/default.jpg'
-
-* Some additional information may be provided, which can be determined by looking through each filters code.
-
-
-If an attribute is not present, muri returns +nil+.
-
-I plan on including more services _and_ more parse information with updates. That being said, MURI is currently not production quality. Please use with caution and in development only. Thank you.
-
-== Contact
-
-If you would like to get in contact with me, my email is bananastalktome@gmail.com. I appreciate any information or assistance reverse-engineering media website URI's.