flickr.rb 1.1.0 → 1.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fe1049d8dd0d71354cf7f221012392823c8896eb
+  data.tar.gz: c95508f5d5d08a400aa902ef1b174f0838431daf
+SHA512:
+  metadata.gz: 70cabf927f292907dee0eb85efa4cf7a0e249e1d04950d89c48a82a0d864b14f2dd325eeaa83091582878814a366b7f6e74525412a449e43622abe0e32a10d13
+  data.tar.gz: 60b7e5c0a70268b8e9efb90d3af595e3cc2aed001f54ef8b53320b2058bca095fe2816b5c883d121fcd8fde2c505105b0d26bc21ba7fa025baffe0de0f98b434

data/Changelog.txt

@@ -1,3 +1,8 @@
+1.1.1 2014-04-17
+* Migrated to usage of Bundler for dependency tracking
+* Fixes retrieving list of photos no matter which sibling they are in XML structure
+* Made tests compatible with latest version of mocha
+
 1.1.0 2010-05-16
 * Major improvement - now gem is very easy to use as a rails plugin with external configuration for api connection. - /config/flickr.api.yml
 
@@ -18,7 +23,7 @@
 * 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
 * Minor enhancements:
- * Refactored parsing of response when getting info about photo (public API is not changed). 
+ * Refactored parsing of response when getting info about photo (public API is not changed).
  * All returned info is now parsed and stored (previously only some attributes were)
  * A record is kept of whether info has been previously fetched from Flickr (avoids unnecessary extra calls)
  * Improved User#getInfo. No longer makes API call for pretty_url (which was in addition to main getInfo call) or photos_url
@@ -49,7 +54,7 @@
 * Minor enhancements:
   * Tweaked internals so new client instance isn't created each time new object (e.g. photo, user) is created
   * Improved test coverage
-  
+
 == 1.0.4 2008-05-11
 
 * 1 major enhancement:

data/Gemfile

@@ -0,0 +1,4 @@
+# A sample Gemfile
+source "https://rubygems.org"
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,24 @@
+PATH
+  remote: .
+  specs:
+    flickr (1.1.0)
+      xml-simple (>= 1.0.7)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    metaclass (0.0.4)
+    mocha (1.0.0)
+      metaclass (~> 0.0.1)
+    rake (10.1.1)
+    rdoc (4.0.0)
+    xml-simple (1.1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  flickr!
+  mocha
+  rake
+  rdoc

data/LICENSE

@@ -1,20 +1,19 @@
-Copyright (c) 2007 Scott Raymond, Patrick Plattes, Chris Taggart
+Copyright (c) 2007 Scott Raymond, Patrick Plattes, Chris Taggart, Rafał Piekarski
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/Manifest.txt

@@ -1,10 +1,10 @@
-History.txt
+Changelog.txt
 index.html
 init.rb
 lib/flickr.rb
 LICENSE
 Manifest.txt
 Rakefile
-README.txt          
+README.txt
 test/flickr_test.rb
 TODO

data/README.txt

@@ -46,7 +46,9 @@ This has now been largely corrected, though not all current API calls are suppor
 
 == INSTALL:
 
-  sudo gem install flickr
+  sudo gem install flickr.rb
+  
+* Gem homepage: http://rubygems.org/gems/flickr.rb
 
 == CONFIGURING:
 

data/Rakefile

@@ -1,11 +1,10 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
-require 'rubygems'
+require 'rdoc/task'
+require "bundler/gem_tasks"
 
 task :default => :test
-         
+
 desc 'Test the flickr plugin.'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
@@ -23,26 +22,6 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-spec = Gem::Specification.new do |s|
-  s.add_dependency('xml-simple', '>= 1.0.7')
-  s.name = 'flickr.rb'
-  s.version = "1.1.0"
-  s.platform = Gem::Platform::RUBY
-  s.summary = "An insanely easy interface to the Flickr photo-sharing service. Also available as a Rails plugin! By Scott Raymond. Maintainer: Patrick Plattes, Rafal Piekarski"
-  s.requirements << 'Flickr developers API key'
-  s.files = Dir.glob("**/*").delete_if { |item| item.include?(".git") || item[/^pkg/] }
-  s.require_path = 'lib'
-  s.author = "Scott Raymond, Patrick Plattes, Rafal Piekarski"
-  s.email = "ravbaker@gmail.com"
-  s.rubyforge_project = "flickr"
-  s.homepage = "http://github.com/RaVbaker/flickr/"
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.need_zip = true
-  pkg.need_tar = true
-end
-
 task "Dump Gemspec file"
 task :debug do
   puts spec.to_ruby

data/flickr.gemspec

@@ -1,30 +1,35 @@
 Gem::Specification.new do |s|
-  s.name = %q{flickr}
-  s.version = "1.1.0"
+  s.name            = 'flickr.rb'
+  s.version         = '1.1.1'
+  s.authors         = ['Scott Raymond, Patrick Plattes, Rafal Piekarski']
+  s.autorequire     = 'flickr.rb'
+  s.date            = '2010-05-15'
+  s.email           = 'ravbaker@gmail.com'
+  s.files           = Dir.glob("**/*").delete_if { |item| item.include?(".git") || item[/^pkg/] }
+  s.homepage        = 'http://github.com/RaVbaker/flickr/'
+  s.require_paths   = ['lib']
+  s.requirements    = ['Flickr developers API key']
+  s.summary         = 'An insanely easy interface to the Flickr photo-sharing service. Also available as a Rails plugin! By Scott Raymond. Maintainer: Rafal Piekarski'
+  s.description     = 'Gem for using Flickr API in Ruby - https://www.flickr.com/services/api/'
+  s.licenses        = ['MIT']
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Scott Raymond, Patrick Plattes, Rafal Piekarski"]
-  s.autorequire = %q{flickr}
-  s.date = %q{2010-05-15}
-  s.email = %q{ravbaker@gmail.com}
-  s.files = ["History.txt", "LICENSE", "README.txt", "TODO", "lib/flickr.rb", "test/flickr_test.rb", "init.rb"]
-  s.homepage = %q{http://github.com/RaVbaker/flickr/}
-  s.require_paths = ["lib"]
-  s.requirements = ["Flickr developers API key"]
-  s.rubyforge_project = %q{flickr}
-  s.rubygems_version = %q{1.2.0}
-  s.summary = %q{An insanely easy interface to the Flickr photo-sharing service. Also available as a rails plugin! By Scott Raymond. Maintainer: Rafal Piekarski}
+  s.rubygems_version = '1.2.0'
+  s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
 
     if current_version >= 3 then
-      s.add_runtime_dependency(%q<xml-simple>, [">= 1.0.7"])
+      s.add_runtime_dependency(%q<xml-simple>, ['>= 1.0.7'])
     else
-      s.add_dependency(%q<xml-simple>, [">= 1.0.7"])
+      s.add_dependency(%q<xml-simple>, ['>= 1.0.7'])
     end
   else
-    s.add_dependency(%q<xml-simple>, [">= 1.0.7"])
+    s.add_dependency(%q<xml-simple>, ['>= 1.0.7'])
   end
+
+  s.add_development_dependency      'rake'
+  s.add_development_dependency      'rdoc'
+  s.add_development_dependency      'mocha'
 end

data/lib/flickr.rb

@@ -1,6 +1,6 @@
 # = Flickr
 #   An insanely easy interface to the Flickr photo-sharing service. By Scott Raymond.
-#   
+#
 # Author::    Scott Raymond <sco@redgreenblu.com>
 # Copyright:: Copyright (c) 2005 Scott Raymond <sco@redgreenblu.com>. Additional content by Patrick Plattes and Chris Taggart (http://pushrod.wordpress.com)
 # License::   MIT <http://www.opensource.org/licenses/mit-license.php>
@@ -42,21 +42,21 @@ require 'digest/md5'
 class Flickr
   attr_reader :api_key, :auth_token
   attr_accessor :user
-  
+
   HOST_URL = 'http://api.flickr.com'
   API_PATH = '/services/rest'
 
-  # Flickr, annoyingly, uses a number of representations to specify the size 
+  # Flickr, annoyingly, uses a number of representations to specify the size
   # of a photo, depending on the context. It gives a label such a "Small" or
-  # "Medium" to a size of photo, when returning all possible sizes. However, 
+  # "Medium" to a size of photo, when returning all possible sizes. However,
   # when generating the uri for the page that features that size of photo, or
-  # the source url for the image itself it uses a single letter. Bizarrely, 
+  # the source url for the image itself it uses a single letter. Bizarrely,
   # these letters are different depending on whether you want the Flickr page
   # for the photo or the source uri -- e.g. a "Small" photo (240 pixels on its
-  # longest side) may be viewed at 
+  # longest side) may be viewed at
   # "http://www.flickr.com/photos/sco/2397458775/sizes/s/"
-  # but its source is at 
-  # "http://farm4.static.flickr.com/3118/2397458775_2ec2ddc324_m.jpg". 
+  # but its source is at
+  # "http://farm4.static.flickr.com/3118/2397458775_2ec2ddc324_m.jpg".
   # The VALID_SIZES hash associates the correct letter with a label
   VALID_SIZES = { "Square" => ["s", "sq"],
                   "Thumbnail" => ["t", "t"],
@@ -65,15 +65,15 @@ class Flickr
                   "Large" => ["b", "l"]
                 }
 
-  # To use the Flickr API you need an api key 
-  # (see http://www.flickr.com/services/api/misc.api_keys.html), and the flickr 
+  # To use the Flickr API you need an api key
+  # (see http://www.flickr.com/services/api/misc.api_keys.html), and the flickr
   # client object shuld be initialized with this. You'll also need a shared
   # secret code if you want to use authentication (e.g. to get a user's
   # private photos)
   # There are two ways to initialize the Flickr client. The preferred way is with
-  # a hash of params, e.g. 'api_key' => 'your_api_key', 'shared_secret' => 
-  # 'shared_secret_code'. Other way is to use in Rails an config file 
-  # RAILS_ROOT/config/flickr.api.yml and there use params as key/values even 
+  # a hash of params, e.g. 'api_key' => 'your_api_key', 'shared_secret' =>
+  # 'shared_secret_code'. Other way is to use in Rails an config file
+  # RAILS_ROOT/config/flickr.api.yml and there use params as key/values even
   # specified for every environment.
   def initialize(api_key_or_params={})
     @host = HOST_URL
@@ -82,8 +82,8 @@ class Flickr
     api_key_or_params = {:api_key => api_key_or_params} if api_key_or_params.is_a?(String)
     api_key_or_params = Config.get if Config.parsed? and api_key_or_params.empty?
     set_up_configuration api_key_or_params if api_key_or_params.is_a? Hash
-  end                                     
-  
+  end
+
   def set_up_configuration api_key_or_params = {}
     @api_key = api_key_or_params[:api_key]
     @shared_secret = api_key_or_params[:shared_secret]
@@ -96,13 +96,13 @@ class Flickr
   def get_token_from(frob)
     auth_response = request("auth.getToken", :frob => frob)['auth']
     @auth_token = auth_response['token']
-    @user = User.new( 'id' => auth_response['user']['nsid'], 
+    @user = User.new( 'id' => auth_response['user']['nsid'],
                       'username' => auth_response['user']['username'],
                       'name' => auth_response['user']['fullname'],
                       'client' => self)
     @auth_token
-  end  
-  
+  end
+
   # Implements flickr.urls.lookupGroup and flickr.urls.lookupUser
   def find_by_url(url)
     response = urls_lookupUser('url'=>url) rescue urls_lookupGroup('url'=>url) rescue nil
@@ -119,18 +119,18 @@ class Flickr
   def recent
     photos_request('photos.getRecent')
   end
-  
+
   def photos_search(params={})
     photos_request('photos.search', params)
   end
   alias_method :search, :photos_search
-  
+
   # Gets public photos with a given tag
   def tag(tag)
     photos('tags'=>tag)
   end
-  
-  # Implements flickr.people.findByEmail and flickr.people.findByUsername. 
+
+  # Implements flickr.people.findByEmail and flickr.people.findByUsername.
   def users(lookup=nil)
     user = people_findByEmail('find_email'=>lookup)['user'] rescue people_findByUsername('username'=>lookup)['user']
     return User.new("id" => user["nsid"], "username" => user["username"], "client" => self)
@@ -140,35 +140,35 @@ class Flickr
   def groups(group_name, options={})
     collection = groups_search({"text" => group_name}.merge(options))['groups']['group']
     collection = [collection] if collection.is_a? Hash
-    
-    collection.collect { |group| Group.new( "id" => group['nsid'], 
-                                            "name" => group['name'], 
+
+    collection.collect { |group| Group.new( "id" => group['nsid'],
+                                            "name" => group['name'],
                                             "eighteenplus" => group['eighteenplus'],
                                             "client" => self) }
   end
-  
+
   def photoset(photoset_id)
     Photoset.new(photoset_id, @api_key)
   end
-  
+
   # Implements flickr.tags.getRelated
   def related_tags(tag)
     tags_getRelated('tag'=>tag)['tags']['tag']
   end
-  
+
   # Implements flickr.photos.licenses.getInfo
   def licenses
     photos_licenses_getInfo['licenses']['license']
   end
-  
+
   # Returns url for user to login in to Flickr to authenticate app for a user
   def login_url(perms)
     "http://flickr.com/services/auth/?api_key=#{@api_key}&perms=#{perms}&api_sig=#{signature_from('api_key'=>@api_key, 'perms' => perms)}"
   end
-    
+
   # Implements everything else.
   # Any method not defined explicitly will be passed on to the Flickr API,
-  # and return an XmlSimple document. For example, Flickr#test_echo is not 
+  # and return an XmlSimple document. For example, Flickr#test_echo is not
   # defined, so it will pass the call to the flickr.test.echo method.
   def method_missing(method_id, params={})
     request(method_id.id2name.gsub(/_/, '.'), params)
@@ -188,82 +188,82 @@ class Flickr
   end
 
   # acts like request but returns a PhotoCollection (a list of Photo objects)
-  def photos_request(method, params={})
+  def photos_request(method, params={}, list_node="photos")
     photos = request(method, params)
-    PhotoCollection.new(photos, @api_key)
+    PhotoCollection.new(photos, @api_key, list_node)
   end
-  
-  # Builds url for Flickr API REST request from given the flickr method name 
+
+  # Builds url for Flickr API REST request from given the flickr method name
   # (exclusing the 'flickr.' that begins each method call) and params (where
   # applicable) which should be supplied as a Hash (e.g 'user_id' => "foo123")
   def request_url(method, params={})
     method = 'flickr.' + method
     url = "#{@host}#{@api}/?api_key=#{@api_key}&method=#{method}"
     params.merge!('api_key' => @api_key, 'method' => method, 'auth_token' => @auth_token)
-    signature = signature_from(params) 
-    
+    signature = signature_from(params)
+
     url = "#{@host}#{@api}/?" + params.merge('api_sig' => signature).collect { |k,v| "#{k}=" + CGI::escape(v.to_s) unless v.nil? }.compact.join("&")
   end
-  
+
   def signature_from(params={})
     return unless @shared_secret # don't both getting signature if no shared_secret
     request_str = params.reject {|k,v| v.nil?}.collect {|p| "#{p[0].to_s}#{p[1]}"}.sort.join # build key value pairs, sort in alpha order then join them, ignoring those with nil value
     return Digest::MD5.hexdigest("#{@shared_secret}#{request_str}")
   end
-  
+
   # A collection of photos is returned as a PhotoCollection, a subclass of Array.
   # This allows us to retain the pagination info returned by Flickr and make it
   # accessible in a friendly way
   class PhotoCollection < Array
     attr_reader :page, :pages, :perpage, :total
-    
-    # builds a PhotoCollection from given params, such as those returned from 
-    # 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 
+
+    # builds a PhotoCollection from given params, such as those returned from
+    # 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={})
-      photos = photos_api_response.values.first 
-      [ "page", "pages", "perpage", "total" ].each { |i| instance_variable_set("@#{i}", photos[i])} 
+    def initialize(photos_api_response={}, api_key={}, list_node="photos")
+      photos = photos_api_response[list_node]
+      [ "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
-  end       
-         
+  end
+
   # This class supports external configuration
-  class Config                                
-    
+  class Config
+
     # Contains whole configuration for flickr API
-    @@configuration = {} 
-               
+    @@configuration = {}
+
     # Is true if configuration has been parsed
     @@parsed = false
-                                              
+
     # parses file and prepare @@configuration for access from outside to fetch configuration hash
     def self.load_from_file file
       return false unless File.exist?(file)
       @@configuration = YAML.load(ERB.new(File.read(file)).result)
       @@parsed = true
       parse_in_rails_env!
-    end                                                                  
-              
+    end
+
     # Excludes specific configuration for choosed environment in Rails
     def self.parse_in_rails_env!
-      @@configuration = @@configuration[RAILS_ENV].symbolize_keys if defined? RAILS_ENV
-    end 
-                                                                      
+      @@configuration = @@configuration[RAILS_ENV].symbolize_keys if defined? RAILS_ENV and @@configuration.has_key? RAILS_ENV
+    end
+
     # Returns configuration Hash
     def self.get
       @@configuration
     end
-                                
+
     # Returns true if configuration has been parsed
     def self.parsed?
       @@parsed
     end
   end
-  
+
   # Todo:
   # logged_in?
   # if logged in:
@@ -279,20 +279,20 @@ class Flickr
   # flickr.test.login
   # uploading
   class User
-    
+
     attr_reader :client, :id, :name, :location, :photos_url, :url, :count, :firstdate, :firstdatetaken
 
-    # A Flickr::User can be instantiated in two ways. The old (deprecated) 
-    # method is with an ordered series of values. The new method is with a 
-    # params Hash, which is easier when a variable number of params are 
+    # A Flickr::User can be instantiated in two ways. The old (deprecated)
+    # method is with an ordered series of values. The new method is with a
+    # params Hash, which is easier when a variable number of params are
     # supplied, which is the case here, and also avoids having to constantly
     # supply nil values for the email and password, which are now irrelevant
-    # as authentication is no longer done this way. 
-    # An associated flickr client will also be generated if an api key is 
+    # as authentication is no longer done this way.
+    # An associated flickr client will also be generated if an api key is
     # passed among the arguments or in the params hash. Alternatively, and
-    # most likely, an existing client object may be passed in the params hash 
+    # most likely, an existing client object may be passed in the params hash
     # (e.g. 'client' => some_existing_flickr_client_object), and this is
-    # what happends when users are initlialized as the result of a method 
+    # what happends when users are initlialized as the result of a method
     # called on the flickr client (e.g. flickr.users)
     def initialize(id_or_params_hash=nil, username=nil, email=nil, password=nil, api_key={})
       if id_or_params_hash.is_a?(Hash)
@@ -325,35 +325,35 @@ class Flickr
     def firstdatetaken
       @firstdatetaken.nil? ? getInfo.firstdatetaken : @firstdatetaken
     end
-    
-    # Builds url for user's photos page as per 
+
+    # Builds url for user's photos page as per
     # http://www.flickr.com/services/api/misc.urls.html
     def photos_url
       "http://www.flickr.com/photos/#{id}/"
     end
-        
-    # Builds url for user's profile page as per 
+
+    # Builds url for user's profile page as per
     # http://www.flickr.com/services/api/misc.urls.html
     def url
       "http://www.flickr.com/people/#{id}/"
     end
-    
+
     def pretty_url
       @pretty_url ||= @client.urls_getUserProfile('user_id'=>@id)['user']['url']
     end
-    
+
     # Implements flickr.people.getPublicGroups
     def groups
       collection = @client.people_getPublicGroups('user_id'=>@id)['groups']['group']
       collection = [collection] if collection.is_a? Hash
-      collection.collect { |group| Group.new( "id" => group['nsid'], 
+      collection.collect { |group| Group.new( "id" => group['nsid'],
                                            "name" => group['name'],
                                            "eighteenplus" => group['eighteenplus'],
                                            "client" => @client) }
     end
-    
+
     # Implements flickr.people.getPublicPhotos. Options hash allows you to add
-    # extra restrictions as per flickr.people.getPublicPhotos docs, e.g. 
+    # extra restrictions as per flickr.people.getPublicPhotos docs, e.g.
     # user.photos('per_page' => '25', 'extras' => 'date_taken')
     def photos(options={})
       @client.photos_request('people.getPublicPhotos', {'user_id' => @id}.merge(options))
@@ -370,12 +370,12 @@ class Flickr
       @client.contacts_getPublicList('user_id'=>@id)['contacts']['contact'].collect { |contact| User.new(contact['nsid'], contact['username'], nil, nil, @api_key) }
       #or
     end
-    
+
     # Implements flickr.favorites.getPublicList
     def favorites
       @client.photos_request('favorites.getPublicList', 'user_id' => @id)
     end
-    
+
     # Implements flickr.photosets.getList
     def photosets
       @client.photosets_getList('user_id'=>@id)['photosets']['photoset'].collect { |photoset| Photoset.new(photoset['id'], @api_key) }
@@ -395,7 +395,7 @@ class Flickr
     def contactsPhotos
       @client.photos_request('photos.getContactsPublicPhotos', 'user_id' => @id)
     end
-    
+
     def to_s
       @name
     end
@@ -426,22 +426,22 @@ class Flickr
       extra_params.each { |k,v| self.instance_variable_set("@#{k}", v) } # convert extra_params into instance variables
       @client = Flickr.new @api_key
     end
-    
-    # Allows access to all photos instance variables through hash like 
-    # interface, e.g. photo["datetaken"] returns @datetaken instance 
+
+    # Allows access to all photos instance variables through hash like
+    # interface, e.g. photo["datetaken"] returns @datetaken instance
     # variable. Useful for accessing any weird and wonderful parameter
     # that may have been returned by Flickr when finding the photo,
-    # e.g. those returned by the extras argument in 
+    # e.g. those returned by the extras argument in
     # flickr.people.getPublicPhotos
     def [](param_name)
       instance_variable_get("@#{param_name}")
     end
-    
+
     def title
       @title.nil? ? getInfo("title") : @title
     end
-    
-    # Returns the owner of the photo as a Flickr::User. If we have no info 
+
+    # Returns the owner of the photo as a Flickr::User. If we have no info
     # about the owner, we make an API call to get it. If we already have
     # the owner's id, create a user based on that. Either way, we cache the
     # result so we don't need to check again
@@ -563,7 +563,7 @@ class Flickr
     # Implements flickr.photos.notes.add
     def add_note(note)
     end
-    
+
     # Implements flickr.photos.setDates
     def dates=(dates)
     end
@@ -571,11 +571,11 @@ class Flickr
     # Implements flickr.photos.setPerms
     def perms=(perms)
     end
-    
+
     # Implements flickr.photos.setTags
     def tags=(tags)
     end
-    
+
     # Implements flickr.photos.setMeta
     def title=(title)
     end
@@ -585,7 +585,7 @@ class Flickr
     # Implements flickr.photos.addTags
     def add_tag(tag)
     end
-    
+
     # Implements flickr.photos.removeTag
     def remove_tag(tag)
     end
@@ -606,12 +606,12 @@ class Flickr
     # Implements flickr.photos.notes.edit
     def editNote(note_id)
     end
-        
+
     # Converts the Photo to a string by returning its title
     def to_s
       title
     end
-    
+
     private
 
       # Implements flickr.photos.getInfo
@@ -626,10 +626,10 @@ class Flickr
         @url = info['urls']['url']['content'] # assumes only one url
         instance_variable_get("@#{attrib}")
       end
-      
-      # Builds source uri of image from params (often returned from other 
-      # methods, e.g. User#photos). As specified at: 
-      # http://www.flickr.com/services/api/misc.urls.html. If size is given 
+
+      # Builds source uri of image from params (often returned from other
+      # methods, e.g. User#photos). As specified at:
+      # http://www.flickr.com/services/api/misc.urls.html. If size is given
       # should be one the keys in the VALID_SIZES hash, i.e.
       # "Square", "Thumbnail", "Medium", "Large", "Original", "Small" (These
       # are the values returned by flickr.photos.getSizes).
@@ -646,8 +646,8 @@ class Flickr
           "http://farm#{@farm}.static.flickr.com/#{@server}/#{@id}_#{@secret}_#{s_size}.jpg"
         end
       end
-      
-      # Builds uri of Flickr page for photo. By default returns the main 
+
+      # Builds uri of Flickr page for photo. By default returns the main
       # page for the photo, but if passed a size will return the simplified
       # flickr page featuring the given size of the photo
       # TODO: Handle "Original" size
@@ -668,13 +668,13 @@ class Flickr
   # flickr.groups.pools.remove
   class Group
     attr_reader :id, :client, :description, :name, :eighteenplus, :members, :online, :privacy, :url#, :chatid, :chatcount
-    
+
     def initialize(id_or_params_hash=nil, api_key={})
       if id_or_params_hash.is_a?(Hash)
         id_or_params_hash.each { |k,v| self.instance_variable_set("@#{k}", v) } # convert extra_params into instance variables
       else
         @id = id_or_params_hash
-        @api_key = api_key      
+        @api_key = api_key
         @client = Flickr.new @api_key
       end
     end
@@ -724,11 +724,11 @@ class Flickr
       @url = "http://www.flickr.com/photos/#{@owner.getInfo.username}/sets/#{@id}/"
       self
     end
-    
+
     def getPhotos
-      photosetPhotos = @client.photos_request('photosets.getPhotos', {'photoset_id' => @id})
+      photosetPhotos = @client.photos_request('photosets.getPhotos', {'photoset_id' => @id}, "photoset")
     end
 
   end
-  
+
 end