muri 0.0.5 → 0.0.6

data/README.textile

@@ -12,6 +12,8 @@ MURI Currently supports:
 * Imageshack
 * Photobucket
 ** "API documentation":http://photobucket.com/developer/documentation
+* Twitpic
+** "API documentation":http://twitpic.com/api.do
 * Facebook
 ** "API documentation":http://wiki.developers.facebook.com/index.php/API
 
@@ -56,11 +58,11 @@ Assuming the URI was successfully parsed (thus @a.valid? == true@), all media ty
 </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)*
+*NOTE: Facebook photos return a @media_api_id@ which can be used to search for photo information in a Facebook photos.get API call as the pid. This pid is NOT the same as the pid found in the query string (the @media_id@)*
 
 * 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)
+* A direct media url for Youtube, Photobucket, Twitpic, and Imageshack (@http://img#{num}.imageshack.us/img#{num}/#{NUMBER}/#{IMAGENAME}@ format)
 
 <pre>
 <code>
@@ -68,7 +70,7 @@ Assuming the URI was successfully parsed (thus @a.valid? == true@), all media ty
 </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)
+* A media landing website url for Youtube, Photobucket, Imageshack, Vimeo, Twitpic, and Flickr (flickr media_url's provide the @http://flic.kr/p/#{ID}@ short url)
 
 <pre>
 <code>
@@ -84,7 +86,7 @@ Assuming the URI was successfully parsed (thus @a.valid? == true@), all media ty
 </code>
 </pre>
 
-* Thumbnails URL for Youtube Photobucket, and Flickr (flickr in the @http://farm#{num}.static.flickr.com/@ format)
+* Thumbnails URL for Youtube Photobucket, 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: 5
+:patch: 6

data/lib/muri/base.rb

@@ -16,6 +16,7 @@ class Muri
   include Filter::Imageshack
   include Filter::Photobucket
   include Filter::Facebook
+  include Filter::Twitpic  
 
   def self.parse(url)
     self.new(url)

data/lib/muri/filters/facebook.rb

@@ -1,10 +1,4 @@
 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
@@ -38,7 +32,9 @@ class Muri
             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 }
+
+            # The media_api_id is the PID which can be searched for in the facebook photos table
+            @info[:media_api_id] = (media_creator << 32) + @info[:media_id]
           end
         end
         
@@ -59,8 +55,8 @@ class Muri
     end
   end
 end
-
 # 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

data/lib/muri/filters/flickr.rb

@@ -45,7 +45,7 @@ class Muri
           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]}"
+            @info[:website] = "http://www.flickr.com/photos/#{media_creator}/sets/#{@info[:media_id]}"#/show takes direct
           end
         else
           raise UnsupportedURI

data/lib/muri/filters/imageshack.rb

@@ -15,10 +15,10 @@ class Muri
         server_id = $1
         url_common = "http://img#{server_id}.imageshack.us"
         
-        if @url.path =~ /^\/i\/([a-z0-9]*?)\.([a-z0-9]*?)\//i
+        if @url.path =~ /^\/i\/([a-z0-9]+?)\.([a-z0-9]+?)\//i
           @info[:media_id] = $1
           @info[:content_type] = $2
-        elsif @url.path =~ /^\/img([0-9]*?)\/([0-9]*?)\/([a-z0-9]*?)\.([a-z0-9]*?)/i
+        elsif @url.path =~ /^\/img([0-9]*?)\/([0-9]+?)\/([a-z0-9]+?)\.([a-z0-9]+?)/i
           content_path_id = $2
           @info[:media_id] = $3
           @info[:content_type] = $4
@@ -48,4 +48,4 @@ end
 
 # http://img30.imageshack.us/img30/4184/rush02.mp4
 # http://img30.imageshack.us/i/rush02.mp4/
-# http://yfrog.us/0urush02z
+# http://yfrog.us/0urush02z => http://code.google.com/p/imageshackapi/wiki/YFROGurls

data/lib/muri/filters/twitpic.rb

@@ -0,0 +1,46 @@
+class Muri
+  module Filter
+    module Twitpic
+      
+      TWITPIC_PHOTO = 'photo'
+      
+      def self.included(base)
+        base.class_eval do
+          self::PARSERS[Muri::Filter::Twitpic] = "twitpic_parse"
+        end
+      end
+      
+      def twitpic_parse
+        @info[:service] = 'Twitpic'
+        url_common = "http://twitpic.com"
+        
+        if @url.path =~ /^([a-z0-9]+)/i
+          @info[:media_id] = $1
+          @info[:website] = "#{url_common}/#{@info[:media_id]}"
+          @info[:media_url] = "#{url_common}/show/large/#{@info[:media_id]}"
+          @info[:media_thumbnail] = "#{url_common}/show/thumb/#{@info[:media_id]}"          
+          @info[:media_api_type] = TWITPIC_PHOTO
+        end
+
+        # Twitpic does not have an API to pull photo info. Media ID is best guess
+        if self.valid?
+          @info[:media_api_id] = @info[:media_id]
+        else
+          raise UnsupportedURI
+        end
+        
+        self
+      end            
+ 
+      def self.parsable?(uri)
+        uri.host =~ /^twitpic\.com$/i
+      end
+      
+    end
+  end
+end
+# http://twitpic.com/17d7th
+# http://twitpic.com/show/large/17d7th
+# http://twitpic.com/show/thumb/17d7th
+
+# http://twitpic.com/api.do

data/lib/muri/filters/vimeo.rb

@@ -19,8 +19,11 @@ class Muri
         if @url.path =~ /^\/(album\/)?([0-9]+)(\/)?$/i
           @info[:media_id] = $2
           @info[:media_api_type] = $1.nil? ? VIMEO_VIDEO : VIMEO_ALBUM
+        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")))
-          @info[:media_id] = params["clip_id"].first if (params["clip_id"].first =~ /([0-9]*)/)
+          @info[:media_id] = params["clip_id"].first if (params["clip_id"].first =~ /([0-9]+)/)
           @info[:media_api_type] = VIMEO_VIDEO
         end
         
@@ -42,6 +45,7 @@ class Muri
     end
   end
 end
+# http://www.vimeo.com/groups/beyondthestill/videos/9394829
 # 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/album/89702

data/lib/muri/filters/youtube.rb

@@ -20,10 +20,10 @@ class Muri
         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)
+        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'))

data/muri.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muri}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["William Schneider"]
-  s.date = %q{2010-03-05}
+  s.date = %q{2010-03-09}
   s.description = %q{Automatically get media information from the URL.}
   s.email = %q{bananastalktome@gmail.com}
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
      "lib/muri/filters/flickr.rb",
      "lib/muri/filters/imageshack.rb",
      "lib/muri/filters/photobucket.rb",
+     "lib/muri/filters/twitpic.rb",
      "lib/muri/filters/vimeo.rb",
      "lib/muri/filters/youtube.rb",
      "muri.gemspec",
@@ -35,6 +36,7 @@ Gem::Specification.new do |s|
      "test/flickr_test.rb",
      "test/imageshack_test.rb",
      "test/photobucket_test.rb",
+     "test/twitpic_test.rb",
      "test/vimeo_test.rb",
      "test/youtube_test.rb"
   ]
@@ -49,6 +51,7 @@ Gem::Specification.new do |s|
      "test/flickr_test.rb",
      "test/imageshack_test.rb",
      "test/photobucket_test.rb",
+     "test/twitpic_test.rb",
      "test/vimeo_test.rb",
      "test/youtube_test.rb"
   ]

data/test/facebook_test.rb

@@ -57,6 +57,6 @@ describe "Facebook parse second" do
   end
    
   it "should have media api id" do
-    @a.media_api_id == { :pid => '34929102', :user_id => '15201063' }
+    @a.media_api_id == 65288068484364750
   end  
 end

data/test/twitpic_test.rb

@@ -0,0 +1,42 @@
+require 'lib/muri.rb'
+shared_examples_for "Twitpic parse" do
+  it "should be Twitpic service" do
+    @a.service == 'Twitpic'
+  end
+  it "should be valid" do
+    @a.valid? == true
+  end
+end
+
+shared_examples_for "Twitpic parse photo" do
+  it_should_behave_like "Twitpic parse"
+  it "should have media api type = TWITPIC_PHOTO" do
+    @a.media_api_type == Muri::TWITPIC_PHOTO
+  end  
+end
+
+describe "Twitpic parse first" do
+  before(:all) do
+    @a = Muri.parse 'http://twitpic.com/17d7th'
+  end
+  it_should_behave_like "Twitpic parse photo"
+  it "should have media id" do
+    @a.media_id == '17d7th'
+  end
+  
+  it "should have a website" do
+    @a.website == "http://twitpic.com/17d7th"
+  end
+   
+  it "should have media api id" do
+    @a.media_api_id == '17d7th'
+  end  
+  
+  it "should have media url" do
+    @a.media_url == "http://twitpic.com/show/large/17d7th"
+  end
+  
+  it "should have a media thumbnail" do
+    @a.media_thumbnail == "http://twitpic.com/show/thumb/17d7th"   
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muri
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - William Schneider
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-05 00:00:00 -05:00
+date: 2010-03-09 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -33,6 +33,7 @@ files:
 - lib/muri/filters/flickr.rb
 - lib/muri/filters/imageshack.rb
 - lib/muri/filters/photobucket.rb
+- lib/muri/filters/twitpic.rb
 - lib/muri/filters/vimeo.rb
 - lib/muri/filters/youtube.rb
 - muri.gemspec
@@ -41,6 +42,7 @@ files:
 - test/flickr_test.rb
 - test/imageshack_test.rb
 - test/photobucket_test.rb
+- test/twitpic_test.rb
 - test/vimeo_test.rb
 - test/youtube_test.rb
 has_rdoc: true
@@ -77,5 +79,6 @@ test_files:
 - test/flickr_test.rb
 - test/imageshack_test.rb
 - test/photobucket_test.rb
+- test/twitpic_test.rb
 - test/vimeo_test.rb
 - test/youtube_test.rb