muri 1.0.0 → 1.1.0

data/README.textile

@@ -16,6 +16,8 @@ MURI Currently supports:
 ** "API documentation":http://twitpic.com/api.do
 * Facebook (photos and albums)
 ** "API documentation":http://wiki.developers.facebook.com/index.php/API
+* Picasa (photos)
+** "API documentation":http://code.google.com/apis/picasaweb/docs/2.0/developers_guide.html
 
 h3. Installation & basic usage
 
@@ -43,7 +45,6 @@ Assuming the URI was successfully parsed (thus @a.valid? == true@), all media ty
 <code>
   a.media_service         # 'Youtube'
   a.media_id              # 'blahblahblah'
-  a.media_original_url    # 'http://www.youtube.com/watch?v=blahblahblah&feature=rec-LGOUT-exp_fresh+div-1r-1-HM'
   a.media_uri             # URI object for 'http://www.youtube.com/watch?v=blahblahblah&feature=rec-LGOUT-exp_fresh+div-1r-1-HM'
 </code>
 </pre>
@@ -58,9 +59,12 @@ Assuming the URI was successfully parsed (thus @a.valid? == true@), all media ty
 </code>
 </pre>
 
+* 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)
+
+
 *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)
+*ALSO NOTE: Picasa @media_api_id@ is a partial string for using the photo API call, so for example @'bananastalktome/album/TestForAPI/photoid/5450524726782297346'@, thus the API call would be @"http://picasaweb.google.com/data/feed/api/user/#{media_api_id}"@*
 
 
 * 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)
@@ -72,7 +76,7 @@ d
 </code>
 </pre>
 
-* A media landing website url for Facebook, Youtube, Photobucket, Imageshack, Vimeo, Twitpic, and Flickr (flickr returns the @http://flic.kr/p/#{ID}@ short url)
+* A media landing website url for Facebook, Picasa, Youtube, Photobucket, Imageshack, Vimeo, Twitpic, and Flickr (flickr returns the @http://flic.kr/p/#{ID}@ short url)
 
 <pre>
 <code>

data/VERSION.yml

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

data/lib/muri/base.rb

@@ -12,12 +12,14 @@ class Muri
   PARSERS = { }
 
   # Defines is_#{service}? and is_#{service type constant}? methods, and sets service name constnat
-  ['Youtube', 'Flickr', 'Vimeo', 'Imageshack', 'Photobucket', 'Facebook', 'Twitpic'].each do |filter|
+  ['Youtube', 'Flickr', 'Vimeo', 'Imageshack', 'Photobucket', 'Facebook', 'Twitpic', 'Picasa'].each do |filter|
     eval "include Filter::#{filter}"    
     is_service = "is_#{filter.downcase}?"
     define_method(is_service) { self.media_service == filter }
     self.constants.reject { |c| c !~ /^#{filter.upcase}/ }.each do |exp|
-      define_method("is_#{exp.downcase}?") { self.media_api_type == eval(exp) && eval("self.#{is_service}") }
+      define_method("is_#{exp.downcase}?") do
+        self.media_api_type == eval(exp) && self.instance_eval(is_service)
+      end
     end
     const_set "#{filter.upcase}_SERVICE_NAME", "#{filter}"
   end

data/lib/muri/filters/picasa.rb

@@ -0,0 +1,42 @@
+class Muri
+  module Filter
+    module Picasa
+
+      private
+      PICASA_PHOTO = 'photo'
+      
+      def self.included(base)
+        base.class_eval do
+          self::PARSERS[Muri::Filter::Picasa] = "picasa_parse"
+        end
+      end
+
+      def self.parsable?(uri)
+        uri.host =~ /^(www\.)?picasaweb\.google\.com$/i
+      end
+
+      def picasa_parse
+        self.media_service = PICASA_SERVICE_NAME
+        url_common = "http://picasaweb.google.com"
+        reencoded_url = URI.parse(URI.encode self.uri.to_s)
+        
+        if reencoded_url.path =~ /^\/(.[^\/]+)\/(.+)/i
+          username = $1
+          album_photoid = $2.split("%23")
+          photoid = album_photoid.last
+          album = album_photoid[0..-2].join("#")#in case other hash symbols exist
+          self.media_id = photoid
+          self.media_website = "#{url_common}/#{username}/#{album}##{photoid}"
+          self.media_api_type = PICASA_PHOTO
+          self.media_api_id = "#{username}/album/#{album}/photoid/#{photoid}"          
+        else
+          raise UnsupportedURI
+        end
+
+      end
+    end
+  end
+end
+# http://picasaweb.google.com/bananastalktome/TestForAPI#5450524726782297346
+# API Call: http://picasaweb.google.com/data/feed/api/user/bananastalktome/album/TestForAPI/photoid/5450524726782297346
+# #=%23

data/muri.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muri}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["William Schneider"]
-  s.date = %q{2010-03-28}
+  s.date = %q{2010-04-01}
   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/picasa.rb",
      "lib/muri/filters/twitpic.rb",
      "lib/muri/filters/vimeo.rb",
      "lib/muri/filters/youtube.rb",
@@ -36,6 +37,7 @@ Gem::Specification.new do |s|
      "test/flickr_test.rb",
      "test/imageshack_test.rb",
      "test/photobucket_test.rb",
+     "test/picasa_test.rb",
      "test/twitpic_test.rb",
      "test/vimeo_test.rb",
      "test/youtube_test.rb"
@@ -50,6 +52,7 @@ Gem::Specification.new do |s|
      "test/twitpic_test.rb",
      "test/photobucket_test.rb",
      "test/vimeo_test.rb",
+     "test/picasa_test.rb",
      "test/imageshack_test.rb",
      "test/error_test.rb",
      "test/flickr_test.rb",

data/test/facebook_test.rb

@@ -2,9 +2,17 @@ require 'lib/muri.rb'
 
 shared_examples_for "Facebook parse" do
   it "should be Facebook service" do
-    @a.media_service.should == 'Facebook'
+    #@a.media_service.should == 'Facebook'
+    @a.is_facebook?.should == true
   end
-
+  
+  it "should be not be other services" do
+    #@a.media_service.should == 'Facebook'
+    @a.is_vimeo?.should == false
+    @a.is_flickr?.should == false
+    @a.is_youtube?.should == false
+  end
+  
   it "should be valid" do
     @a.valid?.should == true
   end
@@ -15,6 +23,14 @@ shared_examples_for "Facebook parse photo" do
   it "should have media api type = FACEBOOK_PHOTO" do
     @a.media_api_type.should == Muri::FACEBOOK_PHOTO
   end
+  
+  it "should be facebook photo" do
+    @a.is_facebook_photo?.should == true
+  end
+  
+  it "should not be flickr photo" do
+    @a.is_flickr_photo?.should == false
+  end  
 end
 
 {'http://www.facebook.com/photo.php?pid=34929102&l=a1abf8cd37&id=15201063' =>

data/test/flickr_test.rb

@@ -1,8 +1,17 @@
 require 'lib/muri.rb'
 shared_examples_for "Flickr parse" do
   it "should be Flickr service" do
-    @a.media_service.should == 'Flickr'
+    # @a.media_service.should == 'Flickr'
+    @a.is_flickr?.should == true
   end
+  
+  it "should be not be other services" do
+    @a.is_vimeo?.should == false
+    @a.is_youtube?.should == false
+    @a.is_facebook?.should == false
+    @a.is_photobucket?.should == false
+  end
+    
   it "should be valid" do
     @a.valid?.should == true
   end
@@ -12,13 +21,25 @@ 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.should == Muri::FLICKR_PHOTO
-  end  
+  end
+  
+  it "should be flickr photo" do
+    @a.is_flickr_photo?.should == true
+  end 
+  
+  it "should not be facebook photo" do
+    @a.is_facebook_photo?.should == false
+  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.should == Muri::FLICKR_SET
+  end
+
+  it "should be flickr set" do
+    @a.is_flickr_set?.should == true
   end    
 end
 

data/test/imageshack_test.rb

@@ -2,8 +2,17 @@ require 'lib/muri.rb'
 
 shared_examples_for "Imageshack parse" do
   it "should be Imageshack service" do
-    @a.media_service.should == 'Imageshack'
+    #@a.media_service.should == 'Imageshack'
+    @a.is_imageshack?.should == true
   end
+  
+  it "should be not be other services" do
+    @a.is_vimeo?.should == false
+    @a.is_youtube?.should == false
+    @a.is_facebook?.should == false
+    @a.is_photobucket?.should == false
+  end
+    
   it "should be valid" do
     @a.valid?.should == true
   end

data/test/photobucket_test.rb

@@ -2,9 +2,17 @@ require 'lib/muri.rb'
 
 shared_examples_for "Photobucket parse" do
   it "should be Photobucket service" do
-    @a.media_service.should == 'Photobucket'
+    #@a.media_service.should == 'Photobucket'
+    @a.is_photobucket?.should == true
   end
   
+  it "should be not be other services" do
+    @a.is_vimeo?.should == false
+    @a.is_youtube?.should == false
+    @a.is_facebook?.should == false
+    @a.is_flickr?.should == false
+  end
+    
   it "should be valid" do
     @a.valid?.should == true
   end
@@ -16,6 +24,10 @@ shared_examples_for "Photobucket parse photo" do
   it "should have media api type = PHOTOBUCKET_MEDIA" do
     @a.media_api_type.should == Muri::PHOTOBUCKET_MEDIA
   end
+  
+  it "should be photobucket media" do
+    @a.is_photobucket_media?.should == true
+  end  
 end
 
 shared_examples_for "Photobucket parse album" do
@@ -24,6 +36,14 @@ shared_examples_for "Photobucket parse album" do
   it "should have media api type = PHOTOBUCKET_ALBUM" do
     @a.media_api_type.should == Muri::PHOTOBUCKET_ALBUM
   end
+
+  it "should be photobucket album" do
+    @a.is_photobucket_album?.should == true
+  end 
+  
+  it "should not be facebook album" do
+    @a.is_facebook_album?.should == false
+  end    
 end
 shared_examples_for "Photobucket parse group album" do
   it_should_behave_like "Photobucket parse"
@@ -31,6 +51,10 @@ shared_examples_for "Photobucket parse group album" do
   it "should have media api type = PHOTOBUCKET_GROUP_ALBUM" do
     @a.media_api_type.should == Muri::PHOTOBUCKET_GROUP_ALBUM
   end
+  
+  it "should be group album" do
+    @a.is_photobucket_group_album?.should == true
+  end  
 end
 
 {'http://gs0001.photobucket.com/groups/0001/F9P8EG7YR8/' =>

data/test/picasa_test.rb

@@ -0,0 +1,71 @@
+require 'lib/muri.rb'
+shared_examples_for "Picasa parse" do
+  it "should be Picasa service" do
+    @a.is_picasa?.should == true
+  end
+  
+  it "should be not be other services" do
+    @a.is_vimeo?.should == false
+    @a.is_youtube?.should == false
+    @a.is_facebook?.should == false
+    @a.is_photobucket?.should == false
+  end
+    
+  it "should be valid" do
+    @a.valid?.should == true
+  end
+end
+
+shared_examples_for "Picasa parse photo" do
+  it_should_behave_like "Picasa parse"
+  it "should have media api type = PICASA_PHOTO" do
+    @a.media_api_type.should == Muri::PICASA_PHOTO
+  end
+  
+  it "should be picasa photo" do
+    @a.is_picasa_photo?.should == true
+  end 
+  
+  it "should not be facebook photo" do
+    @a.is_facebook_photo?.should == false
+  end      
+end
+
+{'http://picasaweb.google.com/bananastalktome/TestForAPI#5450524726782297346' => 
+  { :media_id => '5450524726782297346',
+    :media_website => 'http://picasaweb.google.com/bananastalktome/TestForAPI#5450524726782297346',
+    :media_api_id => 'bananastalktome/album/TestForAPI/photoid/5450524726782297346'
+  }
+}.each do |url, values|
+  
+  describe "Picasa parse #{values[:type]} #{url}" do
+    before(:all) do
+      @a = Muri.parse url
+    end
+    it_should_behave_like "Picasa parse photo"
+
+    if values[:media_id]
+      it "should have media id" do
+        @a.media_id.should == values[:media_id]
+      end
+    end
+    
+    if values[:media_website]
+      it "should have a website" do
+        @a.media_website.should == values[:media_website]
+      end
+    end
+    
+    if values[:media_api_id]
+      it "should have media api id" do
+        @a.media_api_id.should == values[:media_api_id]
+      end
+    end
+    
+    if values[:media_thumbnail]
+      it "should have media thumbnail" do
+        @a.media_thumbnail.should == values[:media_thumbnail]
+      end
+    end
+  end
+end

data/test/twitpic_test.rb

@@ -1,8 +1,17 @@
 require 'lib/muri.rb'
 shared_examples_for "Twitpic parse" do
   it "should be Twitpic service" do
-    @a.media_service.should == 'Twitpic'
+    #@a.media_service.should == 'Twitpic'
+    @a.is_twitpic?.should == true
   end
+  
+  it "should be not be other services" do
+    @a.is_vimeo?.should == false
+    @a.is_youtube?.should == false
+    @a.is_facebook?.should == false
+    @a.is_flickr?.should == false
+  end
+    
   it "should be valid" do
     @a.valid?.should == true
   end
@@ -12,7 +21,15 @@ 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.should == Muri::TWITPIC_PHOTO
+  end
+  
+  it "should be twitpic photo" do
+    @a.is_twitpic_photo?.should == true
   end  
+  
+  it "should not be facebook photo" do
+    @a.is_facebook_photo?.should == false
+  end   
 end
 {'http://twitpic.com/17d7th' =>
   { :media_id => '17d7th',

data/test/vimeo_test.rb

@@ -2,9 +2,17 @@ require 'lib/muri.rb'
 
 shared_examples_for "Vimeo parse" do
   it "should be Vimeo service" do
-    @a.media_service.should == 'Vimeo'
+    #@a.media_service.should == 'Vimeo'
+    @a.is_vimeo?.should == true
   end
   
+  it "should be not be other services" do
+    @a.is_photobucket?.should == false
+    @a.is_youtube?.should == false
+    @a.is_facebook?.should == false
+    @a.is_flickr?.should == false
+  end
+    
   it "should be valid" do
     @a.valid?.should == true
   end
@@ -17,6 +25,14 @@ shared_examples_for "Vimeo parse video" do
   it "should have media api type = VIMEO_VIDEO" do
     @a.media_api_type.should == Muri::VIMEO_VIDEO
   end   
+  
+  it "should be vimeo video" do
+    @a.is_vimeo_video?.should == true
+  end  
+  
+  it "should not be youtube video" do
+    @a.is_youtube_video?.should == false
+  end   
 end
 shared_examples_for "Vimeo parse album" do
   it_should_behave_like "Vimeo parse"
@@ -24,6 +40,14 @@ shared_examples_for "Vimeo parse album" do
   it "should have media api type = VIMEO_ALBUM" do
     @a.media_api_type.should == Muri::VIMEO_ALBUM
   end   
+  
+  it "should be vimeo album" do
+    @a.is_vimeo_album?.should == true
+  end  
+  
+  it "should not be photobucket album" do
+    @a.is_photobucket_album?.should == false
+  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' =>

data/test/youtube_test.rb

@@ -1,9 +1,17 @@
 require 'lib/muri.rb'
 shared_examples_for "Youtube parse" do
   it "should be Youtube service" do
-    @a.media_service.should == 'Youtube'
+    #@a.media_service.should == 'Youtube'
+    @a.is_youtube?.should == true
   end
   
+  it "should be not be other services" do
+    @a.is_photobucket?.should == false
+    @a.is_vimeo?.should == false
+    @a.is_facebook?.should == false
+    @a.is_flickr?.should == false
+  end
+    
   it "should be valid" do
     @a.valid?.should == true
   end
@@ -15,6 +23,14 @@ shared_examples_for "Youtube parse single" do
   it "should have media api type = YOUTUBE_VIDEO" do
     @a.media_api_type.should == Muri::YOUTUBE_VIDEO
   end
+  
+  it "should be youtube video" do
+    @a.is_youtube_video?.should == true
+  end
+  
+  it "should not be vimeo video" do
+    @a.is_vimeo_video?.should == false
+  end
 end
 
 shared_examples_for "Youtube parse playlist" do
@@ -22,7 +38,11 @@ shared_examples_for "Youtube parse playlist" do
   
   it "should have media api type = YOUTUBE_PLAYLIST" do
     @a.media_api_type.should == Muri::YOUTUBE_PLAYLIST
-  end  
+  end
+  
+  it "should be youtube playlist" do
+    @a.is_youtube_playlist?.should == true
+  end
 end
 
 {'http://www.youtube.com/v/4CYDFoEz8rg&hl=en_US&fs=1&' =>

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - William Schneider
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-28 00:00:00 -04:00
+date: 2010-04-01 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -38,6 +38,7 @@ files:
 - lib/muri/filters/flickr.rb
 - lib/muri/filters/imageshack.rb
 - lib/muri/filters/photobucket.rb
+- lib/muri/filters/picasa.rb
 - lib/muri/filters/twitpic.rb
 - lib/muri/filters/vimeo.rb
 - lib/muri/filters/youtube.rb
@@ -47,6 +48,7 @@ files:
 - test/flickr_test.rb
 - test/imageshack_test.rb
 - test/photobucket_test.rb
+- test/picasa_test.rb
 - test/twitpic_test.rb
 - test/vimeo_test.rb
 - test/youtube_test.rb
@@ -85,6 +87,7 @@ test_files:
 - test/twitpic_test.rb
 - test/photobucket_test.rb
 - test/vimeo_test.rb
+- test/picasa_test.rb
 - test/imageshack_test.rb
 - test/error_test.rb
 - test/flickr_test.rb