@@ -1,3 +1,8 @@ +== 1.0.8 2009-01-25 +* 2 minor enhancements + * Refactored initialization of PhotoCollection so can be instantiated from response returned by photosets.getPhotos + * Added photosets.getPhotos. Returns PhotoCollection + == 1.0.7 2008-11-26 * 1 major enhancement * When a collection of photos is fetched (e.g. by Flickr#search), a PhotoCollection object is now returned, a type of array, which allows easy access to the pagination information returned by Flickr (e.g. total items, pages, etc). Previously this info was lost History.txt @@ -24,7 +24,7 @@ user.contacts # ...their contacts... user.favorites # ...favorite photos... user.photosets # ...their photo sets... user.tags # ...their tags... -user.popular_tags # ...and their popular tags +user.popular_tags # ...and their popular tags recentphotos = flickr.photos # get the 100 most recent public photos photo = recentphotos.first # or very most recent one photo.url # see its URL, README.txt @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = %q{flickr} - s.version = "1.0.6" + s.version = "1.0.8" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Scott Raymond, Patrick Plattes"] flickr.gemspec @@ -227,10 +227,14 @@ class Flickr attr_reader :page, :pages, :perpage, :total # builds a PhotoCollection from given params, such as those returned from - # photos.search API call + # photos.search API call. Note all the info is contained in the value of + # the first (and only) key-value pair of the response. The key will vary + # depending on the original object the photos are related to (e.g 'photos', + # 'photoset', etc) def initialize(photos_api_response={}, api_key=nil) - [ "page", "pages", "perpage", "total" ].each { |i| instance_variable_set("@#{i}", photos_api_response["photos"][i])} - collection = photos_api_response['photos']['photo'] || [] + photos = photos_api_response.values.first + [ "page", "pages", "perpage", "total" ].each { |i| instance_variable_set("@#{i}", photos[i])} + collection = photos['photo'] || [] collection = [collection] if collection.is_a? Hash collection.each { |photo| self << Photo.new(photo.delete('id'), api_key, photo) } end @@ -699,11 +703,7 @@ class Flickr end def getPhotos - photosetPhotos = @client.request('photosets.getPhotos', {'photoset_id' => @id}) - - collection = [] - photosetPhotos['photoset']['photo'].each { |photo| collection << Photo.new(photo, @api_key) } - collection + photosetPhotos = @client.photos_request('photosets.getPhotos', {'photoset_id' => @id}) end end lib/flickr.rb @@ -1,17 +1,10 @@ -#require 'rubygems' +require 'rubygems' require 'flickr' require 'test/unit' -#require 'mocha' +require 'mocha' class TestFlickr < Test::Unit::TestCase - def test_get_list_of_photos_from_specified_photoset - flickr = Flickr.new('5a3f78d9a0f34169777dbb3ff266ba06') - testPhotoset = flickr.photoset('72157611041801782') - - assert_not_nil testPhotoset.getPhotos - end - # Flickr client tests # # instantiation tests @@ -850,17 +843,28 @@ class TestFlickr < Test::Unit::TestCase # assert_nil photo['key2'] # end - # ##### PHOTOSETS - # - # #def setup - # # super - # # @photoset = @f.photosets_create('title'=>@title, 'primary_photo_id'=>@photo_id) - # # @photoset_id = @photoset['photoset']['id'] - # #end - # #def teardown - # # @f.photosets_delete('photoset_id'=>@photoset_id) - # #end - # + ## PHOTOSETS + + def test_should_initialize_photoset_from_id + photoset = Flickr::Photoset.new("foo123") + assert_equal "foo123", photoset.id + end + + def test_should_initialize_photoset_from_id_and_api_key + photoset = Flickr::Photoset.new("foo123", "some_api_key") + assert_equal "some_api_key", photoset.instance_variable_get(:@api_key) + end + + def test_should_get_photos_for_specified_photoset + Flickr.any_instance.expects(:request).with('photosets.getPhotos', {'photoset_id' => 'some_id'}).returns(dummy_photoset_photos_response) + photoset = Flickr::Photoset.new("some_id", "some_api_key") + + assert_kind_of Flickr::PhotoCollection, photos = photoset.getPhotos + assert_equal 2, photos.size + assert_kind_of Flickr::Photo, photos.first + end + + # def test_photosets_editMeta # assert_equal @f.photosets_editMeta('photoset_id'=>@photoset_id, 'title'=>@title)['stat'], 'ok' # end @@ -1025,6 +1029,20 @@ class TestFlickr < Test::Unit::TestCase "eighteenplus" => "0" } } } end + def dummy_photoset_photos_response + { "photoset" => + { "photo" => + [{ "id" => "foo123", + "key1" => "value1", + "key2" => "value2" }, + { "id" => "bar456", + "key3" => "value3"}], + "page"=>"3", + "pages"=>"5", + "perpage"=>"10", + "total"=>"42" } } + end + def successful_xml_response <<-EOF <?xml version="1.0" encoding="utf-8" ?> test/test_flickr.rb d75e11ed7943180b504e6e6fd6d9b547a89ea7bb Chris Taggart chris@windowsxponmac.home http://github.com/ctagg/flickr/commit/915949f35c732a6e555df48f2c049babcd2ad0a0 915949f35c732a6e555df48f2c049babcd2ad0a0 2009-01-25T06:37:53-08:00 2009-01-25T06:37:53-08:00 * Added photosets.getPhotos. Returns PhotoCollection. * Refactored PhotoCollection intialization * Updated gem version 0f1adb212afd157978bc98e06da04565b4c02bc6 Chris Taggart chris@windowsxponmac.home