muri 1.1.5 → 1.1.6

data/CHANGELOG

@@ -1,6 +1,10 @@
 Muri Changelog
 ===================================
 
+Version 1.1.6 (Git)
+  * Reenabled Facebook album parsing ability
+  * Enabled short URL's for youtube (ex/ http://youtu.be/ZL1Jta1j42c)
+
 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")

data/README.textile

@@ -7,14 +7,14 @@ MURI Currently supports:
 ** "API documentation":http://code.google.com/apis/youtube/2.0/developers_guide_protocol_audience.html
 * Vimeo (single videos and albums)
 ** "API documentation":http://vimeo.com/api/docs/simple-api
-* Flickr (single images and sets)
+* Flickr (single media items and sets)
 ** "API documentation":http://www.flickr.com/services/api/ or "API Doc 2":http://developer.yahoo.com/flickr/
 * Imageshack
-* Photobucket
+* Photobucket (media items and albums)
 ** "API documentation":http://photobucket.com/developer/documentation
 * Twitpic
 ** "API documentation":http://twitpic.com/api.do
-* Facebook (photos and albums)
+* Facebook (photos, videos 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

data/Rakefile

@@ -14,8 +14,14 @@ rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
 require 'rake'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
-Spec::Rake::SpecTask.new('tests') do |t|
-  t.spec_files = FileList['test/*.rb']
+RSpec::Core::RakeTask.new('tests') do |t|
+  t.rcov_opts = FileList['test/*.rb']
 end
+ 
+# require 'spec/rake/spectask'
+# 
+# Spec::Rake::SpecTask.new('tests') do |t|
+#   t.spec_files = FileList['test/*.rb']
+# end

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 1
-:patch: 5
+:patch: 6

data/lib/muri/filters/facebook.rb

@@ -5,11 +5,11 @@ class Muri
       private
       FACEBOOK_PHOTO = "photo"
       FACEBOOK_VIDEO = "video"
+      FACEBOOK_ALBUM = "album"
       
-      #FACEBOOK_ALBUM = "album"
       REGEX_FACEBOOK_PHOTO = /\/photo\.php/i
       REGEX_FACEBOOK_VIDEO = /\/video\/video\.php/i
-      #REGEX_FACEBOOK_ALBUM = /^\/album\.php$/i
+      REGEX_FACEBOOK_ALBUM = /\/album\.php/i
 
       def self.included(base)
         base.class_eval do
@@ -50,17 +50,20 @@ class Muri
           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) &&
-#             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}"
+        elsif (url_string =~ REGEX_FACEBOOK_ALBUM &&
+          (aid = url_string.gsub(/\A.*?aid=(\d+)(&.*|\Z)/i, '\1')) &&
+          (uid = url_string.gsub(/\A.*?[^a]id=(\d+)(&.*|\Z)/i, '\1')))
+ 
+          self.media_api_type = FACEBOOK_ALBUM
+          self.media_id = aid
+          media_creator = uid
+          
+          fql_id = ((media_creator.to_i << 32) + self.media_id.to_i).to_s
+          
+          self.media_api_id = fql_id
+          
+          self.media_api_ids = { :aid => aid, :uid => media_creator, :fql_id => fql_id }          
+          self.media_website = "#{url_common}/album.php?aid=#{self.media_id}&id=#{media_creator}"
         else
           raise UnsupportedURI
         end

data/lib/muri/filters/youtube.rb

@@ -10,6 +10,7 @@ class Muri
       REGEX_YOUTUBE_VIDEO_DIRECT = /\/v\/([a-z0-9\-\_]+)/i
       REGEX_YOUTUBE_PLAYLIST_WATCH = /^\/view\_play\_list\/?$/i
       REGEX_YOUTUBE_PLAYLIST_DIRECT = /^\/p\/([a-z0-9\-\_]+)/i
+      REGEX_YOUTUBE_SHORTURL = /^\/([a-z0-9]+)$/i
 
       def self.included(base)
         base.class_eval do
@@ -18,7 +19,7 @@ class Muri
       end
 
       def self.parsable?(uri)
-        uri.host =~ /^(www\.)?youtube\.com$/i
+        uri.host =~ /^(www\.)?youtu(be\.com|\.be)$/i
       end
 
       def youtube_parse
@@ -39,6 +40,9 @@ class Muri
         elsif (self.uri.path =~ REGEX_YOUTUBE_PLAYLIST_WATCH) && params['p']
           self.media_id = params['p']
           self.media_api_type = YOUTUBE_PLAYLIST
+        elsif (self.uri.path =~ REGEX_YOUTUBE_SHORTURL)
+          self.media_id = $1
+          self.media_api_type = YOUTUBE_VIDEO
         else
           raise UnsupportedURI
         end

data/muri.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muri}
-  s.version = "1.1.5"
+  s.version = "1.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["William Schneider"]
-  s.date = %q{2010-04-29}
+  s.date = %q{2011-04-19}
   s.description = %q{Automatically get media information from the URL.}
   s.email = %q{bananastalktome@gmail.com}
   s.extra_rdoc_files = [
@@ -33,31 +33,31 @@ Gem::Specification.new do |s|
      "lib/muri/filters/vimeo.rb",
      "lib/muri/filters/youtube.rb",
      "muri.gemspec",
-     "test/error_test.rb",
-     "test/facebook_test.rb",
-     "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"
+     "spec/error_spec.rb",
+     "spec/facebook_spec.rb",
+     "spec/flickr_spec.rb",
+     "spec/imageshack_spec.rb",
+     "spec/photobucket_spec.rb",
+     "spec/picasa_spec.rb",
+     "spec/twitpic_spec.rb",
+     "spec/vimeo_spec.rb",
+     "spec/youtube_spec.rb"
   ]
   s.homepage = %q{http://github.com/bananastalktome/muri/}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Media URI Parser}
   s.test_files = [
-    "test/error_test.rb",
-     "test/facebook_test.rb",
-     "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"
+    "spec/vimeo_spec.rb",
+     "spec/flickr_spec.rb",
+     "spec/twitpic_spec.rb",
+     "spec/picasa_spec.rb",
+     "spec/photobucket_spec.rb",
+     "spec/facebook_spec.rb",
+     "spec/youtube_spec.rb",
+     "spec/error_spec.rb",
+     "spec/imageshack_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/{test/facebook_test.rb → spec/facebook_spec.rb}

@@ -17,6 +17,25 @@ shared_examples_for "Facebook parse" do
     @a.valid?.should == true
   end
 end
+shared_examples_for "Facebook parse album" do
+  it_should_behave_like "Facebook parse"
+  it "should have media api type = FACEBOOK_VIDEO" do
+    @a.media_api_type.should == Muri::FACEBOOK_ALBUM
+  end
+  
+  it "should be facebook video" do
+    @a.facebook_album?.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 video" do
   it_should_behave_like "Facebook parse"
   it "should have media api type = FACEBOOK_VIDEO" do
@@ -70,6 +89,12 @@ end
     :media_id => '545993063513',
     :media_website => "http://www.facebook.com/video/video.php?v=545993063513",
     :media_api_id => '545993063513'
+  },
+'http://www.facebook.com/home.php?#!/album.php?id=15201063&aid=2149275' =>
+  { :type => :album,
+    :media_id => '2149275',
+    :media_website => 'http://www.facebook.com/album.php?aid=2149275&id=15201063',
+    :media_api_id => '65288068451584923'    
   }
 }.each do |url, values|
   describe "Facebook parse #{url}" do
@@ -80,6 +105,8 @@ end
       it_should_behave_like "Facebook parse photo"
     elsif values[:type] == :video
       it_should_behave_like "Facebook parse video"
+    elsif values[:type] == :album
+      it_should_behave_like "Facebook parse album"
     end
   
     if values[:media_id]

data/{test/youtube_test.rb → spec/youtube_spec.rb}

@@ -79,7 +79,17 @@ end
   { :type => :video,
     :media_id => 'IPFnWoYy_8w',
     :media_api_id => 'IPFnWoYy_8w'
-  }
+  },
+  "http://youtu.be/ZL1Jta1j42c" =>
+  { :type => :video,
+    :media_id => "ZL1Jta1j42c",
+    :media_api_id => "ZL1Jta1j42c"
+  },
+  "http://youtu.be/ZL1Jta1j42c?hd=1" =>
+  { :type => :video,
+    :media_id => "ZL1Jta1j42c",
+    :media_api_id => "ZL1Jta1j42c"
+  }  
 }.each do |url, values|
   describe "Youtube parse #{values[:type]} #{url}" do
     before(:all) do

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muri
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 5
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors: 
 - William Schneider
@@ -14,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-29 00:00:00 -04:00
+date: 2011-04-19 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -44,15 +39,15 @@ files:
 - lib/muri/filters/vimeo.rb
 - lib/muri/filters/youtube.rb
 - muri.gemspec
-- test/error_test.rb
-- test/facebook_test.rb
-- 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
+- spec/error_spec.rb
+- spec/facebook_spec.rb
+- spec/flickr_spec.rb
+- spec/imageshack_spec.rb
+- spec/photobucket_spec.rb
+- spec/picasa_spec.rb
+- spec/twitpic_spec.rb
+- spec/vimeo_spec.rb
+- spec/youtube_spec.rb
 has_rdoc: true
 homepage: http://github.com/bananastalktome/muri/
 licenses: []
@@ -66,30 +61,28 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Media URI Parser
 test_files: 
-- test/error_test.rb
-- test/facebook_test.rb
-- 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
+- spec/vimeo_spec.rb
+- spec/flickr_spec.rb
+- spec/twitpic_spec.rb
+- spec/picasa_spec.rb
+- spec/photobucket_spec.rb
+- spec/facebook_spec.rb
+- spec/youtube_spec.rb
+- spec/error_spec.rb
+- spec/imageshack_spec.rb