muri 0.0.11 → 0.0.13

data/VERSION.yml

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

data/lib/muri/filters/flickr.rb

@@ -56,10 +56,11 @@ class Muri
 end
 #           if !$5.nil?
 #             @info[:media_size] = case $5.downcase
-#               when '_s' then 'small'
+#               when '_s' then 'square'
 #               when '_t' then 'thumbnail'
-#               when '_m' then 'medium'
+#               when '_m' then 'small'
 #               when '_b' then 'large'
+#               when '_o' then 'original'
 #               else nil
 #             end
 #           end

data/lib/muri/filters/photobucket.rb

@@ -23,7 +23,7 @@ class Muri
             # OLD: /^\/albums\/(.+?)\/(.+?)\/((?:.+?\/)*)(.+?)\.(.+)/i 
           photobucket_id = $1
           media_creator = $2          
-          album = $3
+          album = $3.nil? ? '' : "#{$3}/"
           @info[:media_id] = $4
           @info[:content_type] = $5
           url_common = "#{server_id}.photobucket.com/albums/#{photobucket_id}/#{media_creator}/#{album}"

data/lib/muri/filters/vimeo.rb

@@ -15,56 +15,7 @@ class Muri
       def vimeo_parse
         @info[:service] = 'Vimeo'
         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
@@ -91,7 +42,7 @@ class Muri
       end            
  
       def self.parsable?(uri)
-        uri.host =~ /^vimeo\.com$/i
+        uri.host =~ /^(www\.)?vimeo\.com$/i
       end
       
     end

data/muri.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muri}
-  s.version = "0.0.11"
+  s.version = "0.0.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["William Schneider"]
-  s.date = %q{2010-03-21}
+  s.date = %q{2010-03-23}
   s.description = %q{Automatically get media information from the URL.}
   s.email = %q{bananastalktome@gmail.com}
   s.extra_rdoc_files = [
@@ -46,13 +46,13 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Media URI Parser}
   s.test_files = [
-    "test/facebook_test.rb",
-     "test/twitpic_test.rb",
+    "test/error_test.rb",
+     "test/facebook_test.rb",
+     "test/flickr_test.rb",
+     "test/imageshack_test.rb",
      "test/photobucket_test.rb",
+     "test/twitpic_test.rb",
      "test/vimeo_test.rb",
-     "test/imageshack_test.rb",
-     "test/error_test.rb",
-     "test/flickr_test.rb",
      "test/youtube_test.rb"
   ]
 

data/test/photobucket_test.rb

@@ -75,6 +75,30 @@ describe "Photobucket parse album first" do
   end
 end
 
+describe "Photobucket parse first" do
+  before(:all) do
+    @a = Muri.parse 'http://i587.photobucket.com/albums/ss319/bananastalktome/API%20Testing/bananastalktomegmailcom_6c337a91.jpg'
+  end
+  it_should_behave_like "Photobucket parse photo"
+      
+  it "should have media id" do
+    @a.media_id.should == 'bananastalktomegmailcom_6c337a91'
+  end
+  
+  it "should have content type" do
+    @a.content_type.should == "jpg"
+  end
+
+  it "should have media url" do
+    @a.media_url.should == "http://i587.photobucket.com/albums/ss319/bananastalktome/API%20Testing/bananastalktomegmailcom_6c337a91.jpg"
+  end
+    
+  it "should have media api id" do
+    @a.media_api_id.should == "http://i587.photobucket.com/albums/ss319/bananastalktome/API%20Testing/bananastalktomegmailcom_6c337a91.jpg"
+  end
+
+end
+
 describe "Photobucket parse first" do
   before(:all) do
     @a = Muri.parse 'http://i244.photobucket.com/albums/gg17/pbapi/file.jpg'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muri
 version: !ruby/object:Gem::Version 
-  version: 0.0.11
+  version: 0.0.13
 platform: ruby
 authors: 
 - William Schneider
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-21 00:00:00 -04:00
+date: 2010-03-23 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -74,11 +74,11 @@ signing_key:
 specification_version: 3
 summary: Media URI Parser
 test_files: 
+- test/error_test.rb
 - test/facebook_test.rb
-- test/twitpic_test.rb
+- test/flickr_test.rb
+- test/imageshack_test.rb
 - test/photobucket_test.rb
+- test/twitpic_test.rb
 - test/vimeo_test.rb
-- test/imageshack_test.rb
-- test/error_test.rb
-- test/flickr_test.rb
 - test/youtube_test.rb