flickrie 1.5.0 → 1.5.1

data/lib/flickrie/api_methods/set.rb

@@ -1,23 +0,0 @@
-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

@@ -1,45 +0,0 @@
-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/media/class_methods.rb

@@ -1,217 +0,0 @@
-module Flickrie
-  module Media
-    # @private
-    module ClassMethods
-      def from_set(hash)
-        collection = hash.delete('photo').map do |media_hash|
-          media_hash['owner'] = {
-            'id' => hash['owner'],
-            'nsid' => hash['owner'],
-            'username' => hash['ownername'],
-          }
-          fix_extras(media_hash)
-          new(media_hash)
-        end
-
-        Collection.new(hash).replace(collection)
-      end
-
-      def from_info(hash)
-        fix_info(hash)
-        new(hash)
-      end
-
-      def from_user(hash)
-        collection = hash.delete('photo').map do |media_hash|
-          media_hash['owner'] = {
-            'id' => media_hash['owner'],
-            'nsid' => media_hash.delete('owner'),
-            'username' => media_hash.delete('ownername')
-          }
-          fix_extras(media_hash)
-          fix_visibility(media_hash)
-          new(media_hash)
-        end
-
-        Collection.new(hash).replace(collection)
-      end
-
-      def from_sizes(hash)
-        fix_sizes(hash)
-        new(hash)
-      end
-
-      def from_search(hash)
-        from_user(hash)
-      end
-
-      def from_contacts(hash)
-        hash['photo'].each do |media_hash|
-          media_hash['ownername'] = media_hash.delete('username')
-        end
-
-        from_user(hash)
-      end
-
-      def from_context(hash)
-        count = hash['count']['_content'].to_i
-        previous_photo = new(hash['prevphoto']) rescue nil
-        next_photo = new(hash['nextphoto']) rescue nil
-        Struct.new(:count, :previous, :next).new \
-          count, previous_photo, next_photo
-      end
-
-      def from_not_in_set(hash)
-        from_user(hash)
-      end
-
-      def of_user(hash)
-        from_user(hash)
-      end
-
-      def from_perms(hash)
-        fix_visibility(hash)
-        hash['permissions'] = {
-          'permcomment' => hash.delete('permcomment'),
-          'permaddmeta' => hash.delete('permaddmeta')
-        }
-        new(hash)
-      end
-
-      def from_recent(hash)
-        from_user(hash)
-      end
-
-      def from_untagged(hash)
-        from_user(hash)
-      end
-
-      def from_geo_data(hash)
-        from_user(hash)
-      end
-
-      def from_recently_updated(hash)
-        from_user(hash)
-      end
-
-    private
-
-      def fix_extras(hash)
-        if hash['iconserver'] or hash['iconfarm']
-          hash['owner'] ||= {}
-          hash['owner'].update \
-            'iconserver' => hash.delete('iconserver'),
-            'iconfarm' => hash.delete('iconfarm')
-        end
-
-        if hash['place_id']
-          geo_info = %w[latitude longitude accuracy context place_id woeid]
-          hash['location'] = geo_info.inject({}) do |location, geo|
-            location.update(geo => hash.delete(geo))
-          end
-          hash['geoperms'] = {
-            'isfamily' => hash['geo_is_family'],
-            'isfriend' => hash['geo_is_friend'],
-            'iscontact' => hash['geo_is_contact'],
-            'ispublic' => hash['geo_is_public']
-          }
-        end
-
-        if hash['tags']
-          hash['tags'] = hash['tags'].split(' ').map do |tag_content|
-            {'_content' => tag_content, 'machine_tag' => 0}
-          end
-        end
-        if hash['machine_tags']
-          hash['tags'] ||= []
-          hash['tags'] += hash.delete('machine_tags').split(' ').map do |tag_content|
-            {'_content' => tag_content, 'machine_tag' => 1}
-          end
-        end
-
-        hash['dates'] = {
-          'uploaded' => hash.delete('dateupload'),
-          'lastupdate' => hash.delete('lastupdate'),
-          'taken' => hash.delete('datetaken'),
-          'takengranularity' => hash.delete('datetakengranularity'),
-        }
-
-        hash
-      end
-
-      def fix_info(hash)
-        hash['title'] = hash['title']['_content']
-        hash['description'] = hash['description']['_content']
-        hash['comments_count'] = hash.delete('comments')['_content']
-        hash['dates']['uploaded'] = hash.delete('dateuploaded')
-        hash['tags'] = hash['tags']['tag']
-
-        hash
-      end
-
-      def fix_visibility(hash)
-        hash['visibility'] = {
-          'ispublic' => hash.delete('ispublic'),
-          'isfriend' => hash.delete('isfriend'),
-          '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)
-
-    # @private
-    def self.included(klass)
-      klass.extend(ClassMethods)
-    end
-
-    # @private
-    def self.new(hash)
-      eval(hash['media'].capitalize).new(hash)
-    end
-  end
-end

data/lib/flickrie/media/visibility.rb

@@ -1,29 +0,0 @@
-module Flickrie
-  module Media
-    class Visibility
-      # @!parse attr_reader \
-      #   :public?, :friends?, :family?, :contacts?, :hash
-
-      # @return [Boolean]
-      def public?()   @info['ispublic'].to_i == 1 if @info['ispublic']   end
-      # @return [Boolean]
-      def friends?()  @info['isfriend'].to_i == 1 if @info['isfriend']   end
-      # @return [Boolean]
-      def family?()   @info['isfamily'].to_i == 1 if @info['isfamily']   end
-      # @return [Boolean]
-      def contacts?() @info['iscontact'].to_i == 1 if @info['iscontact'] end
-
-      def [](key) @info[key] end
-      # @return [Hash]
-      def hash() @info end
-
-      private
-
-      def initialize(info)
-        raise ArgumentError if info.nil?
-
-        @info = info
-      end
-    end
-  end
-end

data/lib/flickrie/media_count.rb

@@ -1,54 +0,0 @@
-require 'date'
-
-module Flickrie
-  class MediaCount
-    # @!parse attr_reader \
-    #   :value, :date_range, :from, :to, :hash
-
-    def value() Integer(@info['count']) rescue nil end
-
-    # @return [Range]
-    def date_range
-      dates =
-        case @dates_kind
-        when "mysql timestamp"
-          [DateTime.parse(@info['fromdate']).to_time,
-           DateTime.parse(@info['todate']).to_time]
-        when "unix timestamp"
-          [Time.at(Integer(@info['fromdate'])),
-           Time.at(Integer(@info['todate']))]
-        end
-
-      dates.first..dates.last
-    end
-    alias time_interval date_range
-
-    # @return [Time]
-    def from() date_range.begin end
-    # @return [Time]
-    def to()   date_range.end   end
-
-    def [](key) @info[key] end
-    # Returns the raw hash from the response. Useful if something isn't available by methods.
-    #
-    # @return [Hash]
-    def hash() @info end
-
-    private
-
-    def initialize(info, params)
-      @info = info
-      @dates_kind = (params[:dates].nil? ? "mysql timestamp" : "unix timestamp")
-    end
-
-    def self.ensure_utc(params)
-      params.dup.tap do |hash|
-        if hash[:taken_dates].is_a?(String)
-          hash[:taken_dates] = hash[:taken_dates].split(',').
-            map { |date| DateTime.parse(date) }.
-            map(&:to_time).map(&:getutc).join(',')
-        end
-      end
-    end
-  end
-end