test/vimeo_test.rb in muri-0.0.13 vs test/vimeo_test.rb in muri-1.0.0

@@ -1,10 +1,10 @@
 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
     @a.valid?.should == true
   end
@@ -24,61 +24,61 @@
   it "should have media api type = VIMEO_ALBUM" do
     @a.media_api_type.should == Muri::VIMEO_ALBUM
   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