reagent-fleakr 0.4.3 → 0.5.0

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
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: reagent-fleakr
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors: 
 - Patrick Reagan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-11 00:00:00 -07:00
+date: 2009-05-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.6.0
+        version: 0.8.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: activesupport