fleakr 0.6.3 → 0.7.0

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

@@ -1,98 +1,99 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.expand_path('../../../../test_helper', __FILE__)
 
 module Fleakr::Objects
   class TagTest < Test::Unit::TestCase
 
     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'      
+
+      should_find_all :tags, :by => :photo_id, :call => 'tags.getListPhoto', :path => 'rsp/photo/tags/tag', :class => Tag
+      should_find_all :tags, :by => :user_id, :call => 'tags.getListUser', :path => 'rsp/who/tags/tag', :class => Tag
+
     end
-    
+
     context "An instance of the Tag class" do
-      
+
       setup { @tag = Tag.new }
-      
+
       context "when populating from the tags_getListPhoto XML data" do
         setup do
           @object = Tag.new(Hpricot.XML(read_fixture('tags.getListPhoto')).at('rsp/photo/tags/tag'))
         end
-        
+
         should_have_a_value_for :id           => '1'
         should_have_a_value_for :author_id    => '15498419@N05'
         should_have_a_value_for :value        => 'stu72'
         should_have_a_value_for :raw          => 'stu 72'
         should_have_a_value_for :machine_flag => '0'
-        
+
       end
-      
+
       should "have an author" do
         user = stub()
-        
+
         @tag.expects(:author_id).at_least_once.with().returns('1')
-        
-        
+
+
         User.expects(:find_by_id).with('1').returns(user)
-        
+
         @tag.author.should == user
       end
-      
+
       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())
-        
+
         2.times { @tag.author }
       end
-      
+
       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
-      
+
       should "have related tags" do
         @tag.expects(:value).with().returns('foo')
-        
+
         response = mock_request_cycle :for => 'tags.getRelated', :with => {:tag => 'foo'}
 
         stubs = []
         elements = (response.body/'rsp/tags/tag').map
-        
+
         elements.each do |element|
           stub = stub()
           stubs << stub
 
           Tag.expects(:new).with(element).returns(stub)
         end
-        
+
         @tag.related.should == stubs
       end
-      
+
       should "memoize the data for related tags" do
         @tag.expects(:value).with().returns('foo')
-        
+
         mock_request_cycle :for => 'tags.getRelated', :with => {:tag => 'foo'}
-        
+
         2.times { @tag.related }
       end
-      
+
       should "be able to generate a string representation of itself" do
         @tag.expects(:value).with().returns('foo')
         @tag.to_s.should == 'foo'
       end
-      
+
       should "know that it is not a machine tag" do
         @tag.expects(:machine_flag).with().returns('0')
         @tag.machine?.should be(false)
       end
-      
+
       should "know that it is a machine tag" do
         @tag.expects(:machine_flag).with().returns('1')
         @tag.machine?.should be(true)
       end
-      
+
     end
-    
+
   end
 end

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

@@ -0,0 +1,185 @@
+require File.expand_path('../../../../test_helper', __FILE__)
+
+module Fleakr::Objects
+  class UrlTest < Test::Unit::TestCase
+
+    context "An instance of the Url class" do
+
+      should "know that it's not a shortened URL" do
+        u = Url.new('http://flickr.com/photos/reagent/4041660453/')
+        u.shortened?.should be(false)
+      end
+
+      should "know that it's a shortened URL" do
+        u = Url.new('http://flic.kr/p/7a9yQV')
+        u.shortened?.should be(true)
+      end
+
+      should "know the path for a shortened URL" do
+        url = 'http://flic.kr/p/7a9yQV'
+
+        Fleakr::Support::UrlExpander.stubs(:expand).with(url).returns('/expanded/path')
+
+        u = Url.new(url)
+        u.path.should == '/expanded/path'
+      end
+
+      should "now the path for a normal URL" do
+        u = Url.new('http://www.flickr.com/photos/reagent/4041660453/')
+        u.path.should == '/photos/reagent/4041660453/'
+      end
+
+      should "know the path when there is no hostname" do
+        u = Url.new('http://flickr.com/photos/reagent/4041660453/')
+        u.path.should == '/photos/reagent/4041660453/'
+      end
+
+      should "be able to retrieve a user" do
+        u = Url.new('')
+        u.stubs(:user_identifier).with().returns('reagent')
+
+        User.expects(:find_by_identifier).with('reagent').returns('user')
+
+        u.user.should == 'user'
+      end
+
+      should "memoize the user" do
+        u = Url.new('')
+        u.stubs(:user_identifier).with().returns('reagent')
+
+        User.expects(:find_by_identifier).with('reagent').once.returns('user')
+
+        2.times { u.user }
+      end
+
+      context "when provided a single photo URL" do
+        subject { Url.new('http://flickr.com/photos/reagent/4041660453/') }
+
+        should "know that it's retrieving a photo resource" do
+          subject.resource_type.should == Photo
+        end
+
+        should "know the :user_identifier" do
+          subject.user_identifier.should == 'reagent'
+        end
+
+        should "know the :resource_identifier" do
+          subject.resource_identifier.should == '4041660453'
+        end
+
+        should "know that it's not retrieving a collection of resources" do
+          subject.collection?.should be(false)
+        end
+
+        should "return the resource" do
+          Fleakr::Objects::Photo.expects(:find_by_id).with('4041660453').returns('photo')
+          subject.resource.should == 'photo'
+        end
+      end
+
+      context "when provided with a photoset URL" do
+        subject { @subject ||= Url.new('http://www.flickr.com/photos/reagent/') }
+
+        should "know that it's retrieving a Photo resource" do
+          subject.resource_type.should == Photo
+        end
+
+        should "know the :user_identifier" do
+          subject.user_identifier.should == 'reagent'
+        end
+
+        should "not have a :resource_identifier" do
+          subject.resource_identifier.should be_nil
+        end
+
+        should "know that it's retrieving a collection of resources" do
+          subject.collection?.should be(true)
+        end
+
+        should "return the resource" do
+          subject.stubs(:user).with().returns(stub(:id => '1'))
+
+          Fleakr::Objects::Photo.expects(:find_all_by_user_id).with('1').returns('photos')
+          subject.resource.should == 'photos'
+        end
+
+      end
+
+      context "when provided with a profile URL" do
+        subject { @subject ||= Url.new('http://www.flickr.com/people/reagent/') }
+
+        should "know that it's retrieving a user resource" do
+          subject.resource_type.should == User
+        end
+
+        should "know the :user_identifier" do
+          subject.user_identifier.should == 'reagent'
+        end
+
+        should "not have a :resource_identifier" do
+          subject.resource_identifier.should be_nil
+        end
+
+        should "return the resource" do
+          subject.expects(:user).with().returns('user')
+          subject.resource.should == 'user'
+        end
+      end
+
+      context "when provided a profile URL with a user ID" do
+        subject { Url.new('http://www.flickr.com/people/43955217@N05/') }
+
+        should "know the :user_identifier" do
+          subject.user_identifier.should == '43955217@N05'
+        end
+
+      end
+
+      context "when provided with a single set URL" do
+        subject { Url.new('http://www.flickr.com/photos/reagent/sets/72157622660138146/') }
+
+        should "know that it's retrieving a set resource" do
+          subject.resource_type.should == Set
+        end
+
+        should "know the :user_identifier" do
+          subject.user_identifier.should == 'reagent'
+        end
+
+        should "know the :resource_identifier" do
+          subject.resource_identifier.should == '72157622660138146'
+        end
+
+        should "return the resource" do
+          Fleakr::Objects::Set.expects(:find_by_id).with('72157622660138146').returns('set')
+          subject.resource.should == 'set'
+        end
+      end
+
+      context "when provided a set listing URL" do
+        subject { @subject ||= Url.new('http://www.flickr.com/photos/reagent/sets/') }
+
+        should "know that it's retrieving a set resource" do
+          subject.resource_type.should == Set
+        end
+
+        should "know the :user_identifier" do
+          subject.user_identifier.should == 'reagent'
+        end
+
+        should "not have a :resource_identifier" do
+          subject.resource_identifier.should be_nil
+        end
+
+        should "return the resource" do
+          subject.stubs(:user).with().returns(stub(:id => '1'))
+
+          Fleakr::Objects::Set.expects(:find_all_by_user_id).with('1').returns('sets')
+          subject.resource.should == 'sets'
+        end
+      end
+
+    end
+
+  end
+end

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

@@ -1,21 +1,48 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.expand_path('../../../../test_helper', __FILE__)
 
 module Fleakr::Objects
   class UserTest < Test::Unit::TestCase
 
     should_search_by :user_id
 
-    should_have_many :photos, :groups, :sets, :contacts, :tags, :collections
-    
+    should_have_many :photos, :class => Photo
+    should_have_many :groups, :class => Group
+    should_have_many :sets, :class => Set
+    should_have_many :contacts, :class => Contact
+    should_have_many :tags, :class => Tag
+    should_have_many :collections, :class => Collection
+
     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
 
     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'
-      should_find_one :user, :by => :id, :with => :user_id, :call => 'people.getInfo', :path => 'rsp/person'
-      should_find_one :user, :by => :url, :call => 'urls.lookupUser', :path => 'rsp/user'
+      should_find_one :user, :by => :username, :call => 'people.findByUsername', :path => 'rsp/user', :class => User
+      should_find_one :user, :by => :email, :with => :find_email, :call => 'people.findByEmail', :path => 'rsp/user', :class => User
+      should_find_one :user, :by => :id, :with => :user_id, :call => 'people.getInfo', :path => 'rsp/person', :class => User
+      should_find_one :user, :by => :url, :call => 'urls.lookupUser', :path => 'rsp/user', :class => User
+
+      should "recognize a string as not being a Flickr user ID" do
+        User.user_id?('reagent').should be(false)
+      end
+
+      should "recognize a string as being a Flickr user ID" do
+        User.user_id?('43955217@N05').should be(true)
+      end
+
+      should "be able to find a user by ID when supplied with an identifier" do
+        id = '43955217@N05'
+        User.expects(:find_by_id).with(id).returns('user')
+
+        User.find_by_identifier(id).should == 'user'
+      end
+
+      should "be able to find a user by username when supplied with an identifier" do
+        username = 'reagent'
+        User.expects(:find_by_username).with(username).returns('user')
+
+        User.find_by_identifier(username).should == 'user'
+      end
 
     end
 
@@ -37,18 +64,18 @@ module Fleakr::Objects
         should_have_a_value_for :icon_farm    => '1'
         should_have_a_value_for :pro          => '1'
         should_have_a_value_for :admin        => '0'
-        
+
       end
-      
+
       context "when populating an object from the urls.lookupUser API call" do
         setup do
           document = Hpricot.XML(read_fixture('urls.lookupUser'))
           @object = User.new(document)
         end
-        
+
         should_have_a_value_for :id       => '123456'
         should_have_a_value_for :username => 'frootpantz'
-        
+
       end
 
       context "in general" do
@@ -79,23 +106,23 @@ module Fleakr::Objects
           @user.stubs(:icon_server).with().returns(nil)
           @user.icon_url.should == 'http://www.flickr.com/images/buddyicon.jpg'
         end
-        
+
         should "return a boolean value for :pro?" do
           @user.stubs(:pro).with().returns('0')
           @user.pro?.should be(false)
-          
+
           @user.stubs(:pro).with().returns('1')
           @user.pro?.should be(true)
         end
-        
+
         should "return a boolean value for :admin?" do
           @user.stubs(:admin).with().returns('0')
           @user.admin?.should be(false)
-          
+
           @user.stubs(:admin).with().returns('1')
           @user.admin?.should be(true)
         end
-        
+
       end
     end
 

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

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.expand_path('../../../../test_helper', __FILE__)
 
 module Fleakr::Support
   class AttributeTest < Test::Unit::TestCase
@@ -13,7 +13,7 @@ module Fleakr::Support
         attr = Attribute.new(:foo)
         attr.sources.should == ['foo']
       end
-      
+
       should "be able to assign multiple sources" do
         attr = Attribute.new(:foo, ['foo1', 'foo2'])
         attr.sources.should == ['foo1', 'foo2']
@@ -23,32 +23,32 @@ module Fleakr::Support
         attr = Attribute.new('foo')
         attr.location('foo').should == 'foo'
       end
-      
+
       should "return the location when splitting" do
         attr = Attribute.new('foo')
         attr.split('foo').should == ['foo', nil]
       end
-      
+
       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
-      
+
       should "allow the setting of the location information" do
         attr = Attribute.new('foo', 'bar')
         attr.sources.should == ['bar']
       end
-      
+
       should "allow the setting of the attribute value" do
         attr = Attribute.new('foo')
         attr.attribute('@bogon').should == 'bogon'
       end
-      
+
       should "use the location as the attribute" do
         attr = Attribute.new('foo')
         attr.attribute('foo').should == 'foo'
       end
-      
+
       should "use the attribute for the attribute if specified" do
         attr = Attribute.new(:id, '@nsid')
         attr.attribute('@nsid').should == 'nsid'
@@ -57,15 +57,15 @@ module Fleakr::Support
       should "be able to retrieve the node from the path" do
         document = Hpricot.XML('<name>Bassdrive</name>')
         expected = document.at('name')
-        
+
         attr = Attribute.new(:name)
         attr.node_for(document, 'name').should == expected
       end
-      
+
       should "be able to retrieve the node that contains the specified attribute" do
         document = Hpricot.XML('<user id="1337" />')
         expected = document.at('user')
-        
+
         attr = Attribute.new(:id)
         attr.node_for(document, '@id').should == expected
       end
@@ -73,11 +73,11 @@ module Fleakr::Support
       should "be able to retrieve the node for the specified attribute" do
         document = Hpricot.XML('<user nsid="1337" />')
         expected = document.at('user')
-        
+
         attr = Attribute.new(:id, '@nsid')
         attr.node_for(document, '@nsid').should == expected
       end
-      
+
       should "be able to pull simple values from an XML document" do
         document = Hpricot.XML('<name>Bassdrive</name>')
         attr = Attribute.new(:name)
@@ -89,7 +89,7 @@ module Fleakr::Support
         attr = Attribute.new(:id)
         attr.value_from(document).should == '1337'
       end
-        
+
       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')
@@ -101,7 +101,7 @@ module Fleakr::Support
         attr = Attribute.new(:slug, 'station/genre@slug')
         attr.value_from(document).should == 'dnb'
       end
-        
+
       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)