muri 0.0.9 → 0.0.10

data/README.textile

@@ -14,7 +14,7 @@ MURI Currently supports:
 ** "API documentation":http://photobucket.com/developer/documentation
 * Twitpic
 ** "API documentation":http://twitpic.com/api.do
-* Facebook
+* Facebook (photos and albums)
 ** "API documentation":http://wiki.developers.facebook.com/index.php/API
 
 h3. Installation & basic usage
@@ -62,7 +62,9 @@ Assuming the URI was successfully parsed (thus @a.valid? == true@), all media ty
 
 * 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, Twitpic, Imageshack (@http://img#{num}.imageshack.us/img#{num}/#{NUMBER}/#{IMAGENAME}@ format) and flickr (@http://farm#{num}.static.flickr.com/@ format)
+
+* A direct media url for Youtube, Photobucket (photos, not albums), Twitpic, Imageshack (@http://img#{num}.imageshack.us/img#{num}/#{NUMBER}/#{IMAGENAME}@ format) and flickr (@http://farm#{num}.static.flickr.com/@ format)
+d
 
 <pre>
 <code>
@@ -70,7 +72,7 @@ Assuming the URI was successfully parsed (thus @a.valid? == true@), all media ty
 </code>
 </pre>
 
-* A media landing website url for Facebook (images, not video), Youtube, Photobucket, Imageshack, Vimeo, Twitpic, and Flickr (flickr returns the @http://flic.kr/p/#{ID}@ short url)
+* A media landing website url for Facebook, Youtube, Photobucket, Imageshack, Vimeo, Twitpic, and Flickr (flickr returns the @http://flic.kr/p/#{ID}@ short url)
 
 <pre>
 <code>
@@ -78,7 +80,7 @@ Assuming the URI was successfully parsed (thus @a.valid? == true@), all media ty
 </code>
 </pre>
 
-* Content type for Imageshack, Photobucket and Flickr (flickr in the @http://farm#{num}.static.flickr.com/@ format)
+* Content type for Imageshack, Photobucket (photos, not albums) and Flickr (flickr in the @http://farm#{num}.static.flickr.com/@ format)
 
 <pre>
 <code>
@@ -86,7 +88,7 @@ Assuming the URI was successfully parsed (thus @a.valid? == true@), all media ty
 </code>
 </pre>
 
-* Thumbnails URL for Youtube, Photobucket, Twitpic, and Flickr (flickr in the @http://farm#{num}.static.flickr.com/@ format)
+* Thumbnails URL for Youtube, Photobucket (photos, not albums), Twitpic, and Flickr (flickr in the @http://farm#{num}.static.flickr.com/@ format)
 
 <pre>
 <code>

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 9
+:patch: 10

data/lib/muri/filters/facebook.rb

@@ -4,7 +4,8 @@ class Muri
     module Facebook
       
       FACEBOOK_PHOTO = "photo"
-      FACEBOOK_VIDEO = "video"
+      #FACEBOOK_VIDEO = "video"
+      FACEBOOK_ALBUM = "album"
       
       def self.included(base)
         base.class_eval do
@@ -17,31 +18,41 @@ class Muri
         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]}"
+#         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
+        if ((@url.path =~ /^\/photo\.php$/i) && 
+            params.include?("pid") && params["pid"].first =~ /^([0-9]+)$/ && 
+            params.include?("id") && params["id"].first =~ /^([0-9]+)$/ && 
+            params.include?("l") && params["l"].first =~ /^([0-9a-z]+)$/i)
           
-          # 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}"
-
-            # The media_api_id is the PID which can be searched for in the facebook photos table
-            @info[:media_api_id] = (media_creator.to_i << 32) + @info[:media_id].to_i
-          end
+          @info[:media_api_type] = FACEBOOK_PHOTO
+          @info[:media_id] = params["pid"].first
+          media_creator = params["id"].first
+          share_key = params["l"].first
+          
+          @info[:website] = "#{url_common}/photo.php?pid=#{@info[:media_id]}&l=#{share_key}&id=#{media_creator}"
+        elsif ((@url.path =~ /^\/album\.php$/i) && 
+            params.include?("aid") && params["aid"].first =~ /^([0-9]+)$/ && 
+            params.include?("id") && params["id"].first =~ /^([0-9]+)$/ && 
+            params.include?("l") && params["l"].first =~ /^([0-9a-z]+)$/i)
+          
+          @info[:media_api_type] = FACEBOOK_ALBUM
+          @info[:media_id] = params["aid"].first
+          media_creator = params["id"].first
+          share_key = params["l"].first
+          
+          @info[:website] = "#{url_common}/album.php?aid=#{@info[:media_id]}&l=#{share_key}&id=#{media_creator}"
         end
         
-        #if self.valid?
-          #@info[:media_api_id] = @info[:media_id]
-        #else
-        if !self.valid?
+        if self.valid?
+          # The media_api_id is the PID which can be searched for in the facebook photos table          
+          @info[:media_api_id] = (media_creator.to_i << 32) + @info[:media_id].to_i
+        else
           raise UnsupportedURI
         end
         
@@ -55,10 +66,11 @@ class Muri
     end
   end
 end
+# http://www.facebook.com/album.php?aid=2131184&id=15201063&l=8917e51479
 # http://www.facebook.com/photo.php?pid=34929102&l=a1abf8cd37&id=15201063 (preview)
 # database_pid = (USER_ID << 32) + PID
 #   pid = photo id
 #   id = user id
 #   l = photo share key
-# http://www.facebook.com/v/614695029223 (full)
+# http://www.facebook.com/v/614695029223 (full) - deprecated
 # http://www.facebook.com/album.php?aid=2149275&id=15201063&l=99900807c3

data/lib/muri/filters/photobucket.rb

@@ -1,8 +1,11 @@
+require 'cgi'
 class Muri
   module Filter
     module Photobucket
 
       PHOTOBUCKET_MEDIA = "media"
+      PHOTOBUCKET_ALBUM = "album"
+      PHOTOBUCKET_GROUP_ALBUM = "group_album"
 
       def self.included(base)
         base.class_eval do
@@ -14,9 +17,9 @@ class Muri
         @info[:service] = 'Photobucket'
         
         @url.host =~ /^([a-z0-9]*?[^(media)])\.photobucket\.com/i
-        server_id = $1.gsub(/([a-z]*)/i,"")
+        @info[:server_id] = $1.gsub(/([a-z]*)/i,"")
         
-        if @url.path =~ /^\/albums\/(.*?)\/(.*?)\/((?:.*?\/)*)(.*?)\.(.*)/i
+        if @url.path =~ /^\/albums\/(.+?)\/(.+?)\/((?:.+?\/)*)(.+?)\.(.+)/i #Images
           photobucket_id = $1
           media_creator = $2          
           album = $3
@@ -24,25 +27,43 @@ class Muri
           @info[:content_type] = $5
           url_common = "#{server_id}.photobucket.com/albums/#{photobucket_id}/#{media_creator}/#{album}"
           direct_url_suffix = "#{url_common}#{@info[:media_id]}.#{@info[:content_type]}"
-          
+          @info[:media_api_type] = PHOTOBUCKET_MEDIA
           @info[:media_url] = "http://i#{direct_url_suffix}"
           @info[:website] = "http://s#{url_common}?action=view&current=#{@info[:media_id]}.#{@info[:content_type]}"
-        elsif @url.path =~ /^\/groups\/(.*?)\/(.*?)\/(.*?)\.(.*)/i
+        elsif @url.path =~ /^\/albums\/(.+?)\/(.+?)\/((?:.[^\/]+?)+)(?:\/|$)/i #Albums
+          photobucket_id = $1
+          media_creator = $2
+          album = $3
+          @info[:media_id] = "#{media_creator}/#{album}"
+          url_common = "#{server_id}.photobucket.com/albums/#{photobucket_id}/#{media_creator}/#{album}"
+          @info[:media_api_type] = PHOTOBUCKET_ALBUM
+          @info[:website] = "http://s#{url_common}/"
+        elsif @url.path =~ /^\/groups\/(.+?)\/(.+?)\/(.+?)\.(.+)/i #Group Images
           group = $1
           group_hash_value = $2
           @info[:media_id] = $3
           @info[:content_type] = $4
           url_common = "#{server_id}.photobucket.com/groups/#{group}/#{group_hash_value}"
           direct_url_suffix = "#{url_common}/#{@info[:media_id]}.#{@info[:content_type]}"
-          
+          @info[:media_api_type] = PHOTOBUCKET_MEDIA
           @info[:media_url] = "http://gi#{direct_url_suffix}"
           @info[:website] = "http://gs#{url_common}/?action=view&current=#{@info[:media_id]}.#{@info[:content_type]}"
+        elsif @url.path =~ /^\/groups\/(.+)\/(.+?)(?:\/|$)/i #Group Album
+          group = $1
+          group_hash_value = $2
+          url_common = "#{server_id}.photobucket.com/groups/#{group}/#{group_hash_value}"
+          @info[:media_id] = group_hash_value
+          @info[:website] = "http://gs#{url_common}/"
+          @info[:media_api_type] = PHOTOBUCKET_GROUP_ALBUM
         end
         
         if self.valid?
-          @info[:media_api_type] = PHOTOBUCKET_MEDIA
-          @info[:media_api_id] = @info[:media_url]
-          @info[:media_thumbnail] = "http://mobth#{direct_url_suffix}"
+          if @info[:media_api_type] == PHOTOBUCKET_MEDIA
+            @info[:media_api_id] = @info[:media_url]
+            @info[:media_thumbnail] = "http://mobth#{direct_url_suffix}"
+          else
+            @info[:media_api_id] = @info[:media_id]
+          end
         else
           raise UnsupportedURI          
         end

data/lib/muri/filters/vimeo.rb

@@ -22,7 +22,7 @@ class Muri
         elsif @url.path =~ /^\/groups\/([0-9a-z\@\-\_]+)\/videos\/([0-9]+)(\/)?$/i
           @info[:media_id] = $2
           @info[:media_api_type] = VIMEO_VIDEO
-        elsif ((@url.path =~ /^\/moogaloop\.swf/i) && (params.include?("clip_id")))
+        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
@@ -31,6 +31,9 @@ class Muri
           @info[:media_api_id] = @info[:media_id]
           album = (@info[:media_api_type] == VIMEO_ALBUM) ? "album/" : ""
           @info[:website] = "http://vimeo.com/#{album}#{@info[:media_id]}"
+          if @info[:media_api_type] == VIMEO_VIDEO
+            @info[:media_url] = "http://vimeo.com/moogaloop.swf?clip_id=#{@info[:media_id]}&server=vimeo.com&show_title=1&show_byline=1&show_portrait=0&color=&fullscreen=1"
+          end
         else
           raise UnsupportedURI
         end

data/lib/muri/filters/youtube.rb

@@ -17,16 +17,16 @@ class Muri
         url_common = "http://www.youtube.com"
         params = @url.query.nil? ? {} : CGI::parse(@url.query)
         
-        if (@url.path =~ /\/watch$/i) && params.include?("v")
+        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)
+        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'))
+        elsif (@url.path =~ /^\/view\_play\_list$/i) && (params.include?('p'))
           @info[:media_id] = params['p'].first
           @info[:media_api_type] = YOUTUBE_PLAYLIST
         end

data/muri.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muri}
-  s.version = "0.0.9"
+  s.version = "0.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["William Schneider"]
-  s.date = %q{2010-03-10}
+  s.date = %q{2010-03-14}
   s.description = %q{Automatically get media information from the URL.}
   s.email = %q{bananastalktome@gmail.com}
   s.extra_rdoc_files = [

data/test/facebook_test.rb

@@ -16,31 +16,31 @@ shared_examples_for "Facebook parse photo" do
   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.should == Muri::FACEBOOK_VIDEO
-  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.should == 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.should == '614695029223'
-  end
-  
-  it "should have a media_url" do
-    @a.media_url.should == 'http://www.facebook.com/v/614695029223'
-  end
-   
-  it "should have media api id" do
-    @a.media_api_id.should == '614695029223'
-  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.should == '614695029223'
+#   end
+#   
+#   it "should have a media_url" do
+#     @a.media_url.should == 'http://www.facebook.com/v/614695029223'
+#   end
+#    
+#   it "should have media api id" do
+#     @a.media_api_id.should == '614695029223'
+#   end
+# end
 
 describe "Facebook parse second" do
   before(:all) do

data/test/photobucket_test.rb

@@ -8,17 +8,78 @@ shared_examples_for "Photobucket parse" do
   it "should be valid" do
     @a.valid?.should == true
   end
+end
+
+shared_examples_for "Photobucket parse photo" do
+  it_should_behave_like "Photobucket parse"
+  it "should be Photobucket service" do
+    @a.service.should == 'Photobucket'
+  end
+  
+  it "should be valid" do
+    @a.valid?.should == true
+  end
   
   it "should have media api type = PHOTOBUCKET_MEDIA" do
     @a.media_api_type.should == Muri::PHOTOBUCKET_MEDIA
   end
 end
+shared_examples_for "Photobucket parse album" do
+  it_should_behave_like "Photobucket parse"
+  
+  it "should have media api type = PHOTOBUCKET_ALBUM" do
+    @a.media_api_type.should == Muri::PHOTOBUCKET_ALBUM
+  end
+end
+shared_examples_for "Photobucket parse group album" do
+  it_should_behave_like "Photobucket parse"
+  
+  it "should have media api type = PHOTOBUCKET_GROUP_ALBUM" do
+    @a.media_api_type.should == Muri::PHOTOBUCKET_GROUP_ALBUM
+  end
+end
+
+describe "Photobucket parse group album first" do
+  before(:all) do
+    @a = Muri.parse 'http://gs0001.photobucket.com/groups/0001/F9P8EG7YR8/'
+  end
+  it_should_behave_like "Photobucket parse group album"
+      
+  it "should have media id" do
+    @a.media_id.should == 'F9P8EG7YR8'
+  end
+  it "should have media api id" do
+    @a.media_id.should == 'F9P8EG7YR8'
+  end
+  
+  it "shoud have website" do
+    @a.website.should == 'http://gs0001.photobucket.com/groups/0001/F9P8EG7YR8/'
+  end
+end
+
+describe "Photobucket parse album first" do
+  before(:all) do
+    @a = Muri.parse 'http://s244.photobucket.com/albums/gg17/pbapi/api-test/api-test-subalbum/'
+  end
+  it_should_behave_like "Photobucket parse album"
+      
+  it "should have media id" do
+    @a.media_id.should == 'pbapi/api-test/api-test-subalbum'
+  end
+  it "should have media api id" do
+    @a.media_id.should == 'pbapi/api-test/api-test-subalbum'
+  end
+  
+  it "shoud have website" do
+    @a.website.should == 'http://s244.photobucket.com/albums/gg17/pbapi/api-test/api-test-subalbum/'
+  end
+end
 
 describe "Photobucket parse first" do
   before(:all) do
     @a = Muri.parse 'http://i244.photobucket.com/albums/gg17/pbapi/file.jpg'
   end
-  it_should_behave_like "Photobucket parse"
+  it_should_behave_like "Photobucket parse photo"
       
   it "should have media id" do
     @a.media_id.should == 'file'
@@ -49,7 +110,7 @@ describe "Photobucket parse second" do
   before(:all) do
     @a = Muri.parse 'http://gi0006.photobucket.com/groups/0006/G5PAK3TBQS/DSCF0015-1-1.jpg'
   end
-  it_should_behave_like "Photobucket parse"
+  it_should_behave_like "Photobucket parse photo"
     
   it "should have media id" do
     @a.media_id.should == 'DSCF0015-1-1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muri
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - William Schneider
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-10 00:00:00 -05:00
+date: 2010-03-14 00:00:00 -05:00
 default_executable: 
 dependencies: []