reagent-fleakr 0.1.3 → 0.2.0

data/README.markdown

@@ -30,13 +30,18 @@ Find a user by username:
     >> user = Fleakr::User.find_by_username('the decapitator')
     => #<Fleakr::User:0x692648 @username="the decapitator", @id="21775151@N06">
 
-And that user's associated sets:
+Or by email:
+
+    >> user = Fleakr::User.find_by_email('user@host.com')
+    => #<Fleakr::User:0x11f484c @username="bckspcr", @id="84481630@N00">
+
+Once you have a user, you can find his associated sets:
 
     >> user.sets
     => [#<Fleakr::Set:0x671358 @title="The Decapitator", @description="">, 
         #<Fleakr::Set:0x66d898 @title="londonpaper hijack", ...
 
-Or that user's groups:
+Or groups if you would like:
     
     >> user.groups
     => [#<Fleakr::Group:0x11f2330 ..., 
@@ -46,7 +51,7 @@ Or that user's groups:
     >> user.groups.first.id
     => "14581414@N00"
 
-You can also grab photos for a particular set:
+When accessing a set, you can also grab all the photos that are in that set:
 
     >> user.sets.first
     => #<Fleakr::Set:0x1195bbc @title="The Decapitator", @id="72157603480986566", @description="">
@@ -54,16 +59,38 @@ You can also grab photos for a particular set:
     => #<Fleakr::Photo:0x1140108 ... >
     >> user.sets.first.photos.first.title
     => "Untitled1"
+    
+If a photo interests you, save it down to a directory of your choosing:
 
-If you would prefer to just search photos, you can do that by tag for now:
-
-  >> search = Fleakr::Search.new(:tags => %w(macro))
-  => [#<Fleakr::Photo:0x118bc70 @title="Demure", @id="3076049945">, 
-      #<Fleakr::Photo:0x118b7d4 @title="Bark fly on Bay leaf", @id="3076052409">, ...
-  >> search.results.first.title
-  => "Demure"
-  >> search.results.first.id
-  => "3076049945"
+    >> user.sets.first.photos.first.small.save_to('/tmp')
+    => #<File:/tmp/2117922283_715587b2cb_m.jpg (closed)>
+    
+If you can't decide on a photo and would rather just save the whole set, specify the target directory 
+and the size of the images you're interested in:
+
+    >> user.sets.first.save_to('/tmp', :square)
+    => [#<Fleakr::Photo:0x1187a1c @secret="715587b2cb" ...
+    >> Dir["/tmp/#{user.sets.first.title}/*.jpg"].map
+    => ["/tmp/The Decapitator/2117919621_8b2d601bff_s.jpg", 
+        "/tmp/The Decapitator/2117921045_5fb15eff90_s.jpg", 
+        "/tmp/The Decapitator/2117922283_715587b2cb_s.jpg", ...
+
+If you would prefer to just search photos, you can do that with search text:
+
+    >> search = Fleakr::Search.new('ponies!!')
+    >> search.results
+    => [#<Fleakr::Photo:0x11f4e64 @title="hiroshima atomic garden", @id="3078234390">, 
+        #<Fleakr::Photo:0x11f4928 @title="PONYLOV", @id="3077360853">, ...
+    >> search.results.first.title
+    => "hiroshima atomic garden"
+
+You can also search based on tags:
+
+    >> search = Fleakr::Search.new(nil, :tags => 'macro')
+    >> search.results.first.title
+    => "Demure"
+    >> search.results.first.id
+    => "3076049945"
 
 ## TODO
 

data/lib/fleakr.rb

@@ -14,4 +14,5 @@ require 'fleakr/error'
 require 'fleakr/set'
 require 'fleakr/user'
 require 'fleakr/group'
-require 'fleakr/search'
+require 'fleakr/search'
+require 'fleakr/image'

data/lib/fleakr/group.rb

@@ -8,9 +8,7 @@ module Fleakr
     
     def self.find_all_by_user_id(user_id)
       response = Request.with_response!('people.getPublicGroups', :user_id => user_id)
-      (response.body/'rsp/groups/group').map do |flickr_group|
-        Group.new(flickr_group)
-      end
+      (response.body/'rsp/groups/group').map {|g| Group.new(g) }
     end
     
   end

data/lib/fleakr/image.rb

@@ -0,0 +1,35 @@
+module Fleakr
+  class Image
+    
+    SUFFIXES = {
+      :square    => '_s.jpg',
+      :thumbnail => '_t.jpg',
+      :small     => '_m.jpg',
+      :medium    => '.jpg',
+      :large     => '_b.jpg',
+    }.freeze
+    
+    def self.suffix_for(size)
+      self::SUFFIXES[size]
+    end
+    
+    def initialize(base_url, size)
+      @base_url = base_url
+      @size = size
+    end
+    
+    def url
+      "#{@base_url}#{Image.suffix_for(@size)}"
+    end
+    
+    def filename
+      self.url.match(/([^\/]+)$/)[1]
+    end
+    
+    def save_to(target)
+      destination = File.directory?(target) ? "#{target}/#{self.filename}" : "#{target}"
+      File.open(destination, 'w') {|f| f << Net::HTTP.get(URI.parse(self.url)) }
+    end
+    
+  end
+end

data/lib/fleakr/object.rb

@@ -22,7 +22,8 @@ module Fleakr
       
       def populate_from(document)
         self.class.attributes.each do |attribute|
-          instance_variable_set("@#{attribute.name}".to_sym, attribute.value_from(document))
+          value = attribute.value_from(document)
+          instance_variable_set("@#{attribute.name}".to_sym, value) unless value.nil?
         end
       end
       

data/lib/fleakr/photo.rb

@@ -5,11 +5,27 @@ module Fleakr
     
     flickr_attribute :title, :attribute => 'title'
     flickr_attribute :id, :attribute => 'id'
+    flickr_attribute :farm_id, :attribute => 'farm'
+    flickr_attribute :server_id, :attribute => 'server'
+    flickr_attribute :secret, :attribute => 'secret'
     
     def self.find_all_by_photoset_id(photoset_id)
       response = Request.with_response!('photosets.getPhotos', :photoset_id => photoset_id)
-      (response.body/'rsp/photoset/photo').map do |photo_body|
-        Photo.new(photo_body)
+      (response.body/'rsp/photoset/photo').map {|p| Photo.new(p) }
+    end
+    
+    def self.find_all_by_user_id(user_id)
+      response = Request.with_response!('people.getPublicPhotos', :user_id => user_id)
+      (response.body/'rsp/photos/photo').map {|p| Photo.new(p) }
+    end
+    
+    def base_url
+      "http://farm#{self.farm_id}.static.flickr.com/#{self.server_id}/#{self.id}_#{self.secret}"
+    end
+
+    [:square, :thumbnail, :small, :medium, :large].each do |size|
+      define_method(size) do
+        Image.new(self.base_url, size)
       end
     end
     

data/lib/fleakr/search.rb

@@ -3,13 +3,25 @@ module Fleakr
 
     attr_reader :tags
 
-    def initialize(parameters)
-      @tags = parameters[:tags]
+    def initialize(text = nil, search_options = {})
+      @text = text
+      @search_options = search_options
+    end
+
+    def tag_list
+      Array(@search_options[:tags]).join(',')
+    end
+    
+    def parameters
+      parameters = {}
+      parameters.merge!(:text => @text) if @text
+      parameters.merge!(:tags => self.tag_list) if self.tag_list.length > 0
+      parameters
     end
 
     def results
       if @results.nil?
-        response = Request.with_response!('photos.search', :tags => self.tags.join(','))
+        response = Request.with_response!('photos.search', self.parameters)
         @results = (response.body/'rsp/photos/photo').map do |flickr_photo|
           Photo.new(flickr_photo)
         end

data/lib/fleakr/set.rb

@@ -9,15 +9,19 @@ module Fleakr
     
     def self.find_all_by_user_id(user_id)
       response = Request.with_response!('photosets.getList', :user_id => user_id)
-      
-      (response.body/'rsp/photosets/photoset').map do |flickr_set|
-        Set.new(flickr_set)
-      end
+      (response.body/'rsp/photosets/photoset').map {|s| Set.new(s) }
     end
     
     def photos
       @photos ||= Photo.find_all_by_photoset_id(self.id)
     end
     
+    def save_to(path, size)
+      target = "#{path}/#{self.title}"
+      FileUtils.mkdir(target) unless File.exist?(target)
+      
+      self.photos.each {|p| p.send(size).save_to(target) }
+    end
+    
   end
 end

data/lib/fleakr/user.rb

@@ -1,28 +1,55 @@
 module Fleakr
   class User
-    
+
     include Fleakr::Object
-    
+
     flickr_attribute :id, :xpath => 'rsp/user', :attribute => 'nsid'
     flickr_attribute :username, :xpath => 'rsp/user/username'
-    
+    flickr_attribute :photos_url, :xpath => 'rsp/person/photosurl'
+    flickr_attribute :profile_url, :xpath => 'rsp/person/profileurl'
+    flickr_attribute :photos_count, :xpath => 'rsp/person/photos/count'
+    flickr_attribute :icon_server, :xpath => 'rsp/person', :attribute => 'iconserver'
+    flickr_attribute :icon_farm, :xpath => 'rsp/person', :attribute => 'iconfarm'
+
+    def icon_farm_with_load
+      retrieve_additional_information
+      icon_farm_without_load
+    end
+
     def self.find_by_username(username)
       response = Request.with_response!('people.findByUsername', :username => username)
       User.new(response.body)
     end
-    
+
     def self.find_by_email(email)
       response = Request.with_response!('people.findByEmail', :find_email => email)
       User.new(response.body)
     end
-    
+
+    def load_info
+      response = Request.with_response!('people.getInfo', :user_id => self.id)
+      self.populate_from(response.body)
+    end
+
+    def icon_url
+      if self.icon_server.to_i > 0
+        "http://farm#{self.icon_farm}.static.flickr.com/#{self.icon_server}/buddyicons/#{self.id}.jpg"
+      else
+        'http://www.flickr.com/images/buddyicon.jpg'
+      end
+    end
+
     def sets
       @set ||= Set.find_all_by_user_id(self.id)
     end
-    
+
     def groups
       @groups ||= Group.find_all_by_user_id(self.id)
     end
     
+    def photos
+      @photos ||= Photo.find_all_by_user_id(self.id)
+    end
+
   end
 end

data/lib/fleakr/version.rb

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

data/test/fixtures/people.getInfo.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rsp stat="ok">
+  <person id="31066442@N69" nsid="31066442@N69" isadmin="0" ispro="1" iconserver="30" iconfarm="1">
+  	<username>frootpantz</username>
+  	<realname />
+  	<mbox_sha1sum>e52ed1e5b91c763694995460e9796fc2adc02019</mbox_sha1sum>
+  	<location />
+  	<photosurl>http://www.flickr.com/photos/frootpantz/</photosurl>
+  	<profileurl>http://www.flickr.com/people/frootpantz/</profileurl>
+  	<mobileurl>http://m.flickr.com/photostream.gne?id=34225</mobileurl>
+  	<photos>
+  		<firstdatetaken>2006-10-11 08:19:57</firstdatetaken>
+  		<firstdate>1160612247</firstdate>
+  		<count>3907</count>
+  		<views>9002</views>
+  	</photos>
+  </person>
+</rsp>

data/test/fixtures/people.getPublicPhotos.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rsp stat="ok">
+<photos page="1" pages="1" perpage="100" total="76">
+	<photo id="2924549350" owner="21775151@N06" secret="cbc1804258" server="3250" farm="4" title="Photo #1" ispublic="1" isfriend="0" isfamily="0" />
+	<photo id="2923697303" owner="21775151@N06" secret="649aa95f29" server="3208" farm="4" title="Photo #2" ispublic="1" isfriend="0" isfamily="0" />
+</photos>
+</rsp>

data/test/fleakr/group_test.rb

@@ -5,37 +5,20 @@ module Fleakr
 
     describe "The Group class" do
       
-      it "should be able to find all groups by user ID" do
-        user_id = 'ABC123'
-        group_1, group_2 = [stub(), stub()]
-
-        response = mock_request_cycle :for => 'people.getPublicGroups', :with => {:user_id => user_id}
-
-        group_1_doc, group_2_doc = (response.body/'rsp/groups/group').map {|doc| doc }
-
-        Group.expects(:new).with(group_1_doc).returns(group_1)
-        Group.expects(:new).with(group_2_doc).returns(group_2)
-
-        Group.find_all_by_user_id(user_id).should == [group_1, group_2]
-      end
-
+      should_find_all :groups, :by => :user_id, :call => 'people.getPublicGroups', :path => 'rsp/groups/group'
+      
     end
     
     describe "An instance of the Group class" do
       context "when initializing from an Hpricot document" do
         
         before do
-          doc = (Hpricot.XML(read_fixture('people.getPublicGroups'))/'rsp/groups/group').first
-          @group = Group.new(doc)
-        end
-      
-        it "should have a value for :id" do
-          @group.id.should == '13378274@N00'
+          doc = Hpricot.XML(read_fixture('people.getPublicGroups')).at('rsp/groups/group')
+          @object = Group.new(doc)
         end
         
-        it "should have a value for :name" do
-          @group.name.should == 'Group #1'
-        end
+        should_have_a_value_for :id   => '13378274@N00'
+        should_have_a_value_for :name => 'Group #1'
         
       end
     end

data/test/fleakr/image_test.rb

@@ -0,0 +1,82 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+module Fleakr
+  class ImageTest < Test::Unit::TestCase
+
+    def self.should_know_the_suffix_for(options)
+      it "should know the suffix for the :#{options.keys.first} size" do
+        Image.suffix_for(options.keys.first).should == options.values.first
+      end
+    end
+    
+    
+    describe "The Image class" do
+      
+      should_know_the_suffix_for :square    => '_s.jpg'
+      should_know_the_suffix_for :thumbnail => '_t.jpg'
+      should_know_the_suffix_for :small     => '_m.jpg'
+      should_know_the_suffix_for :medium    => '.jpg'
+      should_know_the_suffix_for :large     => '_b.jpg'
+      
+    end
+    
+    describe "An instance of the Image class" do
+      
+      before do
+        @base_filename = 'filename'
+        @base_url      = "http://foo.bar/#{@base_filename}"
+        @size          = :thumbnail
+
+        @image = Image.new(@base_url, @size)
+      end
+      
+      it "should know its full URL" do
+        Image.stubs(:suffix_for).with(@size).returns('.jpg')
+        @image.url.should == "#{@base_url}.jpg"
+      end
+      
+      it "should know its filename" do
+        Image.stubs(:suffix_for).with(@size).returns('.jpg')
+        @image.filename.should == "#{@base_filename}.jpg"
+      end
+      
+      context "when saving the file" do
+        
+        before do
+          @tmp_dir = create_temp_directory
+          
+          @url = 'http://host.com/image.jpg'
+          @image_filename = 'image.jpg'
+          
+          @image = Image.new('http://host/image', :thumbnail)
+          @image.stubs(:url).with().returns(@url)
+          @image.stubs(:filename).with().returns(@image_filename)
+        end
+        
+        after do
+          FileUtils.rm_rf(@tmp_dir)
+        end
+        
+        should "be able to save to a directory with the original filename" do
+          Net::HTTP.expects(:get).with(URI.parse(@url)).returns('image_data')
+          
+          @image.save_to(@tmp_dir)
+          File.read("#{@tmp_dir}/image.jpg").should == 'image_data'
+        end
+        
+        should "be able to save to a specified file" do
+          Net::HTTP.expects(:get).with(URI.parse(@url)).returns('image_data')
+          existing_file = "#{@tmp_dir}/existing_file.jpg"
+          
+          FileUtils.touch(existing_file)
+          
+          @image.save_to(existing_file)
+          File.read(existing_file).should == 'image_data'
+        end
+        
+      end
+
+    end
+    
+  end
+end

data/test/fleakr/object_test.rb

@@ -82,6 +82,12 @@ module Fleakr
         FlickrObject.new
       end
       
+      it "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>'))
+        
+        object.name.should == 'Fleakr'
+      end
       
     end
     

data/test/fleakr/photo_test.rb

@@ -2,31 +2,63 @@ require File.dirname(__FILE__) + '/../test_helper'
 
 module Fleakr
   class PhotoTest < Test::Unit::TestCase
-    
+
     describe "The Photo class" do
-      
-      context "when finding all photos by photoset ID" do
-        
+
+      should_find_all :photos, :by => :user_id, :call => 'people.getPublicPhotos', :path => 'rsp/photos/photo'
+      should_find_all :photos, :by => :photoset_id, :call => 'photosets.getPhotos', :path => 'rsp/photoset/photo'
+
+    end
+
+    describe "An instance of the Photo class" do
+      context "when populating from an XML document" do
         before do
-          mock_request_cycle :for => 'photosets.getPhotos', :with => {:photoset_id => '1'}
-          @photos = Photo.find_all_by_photoset_id('1')
-        end  
-      
-        it "should have the correct number of items" do
-          @photos.length.should == 2
-        end
-      
-        it "should have the proper title" do
-          @photos.map {|p| p.title}.should == ['Photo #1', 'Photo #2']
+          @object = Photo.new(Hpricot.XML(read_fixture('people.getPublicPhotos')).at('rsp/photos/photo'))
         end
-        
-        it "should have the proper id" do
-          @photos.map {|p| p.id }.should == %w(3044163577 3045001128)
+
+        should_have_a_value_for :id        => '2924549350'
+        should_have_a_value_for :title     => 'Photo #1'
+        should_have_a_value_for :farm_id   => '4'
+        should_have_a_value_for :server_id => '3250'
+        should_have_a_value_for :secret    => 'cbc1804258'
+
+      end
+    end
+
+    context "in general" do
+
+      before do
+        @photo = Photo.new
+
+        @photo.stubs(:id).with().returns('1')
+        @photo.stubs(:farm_id).with().returns('2')
+        @photo.stubs(:server_id).with().returns('3')
+        @photo.stubs(:secret).with().returns('secret')
+      end
+
+      it "should know the base URL to retrieve images" do
+        @photo.base_url.should == "http://farm2.static.flickr.com/3/1_secret"
+      end
+
+    end
+
+    context "with a base URL" do
+
+      before do
+        @photo = Photo.new
+        @photo.stubs(:base_url).with().returns('url')
+      end
+
+      [:square, :thumbnail, :small, :medium, :large].each do |size|
+        it "should have a :#{size} image" do
+          image = stub()
+          Image.expects(:new).with('url', size).returns(image)
+          
+          @photo.send(size).should == image
         end
-      
       end
-      
+
     end
-    
   end
-end
+
+end

data/test/fleakr/search_test.rb

@@ -4,17 +4,48 @@ module Fleakr
   class SearchTest < Test::Unit::TestCase
     
     describe "An instance of the Search class" do
+
+      it "should be able to generate a list of tags from a single-valued parameter" do
+        search = Search.new(nil, :tags => 'foo')
+        search.tag_list.should == 'foo'
+      end
+      
+      it "should be able to generate a list of tags from multi-valued parameters" do
+        search = Search.new(nil, :tags => %w(foo bar))
+        search.tag_list.should == 'foo,bar'
+      end
+      
+      it "should be able to create parameters for the search" do
+        search = Search.new(nil, :tags => %w(foo bar))
+        search.parameters.should == {:tags => 'foo,bar'}
+      end
+      
+      it "should not have any :tags parameters if none are supplied" do
+        search = Search.new
+        search.parameters.should == {}
+      end
+      
+      it "should convert the search term into the appropriate parameter" do
+        search = Search.new('foo')
+        search.parameters.should == {:text => 'foo'}
+      end
+      
+      it "should be able to search photos based on text" do
+        response = mock_request_cycle :for => 'photos.search', :with => {:text => 'foo'}
+        search = Search.new('foo')
+        search.results
+      end
       
       it "should be able to search photos based on tags" do
         response = mock_request_cycle :for => 'photos.search', :with => {:tags => 'one,two'}
         
         photo_1, photo_2 = [stub(), stub()]
         photo_1_doc, photo_2_doc = (response.body/'rsp/photos/photo').map {|doc| doc }
-
+      
         Photo.expects(:new).with(photo_1_doc).returns(photo_1)
         Photo.expects(:new).with(photo_2_doc).returns(photo_2)
-
-        search = Search.new(:tags => %w(one two))
+      
+        search = Search.new(nil, :tags => %w(one two))
         search.results.should == [photo_1, photo_2]
       end
       
@@ -26,7 +57,7 @@ module Fleakr
           Photo.expects(:new).with(doc).once
         end
         
-        search = Search.new(:tags => %w(foo))
+        search = Search.new(nil, :tags => %w(foo))
         
         2.times { search.results }
       end

data/test/fleakr/set_test.rb

@@ -4,36 +4,25 @@ module Fleakr
   class SetTest < Test::Unit::TestCase
 
     describe "The Set class" do
-      context "When finding all sets for a user_id" do
-        before do
-          user_id = '31066442@N69'
-          mock_request_cycle :for => 'photosets.getList', :with => {:user_id => user_id}
-
-          @sets = Set.find_all_by_user_id(user_id)
-        end
-
-        it "should return an array with the expected number of elements" do
-          @sets.length.should == 2
-        end
-
-        it "should have the proper titles for each set in the collection" do
-          @sets.map {|s| s.title }.should == ["Second Set", "First Set"]
-        end
-
-        it "should have the proper descriptions for each set in the collection" do
-          @sets.map {|s| s.description }.should == ['This is the second set.', 'This is the first set.']
-        end
-
-        it "should have the correct IDs for each of the sets" do
-          @sets.map {|s| s.id }.should == %w(72157609490909659 72157608538140671)
-        end
-
-      end
+      
+      should_find_all :sets, :by => :user_id, :call => 'photosets.getList', :path => 'rsp/photosets/photoset'
+      
     end
 
     describe "An instance of the Set class" do
-      context "when accessing its list of photos" do
+      
+      context "when populating from an XML document" do
+        before do
+          @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.'
+        
+      end
+      
+      context "when accessing its list of photos" do
         before do
           @set = Set.new
           @set.stubs(:id).with().returns('1')          
@@ -51,6 +40,41 @@ module Fleakr
           Photo.expects(:find_all_by_photoset_id).once.returns([])
           2.times { @set.photos }
         end
+      end
+      
+      context "when saving the set" do
+        before do
+          @tmp_dir = create_temp_directory
+        end
+        
+        after { FileUtils.rm_rf(@tmp_dir) }
+        
+        it "should save all files of the specified size to the specified directory" do
+          image = mock()
+          image.expects(:save_to).with("#{@tmp_dir}/set")
+          
+          photo = stub(:small => image)
+          
+          set = Set.new
+          set.stubs(:title).with().returns('set')
+          set.stubs(:photos).with().returns([photo])
+          
+          FileUtils.expects(:mkdir).with("#{@tmp_dir}/set")
+          
+          set.save_to(@tmp_dir, :small)
+        end
+        
+        it "should not create the directory if it already exists" do
+          FileUtils.mkdir("#{@tmp_dir}/set")
+          
+          set = Set.new
+          set.stubs(:title).with().returns('set')
+          set.stubs(:photos).with().returns([])
+          
+          FileUtils.expects(:mkdir).with("#{@tmp_dir}/set").never
+          
+          set.save_to(@tmp_dir, :small)
+        end
         
       end
 

data/test/fleakr/user_test.rb

@@ -4,68 +4,100 @@ module Fleakr
   class UserTest < Test::Unit::TestCase
 
     describe "The User class" do
-    
-      it "should be able to find a user by his username" do
-        user = stub()
-        response = mock_request_cycle :for => 'people.findByUsername', :with => {:username => 'frootpantz'}
-        
-        User.expects(:new).with(response.body).returns(user)
-        User.find_by_username('frootpantz').should == user
-      end
-    
-      it "should be able to find a user by his email" do
-        user = stub()
-        response = mock_request_cycle :for => 'people.findByEmail', :with => {:find_email => 'frootpantz@example.com'}
-        
-        User.expects(:new).with(response.body).returns(user)
-        User.find_by_email('frootpantz@example.com').should == user
-      end
-      
+
+      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'
+
     end
 
     describe "An instance of User" do
+      context "when populating the object from an XML document" do
+        before do
+          @object = User.new(Hpricot.XML(read_fixture('people.findByUsername')))
+          @object.populate_from(Hpricot.XML(read_fixture('people.getInfo')))
+        end
 
-      before do
-        response_body = Hpricot.XML(read_fixture('people.findByUsername'))
-        @user = User.new(response_body)
+        should_have_a_value_for :id           => '31066442@N69'
+        should_have_a_value_for :username     => 'frootpantz'
+        should_have_a_value_for :photos_url   => 'http://www.flickr.com/photos/frootpantz/'
+        should_have_a_value_for :profile_url  => 'http://www.flickr.com/people/frootpantz/'
+        should_have_a_value_for :photos_count => '3907'
+        should_have_a_value_for :icon_server  => '30'
+        should_have_a_value_for :icon_farm    => '1'
       end
 
-      it "should have a value for :id" do
-        @user.id.should == '31066442@N69'
-      end
-      
-      it "should have a value for :username" do
-        @user.username.should == 'frootpantz'
-      end
-      
-      it "should be able to retrieve the user's associated sets" do
-        sets = [stub()]
-        @user.stubs(:id).with().returns('1')
-
-        Set.expects(:find_all_by_user_id).with('1').returns(sets)
-        
-        @user.sets.should == sets
-      end
-      
-      it "should memoize the results returned for this user's sets" do
-        Set.expects(:find_all_by_user_id).once.returns([])
-        2.times { @user.sets }
-      end
-      
-      it "should be able to retrieve the user's associated groups" do
-        groups = [stub()]
-        @user.stubs(:id).with().returns('1')
-        
-        Group.expects(:find_all_by_user_id).with('1').returns(groups)
-        
-        @user.groups.should == groups
-      end
-      
-      it "should memoize the results returned for this user's group" do
-        Group.expects(:find_all_by_user_id).once.returns([])
-        2.times { @user.groups }
+      context "in general" do
+
+        before do
+          @user = User.new
+        end
+
+        it "should be able to retrieve the user's associated sets" do
+          sets = [stub()]
+          @user.stubs(:id).with().returns('1')
+
+          Set.expects(:find_all_by_user_id).with('1').returns(sets)
+
+          @user.sets.should == sets
+        end
+
+        it "should memoize the results returned for this user's sets" do
+          Set.expects(:find_all_by_user_id).once.returns([])
+          2.times { @user.sets }
+        end
+
+        it "should be able to retrieve the user's associated groups" do
+          groups = [stub()]
+          @user.stubs(:id).with().returns('1')
+
+          Group.expects(:find_all_by_user_id).with('1').returns(groups)
+
+          @user.groups.should == groups
+        end
+
+        it "should memoize the results returned for this user's group" do
+          Group.expects(:find_all_by_user_id).once.returns([])
+          2.times { @user.groups }
+        end
+
+        it "should be able to retrieve the user's photos" do
+          photos = [stub()]
+          @user.stubs(:id).with().returns('1')
+
+          Photo.expects(:find_all_by_user_id).with('1').returns(photos)
+          @user.photos.should == photos
+        end
+
+        it "should memoize the results returned for this user's photos" do
+          Photo.expects(:find_all_by_user_id).once.returns([])
+          2.times { @user.photos }
+        end
+
+        it "should be able to retrieve additional information about the current user" do
+          response = mock_request_cycle :for => 'people.getInfo', :with => {:user_id => @user.id}
+          @user.expects(:populate_from).with(response.body)
+
+          @user.load_info
+        end
+
+        it "should be able to generate an icon URL when the :icon_server value is greater than zero" do
+          @user.stubs(:icon_server).with().returns('1')
+          @user.stubs(:icon_farm).with().returns('2')
+          @user.stubs(:id).with().returns('45')
+
+          @user.icon_url.should == 'http://farm2.static.flickr.com/1/buddyicons/45.jpg'
+        end
+
+        it "should return the default icon URL when the :icon_server value is zero" do
+          @user.stubs(:icon_server).with().returns('0')
+          @user.icon_url.should == 'http://www.flickr.com/images/buddyicon.jpg'
+        end
+
+        it "should return the default icon URL when the :icon_server value is nil" do
+          @user.stubs(:icon_server).with().returns(nil)
+          @user.icon_url.should == 'http://www.flickr.com/images/buddyicon.jpg'
+        end
       end
-      
     end
 
   end

data/test/test_helper.rb

@@ -4,10 +4,59 @@ require 'rubygems'
 require 'matchy'
 require 'context'
 require 'mocha'
+require 'activesupport'
 
 require File.dirname(__FILE__) + '/../lib/fleakr'
 
 class Test::Unit::TestCase
+
+  def self.should_have_a_value_for(attribute_test)
+    it "should have a value for :#{attribute_test.keys.first}" do
+      @object.send(attribute_test.keys.first).should == attribute_test.values.first
+    end
+  end
+
+  def self.should_find_one(thing, options)
+    class_name  = thing.to_s.singularize.camelcase
+    klass       = "Fleakr::#{class_name}".constantize
+    object_type = class_name.downcase    
+
+    options[:with] = options[:by] if options[:with].nil?
+
+    it "should be able to find a #{thing} by #{options[:by]}" do
+      condition_value = '1'
+      stub = stub()
+      response = mock_request_cycle :for => options[:call], :with => {options[:with] => condition_value}
+
+      klass.expects(:new).with(response.body).returns(stub)
+      klass.send("find_by_#{options[:by]}".to_sym, condition_value).should == stub
+    end
+  end
+
+  def self.should_find_all(thing, options)
+    class_name  = thing.to_s.singularize.camelcase
+    klass       = "Fleakr::#{class_name}".constantize
+    object_type = class_name.downcase
+    
+    it "should be able to find all #{thing} by #{options[:by]}" do
+      condition_value = '1'
+      response = mock_request_cycle :for => options[:call], :with => {options[:by] => condition_value}
+      
+      stubs = []
+      elements = (response.body/options[:path]).map
+      
+      
+      elements.each do |element|
+        stub = stub()
+        stubs << stub
+        
+        klass.expects(:new).with(element).returns(stub)
+      end
+      
+      klass.send("find_all_by_#{options[:by]}".to_sym, condition_value).should == stubs
+    end
+    
+  end
   
   def read_fixture(method_call)
     fixture_path = File.dirname(__FILE__) + '/fixtures'
@@ -21,4 +70,11 @@ class Test::Unit::TestCase
     response
   end
   
+  def create_temp_directory
+    tmp_dir = File.dirname(__FILE__) + '/tmp'
+    FileUtils.mkdir(tmp_dir)  
+    
+    tmp_dir
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: reagent-fleakr
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors: 
 - Patrick Reagan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-02 00:00:00 -08:00
+date: 2008-12-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,6 +36,7 @@ files:
 - lib/fleakr/attribute.rb
 - lib/fleakr/error.rb
 - lib/fleakr/group.rb
+- lib/fleakr/image.rb
 - lib/fleakr/object.rb
 - lib/fleakr/photo.rb
 - lib/fleakr/request.rb
@@ -48,7 +49,9 @@ files:
 - test/fixtures
 - test/fixtures/people.findByEmail.xml
 - test/fixtures/people.findByUsername.xml
+- test/fixtures/people.getInfo.xml
 - test/fixtures/people.getPublicGroups.xml
+- test/fixtures/people.getPublicPhotos.xml
 - test/fixtures/photos.search.xml
 - test/fixtures/photosets.getList.xml
 - test/fixtures/photosets.getPhotos.xml
@@ -56,6 +59,7 @@ files:
 - test/fleakr/attribute_test.rb
 - test/fleakr/error_test.rb
 - test/fleakr/group_test.rb
+- test/fleakr/image_test.rb
 - test/fleakr/object_test.rb
 - test/fleakr/photo_test.rb
 - test/fleakr/request_test.rb