fleakr 0.4.3 → 0.5.0

data/test/unit/fleakr/api/parameter_test.rb

@@ -3,24 +3,24 @@ require File.dirname(__FILE__) + '/../../../test_helper'
 module Fleakr::Api
   class ParameterTest < Test::Unit::TestCase
     
-    describe "An instance of the Parameter class" do
+    context "An instance of the Parameter class" do
       
-      it "should have a name" do
+      should "have a name" do
         parameter = Parameter.new('foo')
         parameter.name.should == 'foo'
       end
       
-      it "should know to include it in the signature by default" do
+      should "know to include it in the signature by default" do
         parameter = Parameter.new('foo')
         parameter.include_in_signature?.should be(true)
       end
       
-      it "should know not to include it in the signature" do
+      should "know not to include it in the signature" do
         parameter = Parameter.new('foo', false)
         parameter.include_in_signature?.should be(false)
       end
       
-      it "should be able to compare itself to another parameter instance" do
+      should "be able to compare itself to another parameter instance" do
         p1 = Parameter.new('z', 'a')
         p2 = Parameter.new('a', 'z')
         

data/test/unit/fleakr/api/response_test.rb

@@ -3,9 +3,9 @@ require File.dirname(__FILE__) + '/../../../test_helper'
 module Fleakr::Api
   class ResponseTest < Test::Unit::TestCase
 
-    describe "An instance of Response" do
+    context "An instance of Response" do
 
-      it "should provide the response body as an Hpricot element" do
+      should "provide the response body as an Hpricot element" do
         response_xml = '<xml>'
         hpricot_stub = stub()
 
@@ -15,7 +15,7 @@ module Fleakr::Api
         response.body.should == hpricot_stub
       end
       
-      it "should memoize the Hpricot document" do
+      should "memoize the Hpricot document" do
         response = Response.new('<xml>')
         
         Hpricot.expects(:XML).with(kind_of(String)).once.returns(stub())
@@ -23,19 +23,19 @@ module Fleakr::Api
         2.times { response.body }
       end
       
-      it "should know if there are errors in the response" do
+      should "know if there are errors in the response" do
         response_xml = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<rsp stat=\"fail\">\n\t<err code=\"1\" msg=\"User not found\" />\n</rsp>\n"
         response = Response.new(response_xml)
         
         response.error?.should be(true)
       end
       
-      it "should not have an error if there are no errors in the XML" do
+      should "not have an error if there are no errors in the XML" do
         response = Response.new(read_fixture('people.findByUsername'))
         response.error.should be(nil)
       end
       
-      it "should have an error if there is an error in the response" do
+      should "have an error if there is an error in the response" do
         response_xml = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<rsp stat=\"fail\">\n\t<err code=\"1\" msg=\"User not found\" />\n</rsp>\n"
         response = Response.new(response_xml)
         

data/test/unit/fleakr/api/upload_request_test.rb

@@ -3,14 +3,14 @@ require File.dirname(__FILE__) + '/../../../test_helper'
 module Fleakr::Api
   class UploadRequestTest < Test::Unit::TestCase
 
-    describe "An instance of the UploadRequest class" do
+    context "An instance of the UploadRequest class" do
 
-      before do
+      setup do
         @secret = 'sekrit'
         Fleakr.stubs(:shared_secret).with().returns(@secret)
       end
       
-      it "should have a collection of upload_options" do
+      should "have a collection of upload_options" do
         request = UploadRequest.new('foo', :create, {:title => 'foo', :tags => %w(a b)})
         
         option_1, option_2 = [stub(:to_hash => {:one => 'value_1'}), stub(:to_hash => {:two => 'value_2'})]
@@ -21,20 +21,24 @@ module Fleakr::Api
         request.upload_options.should == {:one => 'value_1', :two => 'value_2'}
       end
       
-      it "should create a file parameter on initialization" do
+      should "create a file parameter on initialization" do
         filename = '/path/to/image.jpg'
 
         parameter = stub()
         FileParameter.expects(:new).with('photo', filename).returns(parameter)
 
-        parameter_list = mock() {|m| m.expects(:<<).with(parameter) }
+        parameter_list = mock()
+        parameter_list.expects(:<<).with(parameter)
+        
         ParameterList.expects(:new).with({}).returns(parameter_list)
 
         UploadRequest.new(filename)
       end
       
-      it "should allow setting options on initialization" do
-        option = stub {|s| s.stubs(:to_hash).with().returns({:title => 'foo'})}
+      should "allow setting options on initialization" do
+        option = stub()
+        option.stubs(:to_hash).with().returns({:title => 'foo'})
+        
         Option.expects(:for).with(:title, 'foo').returns(option)
         
         ParameterList.expects(:new).with({:title => 'foo'}).returns(stub(:<<))
@@ -44,36 +48,36 @@ module Fleakr::Api
 
       context "after initialization" do
 
-        before { ParameterList.stubs(:new).returns(stub(:<< => nil)) }
+        setup { ParameterList.stubs(:new).returns(stub(:<< => nil)) }
 
-        it "should default the type to :create" do
+        should "default the type to :create" do
           request = UploadRequest.new('file')
           request.type.should == :create
         end
         
-        it "should allow setting the type to :update" do
+        should "allow setting the type to :update" do
           request = UploadRequest.new('file', :update)
           request.type.should == :update
         end
 
-        it "should know the endpoint_uri" do
+        should "know the endpoint_uri" do
           request = UploadRequest.new('filename')
           request.__send__(:endpoint_uri).should == URI.parse('http://api.flickr.com/services/upload/')
         end
         
-        it "should know the endpoint_uri for an :update request" do
+        should "know the endpoint_uri for an :update request" do
           request = UploadRequest.new('filename', :update)
           request.__send__(:endpoint_uri).should == URI.parse('http://api.flickr.com/services/replace/')
         end
         
-        it "should only parse the endpoint URI once" do
+        should "only parse the endpoint URI once" do
           request = UploadRequest.new('filename')
           URI.expects(:parse).with(kind_of(String)).once.returns('uri')
           
           2.times { request.__send__(:endpoint_uri) }
         end
 
-        it "should have a collection of required headers" do
+        should "have a collection of required headers" do
           form_data = 'data'
 
           request = UploadRequest.new('filename')
@@ -87,28 +91,28 @@ module Fleakr::Api
           request.headers.should == expected
         end
 
-        it "should be able to send a POST request to the API service" do
+        should "be able to send a POST request to the API service" do
           request = UploadRequest.new('filename')
           
-          uri = stub do |s|
-            s.stubs(:host).with().returns('host')
-            s.stubs(:path).with().returns('path')
-            s.stubs(:port).with().returns(80)
-          end
+          uri = stub()
+          uri.stubs(:host).with().returns('host')
+          uri.stubs(:path).with().returns('path')
+          uri.stubs(:port).with().returns(80)
           
           request.stubs(:endpoint_uri).with().returns(uri)
           
           request.stubs(:headers).with().returns('header' => 'value')
           request.parameters.stubs(:to_form).with().returns('form')
 
-          http = mock {|m| m.expects(:post).with('path', 'form', {'header' => 'value'}) }
+          http = mock()
+          http.expects(:post).with('path', 'form', {'header' => 'value'})
 
           Net::HTTP.expects(:start).with('host', 80).yields(http).returns(stub(:body))
           
           request.send
         end
         
-        it "should get back a response from a POST operation" do
+        should "get back a response from a POST operation" do
           response = stub()
           
           Net::HTTP.expects(:start).with(kind_of(String), kind_of(Fixnum)).returns(stub(:body => '<xml>'))
@@ -118,7 +122,7 @@ module Fleakr::Api
           request.send.should == response
         end
         
-        it "should be able to make a full request and response cycle" do
+        should "be able to make a full request and response cycle" do
           filename = 'filename'
           response = stub(:error? => false)
           
@@ -126,7 +130,7 @@ module Fleakr::Api
           UploadRequest.with_response!(filename).should == response
         end
         
-        it "should raise an exception when the full request / response cycle has errors" do
+        should "raise an exception when the full request / response cycle has errors" do
           filename = 'filename'
           response = stub(:error? => true, :error => stub(:code => '1', :message => 'User not found'))
           

data/test/unit/fleakr/api/value_parameter_test.rb

@@ -3,29 +3,29 @@ require File.dirname(__FILE__) + '/../../../test_helper'
 module Fleakr::Api
   class ValueParameterTest < Test::Unit::TestCase
 
-   describe "An instance of the ValueParameter class" do
+   context "An instance of the ValueParameter class" do
       
-     it "should have a value" do
+     should "have a value" do
        parameter = ValueParameter.new('foo', 'bar')
        parameter.value.should == 'bar'
      end
       
-      it "should know how to generate the query representation of itself" do
+      should "know how to generate the query representation of itself" do
         parameter = ValueParameter.new('foo', 'bar')
         parameter.to_query.should == 'foo=bar'
       end
       
-      it "should escape the value when generating the query representation" do
+      should "escape the value when generating the query representation" do
         parameter = ValueParameter.new('foo', 'Mr. Crystal?')
         parameter.to_query.should == 'foo=Mr.+Crystal%3F'
       end
       
-      it "should use an empty string when generating a query if the parameter value is nil" do
+      should "use an empty string when generating a query if the parameter value is nil" do
         parameter = ValueParameter.new('foo', nil)
         parameter.to_query.should == 'foo='
       end
       
-      it "should know how to generate the form representation of itself" do
+      should "know how to generate the form representation of itself" do
         parameter = ValueParameter.new('foo', 'bar')
         expected = 
           'Content-Disposition: form-data; name="foo"' + "\r\n" +

data/test/unit/fleakr/core_ext/false_class_test.rb

@@ -2,9 +2,9 @@ require File.dirname(__FILE__) + '/../../../test_helper'
 
 class FalseClassTest < Test::Unit::TestCase
   
-  describe "An instance of the FalseClass class" do
+  context "An instance of the FalseClass class" do
     
-    it "should have 0 as its integer value" do
+    should "have 0 as its integer value" do
       false.to_i.should == 0
     end
     

data/test/unit/fleakr/core_ext/hash_test.rb

@@ -2,27 +2,27 @@ require File.dirname(__FILE__) + '/../../../test_helper'
 
 class HashTest < Test::Unit::TestCase
   
-  describe "An instance of Hash" do
+  context "An instance of Hash" do
     context "when extracting key/value pairs" do
       
-      before do
+      setup do
         @hash = {:one => 'two', :three => 'four'}
       end
       
-      it "should return a hash with the matching key/value pairs" do
+      should "return a hash with the matching key/value pairs" do
         @hash.extract!(:one).should == {:one => 'two'}
       end
       
-      it "should return an empty hash if the key isn't found" do
+      should "return an empty hash if the key isn't found" do
         @hash.extract!(:foo).should == {}
       end
       
-      it "should alter the original hash when a value is extracted" do
+      should "alter the original hash when a value is extracted" do
         @hash.extract!(:one)
         @hash.should == {:three => 'four'}
       end
       
-      it "should be able to extract multiple keys" do
+      should "be able to extract multiple keys" do
         @hash.extract!(:one, :three, :missing).should == {:one => 'two', :three => 'four'}
       end
       

data/test/unit/fleakr/core_ext/true_class_test.rb

@@ -2,9 +2,9 @@ require File.dirname(__FILE__) + '/../../../test_helper'
 
 class TrueClassTest < Test::Unit::TestCase
   
-  describe "An instance of the TrueClass class" do
+  context "An instance of the TrueClass class" do
     
-    it "should have 1 as its integer value" do
+    should "have 1 as its integer value" do
       true.to_i.should == 1
     end
     

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

@@ -3,9 +3,9 @@ require File.dirname(__FILE__) + '/../../../test_helper'
 module Fleakr::Objects
   class AuthenticationTokenTest < Test::Unit::TestCase
     
-    describe "The AuthenticationToken class" do
+    context "The AuthenticationToken class" do
       
-      it "should be able to create an instance from a mini_token" do
+      should "be able to create an instance from a mini_token" do
         token = '123-123-123'
         auth_token = stub()
         
@@ -16,7 +16,7 @@ module Fleakr::Objects
         AuthenticationToken.from_mini_token(token).should == auth_token
       end
       
-      it "should be able to create an instance from an auth_token" do
+      should "be able to create an instance from an auth_token" do
         token      = 'abc123'
         auth_token = stub()
 
@@ -27,7 +27,7 @@ module Fleakr::Objects
       end
       
       
-      it "should be able to create an instance from a frob" do
+      should "be able to create an instance from a frob" do
         frob       = '12345678901234567-abcde89012fg3456-7890123'
         auth_token = stub()
         
@@ -39,11 +39,11 @@ module Fleakr::Objects
       
     end
     
-    describe "An instance of the AuthenticationToken class" do
+    context "An instance of the AuthenticationToken class" do
       
       context "when populating from an XML document" do
         
-        before do
+        setup do
           @object = AuthenticationToken.new(Hpricot.XML(read_fixture('auth.getFullToken')))
         end
         

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

@@ -3,17 +3,17 @@ require File.dirname(__FILE__) + '/../../../test_helper'
 module Fleakr::Objects
   class CommentTest < Test::Unit::TestCase
 
-    describe "The Comment class" do
+    context "The Comment class" do
 
       should_find_all :comments, :by => :photo_id, :call => 'photos.comments.getList', :path => 'rsp/comments/comment'
       should_find_all :comments, :by => :set_id, :using => :photoset_id, :call => 'photosets.comments.getList', :path => 'rsp/comments/comment'
 
     end
 
-    describe "An instance of the Comment class" do
+    context "An instance of the Comment class" do
 
       context "when populating from the photos_comments_getList XML data" do
-        before do
+        setup do
           @object = Comment.new(Hpricot.XML(read_fixture('photos.comments.getList')).at('rsp/comments/comment'))
         end
 
@@ -27,21 +27,21 @@ module Fleakr::Objects
       
       context "in general" do
         
-        before { @comment = Comment.new }
+        setup { @comment = Comment.new }
 
-        it "should have a value for :created_at" do
+        should "have a value for :created_at" do
           @comment.expects(:created).with().returns('1239217523')
           Time.expects(:at).with(1239217523).returns('time')
           
           @comment.created_at.should == 'time'
         end
 
-        it "should use the body as the string representation" do
+        should "use the body as the string representation" do
           @comment.expects(:body).with().returns('bod')
           @comment.to_s.should == 'bod'
         end
         
-        it "should be able to find the author of the comment" do
+        should "be able to find the author of the comment" do
           author = stub()
           
           
@@ -51,7 +51,7 @@ module Fleakr::Objects
           @comment.author.should == author
         end
         
-        it "should memoize the owner information" do
+        should "memoize the owner information" do
           @comment.stubs(:author_id).with().returns('1')
           
           User.expects(:find_by_id).with('1').once.returns(stub())

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

@@ -3,15 +3,18 @@ require File.dirname(__FILE__) + '/../../../test_helper'
 module Fleakr::Objects
   class ContactTest < Test::Unit::TestCase
 
-    describe "The Contact class" do
+    context "The Contact class" do
       
       should "return a list of users for a specified user's contacts" do
-        user_1, user_2 = [stub(), stub()]
+        # user_1, user_2 = [stub(), stub()]
+        user_1 = stub()
+        user_2 = stub()
+        
         contact_1, contact_2 = [stub(:to_user => user_1), stub(:to_user => user_2)]
         
         response = mock_request_cycle :for => 'contacts.getPublicList', :with => {:user_id => '1'}
         
-        contact_1_doc, contact_2_doc = (response.body/'rsp/contacts/contact').map
+        contact_1_doc, contact_2_doc = (response.body/'rsp/contacts/contact').to_a
         
         Contact.stubs(:new).with(contact_1_doc).returns(contact_1)
         Contact.stubs(:new).with(contact_2_doc).returns(contact_2)
@@ -21,9 +24,9 @@ module Fleakr::Objects
       
     end
 
-    describe "An instance of the Contact class" do
+    context "An instance of the Contact class" do
       context "when populating from an XML document" do
-        before do
+        setup do
           @object = Contact.new(Hpricot.XML(read_fixture('contacts.getPublicList')).at('contacts/contact'))
         end
 

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

@@ -3,9 +3,9 @@ require File.dirname(__FILE__) + '/../../../test_helper'
 module Fleakr::Objects
   class ErrorTest < Test::Unit::TestCase
     
-    describe "An instance of the Error class" do
+    context "An instance of the Error class" do
       
-      it "should have a code and a message" do
+      should "have a code and a message" do
         response_xml = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<rsp stat=\"fail\">\n\t<err code=\"1\" msg=\"User not found\" />\n</rsp>\n"
         
         error = Error.new(Hpricot.XML(response_xml))