flickrie 0.3.2 → 0.4.0

data/.gitignore

@@ -2,3 +2,4 @@ TODO.md
 Gemfile.lock
 *.gem
 pkg/
+credentials.rb

data/CHANGELOG.md

@@ -1,10 +1,16 @@
 # Flickrie changelog
 
-## Version 0.4.0 (Unreleased)
+## Version 0.4.0
 
 - covered `flickr.photos.getContactsPhotos`
 - covered `flickr.photos.getContactsPublicPhotos`
 - covered `flickr.photos.getContext`
+- implemented uploading photos
+- covered `flickr.photos.upload.checkTickets`
+
+## Version 0.3.2
+
+- enabled passing params to `Flickrie::Set#photos`
 
 ## Version 0.3.1
 
@@ -19,4 +25,4 @@
 
 ## Version 0.2.2
 
-- removed `addressable` gem as dependency
+- removed `addressable` gem as a dependency

data/Gemfile

@@ -3,10 +3,10 @@ source :rubygems
 gemspec
 
 group :development, :test do
-  gem "rake"
   gem "activesupport"
   gem "flickrie", :path => "~/Projects/flickrie"
   gem "pry"
+  gem "debugger"
 end
 
 group :test do

data/README.md

@@ -35,13 +35,13 @@ You first need to install the gem.
 [sudo] gem install flickrie
 ```
 
-Then in your app you set the API key and secret (if you don't have them
+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)).
 
 ```ruby
 require 'flickrie'
-Flickrie.api_key = "your api key"
-Flickrie.shared_secret = "your shared secret"
+Flickrie.api_key = "API_KEY"
+Flickrie.shared_secret = "SHARED_SECRET"
 ```
 
 Then you can search for stuff.
@@ -122,8 +122,8 @@ be sure to check the [wiki](https://github.com/janko-m/flickrie/wiki) for some a
 ```ruby
 require 'flickrie'
 
-Flickrie.api_key = "your api key"
-Flickrie.shared_secret = "your shared secret"
+Flickrie.api_key = "API_KEY"
+Flickrie.shared_secret = "SHARED_SECRET"
 
 request_token = Flickrie::OAuth.get_request_token
 url = request_token.get_authorization_url
@@ -147,6 +147,24 @@ 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 [this wiki](https://github.com/janko-m/flickrie/wiki/Authentication-in-web-applications) for instructions.
 
+## Photo upload
+
+```ruby
+photo_id = Flickrie.upload("/path/to/photo.jpg", :title => "A cow")
+photo = Flickrie.get_photo_info(photo_id)
+photo.title # => "A cow"
+```
+
+For the list of parameters you can pass in when uploading a photo, see
+[this page](http://www.flickr.com/services/api/upload.api.html).
+
+Few notes:
+- Photo uploads require authentication with "write" permissions.
+- Path to the photo has to be absolute.
+
+See [this wiki](https://github.com/janko-m/flickrie/wiki/Asynchronous_photo_upload) for an example
+of an asynchronous photo upload.
+
 ## A few words
 
 Now, I covered only a few out of many Flickr's API methods using this approach,
@@ -199,26 +217,32 @@ basis of this gem.
 
 ```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.getPublicPhotos"  -> Flickrie.public_photos_from_user
+"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.getPublicPhotos"         -> Flickrie.public_photos_from_user
 
 # photos
-"flickr.photos.addTags"          -> Flickrie.add_photo_tags
-"flickr.photos.delete"           -> Flickrie.delete_photo
-"flickr.photos.getInfo"          -> Flickrie.get_photo_info
-"flickr.photos.getSizes"         -> Flickrie.get_photo_sizes
-"flickr.photos.removeTag"        -> Flickrie.remove_photo_tag
-"flickr.photos.search"           -> Flickrie.search_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.getInfo"                 -> Flickrie.get_photo_info
+"flickr.photos.getSizes"                -> Flickrie.get_photo_sizes
+"flickr.photos.removeTag"               -> Flickrie.remove_photo_tag
+"flickr.photos.search"                  -> Flickrie.search_photos
+
+# photos.upload
+"flickr.photos.upload.checkTickets"     -> Flickrie.check_upload_tickets
 
 # photos.licenses
-"flickr.photos.licenses.getInfo" -> Flickrie.get_licenses
+"flickr.photos.licenses.getInfo"        -> Flickrie.get_licenses
 
 # photosets
-"flickr.photosets.getInfo"       -> Flickrie.get_set_info
-"flickr.photosets.getList"       -> Flickrie.sets_from_user
-"flickr.photosets.getPhotos"     -> Flickrie.photos_from_set
+"flickr.photosets.getInfo"              -> Flickrie.get_set_info
+"flickr.photosets.getList"              -> Flickrie.sets_from_user
+"flickr.photosets.getPhotos"            -> Flickrie.photos_from_set
 ```
 
 ## Changelog

data/flickrie.gemspec

@@ -17,4 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'faraday_middleware'
   gem.add_dependency 'simple_oauth'
+  gem.add_dependency 'multi_xml'
+
+  gem.add_development_dependency "activesupport"
 end

data/lib/flickrie/api_methods.rb

@@ -1,4 +1,5 @@
 require 'flickrie/client'
+require 'flickrie/upload_client'
 require 'flickrie/oauth'
 require 'flickrie/license'
 require 'flickrie/user'
@@ -9,6 +10,24 @@ require 'flickrie/set'
 
 module Flickrie
   module ApiMethods
+    def upload(media, params = {})
+      response = upload_client.upload(media, params)
+      if params[:async] == 1
+        response.body['rsp']['ticketid']
+      else
+        response.body['rsp']['photoid']
+      end
+    end
+
+    def replace(media, media_id, params = {})
+      response = upload_client.replace(media, media_id, params)
+      if params[:async] == 1
+        response.body['rsp']['ticketid']
+      else
+        response.body['rsp']['photoid']
+      end
+    end
+
     # people
     def find_user_by_email(email)
       response = client.find_user_by_email(email)
@@ -47,10 +66,42 @@ module Flickrie
 
     def delete_media(media_id)
       client.delete_media(media_id)
+      media_id
     end
     alias delete_photo delete_media
     alias delete_video delete_media
 
+    def media_from_contacts(params = {})
+      response = client.media_from_contacts(params)
+      Media.from_contacts(response.body['photos'])
+    end
+    def photos_from_contacts(params = {})
+      media_from_contacts(params).select { |media| media.is_a?(Photo) }
+    end
+    def videos_from_contacts(params = {})
+      media_from_contacts(params).select { |media| media.is_a?(Video) }
+    end
+
+    def public_media_from_user_contacts(user_nsid, params = {})
+      response = client.public_media_from_user_contacts(user_nsid, params)
+      Media.from_contacts(response.body['photos'])
+    end
+    def public_photos_from_user_contacts(user_nsid, params = {})
+      public_media_from_user_contacts(user_nsid, params).
+        select { |media| media.is_a?(Photo) }
+    end
+    def public_videos_from_user_contacts(user_nsid, params = {})
+      public_media_from_user_contacts(user_nsid, params).
+        select { |media| media.is_a?(Photo) }
+    end
+
+    def get_media_context(media_id)
+      response = client.get_media_context(media_id)
+      Media.from_context(response.body)
+    end
+    alias get_photo_context get_media_context
+    alias get_video_context get_media_context
+
     def get_media_info(media_id)
       response = client.get_media_info(media_id)
       Media.from_info(response.body['photo'])
@@ -84,6 +135,14 @@ module Flickrie
       search_media(search_params.merge(:media => 'videos'))
     end
 
+    # photos.upload
+    def check_upload_tickets(tickets)
+      tickets = tickets.join(',') if tickets.is_a?(Array)
+      response = client.check_upload_tickets(tickets)
+      response.body['uploader']['ticket'].
+        map { |info| Media::Ticket.new(info) }
+    end
+
     # licenses
     def get_licenses
       response = client.get_licenses

data/lib/flickrie/client.rb

@@ -17,36 +17,37 @@ module Flickrie
       :timeout, :open_timeout, :access_token, :access_secret
 
     def client(access_token_hash = {})
-      @client ||= begin
-        client = Client.new(params) do |conn|
-          conn.request :oauth,
-            :consumer_key => api_key,
-            :consumer_secret => shared_secret,
-            :token => access_token_hash[:token] || access_token,
-            :token_secret => access_token_hash[:secret] || access_secret
-          conn.response :json, :content_type => /(text\/plain)|(json)$/
-          conn.adapter Faraday.default_adapter
-        end
-
-        client.builder.insert_after FaradayMiddleware::ParseJson, OAuthStatusCheck
-        client.builder.insert_before FaradayMiddleware::ParseJson, StatusCheck
-        client
+      @client ||= Client.new(params) do |conn|
+        conn.request :oauth,
+          :consumer_key => api_key,
+          :consumer_secret => shared_secret,
+          :token => access_token_hash[:token] || access_token,
+          :token_secret => access_token_hash[:secret] || access_secret
+
+        conn.use StatusCheck
+        conn.response :json, :content_type => /(text\/plain)|(json)$/
+        conn.use OAuthStatusCheck
+
+        conn.adapter Faraday.default_adapter
       end
     end
 
     private
 
+    OPEN_TIMEOUT = 4
+    TIMEOUT = 6
+
     def params
       {
-        :url => 'http://api.flickr.com/services/rest/',
+        :url => 'http://api.flickr.com/services/rest',
         :params => {
           :format => 'json',
           :nojsoncallback => '1',
           :api_key => api_key
         },
         :request => {
-          :open_timeout => open_timeout || 8,
-          :timeout => timeout || 8
+          :open_timeout => open_timeout || OPEN_TIMEOUT,
+          :timeout => timeout || TIMEOUT
         }
       }
     end
@@ -114,6 +115,19 @@ module Flickrie
       post 'flickr.photos.delete', :photo_id => media_id
     end
 
+    def media_from_contacts(params = {})
+      get 'flickr.photos.getContactsPhotos', ensure_media(params)
+    end
+
+    def public_media_from_user_contacts(user_nsid, params = {})
+      params = {:user_id => user_nsid}.merge(params)
+      get 'flickr.photos.getContactsPublicPhotos', ensure_media(params)
+    end
+
+    def get_media_context(media_id)
+      get 'flickr.photos.getContext', :photo_id => media_id
+    end
+
     def get_media_info(media_id)
       get 'flickr.photos.getInfo', :photo_id => media_id
     end
@@ -130,6 +144,11 @@ module Flickrie
       get 'flickr.photos.search', ensure_media(params)
     end
 
+    # photos.upload
+    def check_upload_tickets(tickets)
+      get 'flickr.photos.upload.checkTickets', :tickets => tickets
+    end
+
     # licenses
     def get_licenses
       get 'flickr.photos.licenses.getInfo'

data/lib/flickrie/instance.rb

@@ -6,10 +6,15 @@ module Flickrie
       @access_token, @access_secret = access_token, access_secret
     end
 
-    def client
-      Flickrie.client(:token => access_token, :secret => access_secret)
-    end
+    def client;        Flickrie.client(access_token_hash)        end
+    def upload_client; Flickrie.upload_client(access_token_hash) end
 
     include ApiMethods
+
+    private
+
+    def access_token_hash
+      {:token => access_token, :secret => access_secret}
+    end
   end
 end

data/lib/flickrie/media/ticket.rb

@@ -0,0 +1,22 @@
+module Flickrie
+  module Media
+    class Ticket
+      def id; @info['id'] end
+      def media_id; @info['photoid'] end
+      alias photo_id media_id
+      alias video_id media_id
+
+      def complete?
+        @info['complete'].to_i == 1
+      end
+
+      def imported_at
+        Time.at(@info['imported'].to_i)
+      end
+
+      def initialize(info)
+        @info = info
+      end
+    end
+  end
+end

data/lib/flickrie/media.rb

@@ -1,6 +1,7 @@
 require 'flickrie/media/visibility'
 require 'flickrie/media/note'
 require 'flickrie/media/tag'
+require 'flickrie/media/ticket'
 require 'flickrie/location'
 require 'date'
 
@@ -68,6 +69,8 @@ module Flickrie
     def url
       if owner and id
         "http://www.flickr.com/photos/#{owner.nsid}/#{id}"
+      elsif @info['url']
+        "http://www.flickr.com" + @info['url']
       end
     end
 
@@ -102,6 +105,8 @@ module Flickrie
 
     def has_people?; @info['people']['haspeople'].to_i == 1 if @info['people'] end
 
+    def faved?; @info['is_faved'].to_i == 1 if @info['is_faved'] end
+
     def notes
       @info['notes']['note'].map { |hash| Note.new(hash) } if @info['notes']
     end
@@ -190,6 +195,28 @@ module Flickrie
       def from_search(hash)
         from_user(hash)
       end
+
+      def from_contacts(hash)
+        hash['photo'].each do |info|
+          info['ownername'] = info.delete('username')
+        end
+
+        from_user(hash)
+      end
+
+      def from_context(hash)
+        hash['count'] = hash['count']['_content'].to_i
+
+        ['prevphoto', 'nextphoto'].each do |media|
+          unless hash[media]['media'].nil?
+            hash[media] = new(hash[media])
+          else
+            hash[media] = nil
+          end
+        end
+
+        hash
+      end
     end
     extend(ClassMethods)
 

data/lib/flickrie/upload_client.rb

@@ -0,0 +1,88 @@
+module Flickrie
+  class << self
+    def upload_client(access_token_hash = {})
+      @upload_client ||= UploadClient.new(upload_params) do |conn|
+        conn.request :oauth,
+          :consumer_key => api_key,
+          :consumer_secret => shared_secret,
+          :token => access_token_hash[:token] || access_token,
+          :token_secret => access_token_hash[:secret] || access_secret
+        conn.request :multipart
+
+        conn.use UploadStatusCheck
+        conn.response :xml
+
+        conn.adapter Faraday.default_adapter
+      end
+    end
+
+    private
+
+    def upload_params
+      {
+        :url => 'http://api.flickr.com/services',
+        :request => {
+          :open_timeout => open_timeout || OPEN_TIMEOUT
+        }
+      }
+    end
+  end
+
+  class UploadStatusCheck < Faraday::Response::Middleware
+    def on_complete(env)
+      if env[:body]['rsp']['stat'] != 'ok'
+        raise Error, env[:body]['rsp']['err']['msg']
+      end
+    end
+  end
+
+  class UploadClient < Faraday::Connection
+    def upload(media, params = {})
+      media_file = get_file(media, params[:mime_type])
+      post "upload", {:photo => media_file}.merge(params)
+    end
+
+    def replace(media, media_id, params = {})
+      media_file = get_file(media)
+      post "replace", {:photo => media_file,
+                       :photo_id => media_id}.merge(params)
+    end
+
+    private
+
+    MIME_TYPES = {
+      %w[.jpg .jpeg .jpe .jif .jfif .jfi] => 'image/jpeg',
+      %w[.gif]                            => 'image/gif',
+      %w[.png]                            => 'image/png',
+      %w[.svg .svgz]                      => 'image/svg+xml',
+      %w[.tiff .tif]                      => 'image/tiff',
+      %w[.ico]                            => 'image/vnd.microsoft.icon',
+
+      %w[.mpg .mpeg .m1v .m1a .m2a .mpa .mpv] => 'video/mpeg',
+      %w[.mp4 .m4a .m4p .m4b .m4r .m4v]       => 'video/mp4',
+      %w[.ogv .oga .ogx .ogg .spx]            => 'video/ogg',
+      %w[.mov .qt]                            => 'video/quicktime',
+      %w[.webm]                               => 'video/webm',
+      %w[.mkv .mk3d .mka .mks]                => 'video/x-matroska',
+      %w[.wmv]                                => 'video/x-ms-wmv',
+      %w[.flv .f4v .f4p .f4a .f4b]            => 'video/x-flv',
+      %w[.avi]                                => 'video/avi'
+    }.freeze
+
+    def get_file(object, mime_type = nil)
+      if object.is_a?(String)
+        Faraday::UploadIO.new(object, mime_type || get_mime_type(object))
+      else
+        object
+      end
+    end
+
+    def get_mime_type(file_path)
+      extension = file_path[/\.\w{3,4}$/]
+      mime_type = MIME_TYPES.find { |k,v| k.include?(extension) }.last
+
+    rescue NoMethodError
+      raise Error, "Don't know mime type for this extension (#{extension})"
+    end
+  end
+end

data/lib/flickrie/version.rb

@@ -1,3 +1,3 @@
 module Flickrie
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end

data/test/media_test.rb

@@ -286,6 +286,98 @@ class MediaTest < Test::Unit::TestCase
     assert_equal media.tags.join(' '), tags_before_change.chomp("janko").rstrip
   end
 
+  def test_delete_media
+    media_path = File.join(File.expand_path(File.dirname(__FILE__)), 'photo.jpg')
+    media_id = Flickrie.upload(media_path)
+    assert_includes Flickrie.public_media_from_user(@user_nsid).map(&:id), media_id
+    Flickrie.delete_media(media_id)
+    refute_includes Flickrie.public_media_from_user(@user_nsid).map(&:id), media_id
+  end
+
+  def test_media_from_contacts
+    medias = [
+      Flickrie.media_from_contacts(
+        :include_self => 1, :single_photo => 1, :extras => @all_extras).first,
+      Flickrie.public_media_from_user_contacts(@user_nsid,
+        :include_self => 1, :single_photo => 1, :extras => @all_extras).first
+    ]
+
+    medias.each do |media|
+      assert_equal '7093101501', media.id
+      assert_equal '9337f28800', media.secret
+      assert_equal '7090', media.server
+      assert_equal 8, media.farm
+      assert_equal 'IMG_0917', media.title
+      assert_equal '', media.tags.join(' ')
+      assert_equal '', media.machine_tags.join(' ')
+      assert_equal 0, media.views_count
+      assert_equal '0', media.license.id
+      assert_not_nil media.url
+      assert_equal 'ready', media.media_status
+
+      # Time
+      assert_instance_of Time, media.uploaded_at
+      assert_instance_of Time, media.updated_at
+      assert_instance_of Time, media.taken_at
+      assert_equal 0, media.taken_at_granularity
+
+      # Location
+      assert_nil media.location
+
+      # Owner
+      assert_equal '67131352@N04', media.owner.nsid
+      assert_equal 'Janko Marohnić', media.owner.username
+      assert_equal '5464', media.owner.icon_server
+      assert_equal 6, media.owner.icon_farm
+      refute media.owner.buddy_icon_url.empty?
+
+      # Visibility (This is the difference from Flickrie.media_from_set)
+      assert_equal true, media.visibility.public?
+      assert_equal false, media.visibility.friends?
+      assert_equal false, media.visibility.family?
+      assert_equal nil, media.visibility.contacts?
+    end
+  end
+
+  def test_get_media_context
+    context = Flickrie.get_media_context(@media_id)
+
+    assert_equal 98, context['count']
+
+    previous_media = context['prevphoto']
+    assert_equal '6946978706', previous_media.id
+    assert_equal 'b38270bbd6', previous_media.secret
+    assert_equal '7216', previous_media.server
+    assert_equal 8, previous_media.farm
+    assert_equal 'IMG_0795', previous_media.title
+    refute previous_media.url.empty?
+    assert_equal '0', previous_media.license.id
+    assert_equal false, previous_media.faved?
+
+    next_media = context['nextphoto']
+    assert_equal '6946979704', next_media.id
+    assert_equal '74513ff732', next_media.secret
+    assert_equal '7234', next_media.server
+    assert_equal 8, next_media.farm
+    assert_equal 'IMG_0797', next_media.title
+    refute next_media.url.empty?
+    assert_equal '0', next_media.license.id
+    assert_equal false, next_media.faved?
+  end
+
+  def test_media_replace
+    media_path = File.join(File.expand_path(File.dirname(__FILE__)), 'photo.jpg')
+    begin
+      media_id = Flickrie.upload(media_path)
+      Flickrie.replace(media_path, media_id)
+      flunk
+    rescue => exception
+      assert_equal "Not a pro account", exception.message
+    ensure
+      Flickrie.delete_media(media_id)
+    end
+  end
+
   def test_methods_returning_nil
     media = Flickrie::Photo.new
 

data/test/photo_test.rb

@@ -146,6 +146,24 @@ class PhotoTest < Test::Unit::TestCase
       end
   end
 
+  def test_photo_upload
+    photo_path = File.join(File.expand_path(File.dirname(__FILE__)), 'photo.jpg')
+    photo_id = Flickrie.upload(photo_path)
+    assert_nothing_raised(Flickrie::Error) { Flickrie.get_photo_info(photo_id) }
+    Flickrie.delete_photo(photo_id)
+  end
+
+  def test_asynchronous_photo_upload
+    photo_path = File.join(File.expand_path(File.dirname(__FILE__)), 'photo.jpg')
+    ticket_id = Flickrie.upload(photo_path, :async => 1)
+    begin
+      ticket = Flickrie.check_upload_tickets([ticket_id]).first
+    end until ticket.complete?
+    photo_id = ticket.photo_id
+    assert_nothing_raised(Flickrie::Error) { Flickrie.get_photo_info(photo_id) }
+    Flickrie.delete_photo(photo_id)
+  end
+
   def test_other_api_calls
     # add_photo_tags, get_photo_info, remove_photo_tag,
     # search_photos, photos_from_contacts
@@ -155,6 +173,9 @@ class PhotoTest < Test::Unit::TestCase
       photo = Flickrie.get_photo_info(@photo_id)
       tag = photo.tags.find { |tag| tag.content == "janko" }
       Flickrie.remove_photo_tag(tag.id)
+      Flickrie.photos_from_contacts(:include_self => 1)
+      Flickrie.public_photos_from_user_contacts(@user_nsid, :include_self => 1)
+      Flickrie.get_photo_context(@photo_id)
       Flickrie.search_photos(:user_id => @user_nsid)
     end
   end

data/test/test.rb

@@ -1,8 +1,6 @@
 require 'test/unit'
 require 'flickrie/client'
 
-Flickrie.timeout = 20
-Flickrie.open_timeout = 20
 Flickrie.api_key = ENV['FLICKR_API_KEY']
 Flickrie.shared_secret = ENV['FLICKR_SHARED_SECRET']
 Flickrie.access_token = ENV['FLICKR_ACCESS_TOKEN']

data/test/video_test.rb

@@ -66,6 +66,13 @@ class VideoTest < Test::Unit::TestCase
     assert_nil video.mobile_download_url
   end
 
+  def test_video_upload
+    video_path = File.join(File.expand_path(File.dirname(__FILE__)), 'video.mov')
+    video_id = Flickrie.upload(video_path)
+    assert_nothing_raised(Flickrie::Error) { Flickrie.get_video_info(video_id) }
+    Flickrie.delete_video(video_id)
+  end
+
   def test_other_api_calls
     # add_video_tags, remove_video_tag,
     # search_videos, videos_from_contacts,
@@ -76,9 +83,12 @@ class VideoTest < Test::Unit::TestCase
       video = Flickrie.get_video_info(@video_id)
       tag = video.tags.find { |tag| tag.content == "janko" }
       Flickrie.remove_video_tag(tag.id)
-      Flickrie.search_videos(:user_id => @user_nsid)
+      Flickrie.videos_from_contacts(:include_self => 1)
+      Flickrie.public_videos_from_user_contacts(@user_nsid, :include_self => 1)
       Flickrie.public_videos_from_user(@user_nsid)
       Flickrie.videos_from_set(@set_id)
+      Flickrie.get_video_context(@video_id)
+      Flickrie.search_videos(:user_id => @user_nsid)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flickrie
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-02 00:00:00.000000000 Z
+date: 2012-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &70189173611560 !ruby/object:Gem::Requirement
+  requirement: &70095977665920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70189173611560
+  version_requirements: *70095977665920
 - !ruby/object:Gem::Dependency
   name: simple_oauth
-  requirement: &70189173466820 !ruby/object:Gem::Requirement
+  requirement: &70095977665300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,29 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70189173466820
+  version_requirements: *70095977665300
+- !ruby/object:Gem::Dependency
+  name: multi_xml
+  requirement: &70095977664520 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70095977664520
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70095977662960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70095977662960
 description: This gem is a nice wrapper for the Flickr API with an intuitive interface.
 email:
 - janko.marohnic@gmail.com
@@ -56,10 +78,12 @@ files:
 - lib/flickrie/media.rb
 - lib/flickrie/media/note.rb
 - lib/flickrie/media/tag.rb
+- lib/flickrie/media/ticket.rb
 - lib/flickrie/media/visibility.rb
 - lib/flickrie/oauth.rb
 - lib/flickrie/photo.rb
 - lib/flickrie/set.rb
+- lib/flickrie/upload_client.rb
 - lib/flickrie/user.rb
 - lib/flickrie/version.rb
 - lib/flickrie/video.rb
@@ -68,10 +92,12 @@ files:
 - test/location_test.rb
 - test/media_test.rb
 - test/oauth_test.rb
+- test/photo.jpg
 - test/photo_test.rb
 - test/set_test.rb
 - test/test.rb
 - test/user_test.rb
+- test/video.mov
 - test/video_test.rb
 homepage: https://github.com/janko-m/flickrie
 licenses: []
@@ -106,9 +132,11 @@ test_files:
 - test/location_test.rb
 - test/media_test.rb
 - test/oauth_test.rb
+- test/photo.jpg
 - test/photo_test.rb
 - test/set_test.rb
 - test/test.rb
 - test/user_test.rb
+- test/video.mov
 - test/video_test.rb
 has_rdoc: