fleakr 0.6.3 → 0.7.0

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

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.expand_path('../../../../test_helper', __FILE__)
 
 module Fleakr::Api
   class ResponseTest < Test::Unit::TestCase
@@ -10,35 +10,35 @@ module Fleakr::Api
         hpricot_stub = stub()
 
         Hpricot.expects(:XML).with(response_xml).returns(hpricot_stub)
-        
+
         response = Response.new(response_xml)
         response.body.should == hpricot_stub
       end
-      
+
       should "memoize the Hpricot document" do
         response = Response.new('<xml>')
-        
+
         Hpricot.expects(:XML).with(kind_of(String)).once.returns(stub())
-        
+
         2.times { response.body }
       end
-      
+
       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
-      
+
       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
-      
+
       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)
-        
+
         response.error.code.should == '1'
         response.error.message.should == 'User not found'
       end

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

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.expand_path('../../../../test_helper', __FILE__)
 
 module Fleakr::Api
   class UploadRequestTest < Test::Unit::TestCase
@@ -7,32 +7,32 @@ module Fleakr::Api
 
       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'})]
-        
+
         Option.expects(:for).with(:title, 'foo').returns(option_1)
         Option.expects(:for).with(:tags, %w(a b)).returns(option_2)
-        
+
         request.upload_options.should == {:one => 'value_1', :two => 'value_2'}
       end
-      
+
       should "create a file parameter on initialization" do
         filename = '/path/to/image.jpg'
-        
+
         parameter_list = mock() {|p| p.expects(:add_upload_option).with(:photo, filename) }
         UploadRequest.any_instance.stubs(:parameters).with().returns(parameter_list)
-        
+
         UploadRequest.new(filename)
       end
-      
+
       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(:add_upload_option))
-        
+
         UploadRequest.new('filename', :create, {:title => 'foo'})
       end
 
@@ -44,7 +44,7 @@ module Fleakr::Api
           request = UploadRequest.new('file')
           request.type.should == :create
         end
-        
+
         should "allow setting the type to :update" do
           request = UploadRequest.new('file', :update)
           request.type.should == :update
@@ -54,16 +54,16 @@ module Fleakr::Api
           request = UploadRequest.new('filename')
           request.__send__(:endpoint_uri).should == URI.parse('http://api.flickr.com/services/upload/')
         end
-        
+
         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
-        
+
         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
 
@@ -83,14 +83,14 @@ module Fleakr::Api
 
         should "be able to send a POST request to the API service" do
           request = UploadRequest.new('filename')
-          
+
           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')
 
@@ -98,39 +98,39 @@ module Fleakr::Api
           http.expects(:post).with('path', 'form', {'header' => 'value'})
 
           Net::HTTP.expects(:start).with('host', 80).yields(http).returns(stub(:body))
-          
+
           request.send
         end
-        
+
         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>'))
           Response.expects(:new).with('<xml>').returns(response)
-          
+
           request = UploadRequest.new('filename')
           request.send.should == response
         end
-        
+
         should "be able to make a full request and response cycle" do
           filename = 'filename'
           response = stub(:error? => false)
-          
+
           UploadRequest.expects(:new).with(filename, :create, {}).returns(stub(:send => response))
           UploadRequest.with_response!(filename).should == response
         end
-        
+
         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'))
-          
+
           UploadRequest.expects(:new).with(filename, :create, {}).returns(stub(:send => response))
-          
+
           lambda do
             UploadRequest.with_response!(filename)
           end.should raise_error(Fleakr::ApiError)
         end
-        
+
       end
 
     end

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

@@ -1,41 +1,41 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.expand_path('../../../../test_helper', __FILE__)
 
 module Fleakr::Api
   class ValueParameterTest < Test::Unit::TestCase
 
    context "An instance of the ValueParameter class" do
-      
+
      should "have a value" do
        parameter = ValueParameter.new('foo', 'bar')
        parameter.value.should == 'bar'
      end
-      
+
       should "know how to generate the query representation of itself" do
         parameter = ValueParameter.new('foo', 'bar')
         parameter.to_query.should == 'foo=bar'
       end
-      
+
       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
-      
+
       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
-      
+
       should "know how to generate the form representation of itself" do
         parameter = ValueParameter.new('foo', 'bar')
-        expected = 
+        expected =
           'Content-Disposition: form-data; name="foo"' + "\r\n" +
           "\r\n" +
           "bar\r\n"
-          
+
         parameter.to_form.should == expected
       end
-   
+
    end
-    
+
   end
 end

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

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

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

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

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

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

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

@@ -1,70 +1,70 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.expand_path('../../../../test_helper', __FILE__)
 
 module Fleakr::Objects
   class AuthenticationTokenTest < Test::Unit::TestCase
-    
+
     context "The AuthenticationToken class" do
-      
+
       should "be able to create an instance from a mini_token" do
         token = '123-123-123'
         auth_token = stub()
-        
+
         response = mock_request_cycle :for => 'auth.getFullToken', :with => {:mini_token => token, :authenticate? => false}
-        
+
         AuthenticationToken.expects(:new).with(response.body).returns(auth_token)
-        
+
         AuthenticationToken.from_mini_token(token).should == auth_token
       end
-      
+
       should "be able to create an instance from an auth_token" do
         token      = 'abc123'
         auth_token = stub()
 
         response = mock_request_cycle :for => 'auth.checkToken', :with => {:auth_token => token, :authenticate? => false}
-        
+
         AuthenticationToken.expects(:new).with(response.body).returns(auth_token)
         AuthenticationToken.from_auth_token(token).should == auth_token
       end
-      
-      
+
+
       should "be able to create an instance from a frob" do
         frob       = '12345678901234567-abcde89012fg3456-7890123'
         auth_token = stub()
-        
+
         response = mock_request_cycle :for => 'auth.getToken', :with => {:frob => frob, :authenticate? => false}
-        
+
         AuthenticationToken.expects(:new).with(response.body).returns(auth_token)
         AuthenticationToken.from_frob(frob).should == auth_token
       end
-      
+
     end
-    
+
     context "An instance of the AuthenticationToken class" do
-      
+
       should "have an associated user" do
         token = AuthenticationToken.new
         token.stubs(:user_id).with().returns('1')
-        
+
         User.expects(:find_by_id).with('1').returns('user')
-        
+
         token.user.should == 'user'
       end
-      
+
       context "when populating from an XML document" do
-        
+
         setup do
           @object = AuthenticationToken.new(Hpricot.XML(read_fixture('auth.getFullToken')))
         end
-        
+
         should_have_a_value_for :value       => 'abc-123'
         should_have_a_value_for :permissions => 'delete'
         should_have_a_value_for :user_id     => '31066442@N69'
         should_have_a_value_for :full_name   => 'Sir Froot Pants'
         should_have_a_value_for :user_name   => 'frootpantz'
-        
+
       end
-      
+
     end
-    
+
   end
 end

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

@@ -1,23 +1,23 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.expand_path('../../../../test_helper', __FILE__)
 
 module Fleakr::Objects
   class CollectionTest < Test::Unit::TestCase
 
     context "The Collection class" do
-      
-      should_find_one :collections, :by => :id, :call => 'collections.getInfo', :path => 'rsp/collection'
-      should_find_all :collections, :by => :user_id, :call => 'collections.getTree', :path => 'rsp/collections/collection'
-      
+
+      should_find_one :collections, :by => :id, :call => 'collections.getInfo', :path => 'rsp/collection', :class => Collection
+      should_find_all :collections, :by => :user_id, :call => 'collections.getTree', :path => 'rsp/collections/collection', :class => Collection
+
     end
 
     context "An instance of the Collection class" do
-      
+
       context "when populating from a call to collections.getInfo" do
         setup do
           document = Hpricot.XML(read_fixture('collections.getInfo')).at('rsp/collection')
           @object = Collection.new(document)
         end
-        
+
         should_have_a_value_for :id             => '34762917-72157619347181335'
         should_have_a_value_for :title          => 'Work'
         should_have_a_value_for :description    => 'Sample Collection'
@@ -26,46 +26,46 @@ module Fleakr::Objects
         should_have_a_value_for :created        => '1244460707'
 
       end
-      
+
       context "when populating from a call to collections.getTree" do
         setup do
           document = Hpricot.XML(read_fixture('collections.getTree')).at('rsp/collections/collection')
           @object = Collection.new(document)
         end
-        
+
         should_have_a_value_for :id             => '123-456'
         should_have_a_value_for :title          => 'Top-Level Collection 1'
         should_have_a_value_for :description    => 'Description 1'
         should_have_a_value_for :large_icon_url => 'http://farm4.static.flickr.com/3573/cols/72157617429277370_1691956f71_l.jpg'
         should_have_a_value_for :small_icon_url => 'http://farm4.static.flickr.com/3573/cols/72157617429277370_1691956f71_s.jpg'
-        
+
       end
-      
+
       context "that contains collections" do
         setup do
           document = Hpricot.XML(read_fixture('collections.getTree')).at('rsp/collections/collection')
           @collection = Collection.new(document)
         end
-        
+
         should "have a set of collections" do
           collection_titles = @collection.collections.map {|c| c.title }
           collection_titles.should == ['Second-Level Collection 1']
         end
-        
+
         should "not have any associated sets" do
           @collection.sets.should == []
         end
       end
-      
+
       context "that contains sets" do
         setup do
           xml = <<-XML
-            <collection id="123-102" title="Top-Level Collection 2" description="Description 5" iconlarge="http://farm4.static.flickr.com/3573/cols/72157617429277370_1691956f71_l.jpg" iconsmall="http://farm4.static.flickr.com/3573/cols/72157617429277370_1691956f71_s.jpg">	
-          		<set id="1238" title="Set 5" description="" />
-          		<set id="1239" title="Set 6" description="" />
+            <collection id="123-102" title="Top-Level Collection 2" description="Description 5" iconlarge="http://farm4.static.flickr.com/3573/cols/72157617429277370_1691956f71_l.jpg" iconsmall="http://farm4.static.flickr.com/3573/cols/72157617429277370_1691956f71_s.jpg">
+              <set id="1238" title="Set 5" description="" />
+              <set id="1239" title="Set 6" description="" />
             </collection>
           XML
-        
+
           document = Hpricot.XML(xml).at('collection')
           @collection = Collection.new(document)
         end
@@ -73,25 +73,25 @@ module Fleakr::Objects
         should "not have any associated collections" do
           @collection.collections.should == []
         end
-        
+
         should "have associated sets" do
           set_titles = @collection.sets.map {|s| s.title }
           set_titles.should == ['Set 5', 'Set 6']
         end
-        
+
       end
-      
+
       context "in general" do
         setup do
           @collection = Collection.new
           @time       = Time.parse('2008-08-01 00:00:00')
         end
-        
+
         should "have a value for :created_at" do
           @collection.expects(:created).with().returns("#{@time.to_i}")
           @collection.created_at.to_s.should == @time.to_s
         end
-        
+
       end
     end