fleakr 0.5.1 → 0.5.2

data/README.rdoc

@@ -44,10 +44,15 @@ user by his username:
     >> user = Fleakr.user('the decapitator')
     => #<Fleakr::Objects::User:0x692648 @username="the decapitator", @id="21775151@N06">
 
-Or by email:
+By email:
 
     >> user = Fleakr.user('user@host.com')
     => #<Fleakr::Objects::User:0x11f484c @username="bckspcr", @id="84481630@N00">
+    
+Or even by URL:
+
+    >> user = Fleakr.user('http://www.flickr.com/photos/the_decapitator/')
+    => #<Fleakr::Objects::User:0x113440c @username="the decapitator", @id="21775151@N06">
 
 Once you have a user, you can find his associated sets:
 
@@ -201,6 +206,26 @@ All comments have additional information:
 
 See Fleakr::Objects::Comment for more information.
 
+=== Collections
+
+An individual can have zero or more collections associated with his account.  These collections,
+in turn, can have either collections or sets associated with them. For example:
+
+    >> user = Fleakr.user('username')
+    >> user.collections.length
+    => 1
+    >> user.collections.first.title
+    => "The Year in Pictures"
+    >> user.collections.first.collections.length
+    => 2
+    >> user.collections.first.collections.first.sets.length
+    => 3
+    >> user.collections.first.collections.first.sets.first.title
+    => "A Trip to Yosemite"
+
+Note that collections are limited to Flickr pro members. See Fleakr::Objects::Collection for more 
+information.
+
 === Saving Images
 
 If a photo interests you, save it down to a directory of your choosing:
@@ -327,29 +352,40 @@ just the requests you need to tune the log level:
 Even if something doesn't go wrong, this is a good way to get a sense for when you're making
 API requests.
 
+== Contributing
+
+If there is a feature that you would like to contribute, I gladly accept pull requests.  There 
+are a few things that make my life easier when integrating your changes:
+
+* Verify that all tests are passing (run `rake` from the project root)
+* Keep your commits small, focused, and tested - this allows me to apply changes cleanly
+* Leave the Rakefile and version information intact - if you really want to make changes, 
+  please do so in a separate commit.
+
+Once your changes are applied, I will add you to the list of contributors.
+
 == Contributors
 
 While Fleakr started as a labor of love for me, I'm glad that others have been interested
 in this project enough to contribute their ideas and code:
 
+* {Mark Dickson}[http://github.com/ideaoforder]
 * {John Guenin}[http://github.com/johng]
 * {Thomas Olausson}[http://github.com/latompa]
+* {Robert Sköld}[http://github.com/slaskis]
 
 Thanks!
 
 == Roadmap / TODO
 
-=== 0.4.x
-
-* Implement remaining bits of person and photo-related API calls (read-only)
-
 === 0.5.x
 
-* Implement asynchronous file upload / replacement w/ ticket checking
+* Implement remaining bits of person and photo-related API calls (read-only)
 * Provide a better searching interface with ruby-like option syntax
 
 === Future
 
+* Implement asynchronous file upload / replacement w/ ticket checking
 * Implement save-able search results (e.g. Fleakr.search('ponies').save_to('/path', :medium))
 * Implement deeper associations for core elements (e.g. tags / etc..)
 * Implement write methods for photos & photosets

data/Rakefile

@@ -49,7 +49,7 @@ rescue LoadError
 end
 
 desc 'Generate the gemspec to serve this Gem from Github'
-task :github do
+task :gemspec do
   file = File.dirname(__FILE__) + "/#{spec.name}.gemspec"
   File.open(file, 'w') {|f| f << spec.to_ruby }
   puts "Created gemspec: #{file}"

data/lib/fleakr.rb

@@ -88,18 +88,22 @@ module Fleakr
   mattr_accessor :api_key, :shared_secret, :mini_token, :auth_token, :frob
 
   # Find a user based on some unique user data.  This method will try to find
-  # the user based on username and will fall back to email if that fails.  Example:
+  # the user based on several methods, starting with username and falling back to email and URL
+  # sequentially if these methods fail. Example:
   #
   #  Fleakr.api_key = 'ABC123'
-  #  Fleakr.user('the decapitator') # => #<Fleakr::Objects::User:0x692648 @username="the decapitator", @id="21775151@N06">
-  #  Fleakr.user('user@host.com')   # => #<Fleakr::Objects::User:0x11f484c @username="bckspcr", @id="84481630@N00">
+  #  Fleakr.user('the decapitator')
+  #  Fleakr.user('user@host.com')
+  #  Fleakr.user('http://www.flickr.com/photos/the_decapitator/')
   #
   def self.user(user_data)
-    begin
-      Objects::User.find_by_username(user_data)
-    rescue ApiError
-      Objects::User.find_by_email(user_data)
+    user = nil
+    [:username, :email, :url].each do |attribute|
+      if user.nil?
+        user = Objects::User.send("find_by_#{attribute}", user_data) rescue nil
+      end
     end
+    user
   end
   
   # Search all photos on the Flickr site.  By default, this searches based on text, but you can pass

data/lib/fleakr/objects.rb

@@ -1,4 +1,5 @@
 require 'fleakr/objects/authentication_token'
+require 'fleakr/objects/collection'
 require 'fleakr/objects/contact'
 require 'fleakr/objects/error'
 require 'fleakr/objects/group'

data/lib/fleakr/objects/collection.rb

@@ -0,0 +1,57 @@
+module Fleakr
+  module Objects # :nodoc:
+    
+    # = Collection
+    #
+    # == Attributes
+    # 
+    # [id] The ID for this collection
+    # [title] The title of this collection
+    # [description] The description of this collection
+    # [small_icon_url] The URL for the small icon that represents this collection
+    # [large_icon_url] The URL for the large icon that represents this collection
+    # 
+    class Collection
+
+      include Fleakr::Support::Object
+
+      flickr_attribute :id, :title, :description
+      flickr_attribute :created, :from => '@datecreate'
+      flickr_attribute :small_icon_url, :from => '@iconsmall'
+      flickr_attribute :large_icon_url, :from => '@iconlarge'
+
+      find_one :by_id, :call => 'collections.getInfo', :path => 'collection'
+      find_all :by_user_id, :call => 'collections.getTree', :path => 'collections/collection'
+
+      # When was this collection created?
+      #
+      def created_at
+        Time.at(created.to_i)
+      end
+      
+      # The sets associated with this collection
+      #
+      def sets
+        sibling_nodes_for('set').map {|n| Set.new(n) }
+      end
+      
+      # The collections associated with this collection
+      #
+      def collections
+        sibling_nodes_for('collection').map {|n| Collection.new(n) }
+      end
+      
+      private
+      def sibling_nodes_for(node) # :nodoc:
+        nodes    = []
+        selector = "/collection/#{node}"
+
+        document = Hpricot.XML(self.document.to_s)
+        document.search(selector) {|e| nodes << e }
+        
+        nodes
+      end
+      
+    end
+  end
+end

data/lib/fleakr/objects/search.rb

@@ -2,9 +2,21 @@ module Fleakr
   module Objects # :nodoc:
     class Search
 
+      # attr_reader :search_options
+
       # Create a new search
-      def initialize(search_options)
-        @search_options = search_options
+      def initialize(*parameters)
+        @parameters = Hash.new
+        parameters.each {|param| add_parameter(param) }
+      end
+
+      def add_parameter(parameter)
+        value = parameter.is_a?(String) ? {:text => parameter} : parameter
+        @parameters.merge!(value)
+      end
+
+      def tags
+        Array(@parameters[:tags])
       end
 
       # Retrieve search results from the API
@@ -17,12 +29,12 @@ module Fleakr
 
       private
       def tag_list
-        Array(@search_options[:tags]).join(',')
+        tags.join(',')
       end
 
       def parameters
-        @search_options.merge!(:tags => tag_list) if tag_list.length > 0
-        @search_options
+        @parameters.merge!(:tags => tag_list) if tags.any?
+        @parameters
       end
 
     end

data/lib/fleakr/objects/set.rb

@@ -22,6 +22,7 @@ module Fleakr
       has_many :photos, :comments
 
       flickr_attribute :id, :title, :description
+      flickr_attribute :primary_photo_id, :from => '@primary'
       flickr_attribute :count, :from => '@photos'
 
       find_all :by_user_id, :call => 'photosets.getList', :path => 'photosets/photoset'
@@ -45,6 +46,10 @@ module Fleakr
         sprintf("%0#{self.count.length}d_", (index + 1))
       end
 
+      def primary_photo
+        @primary_photo ||= Photo.find_by_id(primary_photo_id)
+      end
+      
     end
   end
 end

data/lib/fleakr/objects/user.rb

@@ -29,6 +29,7 @@ module Fleakr
     # [photos] A list of this user's public photos (newest first).  See Fleakr::Objects::Photo.
     # [contacts] A list of this user's contacts - these are simply User objects
     # [tags] The tags associated with this user
+    # [collections] The top-level collections that this user has created. See Fleakr::Objects::Collection.
     #
     # == Examples
     #
@@ -44,7 +45,7 @@ module Fleakr
 
       include Fleakr::Support::Object
 
-      flickr_attribute :id, :from => 'user@nsid'
+      flickr_attribute :id, :from => ['user@id', 'user@nsid']
       flickr_attribute :username, :location
       flickr_attribute :name, :from => 'person/realname'
       flickr_attribute :photos_url, :from => 'person/photosurl'
@@ -55,11 +56,12 @@ module Fleakr
       flickr_attribute :pro, :from => 'person@ispro'
       flickr_attribute :admin, :from => 'person@isadmin'
 
-      has_many :sets, :groups, :photos, :contacts, :tags
+      has_many :sets, :groups, :photos, :contacts, :tags, :collections
 
       find_one :by_username, :call => 'people.findByUsername'
       find_one :by_email, :using => :find_email, :call => 'people.findByEmail'
       find_one :by_id, :using => :user_id, :call => 'people.getInfo'
+      find_one :by_url, :call => 'urls.lookupUser'
 
       lazily_load :name, :photos_url, :profile_url, :photos_count, :location, :with => :load_info
       lazily_load :icon_server, :icon_farm, :pro, :admin, :with => :load_info

data/lib/fleakr/support/object.rb

@@ -63,8 +63,9 @@ module Fleakr
           key = "#{self.name.demodulize.underscore.downcase}_id".to_sym
 
           class_eval <<-CODE
-            def search(search_text)
-              Fleakr::Objects::Search.new(:text => search_text, :#{key} => self.id).results
+            def search(*parameters)
+              parameters << {:#{key} => self.id}
+              Fleakr::Objects::Search.new(*parameters).results
             end
           CODE
         end
@@ -87,11 +88,14 @@ module Fleakr
     
       module InstanceMethods
       
+        attr_reader :document
+      
         def initialize(document = nil)
           self.populate_from(document) unless document.nil?
         end
       
         def populate_from(document)
+          @document = document
           self.class.attributes.each do |attribute|
             value = attribute.value_from(document)
             self.send("#{attribute.name}=".to_sym, value) unless value.nil?

data/lib/fleakr/version.rb

@@ -3,7 +3,7 @@ module Fleakr
     
     MAJOR = 0
     MINOR = 5
-    TINY  = 1
+    TINY  = 2
     
     def self.to_s
       [MAJOR, MINOR, TINY].join('.')

data/test/fixtures/collections.getInfo.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rsp stat="ok">
+<collection id="34762917-72157619347181335" child_count="5" datecreate="1244460707" iconlarge="http://farm4.static.flickr.com/3603/cols/72157619347181335_30d89a2682_l.jpg" iconsmall="http://farm4.static.flickr.com/3603/cols/72157619347181335_30d89a2682_s.jpg" server="3603" secret="30d89a2682">
+	<title>Work</title>
+	<description>Sample Collection</description>
+	<iconphotos>
+		<photo id="3509228143" owner="34808239@N06" secret="2ed3119372" server="3637" farm="4" title="" ispublic="1" isfriend="0" isfamily="0" />
+		<photo id="3509261341" owner="34808239@N06" secret="43a07ee13c" server="3638" farm="4" title="Saab 9X Air" ispublic="1" isfriend="0" isfamily="0" />
+		<photo id="3488255219" owner="34808239@N06" secret="b94e2c39c1" server="3624" farm="4" title="" ispublic="1" isfriend="0" isfamily="0" />
+		<photo id="3488219705" owner="34808239@N06" secret="d26642a09b" server="3560" farm="4" title="stellaUK_1" ispublic="1" isfriend="0" isfamily="0" />
+		<photo id="3489034148" owner="34808239@N06" secret="89d6f94800" server="3577" farm="4" title="abba_kalles_3" ispublic="1" isfriend="0" isfamily="0" />
+		<photo id="3488220307" owner="34808239@N06" secret="a96a8acbb0" server="3578" farm="4" title="abba_kalles_1" ispublic="1" isfriend="0" isfamily="0" />
+		<photo id="3489034014" owner="34808239@N06" secret="d392cca5d6" server="3124" farm="4" title="abba_kalles_2" ispublic="1" isfriend="0" isfamily="0" />
+		<photo id="3489033670" owner="34808239@N06" secret="4f08e7368c" server="3547" farm="4" title="stellaUK_3" ispublic="1" isfriend="0" isfamily="0" />
+		<photo id="3488219913" owner="34808239@N06" secret="6bcdeb4bf6" server="3310" farm="4" title="stellaUK_2" ispublic="1" isfriend="0" isfamily="0" />
+		<photo id="3509261445" owner="34808239@N06" secret="595cc58f50" server="3313" farm="4" title="Saab 9X Air" ispublic="1" isfriend="0" isfamily="0" />
+		<photo id="3488255345" owner="34808239@N06" secret="de5f1b9133" server="3644" farm="4" title="" ispublic="1" isfriend="0" isfamily="0" />
+		<photo id="3509228095" owner="34808239@N06" secret="3b0a661db7" server="3392" farm="4" title="" ispublic="1" isfriend="0" isfamily="0" />
+	</iconphotos>
+</collection>
+</rsp>

data/test/fixtures/collections.getTree.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rsp stat="ok">
+<collections>
+	<collection id="123-456" title="Top-Level Collection 1" description="Description 1" iconlarge="http://farm4.static.flickr.com/3573/cols/72157617429277370_1691956f71_l.jpg" iconsmall="http://farm4.static.flickr.com/3573/cols/72157617429277370_1691956f71_s.jpg">
+	  <collection id="123-457" title="Second-Level Collection 1" description="Description 2" iconlarge="http://farm4.static.flickr.com/3573/cols/72157617429277370_1691956f71_l.jpg" iconsmall="http://farm4.static.flickr.com/3573/cols/72157617429277370_1691956f71_s.jpg">	  
+  		<collection id="123-789" title="Third-Level Collection 1" description="Description 3" iconlarge="http://farm4.static.flickr.com/3603/cols/72157619347181335_30d89a2682_l.jpg" iconsmall="http://farm4.static.flickr.com/3603/cols/72157619347181335_30d89a2682_s.jpg">
+  			<set id="1234" title="Set 1" description="" />
+  			<set id="1235" title="Set 2" description="" />
+  		</collection>
+  		<collection id="123-101" title="Third-Level Collection 2" description="Description 4" iconlarge="http://farm4.static.flickr.com/3603/cols/72157619347181335_30d89a2682_l.jpg" iconsmall="http://farm4.static.flickr.com/3603/cols/72157619347181335_30d89a2682_s.jpg">
+  			<set id="1236" title="Set 3" description="" />
+  			<set id="1237" title="Set 4" description="" />
+  		</collection>
+		</collection>
+	</collection>
+  <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>
+</collections>
+</rsp>

data/test/fixtures/urls.lookupUser.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rsp stat="ok">
+<user id="123456">
+	<username>frootpantz</username>
+</user>
+</rsp>

data/test/test_helper.rb

@@ -39,7 +39,7 @@ class Test::Unit::TestCase
       instance = klass.new
       instance.stubs(:id).with().returns('1')
       
-      Fleakr::Objects::Search.expects(:new).with(:text => 'foo', key => '1').returns(search)
+      Fleakr::Objects::Search.expects(:new).with('foo', key => '1').returns(search)
       
       instance.search('foo').should == photos
     end

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

@@ -0,0 +1,99 @@
+require File.dirname(__FILE__) + '/../../../test_helper'
+
+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'
+      
+    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'
+        should_have_a_value_for :large_icon_url => 'http://farm4.static.flickr.com/3603/cols/72157619347181335_30d89a2682_l.jpg'
+        should_have_a_value_for :small_icon_url => 'http://farm4.static.flickr.com/3603/cols/72157619347181335_30d89a2682_s.jpg'
+        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>
+          XML
+        
+          document = Hpricot.XML(xml).at('collection')
+          @collection = Collection.new(document)
+        end
+
+        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
+
+  end
+end

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

@@ -5,6 +5,16 @@ module Fleakr::Objects
     
     context "An instance of the Search class" do
 
+      should "have a list of tags" do
+        search = Search.new(:tags => %w(a b c))
+        search.tags.should == %w(a b c)
+      end
+      
+      should "have convert tags into an array" do
+        search = Search.new(:tags => 'a')
+        search.tags.should == ['a']
+      end
+
       should "be able to generate a list of tags from a single-valued parameter" do
         search = Search.new(:tags => 'foo')
         search.send(:tag_list).should == 'foo'
@@ -35,6 +45,16 @@ module Fleakr::Objects
         search.send(:parameters).should == {:text => 'foo'}
       end
       
+      should "convert a single string parameter into a text search" do
+        search = Search.new('term')
+        search.send(:parameters).should == {:text => 'term'}
+      end
+      
+      should "be able to handle a combination of text and options" do
+        search = Search.new('term', :tags => %w(a b))
+        search.send(:parameters).should == {:text => 'term', :tags => 'a,b'}
+      end
+      
       should "be able to search photos based on text" do
         response = mock_request_cycle :for => 'photos.search', :with => {:text => 'foo'}
         search = Search.new(:text => 'foo')

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

@@ -18,13 +18,38 @@ module Fleakr::Objects
           @object = Set.new(Hpricot.XML(read_fixture('photosets.getList')).at('rsp/photosets/photoset'))
         end
         
-        should_have_a_value_for :id          => '72157609490909659'
-        should_have_a_value_for :title       => 'Second Set'
-        should_have_a_value_for :description => 'This is the second set.'
-        should_have_a_value_for :count       => '138'
+        should_have_a_value_for :id               => '72157609490909659'
+        should_have_a_value_for :title            => 'Second Set'
+        should_have_a_value_for :description      => 'This is the second set.'
+        should_have_a_value_for :count            => '138'
+        should_have_a_value_for :primary_photo_id => '3044180117'
         
       end
       
+      should "know the primary photo in the set" do
+        id    = '1'
+        photo = stub()
+        
+        Photo.expects(:find_by_id).with(id).returns(photo)
+        
+        set = Set.new
+        set.stubs(:primary_photo_id).with().returns(id)
+        
+        set.primary_photo.should == photo
+      end
+      
+      should "memoize the primary photo" do
+        id    = '1'
+        photo = stub()
+        
+        Photo.expects(:find_by_id).with(id).once.returns(photo)
+        
+        set = Set.new
+        set.stubs(:primary_photo_id).with().returns(id)
+        
+        2.times { set.primary_photo }
+      end
+      
       context "when saving the set" do
         setup do
           @tmp_dir = create_temp_directory

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

@@ -5,7 +5,7 @@ module Fleakr::Objects
 
     should_search_by :user_id
 
-    should_have_many :photos, :groups, :sets, :contacts, :tags
+    should_have_many :photos, :groups, :sets, :contacts, :tags, :collections
     
     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
@@ -15,6 +15,7 @@ module Fleakr::Objects
       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'
 
     end
 
@@ -38,6 +39,17 @@ module Fleakr::Objects
         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
 

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

@@ -72,8 +72,10 @@ module Fleakr
             <category>Category</category>
           XML
 
+          @document = Hpricot.XML(xml)
+
           @object = FlickrObject.new
-          @object.populate_from(Hpricot.XML(xml))
+          @object.populate_from(@document)
         end
         
         should "have the correct value for :name" do
@@ -102,6 +104,10 @@ module Fleakr
         should "have the correct value for :category" do
           @object.category.should == 'Category'
         end
+        
+        should "maintain a reference to the original document" do
+          @object.document.should == @document
+        end
       end
       
       should "populate its data from an XML document when initializing" do

data/test/unit/fleakr_test.rb

@@ -29,6 +29,27 @@ class FleakrTest < Test::Unit::TestCase
       Fleakr.user(email).should == user
     end
     
+    should "fall back to finding a user by URL if username and email both fail" do
+      user = stub()
+      url = 'http://flickr.com/photos/user'
+      
+      Fleakr::Objects::User.stubs(:find_by_username).with(url).raises(Fleakr::ApiError)
+      Fleakr::Objects::User.stubs(:find_by_email).with(url).raises(Fleakr::ApiError)
+      Fleakr::Objects::User.expects(:find_by_url).with(url).returns(user)
+            
+      Fleakr.user(url).should == user
+    end
+
+    should "not return nil if a user cannot be found" do
+      data = 'data'
+      
+      Fleakr::Objects::User.stubs(:find_by_username).with(data).raises(Fleakr::ApiError)
+      Fleakr::Objects::User.stubs(:find_by_email).with(data).raises(Fleakr::ApiError)
+      Fleakr::Objects::User.stubs(:find_by_url).with(data).raises(Fleakr::ApiError)
+            
+      Fleakr.user(data).should be_nil
+    end
+    
     should "find all contacts for the authenticated user" do
       Fleakr::Objects::Contact.expects(:find_all).with({}).returns('contacts')
       Fleakr.contacts.should == 'contacts'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fleakr
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Patrick Reagan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-21 00:00:00 -04:00
+date: 2009-10-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,6 +67,7 @@ files:
 - lib/fleakr/core_ext/true_class.rb
 - lib/fleakr/core_ext.rb
 - lib/fleakr/objects/authentication_token.rb
+- lib/fleakr/objects/collection.rb
 - lib/fleakr/objects/comment.rb
 - lib/fleakr/objects/contact.rb
 - lib/fleakr/objects/error.rb
@@ -87,6 +88,8 @@ files:
 - test/fixtures/auth.checkToken.xml
 - test/fixtures/auth.getFullToken.xml
 - test/fixtures/auth.getToken.xml
+- test/fixtures/collections.getInfo.xml
+- test/fixtures/collections.getTree.xml
 - test/fixtures/contacts.getList.xml
 - test/fixtures/contacts.getPublicList.xml
 - test/fixtures/groups.pools.getPhotos.xml
@@ -106,6 +109,7 @@ files:
 - test/fixtures/tags.getListPhoto.xml
 - test/fixtures/tags.getListUser.xml
 - test/fixtures/tags.getRelated.xml
+- test/fixtures/urls.lookupUser.xml
 - test/test_helper.rb
 - test/unit/fleakr/api/file_parameter_test.rb
 - test/unit/fleakr/api/method_request_test.rb
@@ -119,6 +123,7 @@ files:
 - test/unit/fleakr/core_ext/hash_test.rb
 - test/unit/fleakr/core_ext/true_class_test.rb
 - test/unit/fleakr/objects/authentication_token_test.rb
+- test/unit/fleakr/objects/collection_test.rb
 - test/unit/fleakr/objects/comment_test.rb
 - test/unit/fleakr/objects/contact_test.rb
 - test/unit/fleakr/objects/error_test.rb