flickrie 1.4.2 → 1.5.0

data/lib/flickrie/api_methods/set.rb

@@ -0,0 +1,23 @@
+module Flickrie
+  module ApiMethods
+    # 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)
+      Set.from_info(response.body['photoset'])
+    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)
+      Set.from_user(response.body['photosets'], nsid)
+    end
+  end
+end

data/lib/flickrie/api_methods/user.rb

@@ -0,0 +1,45 @@
+module Flickrie
+  module ApiMethods
+    # 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)
+      User.from_find(response.body['user'])
+    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)
+      User.from_find(response.body['user'])
+    end
+
+    # 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)
+      User.from_info(response.body['person'])
+    end
+
+    # Returns the upload status of the user who is currently authenticated.
+    #
+    # @return [Flickrie::User]
+    # @api_method [flickr.people.getUploadStatus](http://www.flickr.com/services/api/flickr.people.getUploadStatus.html)
+    # @see Flickrie::User#upload_status
+    #
+    # @note This method requires authentication with "read" permissions.
+    def get_upload_status(params = {})
+      response = client.get_upload_status(params)
+      User.from_upload_status(response.body['user'])
+    end
+  end
+end

data/lib/flickrie/client.rb

@@ -3,6 +3,11 @@ require 'faraday'
 module Flickrie
   class Client < Faraday::Connection
     def get(method, params = {})
+      if params.delete(:include_sizes)
+        urls = Photo::FLICKR_SIZES.values.map { |s| "url_#{s}" }.join(',')
+        params[:extras] = [params[:extras], urls].compact.join(',')
+      end
+
       super() do |req|
         req.params[:method] = method
         req.params.update(params)
@@ -179,6 +184,17 @@ module Flickrie
       get 'flickr.photos.licenses.getInfo', params
     end
 
+    def set_media_license(media_id, license_id, params = {})
+      post 'flickr.photos.licenses.setLicense',
+        {:photo_id => media_id, :license_id => license_id}.merge(params)
+    end
+
+    # photos.transform
+    def rotate_media(media_id, degrees, params = {})
+      post 'flickr.photos.transform.rotate',
+        {:photo_id => media_id, :degrees => degrees}.merge(params)
+    end
+
     # photosets
     def get_set_info(set_id, params = {})
       get 'flickr.photosets.getInfo',

data/lib/flickrie/media.rb

@@ -168,10 +168,8 @@ module Flickrie
     #
     # @return [self]
     def get_info(params = {})
-      hash = Flickrie.client.get_media_info(id, params).body['photo']
-      self.class.fix_info(hash)
-      @hash.deep_merge!(hash)
-
+      media = Flickrie.send("get_#{media_type}_info", id, params)
+      @hash.deep_merge!(media.hash)
       self
     end
 
@@ -179,9 +177,8 @@ module Flickrie
     #
     # @return [self]
     def get_exif(params = {})
-      hash = Flickrie.client.get_media_exif(id, params).body['photo']
-      @hash.deep_merge!(hash)
-
+      media = Flickrie.send("get_#{media_type}_exif", id, params)
+      @hash.deep_merge!(media.hash)
       self
     end
 
@@ -189,9 +186,8 @@ module Flickrie
     #
     # @return [self]
     def get_favorites(params = {})
-      hash = Flickrie.client.get_media_favorites(id, params).body['photo']
-      @hash.deep_merge!(hash)
-
+      media = Flickrie.send("get_#{media_type}_favorites", id, params)
+      @hash.deep_merge!(media.hash)
       self
     end
 
@@ -201,6 +197,10 @@ module Flickrie
 
     private
 
+    def media_type
+      self.class.name.split('::').last.downcase
+    end
+
     BASE58_ALPHABET = '123456789abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ'.chars.to_a.freeze
 
     def to_base58(id)

data/lib/flickrie/media/class_methods.rb

@@ -94,7 +94,7 @@ module Flickrie
         from_user(hash)
       end
 
-      #------------------------------------------------------------
+    private
 
       def fix_extras(hash)
         if hash['iconserver'] or hash['iconfarm']
@@ -156,6 +156,51 @@ module Flickrie
           'isfamily' => hash.delete('isfamily')
         }
       end
+
+      def fix_sizes(hash)
+        case self.name.split('::').last
+        when "Photo"
+          hash['usage'] = {
+            'canblog'     => hash['canblog'],
+            'canprint'    => hash['canprint'],
+            'candownload' => hash['candownload']
+          }
+          flickr_sizes = {
+            'Square'       => Photo::FLICKR_SIZES['Square 75'],
+            'Large Square' => Photo::FLICKR_SIZES['Square 150'],
+            'Thumbnail'    => Photo::FLICKR_SIZES['Thumbnail'],
+            'Small'        => Photo::FLICKR_SIZES['Small 240'],
+            'Small 320'    => Photo::FLICKR_SIZES['Small 320'],
+            'Medium'       => Photo::FLICKR_SIZES['Medium 500'],
+            'Medium 640'   => Photo::FLICKR_SIZES['Medium 640'],
+            'Medium 800'   => Photo::FLICKR_SIZES['Medium 800'],
+            'Large'        => Photo::FLICKR_SIZES['Large 1024'],
+            'Large 1600'   => Photo::FLICKR_SIZES['Large 1600'],
+            'Large 2048'   => Photo::FLICKR_SIZES['Large 2048'],
+            'Original'     => Photo::FLICKR_SIZES['Original']
+          }
+          hash['size'].each do |size_info|
+            size_abbr = flickr_sizes[size_info['label']]
+            hash["width_#{size_abbr}"] = size_info['width']
+            hash["height_#{size_abbr}"] = size_info['height']
+            hash["url_#{size_abbr}"] = size_info['source']
+          end
+        when "Video"
+          hash['usage'] = {
+            'canblog'     => hash['canblog'],
+            'canprint'    => hash['canprint'],
+            'candownload' => hash['candownload']
+          }
+          hash['video'] ||= {}
+          hash['size'].each do |info|
+            case info['label']
+            when 'Video Player' then hash['video']['source_url'] = info['source']
+            when 'Site MP4'     then hash['video']['download_url'] = info['source']
+            when 'Mobile MP4'   then hash['video']['mobile_download_url'] = info['source']
+            end
+          end
+        end
+      end
     end
     extend(ClassMethods)
 

data/lib/flickrie/photo.rb

@@ -50,7 +50,6 @@ module Flickrie
     # @return [self]
     def original()     dup.original!       end
 
-    # @comment Alternate size methods
     # @return [self]
     def square75()   square(75)   end
     # @return [self]
@@ -117,10 +116,8 @@ module Flickrie
     #
     # @return [self]
     def get_sizes(params = {})
-      hash = Flickrie.client.get_media_sizes(id, params).body['sizes']
-      self.class.fix_sizes(hash)
-      @hash.deep_merge!(hash)
-
+      photo = Flickrie.get_photo_sizes(id, params)
+      @hash.deep_merge!(photo.hash)
       largest!
     end
 
@@ -138,33 +135,5 @@ module Flickrie
     def size_abbr
       FLICKR_SIZES[size]
     end
-
-    def self.fix_sizes(hash)
-      hash['usage'] = {
-        'canblog'     => hash['canblog'],
-        'canprint'    => hash['canprint'],
-        'candownload' => hash['candownload']
-      }
-      flickr_sizes = {
-        'Square'       => FLICKR_SIZES['Square 75'],
-        'Large Square' => FLICKR_SIZES['Square 150'],
-        'Thumbnail'    => FLICKR_SIZES['Thumbnail'],
-        'Small'        => FLICKR_SIZES['Small 240'],
-        'Small 320'    => FLICKR_SIZES['Small 320'],
-        'Medium'       => FLICKR_SIZES['Medium 500'],
-        'Medium 640'   => FLICKR_SIZES['Medium 640'],
-        'Medium 800'   => FLICKR_SIZES['Medium 800'],
-        'Large'        => FLICKR_SIZES['Large 1024'],
-        'Large 1600'   => FLICKR_SIZES['Large 1600'],
-        'Large 2048'   => FLICKR_SIZES['Large 2048'],
-        'Original'     => FLICKR_SIZES['Original']
-      }
-      hash['size'].each do |size_info|
-        size_abbr = flickr_sizes[size_info['label']]
-        hash["width_#{size_abbr}"] = size_info['width']
-        hash["height_#{size_abbr}"] = size_info['height']
-        hash["url_#{size_abbr}"] = size_info['source']
-      end
-    end
   end
 end

data/lib/flickrie/version.rb

@@ -1,3 +1,3 @@
 module Flickrie
-  VERSION = "1.4.2"
+  VERSION = "1.5.0"
 end

data/lib/flickrie/video.rb

@@ -32,11 +32,9 @@ module Flickrie
     #
     # @return [self]
     def get_sizes(params = {})
-      hash = Flickrie.client.get_media_sizes(id, params).body['sizes']
-      self.class.fix_sizes(hash)
-      @hash.deep_merge!(hash)
+      video = Flickrie.get_video_sizes(id, params)
+      @hash.deep_merge!(video.hash)
       @video = @hash['video']
-
       self
     end
 
@@ -46,7 +44,6 @@ module Flickrie
     def get_info(params = {})
       super
       @video = @hash['video']
-
       self
     end
 
@@ -56,21 +53,5 @@ module Flickrie
       super
       @video = hash['video'] || {}
     end
-
-    def self.fix_sizes(hash)
-      hash['usage'] = {
-        'canblog'     => hash['canblog'],
-        'canprint'    => hash['canprint'],
-        'candownload' => hash['candownload']
-      }
-      hash['video'] ||= {}
-      hash['size'].each do |info|
-        case info['label']
-        when 'Video Player' then hash['video']['source_url'] = info['source']
-        when 'Site MP4'     then hash['video']['download_url'] = info['source']
-        when 'Mobile MP4'   then hash['video']['mobile_download_url'] = info['source']
-        end
-      end
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flickrie
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-31 00:00:00.000000000 Z
+date: 2012-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &70280592734220 !ruby/object:Gem::Requirement
+  requirement: &70316886740000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70280592734220
+  version_requirements: *70316886740000
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70280592731780 !ruby/object:Gem::Requirement
+  requirement: &70316886737500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,10 +38,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70280592731780
+  version_requirements: *70316886737500
 - !ruby/object:Gem::Dependency
   name: simple_oauth
-  requirement: &70280592729520 !ruby/object:Gem::Requirement
+  requirement: &70316886735040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -49,10 +49,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70280592729520
+  version_requirements: *70316886735040
 - !ruby/object:Gem::Dependency
   name: multi_xml
-  requirement: &70280592727860 !ruby/object:Gem::Requirement
+  requirement: &70316886733520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,10 +60,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70280592727860
+  version_requirements: *70316886733520
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70280592726880 !ruby/object:Gem::Requirement
+  requirement: &70316886723980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,10 +71,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70280592726880
+  version_requirements: *70316886723980
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70280592712880 !ruby/object:Gem::Requirement
+  requirement: &70316886722120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +82,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70280592712880
+  version_requirements: *70316886722120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70280592710720 !ruby/object:Gem::Requirement
+  requirement: &70316886720440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -96,10 +96,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70280592710720
+  version_requirements: *70316886720440
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70280592708920 !ruby/object:Gem::Requirement
+  requirement: &70316886719040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -107,13 +107,16 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *70280592708920
+  version_requirements: *70316886719040
 description: This gem wraps the Flickr API with a nice object-oriented interface.
 email: janko.marohnic@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/flickrie/api_methods/media.rb
+- lib/flickrie/api_methods/set.rb
+- lib/flickrie/api_methods/user.rb
 - lib/flickrie/api_methods.rb
 - lib/flickrie/client.rb
 - lib/flickrie/collection.rb
@@ -142,7 +145,7 @@ files:
 - README.md
 - LICENSE
 - .yardopts
-homepage: https://github.com/janko-m/flickrie
+homepage: http://janko-m.github.com/flickrie/
 licenses:
 - MIT
 post_install_message: 
@@ -163,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4441436478789796734
+      hash: 3210841569562279184
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11