muri 1.1.2 → 1.1.4

data/CHANGELOG

@@ -0,0 +1,13 @@
+Muri Changelog
+===================================
+
+Version 1.1.3
+  * Changed "FLICKR_PHOTO" to "FLICKR_MEDIA" (since it can parse videos)
+    - "flickr_photo?" is replaced by "flickr_media?" now
+  * Facebook parser overhaul thanks to their new 'Graph API'
+    - media_api_id is no longer the true facebook database API id for photos, though it is now for videos
+    - Facebook parser accepts video URL's, but albums temporarily disabled
+  * Removed deprecated "is_" methods
+  * Changed service names all lowercase letters (eg. "Vimeo" to "vimeo").
+    - Should not have any major impact on usage, mostly an internal change.
+  * URL parse now only escapes spaces, not all characters (allows # to create URI fragment)

data/README.textile

@@ -62,7 +62,7 @@ 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)
 
 
-*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@)*
+*NOTE: Facebook photos return a @media_api_id@ hash, keyed for photos by @uid@ and @pid@ (user and photo id, not the true Graph API id), and for videos by @v@ (the video id)*
 
 *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}"@*
 

data/VERSION.yml

@@ -1,4 +1,5 @@
 --- 
+:patch: 4
+:build: 
 :major: 1
 :minor: 1
-:patch: 2

data/lib/muri/base.rb

@@ -9,25 +9,19 @@ class Muri
   #   match accepted formats
   class UnsupportedURI < ArgumentError; end
 
-  AVAILABLE_PARSERS = %w[Youtube Flickr Vimeo Imageshack Photobucket Facebook Twitpic Picasa].freeze
+  AVAILABLE_PARSERS = %w[youtube flickr vimeo imageshack photobucket facebook twitpic picasa].freeze
 
   PARSERS = { }
   
   # Defines #{service}? and #{service_type}? methods, and sets service name constnat
   AVAILABLE_PARSERS.each do |parser|
-    eval "include Filter::#{parser}"    
-    is_service = "is_#{parser.downcase}?"
-    service = "#{parser.downcase}?"
+    eval "include Filter::#{parser.capitalize}"    
+    service = "#{parser}?"
     define_method(service) { self.media_service == parser }    
-    define_method(is_service) { puts "This method will be deprecated, use #{service} instead"; self.instance_eval(service) }
     self.constants.reject { |c| c !~ /^#{parser.upcase}/ }.each do |exp|
       define_method("#{exp.downcase}?") do
         self.media_api_type == eval(exp) && self.instance_eval(service)
       end
-      define_method("is_#{exp.downcase}?") do
-        puts "This method will be deprecated, use #{exp.downcase}? instead"
-        self.instance_eval("#{exp.downcase}?")
-      end    
     end
     const_set "#{parser.upcase}_SERVICE_NAME", "#{parser}"
   end
@@ -69,7 +63,7 @@ class Muri
   
   def parse(raw_url)
     begin
-      raw_url = URI.encode(URI.decode(raw_url)) unless raw_url.nil?
+      raw_url = URI.encode(URI.decode(raw_url), " ") unless raw_url.nil?
       self.uri = URI.parse(raw_url)
       if self.uri.scheme.nil?
         raw_url = "http://#{raw_url}"

data/lib/muri/filters/facebook.rb

@@ -4,10 +4,12 @@ class Muri
 
       private
       FACEBOOK_PHOTO = "photo"
-      #FACEBOOK_VIDEO = "video"
-      FACEBOOK_ALBUM = "album"
-      REGEX_FACEBOOK_PHOTO = /^\/photo\.php$/i
-      REGEX_FACEBOOK_ALBUM = /^\/album\.php$/i
+      FACEBOOK_VIDEO = "video"
+      
+      #FACEBOOK_ALBUM = "album"
+      REGEX_FACEBOOK_PHOTO = /\/photo\.php/i
+      REGEX_FACEBOOK_VIDEO = /\/video\/video\.php/i
+      #REGEX_FACEBOOK_ALBUM = /^\/album\.php$/i
 
       def self.included(base)
         base.class_eval do
@@ -20,55 +22,44 @@ class Muri
       end
 
       def facebook_parse
-        self.media_service = FACEBOOK_SERVICE_NAME #'Facebook'
-        params = Muri.param_parse(self.uri.query)
+        self.media_service = FACEBOOK_SERVICE_NAME #'facebook'
 
-        url_common = "http://www.facebook.com"
+        url_string = self.uri.fragment.nil? ? (self.uri.path.to_s + "?" + self.uri.query.to_s) : self.uri.fragment
 
-#         if self.uri.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 ((self.uri.path =~ REGEX_FACEBOOK_PHOTO) &&
-            params["pid"] =~ /^([0-9]+)$/ &&
-            params["id"] =~ /^([0-9]+)$/ &&
-            params["l"] =~ /^([0-9a-z]+)$/i)
+        url_common = "http://www.facebook.com"
 
+        if (url_string =~ REGEX_FACEBOOK_VIDEO && (v = url_string.gsub(/\A.*?v=(\d+)(&.*|\Z)/i, '\1')))
+          
+          self.media_api_type = FACEBOOK_VIDEO
+          self.media_id = v
+          self.media_api_id = {:v => v}
+          self.media_website = "#{url_common}/video/video.php?v=#{self.media_id}"
+        elsif (url_string =~ REGEX_FACEBOOK_PHOTO &&
+          (pid = url_string.gsub(/\A.*?pid=(\d+)(&.*|\Z)/i, '\1')) &&
+          (uid = url_string.gsub(/\A.*?[^p]id=(\d+)(&.*|\Z)/i, '\1')))
+          
           self.media_api_type = FACEBOOK_PHOTO
-          self.media_id = params["pid"]
-          media_creator = params["id"]
-          share_key = params["l"]
-
-          self.media_website = "#{url_common}/photo.php?pid=#{self.media_id}&l=#{share_key}&id=#{media_creator}"
-        elsif ((self.uri.path =~ REGEX_FACEBOOK_ALBUM) &&
-            params["aid"] =~ /^([0-9]+)$/ &&
-            params["id"] =~ /^([0-9]+)$/ &&
-            params["l"] =~ /^([0-9a-z]+)$/i)
+          self.media_id = pid
+          media_creator = uid
+          self.media_api_id = {:pid => pid, :uid => media_creator}
 
-          self.media_api_type = FACEBOOK_ALBUM
-          self.media_id = params["aid"]
-          media_creator = params["id"]
-          share_key = params["l"]
-
-          self.media_website = "#{url_common}/album.php?aid=#{self.media_id}&l=#{share_key}&id=#{media_creator}"
+          self.media_website = "#{url_common}/photo.php?pid=#{self.media_id}&id=#{media_creator}"
+#         elsif ((self.uri.path =~ REGEX_FACEBOOK_ALBUM) &&
+#             params["aid"] =~ /^([0-9]+)$/ &&
+#             params["id"] =~ /^([0-9]+)$/ &&
+#             params["l"] =~ /^([0-9a-z]+)$/i)
+# 
+#           self.media_api_type = FACEBOOK_ALBUM
+#           self.media_id = params["aid"]
+#           media_creator = params["id"]
+#           share_key = params["l"]
+# 
+#           self.media_website = "#{url_common}/album.php?aid=#{self.media_id}&l=#{share_key}&id=#{media_creator}"
         else
           raise UnsupportedURI
         end
-
-        # The media_api_id is the PID which can be searched for in the facebook photos/albums table
-        self.media_api_id = (media_creator.to_i << 32) + self.media_id.to_i
+        
       end
     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) - deprecated
-# http://www.facebook.com/album.php?aid=2149275&id=15201063&l=99900807c3
+end

data/lib/muri/filters/flickr.rb

@@ -3,11 +3,11 @@ class Muri
     module Flickr
 
       private
-      FLICKR_PHOTO = "photo"
+      FLICKR_MEDIA = "media"
       FLICKR_SET = "set"
 
-      REGEX_FLICKR_PHOTO_OR_SET = /^\/photos\/([a-z0-9\-\_\@]+?)\/(sets\/)?([0-9]+)/i
-      REGEX_FLICKR_STATIC_PHOTO = /^farm([1-3])\.static.flickr.com\/([0-9]+?)\/([0-9]+?)\_([a-z0-9]+?)((?:\_[a-z]){1,2}){0,1}\.([a-z]+)/i
+      REGEX_FLICKR_MEDIA_OR_SET = /^\/photos\/([a-z0-9\-\_\@]+?)\/(sets\/)?([0-9]+)/i
+      REGEX_FLICKR_STATIC_MEDIA = /^farm([1-3])\.static.flickr.com\/([0-9]+?)\/([0-9]+?)\_([a-z0-9]+?)((?:\_[a-z]){1,2}){0,1}\.([a-z]+)/i
       REGEX_FLICKR_SHORTURL = /^flic\.kr\/p\/([a-z0-9]+)/i
 
       def self.included(base)
@@ -23,28 +23,28 @@ class Muri
       def flickr_parse
         self.media_service = FLICKR_SERVICE_NAME #'Flickr'
 
-        if self.uri.path =~ REGEX_FLICKR_PHOTO_OR_SET
+        if self.uri.path =~ REGEX_FLICKR_MEDIA_OR_SET
           media_creator = $1
           self.media_id = $3
-          self.media_api_type = $2.nil? ? FLICKR_PHOTO : FLICKR_SET
-        elsif (self.uri.host + self.uri.path) =~ REGEX_FLICKR_STATIC_PHOTO
+          self.media_api_type = $2.nil? ? FLICKR_MEDIA : FLICKR_SET
+        elsif (self.uri.host + self.uri.path) =~ REGEX_FLICKR_STATIC_MEDIA
           farm = $1
           server_id = $2
           self.media_id = $3
-          self.media_api_type = FLICKR_PHOTO
+          self.media_api_type = FLICKR_MEDIA
           media_secret = $4
           url_prefix = "http://farm#{farm}.static.flickr.com/#{server_id}/#{self.media_id}_#{media_secret}"
           self.media_url = "#{url_prefix}.jpg"
           self.media_thumbnail = "#{url_prefix}_t.jpg"
         elsif (self.uri.host + self.uri.path) =~ REGEX_FLICKR_SHORTURL
           self.media_id = Filter::Flickr.decode58($1)
-          self.media_api_type = FLICKR_PHOTO
+          self.media_api_type = FLICKR_MEDIA
         else
           raise UnsupportedURI
         end
 
         self.media_api_id = self.media_id
-        if self.flickr_photo?
+        if self.flickr_media?
           self.media_website = "http://flic.kr/p/" + Filter::Flickr.encode58(self.media_id.to_i)
         elsif self.flickr_set?
           self.media_website = "http://www.flickr.com/photos/#{media_creator}/sets/#{self.media_id}" # appending /show takes direct to image through redirect

data/lib/muri/filters/picasa.rb

@@ -19,14 +19,12 @@ class Muri
         self.media_service = PICASA_SERVICE_NAME
         url_common = "http://picasaweb.google.com"
         
-        #I hate to have to do this, but it's the best way I can think of to get the hash symbol
-        #reencoded_url = URI.parse(URI.encode self.uri.to_s)
-        
-        if self.uri.path =~ /^\/(.[^\/]+)\/(.[^\/]+)/i
+        if (self.uri.path =~ /^\/(.[^\/]+)\/(.[^\/]+)/i) && !self.uri.fragment.nil?
           username = $1
-          album_photoid = $2.split("%23")
+          album = $2 #album_photoid[0..-2].join("#") #in case other hash symbols exist
+          
+          album_photoid = self.uri.fragment.split("#")
           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
@@ -41,4 +39,5 @@ class Muri
 end
 # http://picasaweb.google.com/bananastalktome/TestForAPI#5450524726782297346
 # API Call: http://picasaweb.google.com/data/feed/api/user/bananastalktome/album/TestForAPI/photoid/5450524726782297346
-# #=%23
+# #=%23
+# http://picasaweb.google.com/data/entry/api/user/bananastalktome/photoid/5450524726782297346

data/muri.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muri}
-  s.version = "1.1.2"
+  s.version = "1.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["William Schneider"]
-  s.date = %q{2010-04-06}
+  s.date = %q{2010-04-29}
   s.description = %q{Automatically get media information from the URL.}
   s.email = %q{bananastalktome@gmail.com}
   s.extra_rdoc_files = [
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "CHANGELOG",
      "README.textile",
      "Rakefile",
      "VERSION.yml",

data/test/facebook_test.rb

@@ -17,6 +17,24 @@ shared_examples_for "Facebook parse" do
     @a.valid?.should == true
   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
+  
+  it "should be facebook video" do
+    @a.facebook_video?.should == true
+  end
+  
+  it "should not be facebook photo" do
+    @a.facebook_photo?.should == false
+  end  
+  
+  it "should not be flickr media" do
+    @a.flickr_media?.should == false
+  end  
+end
 
 shared_examples_for "Facebook parse photo" do
   it_should_behave_like "Facebook parse"
@@ -28,22 +46,39 @@ shared_examples_for "Facebook parse photo" do
     @a.facebook_photo?.should == true
   end
   
-  it "should not be flickr photo" do
-    @a.flickr_photo?.should == false
+  it "should not be flickr media" do
+    @a.flickr_media?.should == false
   end  
 end
 
 {'http://www.facebook.com/photo.php?pid=34929102&l=a1abf8cd37&id=15201063' =>
-  { :media_id => '34929102',
-    :media_website => 'http://www.facebook.com/photo.php?pid=34929102&l=a1abf8cd37&id=15201063',
-    :media_api_id => 65288068484364750
+  { :type => :photo,
+    :media_id => '34929102',
+    :media_website => 'http://www.facebook.com/photo.php?pid=34929102&id=15201063',
+    :media_api_id => {:pid => "34929102", :uid => "15201063"}
+  },
+'http://www.facebook.com/photo.php?pid=3343211&l=a1abf8cd37&id=322232#!/photo.php?pid=34929102&l=a1abf8cd37&id=15201063' =>
+  { :type => :photo,
+    :media_id => '34929102',
+    :media_website => 'http://www.facebook.com/photo.php?pid=34929102&id=15201063',
+    :media_api_id => {:pid => "34929102", :uid => "15201063"}
+  },
+'http://www.facebook.com/photo.php?pid=34929101&id=15201063#!/video/video.php?v=545993063513&subj=15201063' =>
+  { :type => :video,
+    :media_id => '545993063513',
+    :media_website => "http://www.facebook.com/video/video.php?v=545993063513",
+    :media_api_id => {:v => '545993063513'}
   }
 }.each do |url, values|
   describe "Facebook parse #{url}" do
     before(:all) do
       @a = Muri.parse url
     end
-    it_should_behave_like "Facebook parse photo"
+    if values[:type] == :photo
+      it_should_behave_like "Facebook parse photo"
+    elsif values[:type] == :video
+      it_should_behave_like "Facebook parse video"
+    end
   
     if values[:media_id]
       it "should have media id" do

data/test/flickr_test.rb

@@ -20,11 +20,11 @@ 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.should == Muri::FLICKR_PHOTO
+    @a.media_api_type.should == Muri::FLICKR_MEDIA
   end
   
-  it "should be flickr photo" do
-    @a.flickr_photo?.should == true
+  it "should be flickr media" do
+    @a.flickr_media?.should == true
   end 
   
   it "should not be facebook photo" do

data/test/photobucket_test.rb

@@ -41,9 +41,9 @@ shared_examples_for "Photobucket parse album" do
     @a.photobucket_album?.should == true
   end 
   
-  it "should not be facebook album" do
-    @a.facebook_album?.should == false
-  end    
+#   it "should not be facebook album" do
+#     @a.facebook_album?.should == false
+#   end    
 end
 shared_examples_for "Photobucket parse group album" do
   it_should_behave_like "Photobucket parse"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 4
+  version: 1.1.4
 platform: ruby
 authors: 
 - William Schneider
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-06 00:00:00 -04:00
+date: 2010-04-29 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -28,6 +28,7 @@ extra_rdoc_files:
 - README.textile
 files: 
 - .gitignore
+- CHANGELOG
 - README.textile
 - Rakefile
 - VERSION.yml