muri 0.0.10 → 0.0.11

data/VERSION.yml

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

data/lib/muri/filters/facebook.rb

@@ -15,7 +15,7 @@ class Muri
       
       def facebook_parse
         @info[:service] = 'Facebook'
-        params = @url.query.nil? ? {} : CGI::parse(@url.query)
+        params = @url.query.nil? ? {} : CGI::parse(@url.query)#.each {|k,v| b[k] = v.first}
         url_common = "http://www.facebook.com"
         
 #         if @url.path =~ /^\/v\/([0-9]+)/
@@ -50,7 +50,7 @@ class Muri
         end
         
         if self.valid?
-          # The media_api_id is the PID which can be searched for in the facebook photos table          
+          # The media_api_id is the PID which can be searched for in the facebook photos/albums table          
           @info[:media_api_id] = (media_creator.to_i << 32) + @info[:media_id].to_i
         else
           raise UnsupportedURI

data/lib/muri/filters/flickr.rb

@@ -14,30 +14,20 @@ class Muri
       def flickr_parse
         @info[:service] = 'Flickr'
         
-        if @url.path =~ /^\/photos\/([a-z0-9\-\_\@]*?)\/(sets\/)?([0-9]*)/i
+        if @url.path =~ /^\/photos\/([a-z0-9\-\_\@]+?)\/(sets\/)?([0-9]+)/i
           media_creator = $1
           @info[:media_id] = $3
           @info[:media_api_type] = $2.nil? ? FLICKR_PHOTO : FLICKR_SET
-        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
+        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
           @info[:media_api_type] = FLICKR_PHOTO
           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
-            url_prefix = "http://farm#{farm}.static.flickr.com/#{server_id}/#{@info[:media_id]}_#{media_secret}"
-            @info[:media_url] = "#{url_prefix}.jpg"
-            @info[:media_thumbnail] = "#{url_prefix}_t.jpg"
-        elsif (@url.host + @url.path) =~ /^flic\.kr\/p\/([a-z0-9]*)/i
+          url_prefix = "http://farm#{farm}.static.flickr.com/#{server_id}/#{@info[:media_id]}_#{media_secret}"
+          @info[:media_url] = "#{url_prefix}.jpg"
+          @info[:media_thumbnail] = "#{url_prefix}_t.jpg"
+        elsif (@url.host + @url.path) =~ /^flic\.kr\/p\/([a-z0-9]+)/i
           @info[:media_id] = self.class.decode58($1)
           @info[:media_api_type] = FLICKR_PHOTO
         end
@@ -64,6 +54,16 @@ class Muri
     end
   end
 end
+#           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
 # http://www.flickr.com/photos/bananastalktome/2088436532/ (preview)
 # http://flic.kr/p/4bxMqq (preview)
 # http://farm3.static.flickr.com/2178/2088436532_ee07b4474e_m.jpg (direct)

data/lib/muri/filters/photobucket.rb

@@ -16,10 +16,11 @@ class Muri
       def photobucket_parse
         @info[:service] = 'Photobucket'
         
-        @url.host =~ /^([a-z0-9]*?[^(media)])\.photobucket\.com/i
+        @url.host =~ /^([a-z0-9]*?[^(media)])\.photobucket\.com$/i
         @info[:server_id] = $1.gsub(/([a-z]*)/i,"")
         
-        if @url.path =~ /^\/albums\/(.+?)\/(.+?)\/((?:.+?\/)*)(.+?)\.(.+)/i #Images
+        if @url.path =~ /^\/albums\/(.+?)\/(.+?)\/(?:(.*)\/)*(.+?)\.(.+?)$/i #Images
+            # OLD: /^\/albums\/(.+?)\/(.+?)\/((?:.+?\/)*)(.+?)\.(.+)/i 
           photobucket_id = $1
           media_creator = $2          
           album = $3
@@ -30,7 +31,8 @@ class Muri
           @info[:media_api_type] = PHOTOBUCKET_MEDIA
           @info[:media_url] = "http://i#{direct_url_suffix}"
           @info[:website] = "http://s#{url_common}?action=view&current=#{@info[:media_id]}.#{@info[:content_type]}"
-        elsif @url.path =~ /^\/albums\/(.+?)\/(.+?)\/((?:.[^\/]+?)+)(?:\/|$)/i #Albums
+        elsif @url.path =~ /^\/albums\/(.+?)\/(.+?)\/(.[^\.]*?)\/?$/i #Albums
+            # OLD: /^\/albums\/(.+?)\/(.+?)\/((?:.[^\/]+?)+)(?:\/|$)/i
           photobucket_id = $1
           media_creator = $2
           album = $3
@@ -38,7 +40,7 @@ class Muri
           url_common = "#{server_id}.photobucket.com/albums/#{photobucket_id}/#{media_creator}/#{album}"
           @info[:media_api_type] = PHOTOBUCKET_ALBUM
           @info[:website] = "http://s#{url_common}/"
-        elsif @url.path =~ /^\/groups\/(.+?)\/(.+?)\/(.+?)\.(.+)/i #Group Images
+        elsif @url.path =~ /^\/groups\/(.+?)\/(.+?)\/(.+?)\.(.+)$/i #Group Images
           group = $1
           group_hash_value = $2
           @info[:media_id] = $3
@@ -48,7 +50,7 @@ class Muri
           @info[:media_api_type] = PHOTOBUCKET_MEDIA
           @info[:media_url] = "http://gi#{direct_url_suffix}"
           @info[:website] = "http://gs#{url_common}/?action=view&current=#{@info[:media_id]}.#{@info[:content_type]}"
-        elsif @url.path =~ /^\/groups\/(.+)\/(.+?)(?:\/|$)/i #Group Album
+        elsif @url.path =~ /^\/groups\/(\w+?)\/(\w+?)\/?$/i #Group Album
           group = $1
           group_hash_value = $2
           url_common = "#{server_id}.photobucket.com/groups/#{group}/#{group_hash_value}"

data/lib/muri/filters/vimeo.rb

@@ -14,16 +14,65 @@ class Muri
       
       def vimeo_parse
         @info[:service] = 'Vimeo'
-        params = @url.query.nil? ? {} : CGI::parse(@url.query)
-                
-        if @url.path =~ /^\/(album\/)?([0-9]+)(\/)?$/i
+        params = @url.query.nil? ? {} : CGI::parse(@url.query)#.each {|k,v| b[k] = v.first}
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        if @url.path =~ /^\/(album\/)?([0-9]+)\/?$/i
           @info[:media_id] = $2
           @info[:media_api_type] = $1.nil? ? VIMEO_VIDEO : VIMEO_ALBUM
-        elsif @url.path =~ /^\/groups\/([0-9a-z\@\-\_]+)\/videos\/([0-9]+)(\/)?$/i
+        elsif @url.path =~ /^\/groups\/([0-9a-z\@\-\_]+)\/videos\/([0-9]+)\/?$/i
           @info[:media_id] = $2
           @info[:media_api_type] = VIMEO_VIDEO
-        elsif ((@url.path =~ /^\/moogaloop\.swf$/i) && (params.include?("clip_id")))
-          @info[:media_id] = params["clip_id"].first if (params["clip_id"].first =~ /([0-9]+)/)
+        elsif ((@url.path =~ /^\/moogaloop\.swf$/i) && (params.include?("clip_id")) && (params["clip_id"].first =~ /^([0-9]+)$/))
+          @info[:media_id] = params["clip_id"].first
           @info[:media_api_type] = VIMEO_VIDEO
         end
         

data/lib/muri/filters/youtube.rb

@@ -15,7 +15,7 @@ class Muri
       def youtube_parse
         @info[:service] = 'Youtube'
         url_common = "http://www.youtube.com"
-        params = @url.query.nil? ? {} : CGI::parse(@url.query)
+        params = @url.query.nil? ? {} : CGI::parse(@url.query)#.each {|k,v| b[k] = v.first}
         
         if (@url.path =~ /^\/watch$/i) && params.include?("v")
           @info[:media_id] = params["v"].first

data/muri.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muri}
-  s.version = "0.0.10"
+  s.version = "0.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["William Schneider"]
-  s.date = %q{2010-03-14}
+  s.date = %q{2010-03-21}
   s.description = %q{Automatically get media information from the URL.}
   s.email = %q{bananastalktome@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muri
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors: 
 - William Schneider
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-14 00:00:00 -05:00
+date: 2010-03-21 00:00:00 -04:00
 default_executable: 
 dependencies: []