flickr-objects 0.0.1 → 0.0.2

data/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2012 Janko Marohnić
+
+MIT License
+
+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 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/README.md

@@ -30,46 +30,77 @@ If you don't have your API key and shared secret yet, you can apply for them
 Let's start with a general example.
 
 ```ruby
-person_id = "78733179@N04"
-person = Flickr.people.find(preson_id)
-photos = person.get_public_photos #=> API request
+photos = Flickr.photos.search(user_id: "78733179@N04") #=> [#<Flickr::Photo: ...>, #<Flickr::Photo: ...>, ...]
 
 photo = photos.first
-photo.id                 #=> "231233252"
-photo.title              #=> "My cat"
-photo.visibility.public? #=> true
-photo.description        #=> nil
-photo.get_info!          # makes an API request
-photo.description        #=> "He's trying to catch a fly"
+photo.id                  #=> "231233252"
+photo.title               #=> "My cat"
+photo.visibility.public?  #=> true
+photo.tags = "cats funny" # API request
+photo.get_info!           # API request
+photo.tags.join(" ")      #=> "cats funny"
 ```
 
-So, we've seen 2 API requests here:
+Methods like `Flickr.photos.search` are **class** API methods, and methods like `photo.tags=` and
+`photo.get_info!` are **instance** API methods.
 
-- `person.get_public_photos` (`Flickr::Person#get_public_photos`)
-- `photo.get_info!` (`Flickr::Photo#get_info!`)
+- `Flickr.photos.search` <=> `Flickr::Photo.search`
+- `photo.tags=`          <=> `Flickr::Photo#tags=`
+- `photo.get_info!`      <=> `Flickr::Photo#get_info!`
 
-They correspond to the API methods listed on Flickr's official [API page](http://flickr.com/api).
-`Flickr::Person#get_public_photos` corresponds to `flickr.people.getPublicPhotos`, and
-`Flickr::Photo#get_info!` corresponds to `flickr.photos.getInfo`.
+API methods under the hood call methods described on Flickr's official [API page](http://flickr.com/api).
+In our example, we have this correspondence:
 
-Let's say you want to call Flickr's `flickr.photosets.getList`. To find out how to call it,
-you can use `Flickr.api_methods` in the console. This method acts like a
-documentation for API methods. So, for example:
+- `Flickr::Photo.search`    <=> flickr.photos.search
+- `Flickr::Photo#tags=`     <=> flickr.photos.setTags
+- `Flickr::Photo#get_info!` <=> flickr.photos.getInfo
+
+Raw Flickr's API methods always take a hash of parameters. So, for example,
+flickr.people.findByEmail takes the `:find_email` parameter. But this gem
+implies these kind of obvious parameters, so instead of having to call it like this:
+
+```ruby
+Flickr.people.find_by_email(find_email: "janko.marohnic@gmail.com")
+```
+
+you can rather call it like this:
+
+```ruby
+Flickr.people.find_by_email("janko.marohnic@gmail.com")
+```
+
+You can still pass a hash of other parameters as the last argument. For the
+documentation on valid arguments, just look at the source code under
+`lib/flickr/api/`. In our example, because `.find_by_email` belongs to `people`,
+the method is located in [`lib/flickr/api/person.rb`](https://github.com/janko-m/flickr-objects/blob/master/lib/flickr/api/person.rb#L3-6).
+
+Now, let's say that you want to use a method that fetches all sets from a
+person. And you find out that this method is "flickr.photosets.getList".
+How can you now find out where it is located in this gem? Well, that's where
+`Flickr.api_methods` comes in handy. You can call it in the console:
 
 ```ruby
 Flickr.api_methods["flickr.photosets.getList"] #=> ["Flickr::Person#get_sets"]
 ```
 
-Now you found out that it corresponds to `Flickr::Person#get_sets`, which means
-you can call it like this:
+Now you found out that it is located in `Flickr::Person#get_sets`.
 
 ```ruby
+# You can now call it like this:
 sets = Flickr.people.find(person_id).get_sets
 sets.first.id #=> "12312324"
+
+# Or like this:
+sets = Flickr.find_by_username("josh").get_sets
+sets.first.id #=> "12312324"
 ```
 
 ## Sizes
 
+When you upload photos to Flickr, Flickr automatically makes different versions
+(sizes) of your photo. So, for example you have "Medium 500", "Small 320", and
+so on. Here's how you use this in the gem:
+
 ```ruby
 person = Flickr.person.find(person_id)
 photo = person.get_public_photos(sizes: :all).first
@@ -81,19 +112,39 @@ photo.height     #=> 280
 
 photo.medium!(500)
 photo.width      #=> 500
+
+# You can also call it like this:
+photo.small240!
+photo.width      #=> 240
+```
+
+It is important here that you pass `sizes: :all` to `Flickr::Person#get_public_photos`.
+So, in your (Rails) application, one could use it like this:
+
+```ruby
+class PhotosController < ApplicationController
+  def index
+    person = Flickr.people.find("78733179@N04")
+    @photos = person.get_public_photos(sizes: :all).map(&:medium500!)
+  end
+end
+```
+```erb
+<% @photos.each do |photo| %>
+  <%= image_tag photo.source_url, size: "#{photo.width}x#{photo.height}" %>
+<% end %>
 ```
 
 ## Authenticated requests
 
-If you need to make authenticated API requests (which you'll often want), you can create a kind
-of a instance, assigning to it user's access token. That instance then has the same interface as `Flickr`.
+If you need to make authenticated API requests (which you'll probably often want), you can create a kind
+of a instance, assigning to it the user's access token. That instance then has the same interface as `Flickr`.
 
 ```ruby
 flickr = Flickr.new("ACCESS_TOKEN_KEY", "ACCESS_TOKEN_SECRET")
 
 flickr.test_login #=> {"id" => "78733179@N04", "username" => ...}
-flickr.people.find(person_id).get_public_photos
-# ...
+flickr.people.find("78733179@N04").get_photos #=> [#<Flickr::Photo ...>, #<Flickr::Photo, ...>, ...]
 ```
 
 If you're in a Rails application, probably the best solution for authenticating
@@ -105,14 +156,12 @@ You can also assign the access token globally in your configuration.
 
 ```ruby
 Flickr.configure do |config|
-  config.api_key = "API_KEY"
-  config.shared_secret = "SHARED_SECRET"
   config.access_token_key = "ACCESS_TOKEN_KEY"
   config.access_token_secret = "ACCESS_TOKEN_SECRET"
 end
 ```
 
-This is useful if you're, for example, using Flickr as a photo storage in your
+This is especially useful if you're, for example, using Flickr as a photo storage in your
 application, and that access token is actually yours.
 
 
@@ -124,26 +173,21 @@ photo = Flickr.photos.find(photo_id).get_info!
 photo.title #=> "Dandelions"
 ```
 
-You can also upload asynchronously, which will return the upload ticket, which
-you can then use to check when the upload has finished.
-
-```ruby
-ticket_id = Flickr.upload("/path/to/photo.jpg", title: "Dandelions", ansync: true)
-ticket = Flickr.check_upload_tickets(ticket_id).first
-ticket.complete? #=> false
+In the first argument you can pass in either a string (path to the file) or an open file.
+For the details on the additional options you can pass in, check out Flickr's [upload
+documentation](http://www.flickr.com/services/api/upload.api.html).
 
-sleep 1
+For asynchronous upload take a look at [this wiki](https://github.com/janko-m/flickr-objects/wiki/Upload).
 
-ticket = Flickr.check_upload_tickets(ticked_id).first
-ticket.complete? #=> true
-ticket.photo.id #=> "232594385"
-```
+## Attributes and methods
 
-## Attributes
+For the list of attributes and methods that Flickr objects have, the best place to look at
+is the source code. The source code is delibarately written in a way that it's
+really easy to read, even for someone who doesn't have experience in looking into other
+people's code.
 
-For the list of attributes that Flickr objects have, the best place to look at
-is the source code. For example, list of common attributes that `Flickr::Photo`
-and `Flickr::Video` have can be found in `lib/flickr/objects/media.rb`.
+For example, list of common attributes that `Flickr::Photo`
+and `Flickr::Video` have can be found in [`lib/flickr/objects/media.rb`]("https://github.com/janko-m/flickr-objects/blob/master/lib/flickr/objects/media.rb").
 
 ![Flickr::Media](http://farm9.staticflickr.com/8195/8133340670_38c60aaca7.jpg)
 
@@ -151,12 +195,14 @@ As you can see, it is very readable ;)
 
 ## Few words
 
-Most of the API methods are not covered yet (because they are so many for one
-person). All the most important API methods should be implemented, so a person
-with normal demands should have everything he needs. If you feel like some API
-methods should have higher priority to be covered, feel free to post it in
-issues, and I will try to get it covered in the next version. Pull requests are
-also very welcome :)
+Most of the API methods are not covered yet (because they are so many).
+The most important API methods should be already implemented, so a person
+with normal demands should have everything he needs.
+
+If you feel like some API methods (that are not yet covered) should have
+a higher priority to be covered, feel free to let me know (maybe best via
+[Twitter](https://twitter.com/m_janko)), and I will try to get them covered
+in the next version.  Pull requests are also very welcome :)
 
 ## Social
 

data/lib/flickr/api/api_methods/collection.rb

@@ -0,0 +1,4 @@
+class Flickr
+  class Collection < Object
+  end
+end

data/lib/flickr/api/api_methods/flickr.rb

@@ -0,0 +1,6 @@
+class Flickr
+  api_method :check_upload_tickets, "flickr.photos.upload.checkTickets"
+  api_method :test_login,           "flickr.test.login"
+  api_method :test_echo,            "flickr.test.echo"
+  api_method :test_null,            "flickr.test.null"
+end

data/lib/flickr/api/api_methods/location.rb

@@ -0,0 +1,4 @@
+class Flickr
+  class Location < Object
+  end
+end

data/lib/flickr/api/api_methods/media.rb

@@ -0,0 +1,14 @@
+class Flickr
+  class Media < Object
+    class_api_method :get_from_contacts, "flickr.photos.getContactsPhotos"
+    class_api_method :search,            "flickr.photos.search"
+
+    instance_api_method :add_tags,         "flickr.photos.addTags"
+    instance_api_method :delete,           "flickr.photos.delete"
+    instance_api_method :get_info!,        "flickr.photos.getInfo"
+    instance_api_method :get_sizes!,       "flickr.photos.getSizes"
+    instance_api_method :remove_tag,       "flickr.photos.removeTag"
+    instance_api_method :set_content_type, "flickr.photos.setContentType", aliases: [:content_type=]
+    instance_api_method :set_tags,         "flickr.photos.setTags",        aliases: [:tags=]
+  end
+end

data/lib/flickr/api/api_methods/note.rb

@@ -0,0 +1,4 @@
+class Flickr
+  class Note < Object
+  end
+end

data/lib/flickr/api/api_methods/permissions.rb

@@ -0,0 +1,4 @@
+class Flickr
+  class Permissions < Object
+  end
+end

data/lib/flickr/api/api_methods/person.rb

@@ -0,0 +1,12 @@
+class Flickr
+  class Person < Object
+    class_api_method :find_by_email,    "flickr.people.findByEmail"
+    class_api_method :find_by_username, "flickr.people.findByUsername"
+
+    instance_api_method :get_info!,                       "flickr.people.getInfo"
+    instance_api_method :get_photos,                      "flickr.people.getPhotos",               aliases: [:get_videos, :get_media]
+    instance_api_method :get_public_photos,               "flickr.people.getPublicPhotos",         aliases: [:get_public_videos, :get_public_media]
+    instance_api_method :get_public_photos_from_contacts, "flickr.photos.getContactsPublicPhotos", aliases: [:get_public_videos_from_contacts, :get_public_media_from_contacts]
+    instance_api_method :get_sets,                        "flickr.photosets.getList"
+  end
+end

data/lib/flickr/api/api_methods/photo.rb

@@ -0,0 +1,4 @@
+class Flickr
+  class Photo < Media
+  end
+end

data/lib/flickr/api/api_methods/set.rb

@@ -0,0 +1,13 @@
+class Flickr
+  class Set < Object
+    class_api_method :create, "flickr.photosets.create"
+
+    instance_api_method :add_photo,     "flickr.photosets.addPhoto",     aliases: [:add_video, :add_media]
+    instance_api_method :delete,        "flickr.photosets.delete"
+    instance_api_method :edit_photos,   "flickr.photosets.editPhotos",   aliases: [:edit_videos, :edit_media]
+    instance_api_method :get_info!,     "flickr.photosets.getInfo"
+    instance_api_method :get_photos,    "flickr.photosets.getPhotos",    aliases: [:get_videos, :get_media]
+    instance_api_method :remove_photos, "flickr.photosets.removePhotos", aliases: [:remove_videos, :remove_media]
+    instance_api_method :remove_photo,  "flickr.photosets.removePhoto",  aliases: [:remove_video, :remove_media]
+  end
+end

data/lib/flickr/api/api_methods/tag.rb

@@ -0,0 +1,4 @@
+class Flickr
+  class Tag < Object
+  end
+end

data/lib/flickr/api/api_methods/upload_ticket.rb

@@ -0,0 +1,5 @@
+class Flickr
+  class UploadTicket < Object
+    class_api_method :check, "flickr.photos.upload.checkTickets"
+  end
+end

data/lib/flickr/api/api_methods/video.rb

@@ -0,0 +1,4 @@
+class Flickr
+  class Video < Media
+  end
+end

data/lib/flickr/api/api_methods/visibility.rb

@@ -0,0 +1,4 @@
+class Flickr
+  class Visibility < Object
+  end
+end

data/lib/flickr/api/collection.rb

@@ -0,0 +1,4 @@
+class Flickr
+  class Collection < Object
+  end
+end

data/lib/flickr/api/flickr.rb

@@ -1,3 +1,5 @@
+require_relative "api_methods/flickr"
+
 class Flickr
   api_methods = proc do
     def upload(media, params = {})
@@ -14,27 +16,20 @@ class Flickr
       response = client.get flickr_method(__method__), params.merge(tickets: tickets.to_s)
       Collection.new(response["uploader"].delete("ticket"), UploadTicket, response["uploader"], client)
     end
-    api_method :check_upload_tickets, "flickr.photos.upload.checkTickets"
 
     def test_login(params = {})
       client.get flickr_method(__method__), params
     end
-    api_method :test_login, "flickr.test.login"
 
     def test_echo(params = {})
       client.get flickr_method(__method__), params
     end
-    api_method :test_echo, "flickr.test.echo"
 
     def test_null(params = {})
       client.get flickr_method(__method__), params
     end
-    api_method :test_null, "flickr.test.null"
   end
 
-  def self.api_method(*args) class_api_method(*args) end
   instance_eval(&api_methods)
-
-  def self.api_method(*args) instance_api_method(*args) end
   class_eval(&api_methods)
 end

data/lib/flickr/api/location.rb

@@ -0,0 +1,4 @@
+class Flickr
+  class Location < Object
+  end
+end

data/lib/flickr/api/media.rb

@@ -4,60 +4,49 @@ class Flickr
       client.post flickr_method(__method__), params.merge(photo_id: id, tags: tags)
       tags
     end
-    instance_api_method :add_tags, "flickr.photos.addTags"
 
     def delete(params = {})
       client.post flickr_method(__method__), params.merge(photo_id: id)
       self
     end
-    instance_api_method :delete, "flickr.photos.delete"
 
     def self.get_from_contacts(params = {})
       response = client.get flickr_method(__method__), handle_extras(params)
       Collection.new(response["photos"].delete("photo"), Media, response["photos"], client)
     end
-    class_api_method :get_from_contacts, "flickr.photos.getContactsPhotos"
 
     def get_info!(params = {})
       response = client.get flickr_method(__method__), params.merge(photo_id: id)
       @hash.update(response["photo"])
       self
     end
-    instance_api_method :get_info!, "flickr.photos.getInfo"
 
     def get_sizes!(params = {})
       response = client.get flickr_method(__method__), params.merge(photo_id: id)
       @hash.update(response["sizes"])
       self
     end
-    instance_api_method :get_sizes!, "flickr.photos.getSizes"
 
     def remove_tag(tag_id, params = {})
       client.post flickr_method(__method__), params.merge(photo_id: id, tag_id: tag_id)
       tag_id
     end
-    instance_api_method :remove_tag, "flickr.photos.removeTag"
 
     def self.search(params = {})
       response = client.get flickr_method(__method__), handle_extras(params)
       Collection.new(response["photos"].delete("photo"), self, response["photos"], client)
     end
-    class_api_method :search, "flickr.photos.search"
 
     def set_content_type(content_type, params = {})
       client.post flickr_method(__method__), params.merge(photo_id: id, content_type: content_type)
       content_type
     end
-    instance_api_method :set_content_type, "flickr.photos.setContentType"
     alias content_type= set_content_type
-    instance_api_method :content_type=, "flickr.photos.setContentType"
 
     def set_tags(tags, params = {})
       client.post flickr_method(__method__), params.merge(photo_id: id, tags: tags)
       tags
     end
-    instance_api_method :set_tags, "flickr.photos.setTags"
     alias tags= set_tags
-    instance_api_method :tags=, "flickr.photos.setTags"
   end
 end

data/lib/flickr/api/note.rb

@@ -0,0 +1,4 @@
+class Flickr
+  class Note < Object
+  end
+end

data/lib/flickr/api/permissions.rb

@@ -0,0 +1,4 @@
+class Flickr
+  class Permissions < Object
+  end
+end

data/lib/flickr/api/person.rb

@@ -4,67 +4,54 @@ class Flickr
       response = client.get flickr_method(__method__), params.merge(find_email: email)
       new(response["user"], client)
     end
-    class_api_method :find_by_email, "flickr.people.findByEmail"
 
     def self.find_by_username(username, params = {})
       response = client.get flickr_method(__method__), params.merge(username: username)
       new(response["user"], client)
     end
-    class_api_method :find_by_username, "flickr.people.findByUsername"
 
     def get_info!(params = {})
       response = client.get flickr_method(__method__), params.merge(user_id: id)
       @hash.update(response["person"])
       self
     end
-    instance_api_method :get_info!, "flickr.people.getInfo"
 
     def get_photos(params = {})
       get_media(params).select { |object| object.is_a?(Flickr::Photo) }
     end
-    instance_api_method :get_photos, "flickr.people.getPhotos"
     def get_videos(params = {})
       get_media(params).select { |object| object.is_a?(Flickr::Video) }
     end
-    instance_api_method :get_videos, "flickr.people.getPhotos"
     def get_media(params = {})
       response = client.get flickr_method(__method__), handle_extras(params.merge(user_id: id))
       Collection.new(response["photos"].delete("photo"), Media, response["photos"], client)
     end
-    instance_api_method :get_media, "flickr.people.getPhotos"
 
     def get_public_photos(params = {})
       get_public_media(params).select { |object| object.is_a?(Flickr::Photo) }
     end
-    instance_api_method :get_public_photos, "flickr.people.getPublicPhotos"
     def get_public_videos(params = {})
       get_public_media(params).select { |object| object.is_a?(Flickr::Video) }
     end
-    instance_api_method :get_public_videos, "flickr.people.getPublicPhotos"
     def get_public_media(params = {})
       response = client.get flickr_method(__method__), handle_extras(params.merge(user_id: id))
       Collection.new(response["photos"].delete("photo"), Media, response["photos"], client)
     end
-    instance_api_method :get_public_media, "flickr.people.getPublicPhotos"
 
     def get_public_photos_from_contacts(params = {})
       get_public_media_from_contacts(params).select {|object| object.is_a?(Flickr::Photo) }
     end
-    instance_api_method :get_public_photos_from_contacts, "flickr.photos.getContactsPublicPhotos"
     def get_public_videos_from_contacts(params = {})
       get_public_media_from_contacts(params).select {|object| object.is_a?(Flickr::Video) }
     end
-    instance_api_method :get_public_videos_from_contacts, "flickr.photos.getContactsPublicPhotos"
     def get_public_media_from_contacts(params = {})
       response = client.get flickr_method(__method__), handle_extras(params.merge(user_id: id))
       Collection.new(response["photos"].delete("photo"), Media, response["photos"], client)
     end
-    instance_api_method :get_public_media_from_contacts, "flickr.photos.getContactsPublicPhotos"
 
     def get_sets(params = {})
       response = client.get flickr_method(__method__), params.merge(user_id: id)
       Collection.new(response["photosets"].delete("photoset"), Set, response["photosets"], client)
     end
-    instance_api_method :get_sets, "flickr.photosets.getList"
   end
 end

data/lib/flickr/api/set.rb

@@ -3,68 +3,50 @@ class Flickr
     def add_photo(media_id, params = {})
       client.post flickr_method(__method__), params.merge(photoset_id: id, photo_id: media_id)
     end
-    instance_api_method :add_photo, "flickr.photosets.addPhoto"
     alias add_video add_photo
-    instance_api_method :add_video, "flickr.photosets.addPhoto"
     alias add_media add_photo
-    instance_api_method :add_media, "flickr.photosets.addPhoto"
 
     def self.create(params = {})
       response = client.post flickr_method(__method__), params
       new(response["photoset"], client)
     end
-    class_api_method :create, "flickr.photosets.create"
 
     def delete(params = {})
       client.post flickr_method(__method__), params.merge(photoset_id: id)
       self
     end
-    instance_api_method :delete, "flickr.photosets.delete"
 
     def edit_photos(params = {})
       client.post flickr_method(__method__), params.merge(photoset_id: id)
       self
     end
-    instance_api_method :edit_photos, "flickr.photosets.editPhotos"
     alias edit_videos edit_photos
-    instance_api_method :edit_videos, "flickr.photosets.editPhotos"
     alias edit_media edit_photos
-    instance_api_method :edit_media, "flickr.photosets.editPhotos"
 
     def get_info!(params = {})
       response = client.get flickr_method(__method__), params.merge(photoset_id: id)
       @hash.update(response["photoset"])
       self
     end
-    instance_api_method :get_info!, "flickr.photosets.getInfo"
 
     def get_photos(params = {})
       get_media(params.merge(media: "photos"))
     end
-    instance_api_method :get_photos, "flickr.photosets.getPhotos"
     def get_videos(params = {})
       get_media(params.merge(media: "videos"))
     end
-    instance_api_method :get_videos, "flickr.photosets.getPhotos"
     def get_media(params = {})
       response = client.get flickr_method(__method__), handle_extras(params.merge(photoset_id: id))
       Collection.new(response["photoset"].delete("photo"), Media, response["photoset"], client)
     end
-    instance_api_method :get_media, "flickr.photosets.getPhotos"
 
     def remove_photos(media_id, params = {})
       client.post flickr_method(__method__), params.merge(photoset_id: id, photo_ids: media_id)
     end
-    instance_api_method :remove_photos, "flickr.photosets.removePhotos"
     alias remove_videos remove_photos
-    instance_api_method :remove_videos, "flickr.photosets.removePhotos"
     alias remove_media remove_photos
-    instance_api_method :remove_media, "flickr.photosets.removePhotos"
 
-    instance_api_method :remove_media, "flickr.photosets.removePhoto"
     alias remove_photo remove_photos
-    instance_api_method :remove_photo, "flickr.photosets.removePhoto"
     alias remove_video remove_photos
-    instance_api_method :remove_video, "flickr.photosets.removePhoto"
   end
 end

data/lib/flickr/api/tag.rb

@@ -0,0 +1,4 @@
+class Flickr
+  class Tag < Object
+  end
+end

data/lib/flickr/api/upload_ticket.rb

@@ -0,0 +1,8 @@
+class Flickr
+  class UploadTicket < Object
+    def self.check(tickets, params = {})
+      response = client.get flickr_method(__method__), params.merge(tickets: tickets)
+      Collection.new(response["uploader"].delete("ticket"), self, response["uploader"], client)
+    end
+  end
+end

data/lib/flickr/api/visibility.rb

@@ -0,0 +1,4 @@
+class Flickr
+  class Visibility < Object
+  end
+end

data/lib/flickr/api.rb

@@ -42,9 +42,10 @@ class Flickr
     end
   end
 
-  map_interface :media,  Media
-  map_interface :photos, Photo
-  map_interface :videos, Video
-  map_interface :people, Person
-  map_interface :sets,   Set
+  map_interface :media,          Media
+  map_interface :photos,         Photo
+  map_interface :videos,         Video
+  map_interface :people,         Person
+  map_interface :sets,           Set
+  map_interface :upload_tickets, UploadTicket
 end

data/lib/flickr/api_caller.rb

@@ -25,16 +25,25 @@ class Flickr
       end
 
       module ClassMethods
-        def instance_api_method(method, flickr_method)
-          Flickr.api_methods[flickr_method] << "#{self.name}##{method}"
+        def instance_api_method(method, flickr_method, options = {})
+          [method, *options[:aliases]].each do |method|
+            Flickr.api_methods[flickr_method] << "#{self.name}##{method}"
+          end
           children.each { |child| Flickr.api_methods[flickr_method] << "#{child.name}##{method}" } if respond_to?(:children)
         end
 
-        def class_api_method(method, flickr_method)
-          Flickr.api_methods[flickr_method] << "#{self.name}.#{method}"
+        def class_api_method(method, flickr_method, options = {})
+          [method, *options[:aliases]].each do |method|
+            Flickr.api_methods[flickr_method] << "#{self.name}.#{method}"
+          end
           children.each { |child| Flickr.api_methods[flickr_method] << "#{child.name}.#{method}" } if respond_to?(:children)
         end
 
+        def api_method(*args)
+          instance_api_method(*args)
+          class_api_method(*args)
+        end
+
         def flickr_method(method_name)
           resolve_flickr_method("#{self.name}.#{method_name}")
         end

data/lib/flickr/client/middleware/retry.rb

@@ -1,16 +1,7 @@
 class Flickr
   class Client < Faraday::Connection
     module Middleware
-      # A copy-paste from Faraday's master branch
       class Retry < Faraday::Middleware
-        # Public: Initialize middleware
-        #
-        # Options:
-        # max        - Maximum number of retries (default: 2).
-        # interval   - Pause in seconds between retries (default: 0).
-        # exceptions - The list of exceptions to handle. Exceptions can be
-        #              given as Class, Module, or String. (default:
-        #              [Errno::ETIMEDOUT, Timeout::Error, Error::TimeoutError])
         def initialize(app, options = {})
           super(app)
           @retries, options = options, {} if options.is_a? Integer

data/lib/flickr/client/upload_client.rb

@@ -26,14 +26,13 @@ class Flickr
 
     def get_file(object)
       file, content_type, file_path =
-        case object.class.name
-        when "String"
+        if object.is_a?(String)
           [File.open(object), determine_content_type(object), object]
-        when "File"
-          [object, determine_content_type(object.path), object.path]
-        when "ActionDispatch::Http::UploadedFile"
+        elsif object.class.name == "ActionDispatch::Http::UploadedFile"
           [object, object.content_type, object.tempfile]
-        when "Hash" && defined?(Sinatra)
+        elsif object.respond_to?(:read) and object.respond_to?(:path)
+          [object, (object.respond_to?(:content_type) && object.content_type) || determine_content_type(object.path), object.path]
+        elsif object.is_a?(Hash) && defined?(Sinatra)
           [object[:tempfile], object[:type], object[:tempfile].path]
         else
           raise Error, "invalid file format"

data/lib/flickr/client.rb

@@ -5,8 +5,8 @@ require "flickr/client/middleware"
 class Flickr
   class Client < Faraday::Connection
     DEFAULTS = {
-      open_timeout: 3,
-      timeout: 4
+      open_timeout: 4,
+      timeout: 6
     }
 
     def initialize(access_token)

data/lib/flickr/objects/collection.rb

@@ -1,5 +1,3 @@
-require_relative "attribute_values/collection"
-
 class Flickr
   class Collection < Object
     include Enumerable

data/lib/flickr/objects/location.rb

@@ -1,5 +1,3 @@
-require_relative "attribute_values/location"
-
 class Flickr
   class Location < Object
 

data/lib/flickr/objects/media.rb

@@ -1,5 +1,3 @@
-require_relative "attribute_values/media"
-require "flickr/api/media"
 require "flickr/helpers/base_58"
 
 class Flickr

data/lib/flickr/objects/note.rb

@@ -1,5 +1,3 @@
-require_relative "attribute_values/note"
-
 class Flickr
   class Note < Object
 

data/lib/flickr/objects/permissions.rb

@@ -1,5 +1,3 @@
-require_relative "attribute_values/permissions"
-
 class Flickr
   class Permissions < Object
 

data/lib/flickr/objects/person.rb

@@ -1,6 +1,3 @@
-require_relative "attribute_values/person"
-require "flickr/api/person"
-
 class Flickr
   class Person < Object
 

data/lib/flickr/objects/photo.rb

@@ -1,6 +1,3 @@
-require_relative "attribute_values/photo"
-require "flickr/api/photo"
-
 class Flickr
   class Photo < Media
 

data/lib/flickr/objects/set.rb

@@ -1,6 +1,3 @@
-require_relative "attribute_values/set"
-require "flickr/api/set"
-
 class Flickr
   class Set < Object
 

data/lib/flickr/objects/tag.rb

@@ -1,5 +1,3 @@
-require_relative "attribute_values/tag"
-
 class Flickr
   class Tag < Object
 

data/lib/flickr/objects/upload_ticket.rb

@@ -1,5 +1,3 @@
-require_relative "attribute_values/upload_ticket"
-
 class Flickr
   class UploadTicket < Object
 

data/lib/flickr/objects/video.rb

@@ -1,6 +1,3 @@
-require_relative "attribute_values/video"
-require "flickr/api/video"
-
 class Flickr
   class Video < Media
 

data/lib/flickr/objects/visibility.rb

@@ -1,5 +1,3 @@
-require_relative "attribute_values/visibility"
-
 class Flickr
   class Visibility < Object
 

data/lib/flickr/objects.rb

@@ -19,10 +19,11 @@ class Flickr
   class Collection  < Object; end
 end
 
-Flickr::Object.children.each do |klass|
-  underscored_name = klass.name.split("::").last.sub(/(?<=\w)(?=[A-Z])/, "_").downcase
-  begin
-    require "flickr/objects/#{underscored_name}"
-  rescue LoadError
-  end
+objects = Flickr::Object.children.dup
+objects.each do |object|
+  underscored_name = object.name.split("::").last.split(/(?<=\w)(?=[A-Z])/).map(&:downcase).join("_")
+  require "flickr/objects/#{underscored_name}"
+  require "flickr/objects/attribute_values/#{underscored_name}"
+  require "flickr/api/#{underscored_name}"
+  require "flickr/api/api_methods/#{underscored_name}"
 end

data/lib/flickr/version.rb

@@ -1,3 +1,3 @@
 class Flickr
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flickr-objects
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-29 00:00:00.000000000 Z
+date: 2012-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -123,6 +123,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem is an object-oriented wrapper for the Flickr API.
 email:
 - janko.marohnic@gmail.com
@@ -131,12 +147,33 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
+- LICENSE
+- lib/flickr/api/api_methods/collection.rb
+- lib/flickr/api/api_methods/flickr.rb
+- lib/flickr/api/api_methods/location.rb
+- lib/flickr/api/api_methods/media.rb
+- lib/flickr/api/api_methods/note.rb
+- lib/flickr/api/api_methods/permissions.rb
+- lib/flickr/api/api_methods/person.rb
+- lib/flickr/api/api_methods/photo.rb
+- lib/flickr/api/api_methods/set.rb
+- lib/flickr/api/api_methods/tag.rb
+- lib/flickr/api/api_methods/upload_ticket.rb
+- lib/flickr/api/api_methods/video.rb
+- lib/flickr/api/api_methods/visibility.rb
+- lib/flickr/api/collection.rb
 - lib/flickr/api/flickr.rb
+- lib/flickr/api/location.rb
 - lib/flickr/api/media.rb
+- lib/flickr/api/note.rb
+- lib/flickr/api/permissions.rb
 - lib/flickr/api/person.rb
 - lib/flickr/api/photo.rb
 - lib/flickr/api/set.rb
+- lib/flickr/api/tag.rb
+- lib/flickr/api/upload_ticket.rb
 - lib/flickr/api/video.rb
+- lib/flickr/api/visibility.rb
 - lib/flickr/api.rb
 - lib/flickr/api_caller.rb
 - lib/flickr/client/methods_client.rb
@@ -202,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 41965126813317572
+      hash: -2444191243502827259
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23