muri 0.0.2 → 0.0.3

data/.gitignore

@@ -0,0 +1,2 @@
+*.gem
+

data/README.rdoc

@@ -6,6 +6,8 @@ MURI Currently supports:
 * Youtube
 * Vimeo
 * Flickr
+* Imageshack
+* Photobucket
 
 == Installation & basic usage
 
@@ -20,18 +22,23 @@ Using muri is just as easy!
   a.media_id        # 'blahblahblah'
   a.media_url       # 'http://www.youtube.com/watch?v=blahblahblah' (flickr media_url's provide the flic.kr/p/ID short url)
   a.original_url    # 'http://www.youtube.com/watch?v=blahblahblah&feature=rec-LGOUT-exp_fresh+div-1r-1-HM'
-  a.uri             # Parsed URI object for 'http://www.youtube.com/watch?v=blahblahblah&feature=rec-LGOUT-exp_fresh+div-1r-1-HM'
+  a.uri             # URI object for 'http://www.youtube.com/watch?v=blahblahblah&feature=rec-LGOUT-exp_fresh+div-1r-1-HM'
 
 Due to variations in information which can be gathered from a uri, some services provide more information than others. For example:
-  * A direct media url for Youtube videos
-    a.url             # 'http://www.youtube.com/v/blahblahblah'
+  * All but Imageshack have a media_api_id, which is the ID which can be used in API calls to the related services. Typically the same as media_id.
+    a.media_api_id  # 'blahblahblah'
+
+  * A direct media url for Youtube, Photobucket, and Flickr (http://img#{num}.imageshack.us/img#{num}/#{NUMBER}/#{IMAGENAME} format)
+    a.website         # 'http://www.youtube.com/v/blahblahblah'
   
-  * Media creator name for Flickr URI's (for uri's in the http://www.flickr.com/photos/USER/PHOTO-ID/ format)
-    a.media_creator   # 'bananastalktome'
+  * Content type for Imageshack, Photobucket and Flickr URI's (flickr in the http://farm#{num}.static.flickr.com/ format)
+    a.content_type    # 'jpg' (Content Type also for Imageshack and Photobucket)
+    
+  * Thumbnails URL for Youtube Photobucket, and Flickr (flickr in the http://farm#{num}.static.flickr.com/ format)
+    a.media_thumbnail
+    
+  * Some additional information may be provided, which can be determined by looking through each filters code.
   
-  * Media size and content type for Flickr URI's (for uri's in the http://farm3.static.flickr.com/NUMBERS/MORE-NUMBERS_LETTERS-AND-NUMBERS_SIZE-INDICATOR.jpg
-    a.media_size      # 'small'
-    a.content_type    # 'jpg'
 
 If an attribute is not present, muri returns +nil+.
 

data/Rakefile

@@ -13,3 +13,9 @@ begin
 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'
+
+Spec::Rake::SpecTask.new('tests') do |t|
+  t.spec_files = FileList['test/*.rb']
+end

data/VERSION.yml

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

data/lib/muri/base.rb

@@ -2,16 +2,18 @@ require 'uri'
 class Muri
   class NoParser < StandardError; end
     
-  PARSERS = { }
+  PARSERS = {}
   
   include Filter::Youtube
   include Filter::Flickr
   include Filter::Vimeo
-  
+  include Filter::Imageshack
+  include Filter::Photobucket
+
   def self.parse(url)
     self.new(url)
   end
-  
+    
   def initialize(url)
     @info = { }
     _parse(url)
@@ -36,7 +38,7 @@ class Muri
   end
   
   def parsers
-    PARSERS.keys  
+    PARSERS.keys
   end
   
   private
@@ -47,10 +49,10 @@ class Muri
       raw_url = "http://#{raw_url}"
       @url = URI.parse(raw_url)
     end
-    if parse_function = PARSERS[@url.host]
+    if parser = determine_feed_parser
       @info[:uri] = @url
       @info[:original_url] = raw_url
-      send(parse_function)
+      send(PARSERS[parser])
     else
       raise NoParser.new("No Transformer found for URL")
     end
@@ -59,6 +61,10 @@ class Muri
     #raise "failed #{e}"
   end
   
+  def determine_feed_parser
+    PARSERS.keys.detect {|klass| klass.parsable?(@url)}
+  end
+      
   def method_missing(func, args = nil)
     if @info[func.to_sym] != nil
       @info[func.to_sym]
@@ -66,4 +72,36 @@ class Muri
       nil #super(func,args)
     end
   end
+  
+  protected
+  
+  #used by flickr. Ported from PHP.
+  def decode58(str)
+    decoded = 0
+    multi = 1
+    alphabet = "123456789abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ"
+    while str.length > 0
+      digit = str[(str.length - 1),1]
+      decoded += multi * alphabet.index(digit)
+      multi = multi * alphabet.length
+      str.chop!
+    end
+    
+    decoded
+  end
+  
+  #used by flickr. Ported from PHP.
+  def encode58(str)
+    alphabet = "123456789abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ"
+    base_count = alphabet.length
+    encoded = ''
+    while str >= base_count
+      div = str / base_count
+      mod = (str-(base_count * div.to_i))
+      encoded = alphabet[mod,1] + encoded
+      str = div.to_i
+    end
+    encoded = (alphabet[str,1] + encoded) if str
+    encoded
+  end
 end

data/lib/muri/filters/flickr.rb

@@ -4,70 +4,48 @@ class Muri
 
       def self.included(base)
         base.class_eval do
-          self::PARSERS["www.flickr.com"] = "flickr_parse"
-          self::PARSERS["farm3.static.flickr.com"] = "flickr_parse"
-          self::PARSERS["farm2.static.flickr.com"] = "flickr_parse"
-          self::PARSERS["farm1.static.flickr.com"] = "flickr_parse"
-          self::PARSERS["flic.kr"] = "flickr_parse"
+          self::PARSERS[Muri::Filter::Flickr] = "flickr_parse"
         end
       end
       
       def flickr_parse
         @info[:service] = 'Flickr'
         
-        if @url.path =~ /^\/photos\/([a-zA-Z0-9\@]*?)\/[^(?:sets)]([0-9]*)/i
-          @info[:media_creator] = $1
+        if @url.path =~ /^\/photos\/([a-z0-9\@]*?)\/([^(?:sets)][0-9]*)/i
+          #@info[:media_creator] = $1
           @info[:media_id] = $2
-        elsif (@url.host + @url.path) =~ /^farm([1-3])\.static.flickr.com\/([0-9]*?)\/([0-9]*?)\_([a-zA-Z0-9]*?)(\_[a-zA-Z]){0,1}\.([a-zA-Z]*)/i
+        elsif (@url.host + @url.path) =~ /^farm([1-3])\.static.flickr.com\/([0-9]*?)\/([0-9]*?)\_([a-z0-9]*?)(\_[a-z]){0,1}\.([a-z]*)/i
+          farm = $1
+          server_id = $2
           @info[:media_id] = $3
-          if !$5.nil?
-            @info[:media_size] = case $5.downcase
-              when '_s' then 'small'
-              when '_t' then 'thumbnail'
-              when '_m' then 'medium'
-              when '_b' then 'large'
-              else nil
-            end
-          end
-          @info[:content_type] = $6.downcase
-        elsif (@url.host + @url.path) =~ /^flic\.kr\/p\/([a-zA-Z0-9]*)/i
+          media_secret = $4
+#           if !$5.nil?
+#             @info[:media_size] = case $5.downcase
+#               when '_s' then 'small'
+#               when '_t' then 'thumbnail'
+#               when '_m' then 'medium'
+#               when '_b' then 'large'
+#               else nil
+#             end
+#           end
+#           @info[:content_type] = $6
+            @info[:media_thumbnail] = "http://farm#{farm}.static.flickr.com/#{server_id}/#{@info[:media_id]}_#{media_secret}_t.jpg"
+        elsif (@url.host + @url.path) =~ /^flic\.kr\/p\/([a-z0-9]*)/i
           @info[:media_id] = self.decode58($1)
         end
         
         if self.parsed?
+          @info[:media_api_id] = @info[:media_id]
           @info[:media_url] = "http://flic.kr/p/" + self.encode58(@info[:media_id].to_i)
         end
         
         self
       end
       
-      def decode58(str)
-        decoded = 0
-        multi = 1
-        alphabet = "123456789abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ"
-        while str.length > 0
-          digit = str[(str.length - 1),1]
-          decoded += multi * alphabet.index(digit)
-          multi = multi * alphabet.length
-          str.chop!
-        end
-        
-        decoded
-      end
-
-      def encode58(str)
-        alphabet = "123456789abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ"
-        base_count = alphabet.length
-        encoded = ''
-        while str >= base_count
-          div = str / base_count
-          mod = (str-(base_count * div.to_i))
-          encoded = alphabet[mod,1] + encoded
-          str = div.to_i
-        end
-        encoded = alphabet[str,1] + encoded if str
-        encoded
-      end    
+      def self.parsable?(uri)
+        uri.host =~ /^(www\.|)(flic\.kr|(farm[0-9]\.static\.|)(flickr)\.com)/i
+      end  
+  
       
     end
   end

data/lib/muri/filters/imageshack.rb

@@ -0,0 +1,49 @@
+class Muri
+  module Filter
+    module Imageshack
+
+      def self.included(base)
+        base.class_eval do
+          self::PARSERS[Muri::Filter::Imageshack] = "imageshack_parse"
+        end
+      end
+      
+      def imageshack_parse
+        @info[:service] = 'Imageshack'
+        
+        @url.host =~ /^img([0-9]*?)\.imageshack\.us/i
+        server_id = $1
+        url_common = "http://img#{server_id}.imageshack.us"
+        
+        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
+          content_path_id = $2
+          @info[:media_id] = $3
+          @info[:content_type] = $4
+          @info[:website] = "#{url_common}/img#{server_id}/#{content_server_id}/#{@info[:media_id]}.#{@info[:content_type]}"
+        end
+        
+        # imageshack does not currently have API for retrieving individual video information
+        if self.parsed?
+          @info[:media_url] = "#{url_common}/i/#{@info[:media_id]}.#{@info[:content_type]}/"
+        end
+        
+        self
+      end       
+      
+      def self.parsable?(uri)
+        uri.host =~ /^img([0-9]*?)\.imageshack\.us$/i #/^(img([0-9]*?)\.imageshack\.us)|(yfrog\.com)/i
+      end  
+      
+    end
+  end
+end
+# http://img178.imageshack.us/i/dsc01576lo7.jpg/
+# http://img178.imageshack.us/img178/773/dsc01576lo7.jpg
+# http://yfrog.com/4ydsc01576lo7j
+
+# http://img30.imageshack.us/img30/4184/rush02.mp4
+# http://img30.imageshack.us/i/rush02.mp4/
+# http://yfrog.us/0urush02z

data/lib/muri/filters/photobucket.rb

@@ -0,0 +1,77 @@
+class Muri
+  module Filter
+    module Photobucket
+
+      def self.included(base)
+        base.class_eval do
+          self::PARSERS[Muri::Filter::Photobucket] = "photobucket_parse"
+        end
+      end
+      
+      def photobucket_parse
+        @info[:service] = 'Photobucket'
+        
+        @url.host =~ /^([a-z0-9]*?[^(media)])\.photobucket\.com/i
+        server_id = $1.gsub(/([a-z]*)/i,"")
+        
+        if @url.path =~ /^\/albums\/(.*?)\/(.*?)\/((?:.*?\/)*)(.*?)\.(.*)/i
+          photobucket_id = $1
+          media_creator = $2          
+          album = $3
+          @info[:media_id] = $4
+          @info[:content_type] = $5
+          url_common = "#{server_id}.photobucket.com/albums/#{photobucket_id}/#{media_creator}/#{album}"
+          direct_url_suffix = "#{url_common}#{@info[:media_id]}.#{@info[:content_type]}"
+          
+          @info[:website] = "http://i#{direct_url_suffix}"
+          @info[:media_url] = "http://s#{url_common}?action=view&current=#{@info[:media_id]}.#{@info[:content_type]}"
+        elsif @url.path =~ /^\/groups\/(.*?)\/(.*?)\/(.*?)\.(.*)/i
+          group = $1
+          group_hash_value = $2
+          @info[:media_id] = $3
+          @info[:content_type] = $4
+          url_common = "#{server_id}.photobucket.com/groups/#{group}/#{group_hash_value}"
+          direct_url_suffix = "#{url_common}/#{@info[:media_id]}.#{@info[:content_type]}"
+          
+          @info[:website] = "http://gi#{direct_url_suffix}"
+          @info[:media_url] = "http://gs#{url_common}/?action=view&current=#{@info[:media_id]}.#{@info[:content_type]}"
+        end
+        
+        if self.parsed?
+          @info[:media_api_id] = @info[:media_url]
+          @info[:media_thumbnail] = "http://mobth#{direct_url_suffix}"
+        end
+        
+        self
+      end       
+      
+      def self.parsable?(uri)
+        uri.host =~ /^([a-z0-9]*?[^(media)])\.photobucket\.com$/i
+      end  
+      
+    end
+  end
+end
+# http://gw0001.photobucket.com/groups/0001/F9P8EG7YR8/002new.jpg
+
+# http://media.photobucket.com/image/searchterm/pbapi/file.jpg (search result)
+# http://i244.photobucket.com/albums/gg17/pbapi/file.jpg (full view)
+# http://media.photobucket.com/image/gg17/pbapi/?action=view&current=file.jpg (preview view)
+
+# http://s244.photobucket.com/albums/gg17/pbapi/api-test/api-test-subalbum/?action=view&current=ThuOct15131605MDT2009.jpg (preview)
+# http://i244.photobucket.com/albums/gg17/pbapi/api-test/api-test-subalbum/ThuOct15131605MDT2009.jpg (full view)
+
+# http://i37.photobucket.com/albums/e87/hailiespence/shaun%20white/20060212104609990002.jpg
+# http://media.photobucket.com/image/winter%20olympics/hailiespence/shaun%20white/20060212104609990002.jpg?o=12 (preview)
+
+# http://gi0006.photobucket.com/groups/0006/G5PAK3TBQS/siamese_cat_.jpg
+# http://gi0006.photobucket.com/groups/0006/G5PAK3TBQS/DSCF0015-1-1.jpg
+
+
+# http://s434.photobucket.com/albums/qq63/atommy_polar/?action=view&current=Me.jpg&newest=1
+# http://i434.photobucket.com/albums/qq63/atommy_polar/Me.jpg
+# http://s434.photobucket.com/albums/qq63/atommy_polar/?action=view&current=Me.jpg
+
+# http://pic.pbsrc.com/dev_help/WebHelpPublic/PhotobucketPublicHelp.htm -> Conventions -> URL Structures
+#   http://pic.photobucket.com/dev_help/WebHelpPublic/Content/Getting%20Started/Conventions.htm
+#   http://pic.pbsrc.com/dev_help/WebHelpPublic/Content/Getting%20Started/Web%20Authentication.htm

data/lib/muri/filters/vimeo.rb

@@ -2,33 +2,36 @@ require 'cgi'
 class Muri
   module Filter
     module Vimeo
-
+            
       def self.included(base)
         base.class_eval do
-          self::PARSERS["vimeo.com"] = "vimeo_parse"
-          
-              
+          self::PARSERS[Muri::Filter::Vimeo] = "vimeo_parse"
         end
       end
-          def vimeo_parse
-            @info[:service] = 'Vimeo'
-            
-            if @url.path =~ /^\/([0-9]*)/
-              @info[:media_id] = $1
-            elsif (@url.path =~ /^\/moogaloop\.swf/i)
-              params = CGI::parse(@url.query)
-              if params.include?("clip_id")
-                @info[:media_id] = params["clip_id"].first if (params["clip_id"].first =~ /([0-9]*)/)
-              end
-            end
-            
-            if self.parsed?
-              @info[:media_url] = "http://vimeo.com/" + @info[:media_id].to_s
-            end
-            
-            self
-          end       
+      
+      def vimeo_parse
+        @info[:service] = 'Vimeo'
+        
+        if @url.path =~ /^\/([0-9]*)/
+          @info[:media_id] = $1
+        elsif (@url.path =~ /^\/moogaloop\.swf/i)
+          params = CGI::parse(@url.query)
+          if params.include?("clip_id")
+            @info[:media_id] = params["clip_id"].first if (params["clip_id"].first =~ /([0-9]*)/)
+          end
+        end
+        
+        if self.parsed?
+          @info[:media_api_id] = @info[:media_id]
+          @info[:media_url] = "http://vimeo.com/#{@info[:media_id]}"
+        end
+        
+        self
+      end            
  
+      def self.parsable?(uri)
+        uri.host =~ /^vimeo\.com$/i
+      end
       
     end
   end

data/lib/muri/filters/youtube.rb

@@ -4,30 +4,34 @@ class Muri
     module Youtube
 
       def self.included(base)
-        base.class_eval do
-          self::PARSERS["www.youtube.com"] = "youtube_parse"
-          self::PARSERS["youtube.com"] = "youtube_parse"  
+        base.class_eval do 
+          self::PARSERS[Muri::Filter::Youtube] = "youtube_parse"
         end
       end
       
       def youtube_parse
         @info[:service] = 'Youtube'
+        url_common = "http://www.youtube.com"
         
         if (@url.path == "/watch") && !@url.query.nil?
           params = CGI::parse(@url.query)
           @info[:media_id] = params["v"].first
-        elsif (@url.path =~ /\/v\/([a-zA-Z0-9\-\_]*)/i)
+        elsif (@url.path =~ /\/v\/([a-z0-9\-\_]*)/i)
           @info[:media_id] = $1
         end
         
         if self.parsed?
-          @info[:media_url] = "http://www.youtube.com/watch?v=" + @info[:media_id]
-          @info[:url] = "http://www.youtube.com/v/" + @info[:media_id]
+          @info[:media_url] = "#{url_common}/watch?v=#{@info[:media_id]}"
+          @info[:website] = "#{url_common}/v/#{@info[:media_id]}"
+          @info[:media_api_id] = @info[:media_id]
+          @info[:media_thumbnail] = "http://i.ytimg.com/vi/#{@info[:media_id]}/default.jpg"
         end
         
         self
       end     
-      
+      def self.parsable?(uri)
+        uri.host =~ /^(www\.|)youtube\.com$/i
+      end      
     end
   end
 end

data/muri.gemspec

@@ -5,33 +5,48 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muri}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["William Schneider"]
-  s.date = %q{2010-02-24}
+  s.date = %q{2010-03-01}
   s.description = %q{Automatically get media information from the URL.}
   s.email = %q{bananastalktome@gmail.com}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
   s.files = [
-    "README.rdoc",
+    ".gitignore",
+     "README.rdoc",
      "Rakefile",
      "VERSION.yml",
      "lib/muri.rb",
      "lib/muri/base.rb",
      "lib/muri/filter.rb",
      "lib/muri/filters/flickr.rb",
+     "lib/muri/filters/imageshack.rb",
+     "lib/muri/filters/photobucket.rb",
      "lib/muri/filters/vimeo.rb",
      "lib/muri/filters/youtube.rb",
-     "muri.gemspec"
+     "muri.gemspec",
+     "test/flickr_test.rb",
+     "test/imageshack_test.rb",
+     "test/photobucket_test.rb",
+     "test/vimeo_test.rb",
+     "test/youtube_test.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.5}
   s.summary = %q{Media URI Parser}
+  s.test_files = [
+    "test/flickr_test.rb",
+     "test/imageshack_test.rb",
+     "test/photobucket_test.rb",
+     "test/vimeo_test.rb",
+     "test/youtube_test.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/test/flickr_test.rb

@@ -0,0 +1,35 @@
+require 'lib/muri.rb'
+
+shared_examples_for "Flickr parse" do
+  it "should be Flickr service" do
+    @a.service == 'Flickr'
+  end
+  
+  it "should have media id" do
+    @a.media_id == '2088436532'
+  end
+  
+  it "should have media url" do
+    @a.media_url == 'http://flic.kr/p/4bxMqq'
+  end
+   
+  it "should have media api id" do
+    @a.media_api_id == '2088436532'
+  end
+end
+describe "Flickr parse first" do
+  before (:all) do
+    @a = Muri.parse 'http://www.flickr.com/photos/bananastalktome/2088436532/'
+  end
+  it_should_behave_like "Flickr parse"
+end
+describe "Flickr parse second" do
+  before (:all) do
+    @a = Muri.parse 'http://farm3.static.flickr.com/2178/2088436532_ee07b4474e_m.jpg'
+  end
+  it_should_behave_like "Flickr parse"
+  
+  it "should have media thumbnail" do
+    @a.media_thumbnail == 'http://farm3.static.flickr.com/2178/2088436532_ee07b4474e_t.jpg'
+  end
+end

data/test/imageshack_test.rb

@@ -0,0 +1,35 @@
+require 'lib/muri.rb'
+
+shared_examples_for "Imageshack parse" do
+  it "should be Imageshack service" do
+    @a.service == 'Imageshack'
+  end
+  
+  it "should have media id" do
+    @a.media_id == 'dsc01576lo7'
+  end
+  
+  it "should have media url" do
+    @a.media_url == 'http://img178.imageshack.us/i/dsc01576lo7.jpg/'
+  end
+   
+  it "should have content_type" do
+    @a.content_type == 'jpg'
+  end
+end
+describe "Imageshack parse first" do
+  before (:all) do
+    @a = Muri.parse 'http://img178.imageshack.us/i/dsc01576lo7.jpg/'
+  end
+  it_should_behave_like "Imageshack parse"
+end
+describe "Imageshack parse second" do
+  before (:all) do
+    @a = Muri.parse 'http://img178.imageshack.us/img178/773/dsc01576lo7.jpg'
+  end
+  it_should_behave_like "Imageshack parse"
+  
+  it "should have website" do
+    @a.website == 'http://img178.imageshack.us/img178/773/dsc01576lo7.jpg'
+  end
+end

data/test/photobucket_test.rb

@@ -0,0 +1,67 @@
+require 'lib/muri.rb'
+
+shared_examples_for "Photobucket parse" do
+  it "should be Photobucket service" do
+    @a.service == 'Photobucket'
+  end
+end
+describe "Photobucket parse first" do
+  before (:all) do
+    @a = Muri.parse 'http://i244.photobucket.com/albums/gg17/pbapi/file.jpg'
+  end
+  it_should_behave_like "Photobucket parse"
+      
+  it "should have media id" do
+    @a.media_id == 'file'
+  end
+  
+  it "should have content type" do
+    @a.content_type == "jpg"
+  end
+  
+  it "should have media url" do
+    @a.media_url == "http://s244.photobucket.com/albums/gg17/pbapi/?action=view&current=file.jpg"
+  end
+  
+  it "should have website" do
+    @a.website == "http://i244.photobucket.com/albums/gg17/pbapi/file.jpg"
+  end
+    
+  it "should have media api id" do
+    @a.media_api_id == "http://s244.photobucket.com/albums/gg17/pbapi/?action=view&current=file.jpg"
+  end
+    
+  it "should have media thumbnail" do
+    @a.media_thumbnail == 'http://mobth244.photobucket.com/albums/gg17/pbapi/file.jpg'
+  end
+end
+describe "Photobucket parse second" do
+  before (:all) do
+    @a = Muri.parse 'http://gi0006.photobucket.com/groups/0006/G5PAK3TBQS/DSCF0015-1-1.jpg'
+  end
+  it_should_behave_like "Photobucket parse"
+    
+  it "should have media id" do
+    @a.media_id == 'DSCF0015-1-1'
+  end
+  
+  it "should have content type" do
+    @a.content_type == "jpg"
+  end
+  
+  it "should have media url" do
+    @a.media_url == "http://gs0006.photobucket.com/groups/0006/G5PAK3TBQS/?action=view&current=DSCF0015-1-1.jpg"
+  end
+  
+  it "should have website" do
+    @a.website == "http://gi0006.photobucket.com/groups/0006/G5PAK3TBQS/DSCF0015-1-1.jpg"
+  end
+  
+  it "should have media thumbnail" do
+    @a.media_thumbnail == 'http://mobth0006.photobucket.com/groups/0006/G5PAK3TBQS/DSCF0015-1-1.jpg'
+  end
+  
+  it "should have media api id" do
+    @a.media_api_id == "http://gs0006.photobucket.com/groups/0006/G5PAK3TBQS/?action=view&current=DSCF0015-1-1.jpg"
+  end
+end

data/test/vimeo_test.rb

@@ -0,0 +1,31 @@
+require 'lib/muri.rb'
+
+shared_examples_for "Vimeo parse" do
+  it "should be Vimeo service" do
+    @a.service == 'Vimeo'
+  end
+  
+  it "should have media id" do
+    @a.media_id == '7312128'
+  end
+  
+  it "should have media url" do
+    @a.media_url == 'http://vimeo.com/7312128'
+  end
+   
+  it "should have media api id" do
+    @a.media_api_id == '7312128'
+  end
+end
+describe "Vimeo parse first" do
+  before (:all) do
+    @a = Muri.parse 'http://vimeo.com/moogaloop.swf?clip_id=7312128&server=vimeo.com&show_title=1&show_byline=1&show_portrait=0&color=&fullscreen=1'
+  end
+  it_should_behave_like "Vimeo parse"
+end
+describe "Vimeo parse second" do
+  before (:all) do
+    @a = Muri.parse 'http://vimeo.com/7312128'
+  end
+  it_should_behave_like "Vimeo parse"
+end

data/test/youtube_test.rb

@@ -0,0 +1,39 @@
+require 'lib/muri.rb'
+
+shared_examples_for "Youtube parse" do
+  it "should be Youtube service" do
+    @a.service == 'Youtube'
+  end
+  
+  it "should have media id" do
+    @a.media_id == '4CYDFoEz8rg'
+  end
+  
+  it "should have media api id" do
+    @a.media_api_id == '4CYDFoEz8rg'
+  end
+  
+  it "should have media url" do
+    @a.media_url == 'http://www.youtube.com/watch?v=4CYDFoEz8rg'
+  end
+  
+  it "should have website" do
+    @a.website == 'http://www.youtube.com/v/4CYDFoEz8rg'
+  end
+  
+  it "should have thumbnail" do
+    @a.media_thumbnail == 'http://i.ytimg.com/vi/4CYDFoEz8rg/default.jpg'
+  end
+end
+describe "Youtube parse first" do
+  before (:all) do
+    @a = Muri.parse 'http://www.youtube.com/v/4CYDFoEz8rg&hl=en_US&fs=1&'
+  end
+  it_should_behave_like "Youtube parse"
+end
+describe "Youtube parse second" do
+  before (:all) do
+    @a = Muri.parse 'http://www.youtube.com/watch?v=4CYDFoEz8rg'
+  end
+  it_should_behave_like "Youtube parse"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muri
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - William Schneider
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-24 00:00:00 -08:00
+date: 2010-03-01 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -22,6 +22,7 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
+- .gitignore
 - README.rdoc
 - Rakefile
 - VERSION.yml
@@ -29,9 +30,16 @@ files:
 - lib/muri/base.rb
 - lib/muri/filter.rb
 - lib/muri/filters/flickr.rb
+- lib/muri/filters/imageshack.rb
+- lib/muri/filters/photobucket.rb
 - lib/muri/filters/vimeo.rb
 - lib/muri/filters/youtube.rb
 - muri.gemspec
+- test/flickr_test.rb
+- test/imageshack_test.rb
+- test/photobucket_test.rb
+- test/vimeo_test.rb
+- test/youtube_test.rb
 has_rdoc: true
 homepage: http://github.com/bananastalktome/muri/
 licenses: []
@@ -60,5 +68,9 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Media URI Parser
-test_files: []
-
+test_files: 
+- test/flickr_test.rb
+- test/imageshack_test.rb
+- test/photobucket_test.rb
+- test/vimeo_test.rb
+- test/youtube_test.rb