fleakr 0.4.3 → 0.5.0

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'])

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

@@ -21,17 +21,17 @@ end
 module Fleakr
   class ObjectTest < Test::Unit::TestCase
     
-    describe "A class method provided by the Flickr::Object module" do
+    context "A class method provided by the Flickr::Object module" do
    
-      it "should have an empty list of attributes if none are supplied" do
+      should "have an empty list of attributes if none are supplied" do
         EmptyObject.attributes.should == []
       end
       
-      it "should know the names of all its attributes" do
+      should "know the names of all its attributes" do
         FlickrObject.attributes.map {|a| a.name.to_s }.should == %w(name description id photoset_id tag category)
       end
       
-      it "should be able to find by ID" do
+      should "be able to find by ID" do
         id = 1
         flickr_object = stub()
         
@@ -41,7 +41,7 @@ module Fleakr
         FlickrObject.find_by_id(id).should == flickr_object
       end
       
-      it "should be able to pass parameters to the :find_by_id method" do
+      should "be able to pass parameters to the :find_by_id method" do
         id = 1
         params = {:authenticate? => true}
         flickr_object = stub()
@@ -54,16 +54,16 @@ module Fleakr
       
     end
     
-    describe "An instance method provided by the Flickr::Object module" do
+    context "An instance method provided by the Flickr::Object module" do
       
-      it "should have default reader methods" do
+      should "have default reader methods" do
         [:name, :description, :id, :photoset_id, :tag, :category].each do |method_name|
           FlickrObject.new.respond_to?(method_name).should == true
         end
       end
       
       context "when populating data from an XML document" do
-        before do
+        setup do
           xml = <<-XML
             <name>Fleakr</name>
             <desc>Awesome</desc>
@@ -76,47 +76,47 @@ module Fleakr
           @object.populate_from(Hpricot.XML(xml))
         end
         
-        it "should have the correct value for :name" do
+        should "have the correct value for :name" do
           @object.name.should == 'Fleakr'
         end
         
-        it "should have the correct value for :description" do
+        should "have the correct value for :description" do
           @object.description.should == 'Awesome'
         end
         
-        it "should have the correct value for :photoset_id" do
+        should "have the correct value for :photoset_id" do
           @object.photoset_id.should == '1'
         end
         
-        it "should have the correct value for :id" do
+        should "have the correct value for :id" do
           document = Hpricot.XML('<object nsid="1" />').at('object')
           @object.populate_from(document)
           
           @object.id.should == '1'
         end
         
-        it "should have the correct value for :tag" do
+        should "have the correct value for :tag" do
           @object.tag.should == 'Tag'
         end
         
-        it "should have the correct value for :category" do
+        should "have the correct value for :category" do
           @object.category.should == 'Category'
         end
       end
       
-      it "should populate its data from an XML document when initializing" do
+      should "populate its data from an XML document when initializing" do
         document = stub()
         FlickrObject.any_instance.expects(:populate_from).with(document)
         
         FlickrObject.new(document)
       end
       
-      it "should not attempt to populate itself from an XML document if one is not available" do
+      should "not attempt to populate itself from an XML document if one is not available" do
         FlickrObject.any_instance.expects(:populate_from).never
         FlickrObject.new
       end
       
-      it "should not overwrite existing attributes when pulling in a partial new XML document" do
+      should "not overwrite existing attributes when pulling in a partial new XML document" do
         object = FlickrObject.new(Hpricot.XML('<name>Fleakr</name>'))
         object.populate_from(Hpricot.XML('<desc>Awesome</desc>'))
         

data/test/unit/fleakr_test.rb

@@ -2,10 +2,10 @@ require File.dirname(__FILE__) + '/../test_helper'
 
 class FleakrTest < Test::Unit::TestCase
   
-  describe "The Fleakr module" do
+  context "The Fleakr module" do
     
     [:api_key, :shared_secret, :mini_token, :auth_token].each do |attribute|
-      it "should be able to set a value for :#{attribute}" do
+      should "be able to set a value for :#{attribute}" do
         value = 'value'
         
         Fleakr.send("#{attribute}=".to_sym, value)
@@ -13,13 +13,13 @@ class FleakrTest < Test::Unit::TestCase
       end
     end
     
-    it "should provide a means to find a user by his username" do
+    should "provide a means to find a user by his username" do
       user = stub()
       Fleakr::Objects::User.expects(:find_by_username).with('username').returns(user)
       Fleakr.user('username').should == user
     end
     
-    it "should fall back to finding a user by email if finding by username fails" do
+    should "fall back to finding a user by email if finding by username fails" do
       user = stub()
       email = 'user@host.com'
       
@@ -29,20 +29,20 @@ class FleakrTest < Test::Unit::TestCase
       Fleakr.user(email).should == user
     end
     
-    it "should be able to perform text searches" do
+    should "be able to perform text searches" do
       photos = [stub()]
       
       Fleakr::Objects::Search.expects(:new).with(:text => 'foo').returns(stub(:results => photos))
       Fleakr.search('foo').should == photos
     end
     
-    it "should be able to perform searches based on tags" do
+    should "be able to perform searches based on tags" do
       Fleakr::Objects::Search.expects(:new).with(:tags => %w(one two)).returns(stub(:results => []))
       Fleakr.search(:tags => %w(one two))
     end
    
     # TODO: refactor uploading tests?
-    it "should be able to upload a collection of images" do
+    should "be able to upload a collection of images" do
       glob      = '*.jpg'
       filenames = %w(one.jpg two.jpg)
       
@@ -54,7 +54,7 @@ class FleakrTest < Test::Unit::TestCase
       Fleakr.upload(glob)
     end
     
-    it "should return recently uploaded photos" do
+    should "return recently uploaded photos" do
       filename  = '/path/to/image.jpg'
       new_image = stub()
       
@@ -64,7 +64,7 @@ class FleakrTest < Test::Unit::TestCase
       Fleakr.upload(filename).should == [new_image]
     end
     
-    it "should be able to pass options for the uploaded files" do
+    should "be able to pass options for the uploaded files" do
       filename  = '/path/to/image.jpg'
       new_image = stub()
       
@@ -74,7 +74,7 @@ class FleakrTest < Test::Unit::TestCase
       Fleakr.upload(filename, :title => 'bop bip').should == [new_image]
     end
     
-    it "should be able to reset the cached token" do
+    should "be able to reset the cached token" do
       @token = stub()
       Fleakr.expects(:auth_token).with().at_least_once.returns('abc123')
       Fleakr::Objects::AuthenticationToken.expects(:from_auth_token).with('abc123').times(2).returns(@token)
@@ -83,7 +83,7 @@ class FleakrTest < Test::Unit::TestCase
       Fleakr.token # twice
     end
     
-    it "should not have a token by default" do
+    should "not have a token by default" do
       Fleakr.expects(:mini_token).with().returns(nil)
       Fleakr.expects(:auth_token).with().returns(nil)
       Fleakr.expects(:frob).with().returns(nil)
@@ -92,7 +92,7 @@ class FleakrTest < Test::Unit::TestCase
     end
     
     [:mini_token, :auth_token, :frob].each do |attribute|
-      it "should reset_token when :#{attribute} is set" do
+      should "reset_token when :#{attribute} is set" do
         Fleakr.expects(:reset_token).with().at_least_once
         Fleakr.send("#{attribute}=".to_sym, 'value')
       end
@@ -100,7 +100,7 @@ class FleakrTest < Test::Unit::TestCase
     
     context "when generating an AuthenticationToken from an auth_token string" do
 
-      before do
+      setup do
         @token = stub()
         
         Fleakr.expects(:auth_token).with().at_least_once.returns('abc123')
@@ -108,13 +108,13 @@ class FleakrTest < Test::Unit::TestCase
       end
 
       # Make sure to clear the cache
-      after { Fleakr.auth_token = nil }
+      teardown { Fleakr.auth_token = nil }
       
-      it "should return the token" do
+      should "return the token" do
         Fleakr.token.should == @token
       end
       
-      it "should cache the result" do
+      should "cache the result" do
         2.times { Fleakr.token }
       end
 
@@ -122,7 +122,7 @@ class FleakrTest < Test::Unit::TestCase
     
     context "when generating an AuthenticationToken from a frob string" do
 
-      before do
+      setup do
         @token = stub()
         
         Fleakr.expects(:auth_token).with().at_least_once.returns(nil)
@@ -131,13 +131,13 @@ class FleakrTest < Test::Unit::TestCase
       end
 
       # Make sure to clear the cache
-      after { Fleakr.frob = nil }
+      teardown { Fleakr.frob = nil }
       
-      it "should return the token" do
+      should "return the token" do
         Fleakr.token.should == @token
       end
       
-      it "should cache the result" do
+      should "cache the result" do
         2.times { Fleakr.token }
       end
 
@@ -145,7 +145,7 @@ class FleakrTest < Test::Unit::TestCase
     
     context "when generating an AuthenticationToken from a mini_token string" do
       
-      before do
+      setup do
         @token = stub()
 
         Fleakr.expects(:auth_token).with().at_least_once.returns(nil)
@@ -154,13 +154,13 @@ class FleakrTest < Test::Unit::TestCase
       end
       
       # Make sure to clear the cache
-      after { Fleakr.mini_token = nil }
+      teardown { Fleakr.mini_token = nil }
       
-      it "should return the token" do
+      should "return the token" do
         Fleakr.token.should == @token
       end
       
-      it "should cache the result" do
+      should "cache the result" do
         2.times { Fleakr.token }
       end