flickrie 1.6.0 → 1.6.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: aac7ec3fceb277ce74b0708c49f6001e7bd99179
+  data.tar.gz: b8646789ba7a387579743f3653da143dc923e5bc
+SHA512:
+  metadata.gz: ea9b15d28e7d399d4eedc547fdfcd726d96f8bba84a8564b75143ed096c91f2b42b1a1a9dd83dd82c224ccdb53cea5717d2408c38c219fdfd53ad0f22c8ef000
+  data.tar.gz: 65f0a923e9ed74586cd0afa9981f5fb520f850bddab4a0d52ea35715a54f1c7ecfb5479f9f042e3a9eed17da71b173f874b8ab062840ef979bcc3fd458a47ed7

data/README.md

@@ -1,5 +1,10 @@
 # Flickrie
 
+**NOTICE: This gem is deprecated. You should switch to the
+[flickr-objects](https://github.com/janko-m/flickr-objects) gem.**
+
+---
+
 This gem is a nice wrapper for the Flickr API with an object-oriented interface.
 
 - Homepage: [http://janko-m.github.com/flickrie/](http://janko-m.github.com/flickrie/)
@@ -12,54 +17,25 @@ This gem is a nice wrapper for the Flickr API with an object-oriented interface.
 
 - Flickr API page: [http://www.flickr.com/services/api](http://www.flickr.com/services/api/)
 
-## About
-
-The reason why I did this gem is because the existing ones either weren't
-well maintained, or they weren't object oriented and provided a literal
-wrapper over the API. That didn't statisfy me, because Flickr API
-sometimes gives you the same information in different ways. And I want
-to normalize that. Also, JSON responses can return "time" attributes
-only in the string format. And I thought it would be nice that, if you're
-accessing the `updated_at` attribute for example, you actually **get**
-an instance of `Time`, instead of a string, or even integer. These are
-just some of the reason I decided to make this gem.
-
-The method names here aren't called the same as Flickr's API methods
-(and they can't be), but they follow a pattern which
-shouldn't be too difficult to predict. Take a look at the ["Currently covered API
-methods"](#currently-covered-api-methods) section of this readme.
-
-Also, some attribute names that you get from the response are changed.
-So, for example, the `last_update` attribute is called `updated_at`,
-and the `candownload` attribute is called `can_download?`. Because this
-is a **ruby** wrapper, I wanted to write it in Ruby/Rails fashion. At
-first you might not approve of this, because then you might not know
-what the methods name are if you know the name of the key in the
-response hash. But, on the other hand, Flickr often gives you the same
-information in different formats, so this also acts as a normalizer. The
-downsize of this approach is that it may not be up to date when the
-Flickr API changes, but that's why I have **you** to open a new issue
-when you notice something isn't working :)
-
-The gem works on Ruby versions `1.9.2` and `1.9.3`. Also, it follows
-[Semantic versioning](http://semver.org/).
-
-## Examples of usage
-
-You first need to install the gem.
+Supported Ruby versions:
 
-```
-[sudo] gem install flickrie
-```
+- `1.9.2`
+- `1.9.3`
 
-Then, if you're using Bundler in your project, put it into your `Gemfile`:
+This gem follows [Semantic versioning](http://semver.org/).
+
+## Installation and setup
+
+Add it to your `Gemfile`.
 
 ```ruby
-gem "flickrie", "~> 1.4"
+gem "flickrie"
 ```
 
-Then in your app you set the API key and shared secret (if you don't have them
-already, you can apply for them [here](http://www.flickr.com/services/apps/create/apply)).
+And in your Terminal run `bundle install`.
+
+Now you have to set your API key and shared secret in your app (if you don't have them yet,
+you can get them [here](http://www.flickr.com/services/apps/create/apply)).
 
 ```ruby
 require 'flickrie'
@@ -68,9 +44,9 @@ Flickrie.api_key = "API_KEY"
 Flickrie.shared_secret = "SHARED_SECRET"
 ```
 
-If your in Rails, it's a good idea to put this into an initializer.
+If you're in a Rails app, this would go into an initializer.
 
-Now you can search for stuff.
+## Usage
 
 ```ruby
 set_id = 819234
@@ -84,20 +60,21 @@ photo.owner       # => #<User: nsid="67313352@N04", ...>
 photo.owner.nsid  # => "67313352@N04"
 ```
 
-You can also throw in some parameters to `Flickrie.photos_from_set` to get more information about photos. For example,
+You can also pass in additional parameters to to get more information about photos:
 
 ```ruby
-photos = Flickrie.photos_from_set(819234, :extras => 'owner_name,last_update,tags,views')
+photos = Flickrie.photos_from_set(819234, extras: "owner_name,last_update,tags,views")
 
 photo = photos.first
-photo.tags.join(' ') # => "cave cold forrest"
+photo.tags.join(" ") # => "cave cold forrest"
 photo.owner.username # => "jsmith"
 photo.updated_at     # => 2012-04-20 23:29:17 +0200
 photo.views_count    # => 24
 ```
 
-On the list of available parameters you can read in the [Flickr API documentation](http://www.flickr.com/services/api/),
-under the corresponding API method name (in the above case the method name would be `flickr.photosets.getPhotos`).
+For the list of all Flickr API methods and parameters you can pass to them take a look at the
+[Flickr API documentation](http://www.flickr.com/services/api/). The method names in this gem correspond
+to Flickr's method names (so, for example, `Flickr.photos_from_set` is actually `flickr.photosets.getPhotos`).
 
 You can also get additional info on a single photo:
 
@@ -112,7 +89,7 @@ photo.owner.real_name       # => "John Smith"
 photo.location.country.name # => "United States"
 ```
 
-If you already have an existing photo (providing it holds its ID), you can also get info like this:
+If you already have an instatiated photo, you can also get info like this:
 
 ```ruby
 photo.description # => nil
@@ -121,11 +98,11 @@ photo.description # => "In this photo Peter said something really funny..."
 ```
 
 You'll also probably want to display these photos in your app. There are
-some neat methods available for you to help you out with this.
+some neat methods to help you with this.
 
 ```ruby
 photo = Flickrie.get_photo_sizes(8232348)
-# or "photo.get_sizes" on an existing photo
+# or `photo.get_sizes` on an existing photo
 
 photo.medium!(500)
 photo.size       # => "Medium 500"
@@ -144,9 +121,6 @@ So, in your ERB template you could do something like this (in Rails):
 
 You can see the full list of available methods and attributes in the
 [documentation](http://rubydoc.info/gems/flickrie/).
-For photos (and videos) have a look at the `Flickrie::Media` module,
-because it's included into `Flickrie::Photo` and `Flickrie::Video`, and most
-of the attributes are there.
 
 Also, be sure to check the [wiki](https://github.com/janko-m/flickrie/wiki) for some additional info and tips.
 
@@ -169,26 +143,25 @@ puts "You successfully authenticated!"
 
 Flickrie.access_token = access_token.token
 Flickrie.access_secret = access_token.secret
-access_token.user_params # => {:fullname => "John Smith", :user_nsid => "67131352@N03", :username => "jsmith"}
+access_token.user_params # => {fullname: "John Smith", user_nsid: "67131352@N03", username: "jsmith"}
 ```
 
 When getting the authorization url, you can also call
 ```ruby
-request_token.get_authorization_url(:permissions => "read")
+request_token.authorize_url(permissions: "read")
 ```
-to ask only for "read" permissions from the user. Available permissions
-are "read", "write" and "delete".
+to ask only for "read" permissions. Available permissions are "read", "write" and "delete".
 
-If you want to make authentication in your web application, check out my
-[flickr_auth](https://github.com/janko-m/flickr_auth) gem.
-Or, if you want to do it manually, check out
+If you want to make authentication in your web application, I would highly
+recommend the [omniauth-flickr](https://github.com/timbreitkreutz/omniauth-flickr) gem.
+Or, if you want to do it from scratch, without any additional gems, check out
 [this wiki](https://github.com/janko-m/flickrie/wiki/Authentication-in-web-applications)
-for instructions.
+for an example how that authentication might look like.
 
 ## Photo upload
 
 ```ruby
-photo_id = Flickrie.upload("/path/to/photo.jpg", :title => "A cow")
+photo_id = Flickrie.upload("/path/to/photo.jpg", title: "A cow")
 photo = Flickrie.get_photo_info(photo_id)
 photo.title # => "A cow"
 ```
@@ -203,7 +176,7 @@ of an asynchronous photo upload.
 
 ## A few words
 
-Now, I covered only a few out of many Flickr's API methods using this approach,
+Now, there are a lot more API methods that I didn't cover yet,
 but I'll constantly update this gem with new API methods. For all of the methods
 I didn't cover, you can still call them using
 
@@ -238,82 +211,10 @@ It's not nearly as pretty, but at least you can get to the data for the
 time being. Notice that the `:api_key` parameter is always passed in by
 default.
 
-## Issues
-
-Please, feel free to post any issues that you're having. You can also
-post feature requests.
-
-## Cedits
+## Credits
 
 Special thanks to @**mislav**, my brother, he helped me really a lot
-with getting started with ruby. And he also helped me with the
-basis of this gem.
-
-## Currently covered API methods
-
-```ruby
-# people
-"flickr.people.findByEmail"             -> Flickrie.find_user_by_email
-"flickr.people.findByUsername"          -> Flickrie.find_user_by_username
-"flickr.people.getInfo"                 -> Flickrie.get_user_info
-"flickr.people.getPhotos"               -> Flickrie.photos_from_user
-"flickr.people.getPhotosOf"             -> Flickrie.photos_of_user
-"flickr.people.getPublicPhotos"         -> Flickrie.public_photos_from_user
-"flickr.people.getUploadStatus"         -> Flickrie.get_upload_status
-
-# photos
-"flickr.photos.addTags"                 -> Flickrie.add_photo_tags
-"flickr.photos.delete"                  -> Flickrie.delete_photo
-"flickr.photos.getContactsPhotos"       -> Flickrie.photos_from_contacts
-"flickr.photos.getContactsPublicPhotos" -> Flickrie.public_photos_from_user_contacts
-"flickr.photos.getContext"              -> Flickrie.get_photo_context
-"flickr.photos.getCounts"               -> Flickrie.get_photos_counts
-"flickr.photos.getExif"                 -> Flickrie.get_photo_exif
-"flickr.photos.getFavorites"            -> Flickrie.get_photo_favorites
-"flickr.photos.getInfo"                 -> Flickrie.get_photo_info
-"flickr.photos.getNotInSet"             -> Flickrie.photos_not_in_set
-"flickr.photos.getPerms"                -> Flickrie.get_photo_permissions
-"flickr.photos.getRecent"               -> Flickrie.get_recent_photos
-"flickr.photos.getSizes"                -> Flickrie.get_photo_sizes
-"flickr.photos.getUntagged"             -> Flickrie.get_untagged_photos
-"flickr.photos.getWithGeoData"          -> Flickrie.get_photos_with_geo_data
-"flickr.photos.getWithoutGeoData"       -> Flickrie.get_photos_without_geo_data
-"flickr.photos.recentlyUpdated"         -> Flickrie.recently_updated_photos
-"flickr.photos.removeTag"               -> Flickrie.remove_photo_tag
-"flickr.photos.search"                  -> Flickrie.search_photos
-"flickr.photos.setContentType"          -> Flickrie.set_photo_content_type
-"flickr.photos.setDates"                -> Flickrie.set_photo_dates
-"flickr.photos.setMeta"                 -> Flickrie.set_photo_meta
-"flickr.photos.setPerms"                -> Flickrie.set_photo_permissions
-"flickr.photos.setSafetyLevel"          -> Flickrie.set_photo_safety_level
-"flickr.photos.setTags"                 -> Flickrie.set_photo_tags
-
-# photos.licenses
-"flickr.photos.licenses.getInfo"        -> Flickrie.get_licenses
-"flickr.photos.licenses.setLicense"     -> Flickrie.set_photo_license
-
-# photos.upload
-"flickr.photos.upload.checkTickets"     -> Flickrie.check_upload_tickets
-
-# photosets
-"flickr.photosets.addPhoto"             -> Flickrie.add_photo_to_set
-"flickr.photosets.create"               -> Flickrie.create_set
-"flickr.photosets.delete"               -> Flickrie.delete_set
-"flickr.photosets.editMeta"             -> Flickrie.edit_set_metadata
-"flickr.photosets.editPhotos"           -> Flickrie.edit_set_photos
-"flickr.photosets.getContext"           -> Flickrie.get_set_context
-"flickr.photosets.getInfo"              -> Flickrie.get_set_info
-"flickr.photosets.getList"              -> Flickrie.sets_from_user
-"flickr.photosets.getPhotos"            -> Flickrie.photos_from_set
-"flickr.photosets.orderSets"            -> Flickrie.order_sets
-"flickr.photosets.removePhoto"          -> Flickrie.remove_photos_from_set
-"flickr.photosets.removePhotos"         -> Flickrie.remove_photos_from_set
-"flickr.photosets.reorderPhotos"        -> Flickrie.reorder_photos_in_set
-"flickr.photosets.setPrimaryPhoto"      -> Flickrie.set_primary_photo_to_set
-
-# test
-"flickr.test.login"                     -> Flickrie.test_login
-```
+with getting started with Ruby, and with the basis of this gem.
 
 ## Changelog
 
@@ -321,7 +222,7 @@ You can see the changelog [here](https://github.com/janko-m/flickrie/blob/master
 
 ## Social
 
-You can follow me on Twitter, I'm **@m_janko**.
+You can follow me on Twitter, I'm [@jankomarohnic](https://twitter.com/jankomarohnic).
 
 ## License
 

data/lib/flickrie.rb

@@ -1,9 +1,11 @@
 require 'flickrie/callable'
+require 'flickrie/deprecatable'
+require 'flickrie/flickr_api_methods'
 
 module Flickrie
   DEFAULTS = {
-    :open_timeout => 3,
-    :timeout => 4
+    open_timeout: 3,
+    timeout: 4
   }
 
   class << self
@@ -65,7 +67,7 @@ module Flickrie
     #
     # Now let's assume you have a collection of photos
     #
-    #     @photos = Flickrie.photos_from_set(2734243, :per_page => 20, :page => params[:page])
+    #     @photos = Flickrie.photos_from_set(2734243, per_page: 20, page: params[:page])
     #
     # This collection is now paginated. You can now call in your ERB template:
     #
@@ -94,8 +96,6 @@ module Flickrie
           @client = @upload_client = nil
         end
       end
-
-    include Callable
   end
 end
 
@@ -106,6 +106,7 @@ module Flickrie
   autoload :License,      'flickrie/objects/license'
   autoload :User,         'flickrie/objects/user'
   autoload :Media,        'flickrie/objects/media'
+  autoload :Comment,      'flickrie/objects/comment'
   autoload :Photo,        'flickrie/objects/photo'
   autoload :Video,        'flickrie/objects/video'
   autoload :Set,          'flickrie/objects/set'
@@ -119,4 +120,8 @@ module Flickrie
   autoload :Base58,       'flickrie/base58'
 
   extend ApiMethods
+
+  def self.lookup_method(method)
+    FLICKR_API_METHODS[method]
+  end
 end

data/lib/flickrie/api_methods.rb

@@ -1,21 +1,25 @@
 module Flickrie
   module ApiMethods
+
+    include Callable
+    extend Deprecatable
+
     # For uploading photos and videos to Flickr. Example:
     #
     #     path = File.expand_path("photo.jpg")
-    #     photo_id = Flickrie.upload(path, :title => "Me and Jessica", :description => "...")
+    #     photo_id = Flickrie.upload(path, title: "Me and Jessica", description: "...")
     #     photo = Flickrie.get_photo_info(photo_id)
     #     photo.title # => "Me and Jessica"
     #
-    # If the `:async => 1` option is passed, returns the ticket ID (see {#check\_upload\_tickets}).
+    # If the `async: 1` option is passed, returns the ticket ID (see {#check\_upload\_tickets}).
     #
     # @param media [File, String] A file or a path to the file you want to upload
     # @param params [Hash] Options for uploading (see [this page](http://www.flickr.com/services/api/upload.api.html))
-    # @return [String] New photo's ID, or ticket's ID, if `:async => 1` is passed
+    # @return [String] New photo's ID, or ticket's ID, if `async: 1` is passed
     #
     # @note This method requires authentication with "write" permissions.
     def upload(media, params = {})
-      response = upload_client.upload(media, params)
+      response = make_request(media, params)
       if params[:async] == 1
         response.body['rsp']['ticketid']
       else
@@ -29,16 +33,16 @@ module Flickrie
     #     photo_id = 42374 # ID of the photo to be replaced
     #     id = Flickrie.replace(path, photo_id)
     #
-    # If the `:async => 1` option is passed, returns the ticket ID (see {#check\_upload\_tickets}).
+    # If the `async: 1` option is passed, returns the ticket ID (see {#check\_upload\_tickets}).
     #
     # @param media [File, String] A file or a path to the file you want to upload
     # @param media_id [String, Fixnum] The ID of the photo/video to be replaced
     # @param params [Hash] Options for replacing (see [this page](http://www.flickr.com/services/api/replace.api.html))
-    # @return [String] New photo's ID, or ticket's ID, if `:async => 1` is passed
+    # @return [String] New photo's ID, or ticket's ID, if `async: 1` is passed
     #
     # @note This method requires authentication with "write" permissions.
     def replace(media, media_id, params = {})
-      response = upload_client.replace(media, media_id, params)
+      response = make_request(media, media_id, params)
       if params[:async] == 1
         response.body['rsp']['ticketid']
       else
@@ -48,116 +52,113 @@ module Flickrie
 
     # Fetches the Flickr user with the given email.
     #
-    # @param email [String]
     # @return [Flickrie::User]
     # @api_method [flickr.people.findByEmail](http://www.flickr.com/services/api/flickr.people.findByEmail.html)
     def find_user_by_email(email, params = {})
-      response = client.find_user_by_email(email, params)
+      response = make_request(email, params)
       User.new(response.body['user'], self)
     end
 
     # Fetches the Flickr user with the given username.
     #
-    # @param username [String]
     # @return [Flickrie::User]
     # @api_method [flickr.people.findByUsername](http://www.flickr.com/services/api/flickr.people.findByUsername.html)
     def find_user_by_username(username, params = {})
-      response = client.find_user_by_username(username, params)
+      response = make_request(username, params)
       User.new(response.body['user'], self)
     end
 
     # Fetches photos and videos from the Flickr user with the given NSID.
     #
-    # @param nsid [String]
     # @return [Flickrie::Collection<Flickrie::Photo, Flickrie::Video>]
     # @api_method [flickr.people.getPhotos](http://www.flickr.com/services/api/flickr.people.getPhotos.html)
     #
     # @note This method requires authentication with "read" permissions.
-    def media_from_user(nsid, params = {})
-      response = client.media_from_user(nsid, params)
+    def get_media_from_user(nsid, params = {})
+      response = make_request(nsid, params)
       Media.new_collection(response.body['photos'], self)
     end
+    deprecated_alias :media_from_user, :get_media_from_user
     # Fetches photos from the Flickr user with the given NSID.
     #
-    # @param nsid [String]
     # @return [Flickrie::Collection<Flickrie::Photo>]
     # @api_method [flickr.people.getPhotos](http://www.flickr.com/services/api/flickr.people.getPhotos.html)
     #
     # @note This method requires authentication with "read" permissions.
-    def photos_from_user(nsid, params = {})
-      media_from_user(nsid, params).select { |media| media.is_a?(Photo) }
+    def get_photos_from_user(nsid, params = {})
+      get_media_from_user(nsid, params).select { |media| media.is_a?(Photo) }
     end
+    deprecated_alias :photos_from_user, :get_photos_from_user
     # Fetches videos from the Flickr user with the given NSID.
     #
-    # @param nsid [String]
     # @return [Flickrie::Collection<Flickrie::Video>]
     # @api_method [flickr.people.getPhotos](http://www.flickr.com/services/api/flickr.people.getPhotos.html)
     #
     # @note This method requires authentication with "read" permissions.
-    def videos_from_user(nsid, params = {})
-      media_from_user(nsid, params).select { |media| media.is_a?(Video) }
+    def get_videos_from_user(nsid, params = {})
+      get_media_from_user(nsid, params).select { |media| media.is_a?(Video) }
     end
+    deprecated_alias :videos_from_user, :get_videos_from_user
 
     # Fetches photos and videos containing a Flickr user with the given NSID.
     #
-    # @param nsid [String]
     # @return [Flickrie::Collection<Flickrie::Photo, Flickrie::Video>]
     # @api_method [flickr.people.getPhotosOf](http://www.flickr.com/services/api/flickr.people.getPhotosOf.html)
-    def media_of_user(nsid, params = {})
-      response = client.media_of_user(nsid, params)
+    def get_media_of_user(nsid, params = {})
+      response = make_request(nsid, params)
       Media.new_collection(response.body['photos'], self)
     end
+    deprecated_alias :media_of_user, :get_media_of_user
     # Fetches photos containing a Flickr user with the given NSID.
     #
-    # @param nsid [String]
     # @return [Flickrie::Collection<Flickrie::Photo>]
     # @api_method [flickr.people.getPhotosOf](http://www.flickr.com/services/api/flickr.people.getPhotosOf.html)
-    def photos_of_user(nsid, params = {})
-      media_of_user(nsid, params).select { |media| media.is_a?(Photo) }
+    def get_photos_of_user(nsid, params = {})
+      get_media_of_user(nsid, params).select { |media| media.is_a?(Photo) }
     end
+    deprecated_alias :photos_of_user, :get_photos_of_user
     # Fetches videos containing a Flickr user with the given NSID.
     #
-    # @param nsid [String]
     # @return [Flickrie::Collection<Flickrie::Video>]
     # @api_method [flickr.people.getPhotosOf](http://www.flickr.com/services/api/flickr.people.getPhotosOf.html)
-    def videos_of_user(nsid, params = {})
-      media_of_user(nsid, params).select { |media| media.is_a?(Video) }
+    def get_videos_of_user(nsid, params = {})
+      get_media_of_user(nsid, params).select { |media| media.is_a?(Video) }
     end
+    deprecated_alias :videos_of_user, :get_videos_of_user
 
     # Fetches public photos and videos from the Flickr user with the given
     # NSID.
     #
-    # @param nsid [String]
     # @return [Flickrie::Collection<Flickrie::Photo, Flickrie::Video>]
     # @api_method [flickr.people.getPublicPhotos](http://www.flickr.com/services/api/flickr.people.getPublicPhotos.html)
-    def public_media_from_user(nsid, params = {})
-      response = client.public_media_from_user(nsid, params)
+    def get_public_media_from_user(nsid, params = {})
+      response = make_request(nsid, params)
       Media.new_collection(response.body['photos'], self)
     end
+    deprecated_alias :public_media_from_user, :get_public_media_from_user
     # Fetches public photos from the Flickr user with the given NSID.
     #
-    # @param nsid [String]
     # @return [Flickrie::Collection<Flickrie::Photo>]
     # @api_method [flickr.people.getPublicPhotos](http://www.flickr.com/services/api/flickr.people.getPublicPhotos.html)
-    def public_photos_from_user(nsid, params = {})
-      public_media_from_user(nsid, params).select { |media| media.is_a?(Photo) }
+    def get_public_photos_from_user(nsid, params = {})
+      get_public_media_from_user(nsid, params).select { |media| media.is_a?(Photo) }
     end
+    deprecated_alias :public_photos_from_user, :get_public_photos_from_user
     # Fetches public videos from the Flickr user with the given NSID.
     #
-    # @param nsid [String]
     # @return [Flickrie::Collection<Flickrie::Video>]
     # @api_method [flickr.people.getPublicPhotos](http://www.flickr.com/services/api/flickr.people.getPublicPhotos.html)
-    def public_videos_from_user(nsid, params = {})
-      public_media_from_user(nsid, params).select { |media| media.is_a?(Video) }
+    def get_public_videos_from_user(nsid, params = {})
+      get_public_media_from_user(nsid, params).select { |media| media.is_a?(Video) }
     end
+    deprecated_alias :public_videos_from_user, :get_public_videos_from_user
 
     # Fetches the Flickr user with the given NSID.
     #
-    # @param nsid [String]
     # @return [Flickrie::User]
     # @api_method [flickr.people.getInfo](http://www.flickr.com/services/api/flickr.people.getInfo.html)
     def get_user_info(nsid, params = {})
-      response = client.get_user_info(nsid, params)
+      response = make_request(nsid, params)
       User.new(response.body['person'], self)
     end
 
@@ -169,34 +170,35 @@ module Flickrie
     #
     # @note This method requires authentication with "read" permissions.
     def get_upload_status(params = {})
-      response = client.get_upload_status(params)
+      response = make_request(params)
       User.new(response.body['user'], self)
     end
 
     # Add tags to the photo/video with the given ID.
     #
-    # @param media_id [String, Fixnum]
     # @param tags [String] A space delimited string with tags
     # @return [nil]
     # @api_method [flickr.photos.addTags](http://www.flickr.com/services/api/flickr.photos.addTags.html)
     #
     # @note This method requires authentication with "write" permissions.
-    def add_media_tags(media_id, tags, params = {})
-      client.add_media_tags(media_id, tags, params)
+    def tag_media(media_id, tags, params = {})
+      make_request(media_id, tags, params)
       nil
     end
-    alias add_photo_tags add_media_tags
-    alias add_video_tags add_media_tags
+    deprecated_alias :add_media_tags, :tag_media
+    alias tag_photo tag_media
+    deprecated_alias :add_photo_tags, :tag_photo
+    alias tag_video tag_media
+    deprecated_alias :add_video_tags, :tag_video
 
     # Deletes the photo/video with the given ID.
     #
-    # @param media_id [String, Fixnum]
     # @return [nil]
     # @api_method [flickr.photos.delete](http://www.flickr.com/services/api/flickr.photos.delete.html)
     #
     # @note This method requires authentication with "delete" permissions.
     def delete_media(media_id, params = {})
-      client.delete_media(media_id, params)
+      make_request(media_id, params)
       nil
     end
     alias delete_photo delete_media
@@ -204,69 +206,64 @@ module Flickrie
 
     # Fetches photos and videos from contacts of the user who authenticated.
     #
-    # @param params [Hash] Options for this API method (see the link below under "Flickr API method")
     # @return [Flickrie::Collection<Flickrie::Photo, Flickrie::Video>]
     # @api_method [flickr.photos.getContactsPhotos](http://www.flickr.com/services/api/flickr.photos.getContactsPhotos.html)
     #
     # @note This method requires authentication with "read" permissions.
-    def media_from_contacts(params = {})
-      response = client.media_from_contacts(params)
+    def get_media_from_contacts(params = {})
+      response = make_request(params)
       Media.new_collection(response.body['photos'], self)
     end
+    deprecated_alias :media_from_contacts, :get_media_from_contacts
     # Fetches photos from contacts of the user who authenticated.
     #
-    # @param params [Hash] Options for this API method (see the link below under "Flickr API method")
     # @return [Flickrie::Collection<Flickrie::Photo>]
     # @api_method [flickr.photos.getContactsPhotos](http://www.flickr.com/services/api/flickr.photos.getContactsPhotos.html)
     #
     # @note This method requires authentication with "read" permissions.
-    def photos_from_contacts(params = {})
-      media_from_contacts(params).select { |media| media.is_a?(Photo) }
+    def get_photos_from_contacts(params = {})
+      get_media_from_contacts(params).select { |media| media.is_a?(Photo) }
     end
+    deprecated_alias :photos_from_contacts, :get_photos_from_contacts
     # Fetches videos from contacts of the user who authenticated.
     #
-    # @param params [Hash] Options for this API method (see the link below under "Flickr API method")
     # @return [Flickrie::Collection<Flickrie::Video>]
     # @api_method [flickr.photos.getContactsPhotos](http://www.flickr.com/services/api/flickr.photos.getContactsPhotos.html)
     #
     # @note This method requires authentication with "read" permissions.
-    def videos_from_contacts(params = {})
-      media_from_contacts(params).select { |media| media.is_a?(Video) }
+    def get_videos_from_contacts(params = {})
+      get_media_from_contacts(params).select { |media| media.is_a?(Video) }
     end
+    deprecated_alias :videos_from_contacts, :get_videos_from_contacts
 
     # Fetches public photos and videos from contacts of the user with the
     # given NSID.
     #
-    # @param nsid [String]
-    # @param params [Hash] Options for this API method (see the link below under "Flickr API method")
     # @return [Flickrie::Collection<Flickrie::Photo, Flickrie::Video>]
     # @api_method [flickr.photos.getContactsPublicPhotos](http://www.flickr.com/services/api/flickr.photos.getContactsPublicPhotos.html)
-    def public_media_from_user_contacts(nsid, params = {})
-      response = client.public_media_from_user_contacts(nsid, params)
+    def get_public_media_from_contacts(nsid, params = {})
+      response = make_request(nsid, params)
       Media.new_collection(response.body['photos'], self)
     end
+    deprecated_alias :public_media_from_user_contacts, :get_public_media_from_contacts
     # Fetches public photos from contacts of the user with the
     # given NSID.
     #
-    # @param nsid [String]
-    # @param params [Hash] Options for this API method (see the link below under "Flickr API method")
     # @return [Flickrie::Collection<Flickrie::Photo>]
     # @api_method [flickr.photos.getContactsPublicPhotos](http://www.flickr.com/services/api/flickr.photos.getContactsPublicPhotos.html)
-    def public_photos_from_user_contacts(nsid, params = {})
-      public_media_from_user_contacts(nsid, params).
-        select { |media| media.is_a?(Photo) }
+    def get_public_photos_from_contacts(nsid, params = {})
+      get_public_media_from_contacts(nsid, params).select { |media| media.is_a?(Photo) }
     end
+    deprecated_alias :public_photos_from_user_contacts, :get_public_photos_from_contacts
     # Fetches public videos from contacts of the user with the
     # given NSID.
     #
-    # @param nsid [String]
-    # @param params [Hash] Options for this API method (see the link below under "Flickr API method")
     # @return [Flickrie::Collection<Flickrie::Video>]
     # @api_method [flickr.photos.getContactsPublicPhotos](http://www.flickr.com/services/api/flickr.photos.getContactsPublicPhotos.html)
-    def public_videos_from_user_contacts(nsid, params = {})
-      public_media_from_user_contacts(nsid, params).
-        select { |media| media.is_a?(Video) }
+    def get_public_videos_from_contacts(nsid, params = {})
+      get_public_media_from_contacts(nsid, params).select { |media| media.is_a?(Video) }
     end
+    deprecated_alias :public_videos_from_user_contacts, :get_public_videos_from_contacts
 
     # Fetches context of the photo/video with the given ID. Example:
     #
@@ -275,11 +272,10 @@ module Flickrie
     #     context.previous # => #<Photo: id=2433240, ...>
     #     context.next     # => #<Video: id=1282404, ...>
     #
-    # @param media_id [String, Fixnum]
-    # @return [Struct]
+    # @return [Flickrie::MediaContext]
     # @api_method [flickr.photos.getContext](http://www.flickr.com/services/api/flickr.photos.getContext.html)
     def get_media_context(media_id, params = {})
-      response = client.get_media_context(media_id, params)
+      response = make_request(media_id, params)
       MediaContext.new(response.body, self)
     end
     alias get_photo_context get_media_context
@@ -289,7 +285,7 @@ module Flickrie
     #
     #     require 'date'
     #     dates = [DateTime.parse("3rd Jan 2011").to_time, DateTime.parse("11th Aug 2011").to_time]
-    #     counts = Flickrie.get_media_counts(:taken_dates => dates.map(&:to_i).join(','))
+    #     counts = Flickrie.get_media_counts(taken_dates: dates.map(&:to_i).join(','))
     #
     #     count = counts.first
     #     count.value            # => 24
@@ -297,11 +293,10 @@ module Flickrie
     #     count.date_range.begin # => 2011-01-03 01:00:00 +0100
     #     count.from             # => 2011-01-03 01:00:00 +0100
     #
-    # @param params [Hash] Options for this API method (see the link below under "Flickr API method")
     # @return [Flickrie::MediaCount]
     # @api_method [flickr.photos.getCounts](http://www.flickr.com/services/api/flickr.photos.getCounts.html)
     def get_media_counts(params = {})
-      response = client.get_media_counts(params)
+      response = make_request(params)
       MediaCount.new_collection(response.body['photocounts'])
     end
     alias get_photos_counts get_media_counts
@@ -312,15 +307,15 @@ module Flickrie
     #     photo = Flickrie.get_photo_exif(27234987)
     #     photo.exif.get('Model') # => 'Canon PowerShot G12'
     #
-    #     photo.exif.get('X-Resolution', :data => 'raw')   # => '180'
-    #     photo.exif.get('X-Resolution', :data => 'clean') # => '180 dpi'
+    #     photo.exif.get('X-Resolution', data: 'raw')   # => '180'
+    #     photo.exif.get('X-Resolution', data: 'clean') # => '180 dpi'
     #     photo.exif.get('X-Resolution')                   # => '180 dpi'
     #
     # @param photo_id [String, Fixnum]
     # @return [Flickrie::Photo]
     # @api_method [flickr.photos.getExif](http://www.flickr.com/services/api/flickr.photos.getExif.html)
     def get_photo_exif(photo_id, params = {})
-      response = client.get_media_exif(photo_id, params)
+      response = make_request(photo_id, params)
       Photo.new(response.body['photo'], self)
     end
     # Fetches the exif for the video with the given ID. Example:
@@ -328,15 +323,15 @@ module Flickrie
     #     video = Flickrie.get_video_exif(27234987)
     #     video.exif.get('Model') # => 'Canon PowerShot G12'
     #
-    #     video.exif.get('X-Resolution', :data => 'raw')   # => '180'
-    #     video.exif.get('X-Resolution', :data => 'clean') # => '180 dpi'
+    #     video.exif.get('X-Resolution', data: 'raw')   # => '180'
+    #     video.exif.get('X-Resolution', data: 'clean') # => '180 dpi'
     #     video.exif.get('X-Resolution')                   # => '180 dpi'
     #
     # @param video_id [String, Fixnum]
     # @return [Flickrie::Video]
     # @api_method [flickr.photos.getExif](http://www.flickr.com/services/api/flickr.photos.getExif.html)
     def get_video_exif(video_id, params = {})
-      response = client.get_media_exif(video_id, params)
+      response = make_request(video_id, params)
       Video.new(response.body['photo'], self)
     end
 
@@ -350,7 +345,7 @@ module Flickrie
     # @return [Flickrie::Photo]
     # @api_method [flickr.photos.getFavorites](http://www.flickr.com/services/api/flickr.photos.getFavorites.html)
     def get_photo_favorites(photo_id, params = {})
-      response = client.get_media_favorites(photo_id, params)
+      response = make_request(photo_id, params)
       Photo.new(response.body['photo'], self)
     end
     # Fetches the list of users who favorited the video with the given ID.
@@ -363,7 +358,7 @@ module Flickrie
     # @return [Flickrie::Video]
     # @api_method [flickr.photos.getFavorites](http://www.flickr.com/services/api/flickr.photos.getFavorites.html)
     def get_video_favorites(video_id, params = {})
-      response = client.get_media_favorites(video_id, params)
+      response = make_request(video_id, params)
       Video.new(response.body['photo'], self)
     end
 
@@ -373,7 +368,7 @@ module Flickrie
     # @return [Flickrie::Photo, Flickrie::Video]
     # @api_method [flickr.photos.getInfo](http://www.flickr.com/services/api/flickr.photos.getInfo.html)
     def get_media_info(media_id, params = {})
-      response = client.get_media_info(media_id, params)
+      response = make_request(media_id, params)
       Media.new(response.body['photo'], self)
     end
     alias get_photo_info get_media_info
@@ -386,10 +381,11 @@ module Flickrie
     # @api_method [flickr.photos.getNotInSet](http://www.flickr.com/services/api/flickr.photos.getNotInSet.html)
     #
     # @note This method requires authentication with "read" permissions.
-    def media_not_in_set(params = {})
-      response = client.media_not_in_set({:media => 'all'}.merge(params))
+    def get_media_not_in_set(params = {})
+      response = make_request({media: 'all'}.merge(params))
       Media.new_collection(response.body['photos'], self)
     end
+    deprecated_alias :media_not_in_set, :get_media_not_in_set
     # Fetches photos from the authenticated user
     # that are not in any set.
     #
@@ -397,9 +393,10 @@ module Flickrie
     # @api_method [flickr.photos.getNotInSet](http://www.flickr.com/services/api/flickr.photos.getNotInSet.html)
     #
     # @note This method requires authentication with "read" permissions.
-    def photos_not_in_set(params = {})
-      media_not_in_set({:media => "photos"}.merge(params))
+    def get_photos_not_in_set(params = {})
+      get_media_not_in_set({media: "photos"}.merge(params))
     end
+    deprecated_alias :photos_not_in_set, :get_photos_not_in_set
     # Fetches videos from the authenticated user
     # that are not in any set.
     #
@@ -407,9 +404,10 @@ module Flickrie
     # @api_method [flickr.photos.getNotInSet](http://www.flickr.com/services/api/flickr.photos.getNotInSet.html)
     #
     # @note This method requires authentication with "read" permissions.
-    def videos_not_in_set(params = {})
-      media_not_in_set({:media => "videos"}.merge(params))
+    def get_videos_not_in_set(params = {})
+      get_media_not_in_set({media: "videos"}.merge(params))
     end
+    deprecated_alias :videos_not_in_set, :get_videos_not_in_set
 
     # Gets permissions of a photo with the given ID.
     #
@@ -418,7 +416,7 @@ module Flickrie
     #
     # @note This method requires authentication with "read" permissions.
     def get_photo_permissions(photo_id, params = {})
-      response = client.get_media_permissions(photo_id, params)
+      response = make_request(photo_id, params)
       Photo.new(response.body['perms'], self)
     end
     # Gets permissions of a video with the given ID.
@@ -428,7 +426,7 @@ module Flickrie
     #
     # @note This method requires authentication with "read" permissions.
     def get_video_permissions(video_id, params = {})
-      response = client.get_media_permissions(video_id, params)
+      response = make_request(video_id, params)
       Video.new(response.body['perms'], self)
     end
 
@@ -437,7 +435,7 @@ module Flickrie
     # @return [Flickrie::Collection<Flickrie::Photo, Flickrie::Video>]
     # @api_method [flickr.photos.getRecent](http://www.flickr.com/services/api/flickr.photos.getRecent.html)
     def get_recent_media(params = {})
-      response = client.get_recent_media(params)
+      response = make_request(params)
       Media.new_collection(response.body['photos'], self)
     end
     # Fetches the latest photos uploaded to Flickr.
@@ -466,7 +464,7 @@ module Flickrie
     # @return [Flickrie::Photo]
     # @api_method [flickr.photos.getSizes](http://www.flickr.com/services/api/flickr.photos.getSizes.html)
     def get_photo_sizes(photo_id, params = {})
-      response = client.get_media_sizes(photo_id, params)
+      response = make_request(photo_id, params)
       Photo.new(response.body['sizes'], self)
     end
     # Fetches the sizes of the video with the given ID. Example:
@@ -478,7 +476,7 @@ module Flickrie
     # @return [Flickrie::Video]
     # @api_method [flickr.photos.getSizes](http://www.flickr.com/services/api/flickr.photos.getSizes.html)
     def get_video_sizes(video_id, params = {})
-      response = client.get_media_sizes(video_id, params)
+      response = make_request(video_id, params)
       Video.new(response.body['sizes'], self)
     end
 
@@ -490,7 +488,7 @@ module Flickrie
     #
     # @note This method requires authentication with "read" permissions.
     def get_untagged_media(params = {})
-      response = client.get_untagged_media({:media => 'all'}.merge(params))
+      response = make_request({media: 'all'}.merge(params))
       Media.new_collection(response.body['photos'], self)
     end
     # Fetches photos from the authenticated user that have no tags.
@@ -500,7 +498,7 @@ module Flickrie
     #
     # @note This method requires authentication with "read" permissions.
     def get_untagged_photos(params = {})
-      get_untagged_media({:media => 'photos'}.merge(params))
+      get_untagged_media({media: 'photos'}.merge(params))
     end
     # Fetches videos from the authenticated user that have no tags.
     #
@@ -509,7 +507,7 @@ module Flickrie
     #
     # @note This method requires authentication with "read" permissions.
     def get_untagged_videos(params = {})
-      get_untagged_media({:media => 'videos'}.merge(params))
+      get_untagged_media({media: 'videos'}.merge(params))
     end
 
     # Fetches geo-tagged photos and videos from the authenticated user.
@@ -519,7 +517,7 @@ module Flickrie
     #
     # @note This method requires authentication with "read" permissions.
     def get_media_with_geo_data(params = {})
-      response = client.get_media_with_geo_data({:media => 'all'}.merge(params))
+      response = make_request({media: 'all'}.merge(params))
       Media.new_collection(response.body['photos'], self)
     end
     # Fetches geo-tagged photos from the authenticated user.
@@ -529,7 +527,7 @@ module Flickrie
     #
     # @note This method requires authentication with "read" permissions.
     def get_photos_with_geo_data(params = {})
-      get_media_with_geo_data({:media => 'photos'}.merge(params))
+      get_media_with_geo_data({media: 'photos'}.merge(params))
     end
     # Fetches geo-tagged videos from the authenticated user.
     #
@@ -538,7 +536,7 @@ module Flickrie
     #
     # @note This method requires authentication with "read" permissions.
     def get_videos_with_geo_data(params = {})
-      get_media_with_geo_data({:media => 'videos'}.merge(params))
+      get_media_with_geo_data({media: 'videos'}.merge(params))
     end
 
     # Fetches photos and videos from the authenticated user that are not
@@ -549,7 +547,7 @@ module Flickrie
     #
     # @note This method requires authentication with "read" permissions.
     def get_media_without_geo_data(params = {})
-      response = client.get_media_with_geo_data({:media => 'all'}.merge(params))
+      response = make_request({media: 'all'}.merge(params))
       Media.new_collection(response.body['photos'], self)
     end
     # Fetches photos from the authenticated user that are not geo-tagged.
@@ -559,7 +557,7 @@ module Flickrie
     #
     # @note This method requires authentication with "read" permissions.
     def get_photos_without_geo_data(params = {})
-      get_media_with_geo_data({:media => 'photos'}.merge(params))
+      get_media_with_geo_data({media: 'photos'}.merge(params))
     end
     # Fetches videos from the authenticated user that are not geo-tagged.
     #
@@ -568,7 +566,7 @@ module Flickrie
     #
     # @note This method requires authentication with "read" permissions.
     def get_videos_without_geo_data(params = {})
-      get_media_with_geo_data({:media => 'videos'}.merge(params))
+      get_media_with_geo_data({media: 'videos'}.merge(params))
     end
 
     # Fetches photos and videos from the authenticated user that have
@@ -578,28 +576,31 @@ module Flickrie
     # @api_method [flickr.photos.recentlyUpdated](http://www.flickr.com/services/api/flickr.photos.recentlyUpdated.html)
     #
     # @note This method requires authentication with "read" permissions.
-    def recently_updated_media(params = {})
-      response = client.recently_updated_media(params)
+    def get_recently_updated_media(params = {})
+      response = make_request(params)
       Media.new_collection(response.body['photos'], self)
     end
+    deprecated_alias :recently_updated_media, :get_recently_updated_media
     # Fetches photos from the authenticated user that have recently been updated.
     #
     # @return [Flickrie::Collection<Flickrie::Photo>]
     # @api_method [flickr.photos.recentlyUpdated](http://www.flickr.com/services/api/flickr.photos.recentlyUpdated.html)
     #
     # @note This method requires authentication with "read" permissions.
-    def recently_updated_photos(params = {})
+    def get_recently_updated_photos(params = {})
       recently_updated_media(params).select { |media| media.is_a?(Photo) }
     end
+    deprecated_alias :recently_updated_photos, :get_recently_updated_photos
     # Fetches videos from the authenticated user that have recently been updated.
     #
     # @return [Flickrie::Collection<Flickrie::Video>]
     # @api_method [flickr.photos.recentlyUpdated](http://www.flickr.com/services/api/flickr.photos.recentlyUpdated.html)
     #
     # @note This method requires authentication with "read" permissions.
-    def recently_updated_videos(params = {})
+    def get_recently_updated_videos(params = {})
       recently_updated_media(params).select { |media| media.is_a?(Video) }
     end
+    deprecated_alias :recently_updated_videos, :get_recently_updated_videos
 
     # Remove the tag with the given ID
     #
@@ -608,19 +609,22 @@ module Flickrie
     # @api_method [flickr.photos.removeTag](http://www.flickr.com/services/api/flickr.photos.removeTag.html)
     #
     # @note This method requires authentication with "write" permissions.
-    def remove_media_tag(tag_id, params = {})
-      client.remove_media_tag(tag_id, params)
+    def untag_media(tag_id, params = {})
+      make_request(tag_id, params)
       nil
     end
-    alias remove_photo_tag remove_media_tag
-    alias remove_video_tag remove_media_tag
+    deprecated_alias :remove_media_tag, :untag_media
+    alias untag_photo untag_media
+    deprecated_alias :remove_photo_tag, :untag_photo
+    alias untag_video untag_media
+    deprecated_alias :remove_video_tag, :untag_video
 
     # Fetches photos and videos matching a certain criteria.
     #
     # @return [Flickrie::Collection<Flickrie::Photo, Flickrie::Video>]
     # @api_method [flickr.photos.search](http://www.flickr.com/services/api/flickr.photos.search.html)
     def search_media(params = {})
-      response = client.search_media({:media => 'all'}.merge(params))
+      response = make_request({media: 'all'}.merge(params))
       Media.new_collection(response.body['photos'], self)
     end
     # Fetches photos matching a certain criteria.
@@ -628,14 +632,14 @@ module Flickrie
     # @return [Flickrie::Collection<Flickrie::Photo>]
     # @api_method [flickr.photos.search](http://www.flickr.com/services/api/flickr.photos.search.html)
     def search_photos(params = {})
-      search_media({:media => 'photos'}.merge(params))
+      search_media({media: 'photos'}.merge(params))
     end
     # Fetches videos matching a certain criteria.
     #
     # @return [Flickrie::Collection<Flickrie::Video>]
     # @api_method [flickr.photos.search](http://www.flickr.com/services/api/flickr.photos.search.html)
     def search_videos(params = {})
-      search_media({:media => 'videos'}.merge(params))
+      search_media({media: 'videos'}.merge(params))
     end
 
     # Sets the content type of a photo/video.
@@ -647,7 +651,7 @@ module Flickrie
     #
     # @note This method requires authentication with "write" permissions.
     def set_media_content_type(media_id, content_type, params = {})
-      client.set_media_content_type(media_id, content_type, params)
+      make_request(media_id, content_type, params)
       nil
     end
     alias set_photo_content_type set_media_content_type
@@ -661,7 +665,7 @@ module Flickrie
     #
     # @note This method requires authentication with "write" permissions.
     def set_media_dates(media_id, params = {})
-      client.set_media_dates(media_id, params)
+      make_request(media_id, params)
       nil
     end
     alias set_photo_dates set_media_dates
@@ -675,7 +679,7 @@ module Flickrie
     #
     # @note This method requires authentication with "write" permissions.
     def set_media_meta(media_id, params = {})
-      client.set_media_meta(media_id, params)
+      make_request(media_id, params)
       nil
     end
     alias set_photo_meta set_media_meta
@@ -689,7 +693,7 @@ module Flickrie
     #
     # @note This method requires authentication with "write" permissions.
     def set_media_permissions(media_id, params = {})
-      client.set_media_permissions(media_id, params)
+      make_request(media_id, params)
       nil
     end
     alias set_photo_permissions set_media_permissions
@@ -703,7 +707,7 @@ module Flickrie
     #
     # @note This method requires authentication with "write" permissions.
     def set_media_safety_level(media_id, params = {})
-      client.set_media_safety_level(media_id, params)
+      make_request(media_id, params)
       nil
     end
     alias set_photo_safety_level set_media_safety_level
@@ -711,24 +715,106 @@ module Flickrie
 
     # Sets tags for a photo/video.
     #
-    # @param media_id [String, Fixnum]
+    # @param tags [String] A space-delimited string with tags
     # @return [nil]
     # @api_method [flickr.photos.setTags](http://www.flickr.com/services/api/flickr.photos.setTags.html)
     #
     # @note This method requires authentication with "write" permissions.
     def set_media_tags(media_id, tags, params = {})
-      client.set_media_tags(media_id, tags, params)
+      make_request(media_id, tags, params)
       nil
     end
     alias set_photo_tags set_media_tags
     alias set_video_tags set_media_tags
 
+    # Comment on a photo/video.
+    #
+    # @return [String] Comment's ID
+    # @api_method [flickr.photos.comments.addComment](http://www.flickr.com/services/api/flickr.photos.comments.addComment.html)
+    #
+    # @note This method requires authentication with "write" permissions.
+    def comment_media(media_id, comment, params = {})
+      response = make_request(media_id, comment, params)
+      response.body["comment"]["id"]
+    end
+    alias comment_photo comment_media
+    alias comment_video comment_media
+
+    # Delete a comment.
+    #
+    # @return [nil]
+    # @api_method [flickr.photos.comments.deleteComment](http://www.flickr.com/services/api/flickr.photos.comments.deleteComment.html)
+    #
+    # @note This method requires authentication with "write" permissions.
+    def delete_media_comment(comment_id, params = {})
+      make_request(comment_id, params)
+      nil
+    end
+    alias delete_photo_comment delete_media_comment
+    alias delete_video_comment delete_media_comment
+
+    # Edit a specific comment.
+    #
+    # @return [nil]
+    # @api_method [flickr.photos.comments.editComment](http://www.flickr.com/services/api/flickr.photos.comments.editComment.html)
+    #
+    # @note This method requires authentication with "write" permissions.
+    def edit_media_comment(comment_id, comment, params = {})
+      make_request(comment_id, comment, params)
+      nil
+    end
+    alias edit_photo_comment edit_media_comment
+    alias edit_video_comment edit_media_comment
+
+    # Get list of comments of a photo/video.
+    #
+    # @return [Array<Flickrie::Comment>]
+    # @api_method [flickr.photos.comments.getList](http://www.flickr.com/services/api/flickr.photos.comments.getList.html)
+    def get_media_comments(media_id, params = {})
+      response = make_request(media_id, params)
+      response.body["comments"]["comment"].map { |hash| Flickrie::Comment.new(hash, self) }
+    end
+    alias get_photo_comments get_media_comments
+    alias get_video_comments get_media_comments
+
+    # Get list of photos/videos that have been recently commented by
+    # the contacts of the authenticated user.
+    #
+    # @return [Flickrie::Collection<Flickrie::Photo, Flickrie::Video>]
+    # @api_method [flickr.photos.comments.getRecentForContacts](http://www.flickr.com/services/api/flickr.photos.comments.getRecentForContacts.html)
+    #
+    # @note This method requires authentication with "read" permissions.
+    def get_recently_commented_media_from_contacts(params = {})
+      response = make_request(params)
+      Media.new_collection(response.body["photos"], self)
+    end
+    # Get list of photos that have been recently commented by
+    # the contacts of the authenticated user.
+    #
+    # @return [Flickrie::Collection<Flickrie::Photo>]
+    # @api_method [flickr.photos.comments.getRecentForContacts](http://www.flickr.com/services/api/flickr.photos.comments.getRecentForContacts.html)
+    #
+    # @note This method requires authentication with "read" permissions.
+    def get_recently_commented_photos_from_contacts(params = {})
+      get_recently_commented_media_from_contacts(params).select { |media| media.is_a?(Photo) }
+    end
+    # Get list of videos that have been recently commented by
+    # the contacts of the authenticated user.
+    #
+    # @return [Flickrie::Collection<Flickrie::Video>]
+    # @api_method [flickr.photos.comments.getRecentForContacts](http://www.flickr.com/services/api/flickr.photos.comments.getRecentForContacts.html)
+    #
+    # @note This method requires authentication with "read" permissions.
+    def get_recently_commented_videos_from_contacts(params = {})
+      get_recently_commented_media_from_contacts(params).select { |media| media.is_a?(Video) }
+    end
+
     # Fetches all available types of licenses.
     #
     # @return [Array<Flickrie::License>]
     # @api_method [flickr.photos.licenses.getInfo](http://www.flickr.com/services/api/flickr.photos.licenses.getInfo.html)
     def get_licenses(params = {})
-      response = client.get_licenses(params)
+      response = make_request(params)
       License.from_hash(response.body['licenses']['license'])
     end
 
@@ -739,7 +825,7 @@ module Flickrie
     #
     # @note This method requires authentication with "write" permissions.
     def set_media_license(media_id, license_id, params = {})
-      client.set_media_license(media_id, license_id, params)
+      make_request(media_id, license_id, params)
       nil
     end
     alias set_photo_license set_media_license
@@ -752,7 +838,7 @@ module Flickrie
     #
     # @note This method requires authentication with "write" permissions.
     def rotate_media(media_id, degrees, params = {})
-      client.rotate_media(media_id, degrees, params)
+      make_request(media_id, degrees, params)
       nil
     end
     alias rotate_photo rotate_media
@@ -761,7 +847,7 @@ module Flickrie
     # Fetches upload tickets with given IDs. Example:
     #
     #     photo = File.open("...")
-    #     ticket_id = Flickrie.upload(photo, :async => 1)
+    #     ticket_id = Flickrie.upload(photo, async: 1)
     #     sleep(10)
     #
     #     ticket = Flickrie.check_upload_tickets(ticket_id)
@@ -774,7 +860,7 @@ module Flickrie
     # @api_method [flickr.photos.upload.checkTickets](http://www.flickr.com/services/api/flickr.photos.upload.checkTickets.html)
     def check_upload_tickets(tickets, params = {})
       ticket_ids = tickets.join(',') rescue tickets
-      response = client.check_upload_tickets(ticket_ids, params)
+      response = make_request(ticket_ids, params)
       response.body['uploader']['ticket'].
         map { |info| Ticket.new(info) }
     end
@@ -787,7 +873,7 @@ module Flickrie
     #
     # @note This method requires authentication with "write" permissions.
     def add_media_to_set(set_id, media_id, params = {})
-      client.add_media_to_set(set_id, media_id, params)
+      make_request(set_id, media_id, params)
     end
     alias add_photo_to_set add_media_to_set
     alias add_video_to_set add_media_to_set
@@ -799,7 +885,7 @@ module Flickrie
     #
     # @note This method requires authentication with "write" permissions.
     def create_set(params = {})
-      response = client.create_set(params)
+      response = make_request(params)
       Set.new(response.body['photoset'], self)
     end
 
@@ -811,7 +897,7 @@ module Flickrie
     #
     # @note This method requires authentication with "write" permissions.
     def delete_set(set_id, params = {})
-      client.delete_set(set_id, params)
+      make_request(set_id, params)
       nil
     end
 
@@ -823,7 +909,7 @@ module Flickrie
     #
     # @note This method requires authentication with "write" permissions.
     def edit_set_metadata(set_id, params = {})
-      client.edit_set_metadata(set_id, params)
+      make_request(set_id, params)
       nil
     end
 
@@ -835,88 +921,87 @@ module Flickrie
     #
     # @note This method requires authentication with "write" permissions.
     def edit_set_media(set_id, params = {})
-      client.edit_set_photos(set_id, params)
+      make_request(set_id, params)
       nil
     end
     alias edit_set_photos edit_set_media
     alias edit_set_videos edit_set_media
 
     # Returns next and previous photos/videos for a photo/video in a set
+    #
+    # @return [Flickrie::MediaContext]
+    # @api_method [flickr.photosets.getContext](http://www.flickr.com/services/api/flickr.photosets.getContext.html)
     def get_set_context(set_id, media_id, params = {})
-      response = client.get_set_context(set_id, media_id, params)
+      response = make_request(set_id, media_id, params)
       MediaContext.new(response.body, self)
     end
 
     # Fetches information about the set with the given ID.
     #
-    # @param set_id [String, Fixnum]
     # @return [Flickrie::Set]
     # @api_method [flickr.photosets.getInfo](http://www.flickr.com/services/api/flickr.photosets.getInfo.html)
     def get_set_info(set_id, params = {})
-      response = client.get_set_info(set_id, params)
+      response = make_request(set_id, params)
       Set.new(response.body['photoset'], self)
     end
 
     # Fetches sets from a user with the given NSID.
     #
-    # @param nsid [String]
     # @return [Flickrie::Collection<Flickrie::Set>]
     # @api_method [flickr.photosets.getList](http://www.flickr.com/services/api/flickr.photosets.getList.html)
-    def sets_from_user(nsid, params = {})
-      response = client.sets_from_user(nsid, params)
+    def get_sets_from_user(nsid, params = {})
+      response = make_request(nsid, params)
       Set.new_collection(response.body['photosets'], self)
     end
+    deprecated_alias :sets_from_user, :get_sets_from_user
 
     # Fetches photos and videos from a set with the given ID.
     #
-    # @param set_id [String]
-    # @param params [Hash] Options for this API method (see the link below under "Flickr API method")
     # @return [Flickrie::Collection<Flickrie::Photo, Flickrie::Video>]
     # @api_method [flickr.photosets.getPhotos](http://www.flickr.com/services/api/flickr.photosets.getPhotos.html)
-    def media_from_set(set_id, params = {})
-      response = client.media_from_set(set_id, {:media => 'all'}.merge(params))
+    def get_media_from_set(set_id, params = {})
+      response = make_request(set_id, {media: 'all'}.merge(params))
       Media.new_collection(response.body['photoset'], self)
     end
+    deprecated_alias :media_from_set, :get_media_from_set
     # Fetches photos from a set with the given ID.
     #
-    # @param set_id [String]
-    # @param params [Hash] Options for this API method (see the link below under "Flickr API method")
     # @return [Flickrie::Collection<Flickrie::Photo>]
     # @api_method [flickr.photosets.getPhotos](http://www.flickr.com/services/api/flickr.photosets.getPhotos.html)
-    def photos_from_set(set_id, params = {})
-      media_from_set(set_id, {:media => 'photos'}.merge(params))
+    def get_photos_from_set(set_id, params = {})
+      get_media_from_set(set_id, {media: 'photos'}.merge(params))
     end
+    deprecated_alias :photos_from_set, :get_photos_from_set
     # Fetches videos from a set with the given ID.
     #
-    # @param set_id [String]
-    # @param params [Hash] Options for this API method (see the link below under "Flickr API method")
     # @return [Flickrie::Collection<Flickrie::Video>]
     # @api_method [flickr.photosets.getPhotos](http://www.flickr.com/services/api/flickr.photosets.getPhotos.html)
-    def videos_from_set(set_id, params = {})
-      media_from_set(set_id, {:media => 'videos'}.merge(params))
+    def get_videos_from_set(set_id, params = {})
+      get_media_from_set(set_id, {media: 'videos'}.merge(params))
     end
+    deprecated_alias :videos_from_set, :get_videos_from_set
 
     # Sets the order of sets belonging to the authenticated user.
     #
-    # @param set_ids [String, Fixnum]
+    # @param set_ids [String] A comma delimited list of set IDs
     # @return [nil]
     # @api_method [flickr.photosets.orderSets](http://www.flickr.com/services/api/flickr.photosets.orderSets.html)
     #
     # @note This method requires authentication with "write" permissions.
     def order_sets(set_ids, params = {})
-      client.order_sets(set_ids, params)
+      make_request(set_ids, params)
       nil
     end
 
     # Removes photos/videos from a set.
     #
-    # @param set_id [Fixnum, String]
-    # @param media_ids [String]
+    # @param media_ids [String] A comma delimited list of photo/video IDs
+    # @return [nil]
     # @api_method [flickr.photosets.removePhotos](http://www.flickr.com/services/api/flickr.photosets.removePhotos.html)
     #
     # @note This method requires authentication with "write" permissions.
     def remove_media_from_set(set_id, media_ids, params = {})
-      client.remove_media_from_set(set_id, media_ids, params)
+      make_request(set_id, media_ids, params)
       nil
     end
     alias remove_photos_from_set remove_media_from_set
@@ -924,13 +1009,13 @@ module Flickrie
 
     # Reorders photos/videos inside a set.
     #
-    # @param set_id [Fixnum, String]
-    # @param media_ids [String]
+    # @param media_ids [String] A comma delimited list of photo/video IDs
+    # @return [nil]
     # @api_method [flickr.photosets.reorderPhotos](http://www.flickr.com/services/api/flickr.photosets.reorderPhotos.html)
     #
     # @note This method requires authentication with "write" permissions.
     def reorder_media_in_set(set_id, media_ids, params = {})
-      client.reorder_media_in_set(set_id, media_ids, params)
+      make_request(set_id, media_ids, params)
       nil
     end
     alias reorder_photos_in_set reorder_media_in_set
@@ -938,17 +1023,28 @@ module Flickrie
 
     # Sets set's primary photo/video.
     #
-    # @param set_id [Fixnum, String]
-    # @param media_id [String]
+    # @return [nil]
     # @api_method [flickr.photosets.setPrimaryPhoto](http://www.flickr.com/services/api/flickr.photosets.setPrimaryPhoto.html)
     #
     # @note This method requires authentication with "write" permissions.
-    def set_primary_media_to_set(set_id, media_id, params = {})
-      client.set_primary_media_to_set(set_id, media_id, params)
+    def set_set_primary_media(set_id, media_id, params = {})
+      make_request(set_id, media_id, params)
       nil
     end
-    alias set_primary_photo_to_set set_primary_media_to_set
-    alias set_primary_video_to_set set_primary_media_to_set
+    deprecated_alias :set_primary_media_to_set, :set_set_primary_media
+    alias set_set_primary_photo set_set_primary_media
+    deprecated_alias :set_primary_photo_to_set, :set_set_primary_photo
+    alias set_set_primary_video set_set_primary_media
+    deprecated_alias :set_primary_video_to_set, :set_set_primary_video
+
+    # Fetches the list of all API methods.
+    #
+    # @return [Array<String>]
+    # @api_method [flickr.reflection.getMethods](http://www.flickr.com/services/api/flickr.reflection.getMethods.html)
+    def get_methods(params = {})
+      response = make_request(params)
+      response.body["methods"]["method"]
+    end
 
     # Tests if the authentication was successful. If it was, it
     # returns info of the user who just authenticated.
@@ -958,8 +1054,19 @@ module Flickrie
     #
     # @note This method requires authentication with "read" permissions.
     def test_login(params = {})
-      response = client.test_login(params)
+      response = make_request(params)
       User.new(response.body['user'], self)
     end
+
+    private
+
+    def make_request(*args)
+      method = caller.first[/`.*'/][1..-2]
+      if ["upload", "replace"].include?(method)
+        upload_client.send(method, *args)
+      else
+        client.send(method, *args)
+      end
+    end
   end
 end