muri 0.0.13 → 1.0.0

data/test/vimeo_test.rb

@@ -2,7 +2,7 @@ require 'lib/muri.rb'
 
 shared_examples_for "Vimeo parse" do
   it "should be Vimeo service" do
-    @a.service.should == 'Vimeo'
+    @a.media_service.should == 'Vimeo'
   end
   
   it "should be valid" do
@@ -26,59 +26,59 @@ shared_examples_for "Vimeo parse album" do
   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'
+{'http://vimeo.com/moogaloop.swf?clip_id=7312128&server=vimeo.com&show_title=1&show_byline=1&show_portrait=0&color=&fullscreen=1' =>
+  { :type => :video,
+    :media_id => '7312128',
+    :media_url => 'http://vimeo.com/moogaloop.swf?clip_id=7312128&server=vimeo.com&show_title=1&show_byline=1&show_portrait=0&color=&fullscreen=1',
+    :media_website => 'http://vimeo.com/7312128',
+    :media_api_id => '7312128'
+  },
+  'http://vimeo.com/7312128' =>
+  { :type => :video,
+    :media_id => '7312128',
+    :media_url => "http://vimeo.com/moogaloop.swf?clip_id=7312128&server=vimeo.com&show_title=1&show_byline=1&show_portrait=0&color=&fullscreen=1",
+    :media_website => 'http://vimeo.com/7312128',
+    :media_api_id => '7312128'
+  },
+  'http://vimeo.com/album/89702' =>
+  { :type => :album,
+    :media_id => '89702',
+    :media_website => 'http://vimeo.com/album/89702',
+    :media_api_id => '89702'
+  }
+}.each do |url, values|
+  describe "Vimeo parse #{values[:type]} #{url}" do
+    before(:all) do
+      @a = Muri.parse url
+    end
+    if values[:type] == :video    
+      it_should_behave_like "Vimeo parse video"
+    elsif values[:type] == :album    
+      it_should_behave_like "Vimeo parse album"
+    end
+    
+    if values[:media_id]
+      it "should have media id" do
+        @a.media_id.should == values[:media_id]
+      end
+    end
+    
+    if values[:media_url]
+      it "should have a media url" do
+        @a.media_url.should == values[:media_url]
+      end
+    end
+    
+    if values[:media_website]
+      it "should have a website" do
+        @a.media_website.should == values[:media_website]
+      end
+    end
+    
+    if values[:media_api_id]     
+      it "should have media api id" do
+        @a.media_api_id.should == values[:media_api_id]
+      end
+    end
   end
-  it_should_behave_like "Vimeo parse video"
-  
-  it "should have media id" do
-    @a.media_id.should == '7312128'
-  end
-  
-  it "should have a website" do
-    @a.website.should == 'http://vimeo.com/7312128'
-  end
-   
-  it "should have media api id" do
-    @a.media_api_id.should == '7312128'
-  end
-end
-
-describe "Vimeo parse second" do
-  before(:all) do
-    @a = Muri.parse 'http://vimeo.com/7312128'
-  end
-  it_should_behave_like "Vimeo parse video"
-  
-  it "should have media id" do
-    @a.media_id.should == '7312128'
-  end
-  
-  it "should have a website" do
-    @a.website.should == 'http://vimeo.com/7312128'
-  end
-   
-  it "should have media api id" do
-    @a.media_api_id.should == '7312128'
-  end
-end
-
-describe "Vimeo parse album first" do
-  before(:all) do
-    @a = Muri.parse 'http://vimeo.com/album/89702'
-  end
-  it_should_behave_like "Vimeo parse album"
-  
-  it "should have media id" do
-    @a.media_id.should == '89702'
-  end
-
-  it "should have a website" do
-    @a.website.should == 'http://vimeo.com/album/89702'
-  end
-   
-  it "should have media api id" do
-    @a.media_api_id.should == '89702'
-  end  
 end

data/test/youtube_test.rb

@@ -1,7 +1,7 @@
 require 'lib/muri.rb'
 shared_examples_for "Youtube parse" do
   it "should be Youtube service" do
-    @a.service.should == 'Youtube'
+    @a.media_service.should == 'Youtube'
   end
   
   it "should be valid" do
@@ -25,99 +25,80 @@ shared_examples_for "Youtube parse playlist" do
   end  
 end
 
-describe "Youtube parse first" do
-  before(:all) do
-    @a = Muri.parse 'http://www.youtube.com/v/4CYDFoEz8rg&hl=en_US&fs=1&'
+{'http://www.youtube.com/v/4CYDFoEz8rg&hl=en_US&fs=1&' =>
+  { :type => :video,
+    :media_id => '4CYDFoEz8rg',
+    :media_api_id => '4CYDFoEz8rg',
+    :media_website => 'http://www.youtube.com/watch?v=4CYDFoEz8rg',
+    :media_url => 'http://www.youtube.com/v/4CYDFoEz8rg',
+    :media_thumbnail => 'http://i.ytimg.com/vi/4CYDFoEz8rg/default.jpg'    
+  },
+  'http://www.youtube.com/watch?v=4CYDFoEz8rg' =>
+  { :type => :video,
+    :media_id => '4CYDFoEz8rg',
+    :media_api_id => '4CYDFoEz8rg',
+    :media_website => 'http://www.youtube.com/watch?v=4CYDFoEz8rg',
+    :media_url => 'http://www.youtube.com/v/4CYDFoEz8rg',
+    :media_thumbnail => 'http://i.ytimg.com/vi/4CYDFoEz8rg/default.jpg'
+  },
+  'http://www.youtube.com/p/57633EC69B4A10A2&hl=en_US&fs=1' =>
+  { :type => :playlist,
+    :media_id => '57633EC69B4A10A2',
+    :media_api_id => '57633EC69B4A10A2',
+    :media_website => 'http://www.youtube.com/view_play_list?p=57633EC69B4A10A2',
+    :media_url => 'http://www.youtube.com/p/57633EC69B4A10A2'
+  },
+  'http://www.youtube.com/view_play_list?p=57633EC69B4A10A2' =>
+  { :type => :playlist,
+    :media_id => '57633EC69B4A10A2',
+    :media_api_id => '57633EC69B4A10A2',
+    :media_website => 'http://www.youtube.com/view_play_list?p=57633EC69B4A10A2',
+    :media_url => 'http://www.youtube.com/p/57633EC69B4A10A2'
+  },
+  "http://www.youtube.com/watch?v=IPFnWoYy_8w&feature=topvideos" =>
+  { :type => :video,
+    :media_id => 'IPFnWoYy_8w',
+    :media_api_id => 'IPFnWoYy_8w'
+  }
+}.each do |url, values|
+  describe "Youtube parse #{values[:type]} #{url}" do
+    before(:all) do
+      @a = Muri.parse url
+    end
+    if values[:type] == :playlist    
+      it_should_behave_like "Youtube parse playlist"
+    elsif values[:type] == :video    
+      it_should_behave_like "Youtube parse single"
+    end
+  
+    if values[:media_id]  
+      it "should have media id" do
+        @a.media_id.should == values[:media_id]
+      end
+    end
+    
+    if values[:media_api_id]
+      it "should have media api id" do
+        @a.media_api_id.should == values[:media_api_id]
+      end
+    end
+    
+    if values[:media_website]
+      it "should have media website" do
+        @a.media_website.should == values[:media_website]
+      end
+    end
+    
+    if values[:media_url]
+      it "should have media url" do
+        @a.media_url.should == values[:media_url]
+      end
+    end
+    
+    if values[:media_thumbnail]
+      it "should have thumbnail" do
+        @a.media_thumbnail.should == values[:media_thumbnail]
+      end
+    end
   end
-  it_should_behave_like "Youtube parse single"
-
-  it "should have media id" do
-    @a.media_id.should == '4CYDFoEz8rg'
-  end
-  
-  it "should have media api id" do
-    @a.media_api_id.should == '4CYDFoEz8rg'
-  end
-  
-  it "should have media url" do
-    @a.website.should == 'http://www.youtube.com/watch?v=4CYDFoEz8rg'
-  end
-  
-  it "should have website" do
-    @a.media_url.should == 'http://www.youtube.com/v/4CYDFoEz8rg'
-  end
-  
-  it "should have thumbnail" do
-    @a.media_thumbnail.should == 'http://i.ytimg.com/vi/4CYDFoEz8rg/default.jpg'
-  end  
-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 single"
-
-  it "should have media id" do
-    @a.media_id.should == '4CYDFoEz8rg'
-  end
-  
-  it "should have media api id" do
-    @a.media_api_id.should == '4CYDFoEz8rg'
-  end
-  
-  it "should have media url" do
-    @a.website.should == 'http://www.youtube.com/watch?v=4CYDFoEz8rg'
-  end
-  
-  it "should have website" do
-    @a.media_url.should == 'http://www.youtube.com/v/4CYDFoEz8rg'
-  end
-  
-  it "should have thumbnail" do
-    @a.media_thumbnail.should == 'http://i.ytimg.com/vi/4CYDFoEz8rg/default.jpg'
-  end  
-end
-
-describe "Youtube parse playlist first" do
-  before(:all) do
-    @a = Muri.parse 'http://www.youtube.com/p/57633EC69B4A10A2&hl=en_US&fs=1'
-  end
-  it_should_behave_like "Youtube parse playlist"
-  it "should have media id" do
-    @a.media_id.should == '57633EC69B4A10A2'
-  end
-  
-  it "should have media api id" do
-    @a.media_api_id.should == '57633EC69B4A10A2'
-  end
-  
-  it "should have media url" do
-    @a.website.should == 'http://www.youtube.com/view_play_list?p=57633EC69B4A10A2'
-  end
-  
-  it "should have website" do
-    @a.media_url.should == 'http://www.youtube.com/p/57633EC69B4A10A2'
-  end  
-end
-
-describe "Youtube parse playlist second" do
-  before(:all) do
-    @a = Muri.parse 'http://www.youtube.com/view_play_list?p=57633EC69B4A10A2'
-  end
-  it_should_behave_like "Youtube parse playlist"
-  it "should have media id" do
-    @a.media_id.should == '57633EC69B4A10A2'
-  end
-  
-  it "should have media api id" do
-    @a.media_api_id.should == '57633EC69B4A10A2'
-  end
-  
-  it "should have media url" do
-    @a.website.should == 'http://www.youtube.com/view_play_list?p=57633EC69B4A10A2'
-  end
-  
-  it "should have website" do
-    @a.media_url.should == 'http://www.youtube.com/p/57633EC69B4A10A2'
-  end  
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: muri
 version: !ruby/object:Gem::Version 
-  version: 0.0.13
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - William Schneider
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-23 00:00:00 -04:00
+date: 2010-03-28 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -58,27 +63,29 @@ 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.5
+rubygems_version: 1.3.6
 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/twitpic_test.rb
+- test/photobucket_test.rb
 - test/vimeo_test.rb
+- test/imageshack_test.rb
+- test/error_test.rb
+- test/flickr_test.rb
 - test/youtube_test.rb