fleakr 0.4.3 → 0.5.0

data/test/unit/fleakr/objects/group_test.rb

@@ -7,16 +7,16 @@ module Fleakr::Objects
     
     should_search_by :group_id
 
-    describe "The Group class" do
+    context "The Group class" do
       
       should_find_all :groups, :by => :user_id, :call => 'people.getPublicGroups', :path => 'rsp/groups/group'
       
     end
     
-    describe "An instance of the Group class" do
+    context "An instance of the Group class" do
       context "when initializing from an Hpricot document" do
         
-        before do
+        setup do
           doc = Hpricot.XML(read_fixture('people.getPublicGroups')).at('rsp/groups/group')
           @object = Group.new(doc)
         end
@@ -27,13 +27,13 @@ module Fleakr::Objects
         
       end
 
-      it "should know that the group is adult-only" do
+      should "know that the group is adult-only" do
         group = Group.new
         group.stubs(:adult_flag).with().returns('1')
         group.adult?.should be(true)
       end
       
-      it "should know that the group is not adult-only" do
+      should "know that the group is not adult-only" do
         group = Group.new
         group.stubs(:adult_flag).with().returns('0')
         group.adult?.should be(false)

data/test/unit/fleakr/objects/image_test.rb

@@ -3,17 +3,17 @@ require File.dirname(__FILE__) + '/../../../test_helper'
 module Fleakr::Objects
   class ImageTest < Test::Unit::TestCase
 
-    describe "The Image class" do
+    context "The Image class" do
 
       should_find_all :images, :by => :photo_id, :call => 'photos.getSizes', :path => 'sizes/size'
 
     end
 
-    describe "An instance of the Image class" do
+    context "An instance of the Image class" do
 
       context "when populating the object from an XML document" do
 
-        before do
+        setup do
           @object = Image.new(Hpricot.XML(read_fixture('photos.getSizes')).at('sizes/size'))
         end
 
@@ -27,7 +27,7 @@ module Fleakr::Objects
 
       context "in general" do
 
-        it "should know its filename" do
+        should "know its filename" do
           image = Image.new
           image.stubs(:url).with().returns('http://flickr.com/photos/foobar.jpg')
 
@@ -36,7 +36,7 @@ module Fleakr::Objects
 
         context "when saving the file" do
 
-          before do
+          setup do
             @tmp_dir = create_temp_directory
 
             @url = 'http://host.com/image.jpg'
@@ -50,7 +50,7 @@ module Fleakr::Objects
             Net::HTTP.expects(:get).with(URI.parse(@url)).returns(@image_data)
           end
 
-          after do
+          teardown do
             FileUtils.rm_rf(@tmp_dir)
           end
 

data/test/unit/fleakr/objects/photo_context_test.rb

@@ -3,12 +3,12 @@ require File.dirname(__FILE__) + '/../../../test_helper'
 module Fleakr::Objects
   class PhotoContextTest < Test::Unit::TestCase
     
-    describe "An instance of the PhotoContext class" do
+    context "An instance of the PhotoContext class" do
       
-      before { @context = PhotoContext.new }
+      setup { @context = PhotoContext.new }
       
       context "when populating from the photos_getContext XML data" do
-        before do
+        setup do
           @object = PhotoContext.new(Hpricot.XML(read_fixture('photos.getContext')))
         end
         
@@ -18,27 +18,27 @@ module Fleakr::Objects
 
       end
       
-      it "should know that there is a previous photo" do
+      should "know that there is a previous photo" do
         @context.expects(:previous_id).with().returns('1')
         @context.previous?.should be(true)
       end
       
-      it "should know that there isn't a previous photo" do
+      should "know that there isn't a previous photo" do
         @context.expects(:previous_id).with().returns('0')
         @context.previous?.should be(false)
       end
       
-      it "should know that there is a next photo" do
+      should "know that there is a next photo" do
         @context.expects(:next_id).with().returns('1')
         @context.next?.should be(true)
       end
       
-      it "should know that there isn't a next photo" do
+      should "know that there isn't a next photo" do
         @context.expects(:next_id).with().returns('0')
         @context.next?.should be(false)
       end
       
-      it "should find the previous photo" do
+      should "find the previous photo" do
         photo = stub()
         
         @context.expects(:previous_id).with().returns('1')
@@ -49,14 +49,14 @@ module Fleakr::Objects
         @context.previous.should == photo
       end
       
-      it "should not try to find the previous photo if it doesn't exist" do
+      should "not try to find the previous photo if it doesn't exist" do
         @context.expects(:previous?).with().returns(false)
         Photo.expects(:find_by_id).never
         
         @context.previous.should be(nil)
       end
       
-      it "should find the next photo" do
+      should "find the next photo" do
         photo = stub()
         @context.expects(:next_id).with().returns('1')
         @context.expects(:next?).with().returns(true)
@@ -66,7 +66,7 @@ module Fleakr::Objects
         @context.next.should == photo
       end
       
-      it "should not try to find the next photo if it doesn't exist" do
+      should "not try to find the next photo if it doesn't exist" do
         @context.expects(:next?).with().returns(false)
         Photo.expects(:find_by_id).never
         

data/test/unit/fleakr/objects/photo_test.rb

@@ -8,7 +8,7 @@ module Fleakr::Objects
     should_autoload_when_accessing :posted, :taken, :updated, :comment_count, :with => :load_info
     should_autoload_when_accessing :url, :description, :with => :load_info
 
-    describe "The Photo class" do
+    context "The Photo class" do
 
       should_find_all :photos, :by => :user_id, :call => 'people.getPublicPhotos', :path => 'rsp/photos/photo'
       should_find_all :photos, :by => :set_id, :using => :photoset_id, :call => 'photosets.getPhotos', :path => 'rsp/photoset/photo'
@@ -17,13 +17,12 @@ module Fleakr::Objects
       should_find_one :photo, :by => :id, :with => :photo_id, :call => 'photos.getInfo'
 
       # TODO: refactor these 2 tests
-      it "should be able to upload a photo and return the new photo information" do
+      should "be able to upload a photo and return the new photo information" do
         filename = '/path/to/mugshot.jpg'
         photo = stub()
         
-        response = stub do |s|
-          s.stubs(:body).with().returns(Hpricot.XML('<photoid>123</photoid>'))
-        end
+        response = stub()
+        response.stubs(:body).with().returns(Hpricot.XML('<photoid>123</photoid>'))
         
         Fleakr::Api::UploadRequest.expects(:with_response!).with(filename, :create, {}).returns(response)
         Photo.expects(:find_by_id).with('123').returns(photo)
@@ -31,13 +30,12 @@ module Fleakr::Objects
         Photo.upload(filename).should == photo
       end
       
-      it "should be able to pass additional options when uploading a new file" do
+      should "be able to pass additional options when uploading a new file" do
         filename = '/path/to/mugshot.jpg'
         photo = stub()
         
-        response = stub do |s|
-          s.stubs(:body).with().returns(Hpricot.XML('<photoid>123</photoid>'))
-        end
+        response = stub()
+        response.stubs(:body).with().returns(Hpricot.XML('<photoid>123</photoid>'))
         
         Fleakr::Api::UploadRequest.expects(:with_response!).with(filename, :create, {:title => 'foo'}).returns(response)
         Photo.expects(:find_by_id).with('123').returns(photo)
@@ -47,9 +45,9 @@ module Fleakr::Objects
 
     end
 
-    describe "An instance of the Photo class" do
+    context "An instance of the Photo class" do
       
-      it "should be able to replace the associated photo data" do
+      should "be able to replace the associated photo data" do
         filename = '/path/to/file.jpg'
         response = stub(:body => 'body')
         
@@ -65,7 +63,7 @@ module Fleakr::Objects
       end
       
       context "when populating from the people_getPublicPhotos XML data" do
-        before do
+        setup do
           @object = Photo.new(Hpricot.XML(read_fixture('people.getPublicPhotos')).at('rsp/photos/photo'))
         end
 
@@ -79,7 +77,7 @@ module Fleakr::Objects
       end
       
       context "when populating from the photo upload XML data" do
-        before do
+        setup do
           @object = Photo.new(Hpricot.XML('<photoid>123</photoid>'))
         end
         
@@ -87,7 +85,7 @@ module Fleakr::Objects
       end
       
       context "when populating from the photos_getInfo XML data" do
-        before do
+        setup do
           @object = Photo.new(Hpricot.XML(read_fixture('photos.getInfo')))
           
         end
@@ -109,12 +107,12 @@ module Fleakr::Objects
       
       context "in general" do
         
-        before do
+        setup do
           @photo = Photo.new
           @time = Time.parse('2009-08-01 00:00:00')
         end
         
-        it "should be able to retrieve additional information about the current user" do
+        should "be able to retrieve additional information about the current user" do
           photo_id = '1'
           photo = Photo.new
           photo.expects(:id).with().returns(photo_id)
@@ -125,22 +123,22 @@ module Fleakr::Objects
           photo.load_info
         end
         
-        it "should have a value for :posted_at" do
+        should "have a value for :posted_at" do
           @photo.expects(:posted).with().returns("#{@time.to_i}")
           @photo.posted_at.to_s.should == @time.to_s
         end
         
-        it "should have a value for :taken_at" do
+        should "have a value for :taken_at" do
           @photo.expects(:taken).with().returns(@time.strftime('%Y-%m-%d %H:%M:%S'))
           @photo.taken_at.to_s.should == @time.to_s
         end
         
-        it "should have a value for :updated_at" do
+        should "have a value for :updated_at" do
           @photo.expects(:updated).with().returns("#{@time.to_i}")
           @photo.updated_at.to_s.should == @time.to_s
         end
         
-        it "should have a collection of images by size" do
+        should "have a collection of images by size" do
           photo = Photo.new
           
           small_image, large_image = [stub(:size => 'Small'), stub(:size => 'Large')]
@@ -160,7 +158,7 @@ module Fleakr::Objects
         end
         
         [:square, :thumbnail, :small, :medium, :large, :original].each do |method|
-          it "should have a reader for the :#{method} image" do
+          should "have a reader for the :#{method} image" do
             photo = Photo.new
             image = stub()
             
@@ -169,7 +167,7 @@ module Fleakr::Objects
           end
         end
         
-        it "should be able to retrieve the context for this photo" do
+        should "be able to retrieve the context for this photo" do
           id = '1'
           
           context = stub()
@@ -183,7 +181,7 @@ module Fleakr::Objects
           photo.context.should == context
         end
         
-        it "should memoize the context data" do
+        should "memoize the context data" do
           id = '1'
           
           context = stub()
@@ -197,25 +195,30 @@ module Fleakr::Objects
           2.times { photo.context }
         end
         
-        it "should be able to retrieve the next photo" do
+        should "be able to retrieve the next photo" do
           next_photo = stub()
+          context = mock()
+          context.expects(:next).with().returns(next_photo)
           
           photo = Photo.new
-          photo.expects(:context).with().returns(mock {|m| m.expects(:next).with().returns(next_photo)})
+          
+          photo.expects(:context).with().returns(context)
           
           photo.next.should == next_photo
         end
         
-        it "should be able to retrieve the previous photo" do
+        should "be able to retrieve the previous photo" do
           previous_photo = stub()
+          context = mock()
+          context.expects(:previous).with().returns(previous_photo)
 
           photo = Photo.new
-          photo.expects(:context).with().returns(mock {|m| m.expects(:previous).with().returns(previous_photo)})
+          photo.expects(:context).with().returns(context)
 
           photo.previous.should == previous_photo
         end
         
-        it "should be able to find the owner of the photo" do
+        should "be able to find the owner of the photo" do
           owner = stub()
           
           photo = Photo.new
@@ -226,7 +229,7 @@ module Fleakr::Objects
           photo.owner.should == owner
         end
         
-        it "should memoize the owner information" do
+        should "memoize the owner information" do
           photo = Photo.new
           photo.stubs(:owner_id).with().returns('1')
           

data/test/unit/fleakr/objects/search_test.rb

@@ -3,45 +3,45 @@ require File.dirname(__FILE__) + '/../../../test_helper'
 module Fleakr::Objects
   class SearchTest < Test::Unit::TestCase
     
-    describe "An instance of the Search class" do
+    context "An instance of the Search class" do
 
-      it "should be able to generate a list of tags from a single-valued parameter" do
+      should "be able to generate a list of tags from a single-valued parameter" do
         search = Search.new(:tags => 'foo')
         search.send(:tag_list).should == 'foo'
       end
       
-      it "should be able to generate a list of tags from multi-valued parameters" do
+      should "be able to generate a list of tags from multi-valued parameters" do
         search = Search.new(:tags => %w(foo bar))
         search.send(:tag_list).should == 'foo,bar'
       end
       
-      it "should be able to create parameters for the search" do
+      should "be able to create parameters for the search" do
         search = Search.new(:tags => %w(foo bar))
         search.send(:parameters).should == {:tags => 'foo,bar'}
       end
       
-      it "should preserve the original :tags parameter if it is a comma-separated string" do
+      should "preserve the original :tags parameter if it is a comma-separated string" do
         search = Search.new(:tags => 'one,two')
         search.send(:parameters).should == {:tags => 'one,two'}
       end
       
-      it "should not have any :tags parameters if none are supplied" do
+      should "not have any :tags parameters if none are supplied" do
         search = Search.new({})
         search.send(:parameters).should == {}
       end
       
-      it "should convert the search term into the appropriate parameter" do
+      should "convert the search term into the appropriate parameter" do
         search = Search.new(:text => 'foo')
         search.send(:parameters).should == {:text => 'foo'}
       end
       
-      it "should be able to search photos based on text" do
+      should "be able to search photos based on text" do
         response = mock_request_cycle :for => 'photos.search', :with => {:text => 'foo'}
         search = Search.new(:text => 'foo')
         search.results
       end
       
-      it "should be able to search photos based on tags" do
+      should "be able to search photos based on tags" do
         response = mock_request_cycle :for => 'photos.search', :with => {:tags => 'one,two'}
         
         photo_1, photo_2 = [stub(), stub()]

data/test/unit/fleakr/objects/set_test.rb

@@ -5,16 +5,16 @@ module Fleakr::Objects
 
     should_have_many :photos, :comments
 
-    describe "The Set class" do
+    context "The Set class" do
       
       should_find_all :sets, :by => :user_id, :call => 'photosets.getList', :path => 'rsp/photosets/photoset'
       
     end
 
-    describe "An instance of the Set class" do
+    context "An instance of the Set class" do
       
       context "when populating from an XML document" do
-        before do
+        setup do
           @object = Set.new(Hpricot.XML(read_fixture('photosets.getList')).at('rsp/photosets/photoset'))
         end
         
@@ -26,7 +26,7 @@ module Fleakr::Objects
       end
       
       context "when saving the set" do
-        before do
+        setup do
           @tmp_dir = create_temp_directory
           @set_title = 'set'
           
@@ -34,9 +34,9 @@ module Fleakr::Objects
           @set.stubs(:title).with().returns(@set_title)
         end
         
-        after { FileUtils.rm_rf(@tmp_dir) }
+        teardown { FileUtils.rm_rf(@tmp_dir) }
 
-        it "should know the prefix string based on the number of photos in the set" do
+        should "know the prefix string based on the number of photos in the set" do
           set = Set.new
           set.stubs(:count).with().returns('5')
           set.file_prefix(0).should == '1_'
@@ -45,7 +45,7 @@ module Fleakr::Objects
           set.file_prefix(0).should == '01_'
         end
         
-        it "should save all files of the specified size to the specified directory" do
+        should "save all files of the specified size to the specified directory" do
           image = mock()
           image.expects(:save_to).with("#{@tmp_dir}/set", '1_')
           
@@ -59,7 +59,7 @@ module Fleakr::Objects
           @set.save_to(@tmp_dir, :small)
         end
         
-        it "should not create the directory if it already exists" do
+        should "not create the directory if it already exists" do
           FileUtils.mkdir("#{@tmp_dir}/set")
 
           @set.stubs(:photos).with().returns([])
@@ -69,7 +69,7 @@ module Fleakr::Objects
           @set.save_to(@tmp_dir, :small)
         end
         
-        it "should not raise errors when saving an image size that doesn't exist" do
+        should "not raise errors when saving an image size that doesn't exist" do
           @set.stubs(:photos).with().returns([stub(:large => nil)])
           lambda { @set.save_to(@tmp_dir, :large) }.should_not raise_error
         end