flickrie 1.5.2 → 1.6.0

data/README.md

@@ -296,9 +296,20 @@ basis of this gem.
 "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

data/lib/flickrie/api_methods.rb

@@ -779,6 +779,74 @@ module Flickrie
         map { |info| Ticket.new(info) }
     end
 
+    # Adds existing photo/video to a set with the given ID.
+    #
+    # @param set_id [Fixnum, String]
+    # @return [nil]
+    # @api_method [flickr.photosets.addPhoto](http://www.flickr.com/services/api/flickr.photosets.addPhoto.html)
+    #
+    # @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)
+    end
+    alias add_photo_to_set add_media_to_set
+    alias add_video_to_set add_media_to_set
+
+    # Creates a new set.
+    #
+    # @return [Flickrie::Set]
+    # @api_method [flickr.photosets.create](http://www.flickr.com/services/api/flickr.photosets.create.html)
+    #
+    # @note This method requires authentication with "write" permissions.
+    def create_set(params = {})
+      response = client.create_set(params)
+      Set.new(response.body['photoset'], self)
+    end
+
+    # Deletes a set.
+    #
+    # @param set_id [Fixnum, String]
+    # @return [nil]
+    # @api_method [flickr.photosets.delete](http://www.flickr.com/services/api/flickr.photosets.delete.html)
+    #
+    # @note This method requires authentication with "write" permissions.
+    def delete_set(set_id, params = {})
+      client.delete_set(set_id, params)
+      nil
+    end
+
+    # Modifies metadata of a set.
+    #
+    # @param set_id [Fixnum, String]
+    # @return [nil]
+    # @api_method [flickr.photosets.editMeta](http://www.flickr.com/services/api/flickr.photosets.editMeta.html)
+    #
+    # @note This method requires authentication with "write" permissions.
+    def edit_set_metadata(set_id, params = {})
+      client.edit_set_metadata(set_id, params)
+      nil
+    end
+
+    # Edits photos/videos of a set with the given ID.
+    #
+    # @param set_id [Fixnum, String]
+    # @return [nil]
+    # @api_method [flickr.photosets.editPhotos](http://www.flickr.com/services/api/flickr.photosets.editPhotos.html)
+    #
+    # @note This method requires authentication with "write" permissions.
+    def edit_set_media(set_id, params = {})
+      client.edit_set_photos(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
+    def get_set_context(set_id, media_id, params = {})
+      response = client.get_set_context(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]
@@ -828,6 +896,60 @@ module Flickrie
       media_from_set(set_id, {:media => 'videos'}.merge(params))
     end
 
+    # Sets the order of sets belonging to the authenticated user.
+    #
+    # @param set_ids [String, Fixnum]
+    # @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)
+      nil
+    end
+
+    # Removes photos/videos from a set.
+    #
+    # @param set_id [Fixnum, String]
+    # @param media_ids [String]
+    # @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)
+      nil
+    end
+    alias remove_photos_from_set remove_media_from_set
+    alias remove_videos_from_set remove_media_from_set
+
+    # Reorders photos/videos inside a set.
+    #
+    # @param set_id [Fixnum, String]
+    # @param media_ids [String]
+    # @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)
+      nil
+    end
+    alias reorder_photos_in_set reorder_media_in_set
+    alias reorder_videos_in_set reorder_media_in_set
+
+    # Sets set's primary photo/video.
+    #
+    # @param set_id [Fixnum, String]
+    # @param media_id [String]
+    # @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)
+      nil
+    end
+    alias set_primary_photo_to_set set_primary_media_to_set
+    alias set_primary_video_to_set set_primary_media_to_set
+
     # Tests if the authentication was successful. If it was, it
     # returns info of the user who just authenticated.
     #

data/lib/flickrie/client.rb

@@ -194,6 +194,33 @@ module Flickrie
     end
 
     # photosets
+    def add_media_to_set(set_id, media_id, params = {})
+      post 'flickr.photosets.addPhoto',
+        {:photoset_id => set_id, :photo_id => media_id}.merge(params)
+    end
+
+    def create_set(params = {})
+      post 'flickr.photosets.create', params
+    end
+
+    def delete_set(set_id, params = {})
+      post 'flickr.photosets.delete', {:photoset_id => set_id}.merge(params)
+    end
+
+    def edit_set_metadata(set_id, params = {})
+      post 'flickr.photosets.editMeta', {:photoset_id => set_id}.merge(params)
+    end
+
+    def edit_set_photos(set_id, params = {})
+      post 'flickr.photosets.editPhotos',
+        {:photoset_id => set_id}.merge(params)
+    end
+
+    def get_set_context(set_id, media_id, params = {})
+      get 'flickr.photosets.getContext',
+        {:photoset_id => set_id, :photo_id => media_id}.merge(params)
+    end
+
     def get_set_info(set_id, params = {})
       get 'flickr.photosets.getInfo',
         {:photoset_id => set_id}.merge(params)
@@ -209,6 +236,25 @@ module Flickrie
         ensure_media({:photoset_id => set_id}.merge(params))
     end
 
+    def order_sets(set_ids, params = {})
+      post 'flickr.photosets.orderSets', {:photoset_ids => set_ids}.merge(params)
+    end
+
+    def remove_media_from_set(set_id, media_ids, params = {})
+      post 'flickr.photosets.removePhotos',
+        {:photoset_id => set_id, :photo_ids => media_ids}.merge(params)
+    end
+
+    def reorder_media_in_set(set_id, media_ids, params = {})
+      post 'flickr.photosets.reorderPhotos',
+        {:photoset_id => set_id, :photo_ids => media_ids}.merge(params)
+    end
+
+    def set_primary_media_to_set(set_id, media_id, params = {})
+      post 'flickr.photosets.setPrimaryPhoto',
+        {:photoset_id => set_id, :photo_id => media_id}.merge(params)
+    end
+
     # test
     def test_login(params = {})
       get 'flickr.test.login', params

data/lib/flickrie/objects/media_context.rb

@@ -9,8 +9,8 @@ module Flickrie
 
     def initialize(hash, api_caller)
       count = hash['count']['_content'].to_i
-      previous = Media.new(hash['prevphoto'], api_caller) rescue nil
-      next_ = Media.new(hash['nextphoto'], api_caller) rescue nil
+      previous = hash['prevphoto']['id'].to_i > 0 ? Media.new(hash['prevphoto'], api_caller) : nil
+      next_ = hash['nextphoto']['id'].to_i > 0 ? Media.new(hash['nextphoto'], api_caller) : nil
       @count, @previous, @next = count, previous, next_
     end
   end

data/lib/flickrie/objects/set.rb

@@ -74,7 +74,13 @@ module Flickrie
     def updated_at() Time.at(Integer(@hash['date_update'])) rescue nil end
 
     # @return [String]
-    def url() "http://www.flickr.com/photos/#{owner.nsid}/sets/#{id}" rescue nil end
+    def url
+      if @hash['url']
+        @hash['url']
+      elsif owner
+        "http://www.flickr.com/photos/#{owner.nsid}/sets/#{id}"
+      end
+    end
 
     def [](key) @hash[key] end
     # @return [Hash]

data/lib/flickrie/version.rb

@@ -1,3 +1,3 @@
 module Flickrie
-  VERSION = "1.5.2"
+  VERSION = "1.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flickrie
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-10 00:00:00.000000000 Z
+date: 2012-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &70237381004760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,18 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70237381004760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+    - - <
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70237381003940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,10 +46,18 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70237381003940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.6
+    - - <
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: simple_oauth
-  requirement: &70237381003160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -49,10 +65,15 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70237381003160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: multi_xml
-  requirement: &70237381002580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,10 +81,15 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70237381002580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70237381002100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,10 +97,15 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70237381002100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70237381001620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +113,15 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70237381001620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70237381001120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -96,10 +132,18 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70237381001120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.10'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70237381000280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -107,7 +151,12 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *70237381000280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.1'
 description: This gem wraps the Flickr API with a nice object-oriented interface.
 email: janko.marohnic@gmail.com
 executables: []
@@ -165,13 +214,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3513964845288430156
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: This gem wraps the Flickr API with a nice object-oriented interface.
 test_files: []
+has_rdoc: