reagent-fleakr 0.4.3 → 0.5.0

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

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

@@ -3,18 +3,18 @@ require File.dirname(__FILE__) + '/../../../test_helper'
 module Fleakr::Objects
   class TagTest < Test::Unit::TestCase
 
-    describe "The Tag class" do
+    context "The Tag class" do
       
       should_find_all :tags, :by => :photo_id, :call => 'tags.getListPhoto', :path => 'rsp/photo/tags/tag'
       should_find_all :tags, :by => :user_id, :call => 'tags.getListUser', :path => 'rsp/who/tags/tag'      
     end
     
-    describe "An instance of the Tag class" do
+    context "An instance of the Tag class" do
       
-      before { @tag = Tag.new }
+      setup { @tag = Tag.new }
       
       context "when populating from the tags_getListPhoto XML data" do
-        before do
+        setup do
           @object = Tag.new(Hpricot.XML(read_fixture('tags.getListPhoto')).at('rsp/photo/tags/tag'))
         end
         
@@ -26,7 +26,7 @@ module Fleakr::Objects
         
       end
       
-      it "should have an author" do
+      should "have an author" do
         user = stub()
         
         @tag.expects(:author_id).at_least_once.with().returns('1')
@@ -37,7 +37,7 @@ module Fleakr::Objects
         @tag.author.should == user
       end
       
-      it "should memoize the author data" do
+      should "memoize the author data" do
         @tag.expects(:author_id).at_least_once.with().returns('1')
         
         User.expects(:find_by_id).with('1').once.returns(stub())
@@ -45,13 +45,13 @@ module Fleakr::Objects
         2.times { @tag.author }
       end
       
-      it "should return nil for author if author_id is not present" do
+      should "return nil for author if author_id is not present" do
         @tag.expects(:author_id).with().returns(nil)
         
         @tag.author.should be(nil)
       end
       
-      it "should have related tags" do
+      should "have related tags" do
         @tag.expects(:value).with().returns('foo')
         
         response = mock_request_cycle :for => 'tags.getRelated', :with => {:tag => 'foo'}
@@ -69,7 +69,7 @@ module Fleakr::Objects
         @tag.related.should == stubs
       end
       
-      it "should memoize the data for related tags" do
+      should "memoize the data for related tags" do
         @tag.expects(:value).with().returns('foo')
         
         mock_request_cycle :for => 'tags.getRelated', :with => {:tag => 'foo'}
@@ -77,17 +77,17 @@ module Fleakr::Objects
         2.times { @tag.related }
       end
       
-      it "should be able to generate a string representation of itself" do
+      should "be able to generate a string representation of itself" do
         @tag.expects(:value).with().returns('foo')
         @tag.to_s.should == 'foo'
       end
       
-      it "should know that it is not a machine tag" do
+      should "know that it is not a machine tag" do
         @tag.expects(:machine_flag).with().returns('0')
         @tag.machine?.should be(false)
       end
       
-      it "should know that it is a machine tag" do
+      should "know that it is a machine tag" do
         @tag.expects(:machine_flag).with().returns('1')
         @tag.machine?.should be(true)
       end

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

@@ -10,7 +10,7 @@ module Fleakr::Objects
     should_autoload_when_accessing :name, :photos_url, :profile_url, :photos_count, :location, :with => :load_info
     should_autoload_when_accessing :icon_server, :icon_farm, :pro, :admin, :icon_url, :with => :load_info
 
-    describe "The User class" do
+    context "The User class" do
 
       should_find_one :user, :by => :username, :call => 'people.findByUsername', :path => 'rsp/user'
       should_find_one :user, :by => :email, :with => :find_email, :call => 'people.findByEmail', :path => 'rsp/user'
@@ -18,9 +18,9 @@ module Fleakr::Objects
 
     end
 
-    describe "An instance of User" do
+    context "An instance of User" do
       context "when populating the object from an XML document" do
-        before do
+        setup do
           @object = User.new(Hpricot.XML(read_fixture('people.findByUsername')))
           @object.populate_from(Hpricot.XML(read_fixture('people.getInfo')))
         end
@@ -41,16 +41,16 @@ module Fleakr::Objects
 
       context "in general" do
 
-        before { @user = User.new }
+        setup { @user = User.new }
 
-        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
           response = mock_request_cycle :for => 'people.getInfo', :with => {:user_id => @user.id}
           @user.expects(:populate_from).with(response.body)
 
           @user.load_info
         end
 
-        it "should be able to generate an icon URL when the :icon_server value is greater than zero" do
+        should "be able to generate an icon URL when the :icon_server value is greater than zero" do
           @user.stubs(:icon_server).with().returns('1')
           @user.stubs(:icon_farm).with().returns('2')
           @user.stubs(:id).with().returns('45')
@@ -58,17 +58,17 @@ module Fleakr::Objects
           @user.icon_url.should == 'http://farm2.static.flickr.com/1/buddyicons/45.jpg'
         end
 
-        it "should return the default icon URL when the :icon_server value is zero" do
+        should "return the default icon URL when the :icon_server value is zero" do
           @user.stubs(:icon_server).with().returns('0')
           @user.icon_url.should == 'http://www.flickr.com/images/buddyicon.jpg'
         end
 
-        it "should return the default icon URL when the :icon_server value is nil" do
+        should "return the default icon URL when the :icon_server value is nil" do
           @user.stubs(:icon_server).with().returns(nil)
           @user.icon_url.should == 'http://www.flickr.com/images/buddyicon.jpg'
         end
         
-        it "should return a boolean value for :pro?" do
+        should "return a boolean value for :pro?" do
           @user.stubs(:pro).with().returns('0')
           @user.pro?.should be(false)
           
@@ -76,7 +76,7 @@ module Fleakr::Objects
           @user.pro?.should be(true)
         end
         
-        it "should return a boolean value for :admin?" do
+        should "return a boolean value for :admin?" do
           @user.stubs(:admin).with().returns('0')
           @user.admin?.should be(false)
           

data/test/unit/fleakr/support/attribute_test.rb

@@ -2,59 +2,59 @@ require File.dirname(__FILE__) + '/../../../test_helper'
 
 module Fleakr::Support
   class AttributeTest < Test::Unit::TestCase
-    describe "An instance of the Attribute class" do
+    context "An instance of the Attribute class" do
 
-      it "should know the name of the attribute" do
+      should "know the name of the attribute" do
         attr = Attribute.new('foo')
         attr.name.should == :foo
       end
 
-      it "should have a default source" do
+      should "have a default source" do
         attr = Attribute.new(:foo)
         attr.sources.should == ['foo']
       end
       
-      it "should be able to assign multiple sources" do
+      should "be able to assign multiple sources" do
         attr = Attribute.new(:foo, ['foo1', 'foo2'])
         attr.sources.should == ['foo1', 'foo2']
       end
 
-      it "should pull the location from the source" do
+      should "pull the location from the source" do
         attr = Attribute.new('foo')
         attr.location('foo').should == 'foo'
       end
       
-      it "should return the location when splitting" do
+      should "return the location when splitting" do
         attr = Attribute.new('foo')
         attr.split('foo').should == ['foo', nil]
       end
       
-      it "should return the name for the location when splitting if the location isn't specified" do
+      should "return the name for the location when splitting if the location isn't specified" do
         attr = Attribute.new('foo')
         attr.split('@bar').should == ['foo', 'bar']
       end
       
-      it "should allow the setting of the location information" do
+      should "allow the setting of the location information" do
         attr = Attribute.new('foo', 'bar')
         attr.sources.should == ['bar']
       end
       
-      it "should allow the setting of the attribute value" do
+      should "allow the setting of the attribute value" do
         attr = Attribute.new('foo')
         attr.attribute('@bogon').should == 'bogon'
       end
       
-      it "should use the location as the attribute" do
+      should "use the location as the attribute" do
         attr = Attribute.new('foo')
         attr.attribute('foo').should == 'foo'
       end
       
-      it "should use the attribute for the attribute if specified" do
+      should "use the attribute for the attribute if specified" do
         attr = Attribute.new(:id, '@nsid')
         attr.attribute('@nsid').should == 'nsid'
       end
 
-      it "should be able to retrieve the node from the path" do
+      should "be able to retrieve the node from the path" do
         document = Hpricot.XML('<name>Bassdrive</name>')
         expected = document.at('name')
         
@@ -62,7 +62,7 @@ module Fleakr::Support
         attr.node_for(document, 'name').should == expected
       end
       
-      it "should be able to retrieve the node that contains the specified attribute" do
+      should "be able to retrieve the node that contains the specified attribute" do
         document = Hpricot.XML('<user id="1337" />')
         expected = document.at('user')
         
@@ -70,7 +70,7 @@ module Fleakr::Support
         attr.node_for(document, '@id').should == expected
       end
 
-      it "should be able to retrieve the node for the specified attribute" do
+      should "be able to retrieve the node for the specified attribute" do
         document = Hpricot.XML('<user nsid="1337" />')
         expected = document.at('user')
         
@@ -78,43 +78,43 @@ module Fleakr::Support
         attr.node_for(document, '@nsid').should == expected
       end
       
-      it "should be able to pull simple values from an XML document" do
+      should "be able to pull simple values from an XML document" do
         document = Hpricot.XML('<name>Bassdrive</name>')
         attr = Attribute.new(:name)
         attr.value_from(document).should == 'Bassdrive'
       end
 
-      it "should be able to pull an attribute value from the current XML node" do
+      should "be able to pull an attribute value from the current XML node" do
         document = Hpricot.XML('<user id="1337" />')
         attr = Attribute.new(:id)
         attr.value_from(document).should == '1337'
       end
         
-      it "should be able to pull a specific attribute value from the current XML node" do
+      should "be able to pull a specific attribute value from the current XML node" do
         document = Hpricot.XML('<user nsid="1337" />')
         attr = Attribute.new(:id, '@nsid')
         attr.value_from(document).should  == '1337'
       end
 
-      it "should be able to pull an attribute value for a node and attribute" do
+      should "be able to pull an attribute value for a node and attribute" do
         document = Hpricot.XML('<station><genre slug="dnb">Drum & Bass</genre></station>')
         attr = Attribute.new(:slug, 'station/genre@slug')
         attr.value_from(document).should == 'dnb'
       end
         
-      it "should be able to pull a value from a nested XML node" do
+      should "be able to pull a value from a nested XML node" do
         document = Hpricot.XML('<rsp><user>blip</user></rsp>')
         attr = Attribute.new(:user)
         attr.value_from(document).should == 'blip'
       end
 
-      it "should return nil if it cannot find the specified node" do
+      should "return nil if it cannot find the specified node" do
         document = Hpricot.XML('<user id="1" />')
         attr = Attribute.new(:photoset, '@nsid')
         attr.value_from(document).should be(nil)
       end
 
-      it "should be able to try a series of nodes to find a value" do
+      should "be able to try a series of nodes to find a value" do
         document = Hpricot.XML('<photoid>123</photoid>')
 
         attr = Attribute.new(:id, ['photo@nsid', 'photoid'])