muri 1.1.4 → 1.1.5

data/CHANGELOG

@@ -1,6 +1,10 @@
 Muri Changelog
 ===================================
 
+Version 1.1.5
+  * Minor update, changed facebook "media_api_id" to only return a string representation, not a hash
+    - Facebook provides "media_api_ids" which is a hash including pid, uid, and fql_id (the regular "media_api_id")
+
 Version 1.1.3
   * Changed "FLICKR_PHOTO" to "FLICKR_MEDIA" (since it can parse videos)
     - "flickr_photo?" is replaced by "flickr_media?" now

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@ 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)*
+*NOTE: Facebook content returns a @media_api_id@ string which is the FQL compatible ID. Facebook photos can also returns a @media_api_ids@ hash, keyed by @:uid@, @:pid@, and @:fql_id@ (user, photo, and fql id). This is courtesy the new Facebook Graph API messing stuff up.*
 
 *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,5 +1,4 @@
 --- 
-:patch: 4
-:build: 
 :major: 1
 :minor: 1
+:patch: 5

data/lib/muri/filters/facebook.rb

@@ -32,7 +32,7 @@ class Muri
           
           self.media_api_type = FACEBOOK_VIDEO
           self.media_id = v
-          self.media_api_id = {:v => v}
+          self.media_api_id = 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')) &&
@@ -41,7 +41,13 @@ class Muri
           self.media_api_type = FACEBOOK_PHOTO
           self.media_id = pid
           media_creator = uid
-          self.media_api_id = {:pid => pid, :uid => media_creator}
+          
+          fql_id = ((media_creator.to_i << 32) + self.media_id.to_i).to_s
+          
+          self.media_api_id = fql_id
+          
+          #ugh, ugly, I hate facebook. FQL id's may stop working soon, so this may become media_api_id again later.
+          self.media_api_ids = { :pid => pid, :uid => media_creator, :fql_id => fql_id }
 
           self.media_website = "#{url_common}/photo.php?pid=#{self.media_id}&id=#{media_creator}"
 #         elsif ((self.uri.path =~ REGEX_FACEBOOK_ALBUM) &&

data/muri.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muri}
-  s.version = "1.1.4"
+  s.version = "1.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["William Schneider"]

data/test/facebook_test.rb

@@ -55,19 +55,21 @@ end
   { :type => :photo,
     :media_id => '34929102',
     :media_website => 'http://www.facebook.com/photo.php?pid=34929102&id=15201063',
-    :media_api_id => {:pid => "34929102", :uid => "15201063"}
+    :media_api_id => '65288068484364750',
+    :media_api_ids => {:pid => "34929102", :uid => "15201063", :fql_id => '65288068484364750'}
   },
 '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"}
+    :media_api_id => '65288068484364750',
+    :media_api_ids => {:pid => "34929102", :uid => "15201063", :fql_id => '65288068484364750'}
   },
 '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'}
+    :media_api_id => '545993063513'
   }
 }.each do |url, values|
   describe "Facebook parse #{url}" do
@@ -86,6 +88,12 @@ end
       end
     end
     
+    if values[:media_api_ids]
+      it "should have media api id hash" do
+        @a.media_api_ids.should == values[:media_api_ids]
+      end
+    end
+    
     if values[:media_website]
       it "should have a website" do
         @a.media_website.should == values[:media_website]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 4
-  version: 1.1.4
+  - 5
+  version: 1.1.5
 platform: ruby
 authors: 
 - William Schneider