flickrie 1.1.2 → 1.2.0

data/README.md

@@ -1,9 +1,11 @@
-# Flickrie [![Build Status](https://secure.travis-ci.org/janko-m/flickrie.png)](http://travis-ci.org/janko-m/flickrie)
-
-## About
+# Flickrie
 
 This gem is a nice wrapper for the Flickr API with an object-oriented interface.
 
+[![Build Status](https://secure.travis-ci.org/janko-m/flickrie.png)](http://travis-ci.org/janko-m/flickrie)
+
+## About
+
 The reason why I did this gem is because the existing ones either weren't
 well maintained, or they weren't object oriented and provided a literal
 wrapper over the API. That didn't statisfy me, because Flickr API

data/lib/flickrie/api_methods.rb

@@ -10,6 +10,7 @@ require 'flickrie/video'
 require 'flickrie/set'
 require 'flickrie/media_count'
 require 'flickrie/ticket'
+require 'flickrie/core_ext'
 
 module Flickrie
   module ApiMethods
@@ -299,7 +300,7 @@ module Flickrie
     # @api_method [flickr.photos.getExif](http://www.flickr.com/services/api/flickr.photos.getExif.html)
     def get_photo_exif(photo_id, params = {})
       response = client.get_media_exif(photo_id, params)
-      Photo.from_exif(response.body['photo'])
+      Photo.new(response.body['photo'])
     end
     # Fetches the exif for the video with the given ID. Example:
     #
@@ -315,7 +316,7 @@ module Flickrie
     # @api_method [flickr.photos.getExif](http://www.flickr.com/services/api/flickr.photos.getExif.html)
     def get_video_exif(video_id, params = {})
       response = client.get_media_exif(video_id, params)
-      Video.from_exif(response.body['photo'])
+      Video.new(response.body['photo'])
     end
 
     # Fetches the list of users who favorited the photo with the given ID.

data/lib/flickrie/core_ext.rb

@@ -0,0 +1,13 @@
+class Hash
+  def deep_merge(other_hash)
+    dup.deep_merge!(other_hash)
+  end
+
+  def deep_merge!(other_hash)
+    other_hash.each_pair do |k,v|
+      tv = self[k]
+      self[k] = tv.is_a?(Hash) && v.is_a?(Hash) ? tv.deep_merge(v) : v
+    end
+    self
+  end
+end

data/lib/flickrie/media/class_methods.rb

@@ -0,0 +1,131 @@
+module Flickrie
+  module Media
+    # @private
+    module ClassMethods
+      def from_set(hash)
+        hash['photo'].map do |individual_hash|
+          individual_hash['owner'] = {
+            'nsid' => hash['owner'],
+            'username' => hash['ownername'],
+          }
+          fix_extras(individual_hash)
+          new(individual_hash)
+        end
+      end
+
+      def from_info(hash)
+        fix_info(hash)
+        new(hash)
+      end
+
+      def from_user(hash)
+        hash['photo'].map do |individual_hash|
+          individual_hash['owner'] = {
+            'nsid' => individual_hash.delete('owner'),
+            'username' => individual_hash.delete('ownername')
+          }
+          fix_extras(individual_hash)
+          fix_visibility(individual_hash)
+          new(individual_hash)
+        end
+      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 |individual_hash|
+          individual_hash['ownername'] = individual_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 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
+    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.rb

@@ -1,3 +1,4 @@
+require 'flickrie/media/class_methods'
 require 'flickrie/media/visibility'
 require 'flickrie/media/note'
 require 'flickrie/media/tag'
@@ -20,24 +21,24 @@ module Flickrie
     #   :has_people?, :faved?, :notes, :favorites, :hash
 
     # @return [String]
-    def id()             @info['id']           end
+    def id()             @hash['id']           end
     # @return [String]
-    def secret()         @info['secret']       end
+    def secret()         @hash['secret']       end
     # @return [String]
-    def server()         @info['server']       end
+    def server()         @hash['server']       end
     # @return [Fixnum]
-    def farm()           @info['farm']         end
+    def farm()           @hash['farm']         end
     # @return [String]
-    def title()          @info['title']        end
+    def title()          @hash['title']        end
     # @return [String]
-    def description()    @info['description']  end
+    def description()    @hash['description']  end
     # @return [String]
-    def media_status()   @info['media_status'] end
+    def media_status()   @hash['media_status'] end
     # @return [String]
-    def path_alias()     @info['pathalias']    end
+    def path_alias()     @hash['pathalias']    end
 
     # @return [String]
-    def camera() @info['camera'] end
+    def camera() @hash['camera'] end
     # Returns exif of the photo/video. Example:
     #
     #     photo.exif.get('Model') # => 'Canon PowerShot G12'
@@ -47,42 +48,42 @@ module Flickrie
     #     photo.exif.get('X-Resolution')                   # => '180 dpi'
     #
     # @return [Flickrie::Media::Exif]
-    def exif() Exif.new(@info['exif']) rescue nil end
+    def exif() Exif.new(@hash['exif']) rescue nil end
 
     # @return [Fixnum]
-    def views_count()    Integer(@info['views'])          rescue nil end
+    def views_count()    Integer(@hash['views'])          rescue nil end
     # @return [Fixnum]
-    def comments_count() Integer(@info['comments_count']) rescue nil end
+    def comments_count() Integer(@hash['comments_count']) rescue nil end
 
     # @return [Flickrie::Location]
-    def location() Location.new(@info['location']) rescue nil end
+    def location() Location.new(@hash['location']) rescue nil end
     # @return [Flickrie::Media::Visibility]
-    def geo_permissions() Visibility.new(@info['geoperms']) rescue nil end
+    def geo_permissions() Visibility.new(@hash['geoperms']) rescue nil end
 
     # @return [Array<Flickrie::Media::Tag>]
-    def tags() @info['tags'].map { |info| Tag.new(info) }     rescue nil end
+    def tags() @hash['tags'].map { |info| Tag.new(info) }     rescue nil end
     # @return [Array<Flickrie::Media::Tag>]
     def machine_tags() tags.select { |tag| tag.machine_tag? } rescue nil end
 
     # @return [Flickrie::License]
-    def license() License.new(@info['license']) rescue nil end
+    def license() License.new(@hash['license']) rescue nil end
 
     # @return [Time]
-    def posted_at()   Time.at(Integer(@info['dates']['posted']))           rescue nil end
+    def posted_at()   Time.at(Integer(@hash['dates']['posted']))           rescue nil end
     # @return [Time]
-    def uploaded_at() Time.at(Integer(@info['dates']['uploaded']))         rescue nil end
+    def uploaded_at() Time.at(Integer(@hash['dates']['uploaded']))         rescue nil end
     # @return [Time]
-    def updated_at()  Time.at(Integer(@info['dates']['lastupdate']))       rescue nil end
+    def updated_at()  Time.at(Integer(@hash['dates']['lastupdate']))       rescue nil end
     # @return [Time]
-    def taken_at()    DateTime.parse(@info['dates']['taken']).to_time      rescue nil end
+    def taken_at()    DateTime.parse(@hash['dates']['taken']).to_time      rescue nil end
     # @return [Fixnum]
-    def taken_at_granularity() Integer(@info['dates']['takengranularity']) rescue nil end
+    def taken_at_granularity() Integer(@hash['dates']['takengranularity']) rescue nil end
 
     # @return [Flickrie::User]
-    def owner() User.new(@info['owner']) rescue nil end
+    def owner() User.new(@hash['owner']) rescue nil end
 
     # @return [Fixnum]
-    def safety_level() Integer(@info['safety_level']) rescue nil end
+    def safety_level() Integer(@hash['safety_level']) rescue nil end
 
     # @return [Boolean]
     def safe?()       safety_level <= 1 if safety_level end
@@ -95,201 +96,90 @@ 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']
+      elsif @hash['url']
+        "http://www.flickr.com" + @hash['url']
       end
     end
 
     # @return [Flickrie::Media::Visibility]
-    def visibility() Visibility.new(@info['visibility']) rescue nil end
+    def visibility() Visibility.new(@hash['visibility']) rescue nil end
 
     # @return [Boolean]
-    def primary?() Integer(@info['isprimary']) == 1 rescue nil end
+    def primary?() Integer(@hash['isprimary']) == 1 rescue nil end
 
     # @return [Boolean]
-    def favorite?() Integer(@info['isfavorite']) == 1 rescue nil end
+    def favorite?() Integer(@hash['isfavorite']) == 1 rescue nil end
 
     # @return [Boolean]
-    def can_comment?()  Integer(@info['editability']['cancomment']) == 1 rescue nil end
+    def can_comment?()  Integer(@hash['editability']['cancomment']) == 1 rescue nil end
     # @return [Boolean]
-    def can_add_meta?() Integer(@info['editability']['canaddmeta']) == 1 rescue nil end
+    def can_add_meta?() Integer(@hash['editability']['canaddmeta']) == 1 rescue nil end
 
     # @return [Boolean]
-    def can_everyone_comment?()  Integer(@info['publiceditability']['cancomment']) == 1 rescue nil end
+    def can_everyone_comment?()  Integer(@hash['publiceditability']['cancomment']) == 1 rescue nil end
     # @return [Boolean]
-    def can_everyone_add_meta?() Integer(@info['publiceditability']['canaddmeta']) == 1 rescue nil end
+    def can_everyone_add_meta?() Integer(@hash['publiceditability']['canaddmeta']) == 1 rescue nil end
 
     # @return [Boolean]
-    def can_download?() Integer(@info['usage']['candownload']) == 1 rescue nil end
+    def can_download?() Integer(@hash['usage']['candownload']) == 1 rescue nil end
     # @return [Boolean]
-    def can_blog?()     Integer(@info['usage']['canblog']) == 1     rescue nil end
+    def can_blog?()     Integer(@hash['usage']['canblog']) == 1     rescue nil end
     # @return [Boolean]
-    def can_print?()    Integer(@info['usage']['canprint']) == 1    rescue nil end
+    def can_print?()    Integer(@hash['usage']['canprint']) == 1    rescue nil end
     # @return [Boolean]
-    def can_share?()    Integer(@info['usage']['canshare']) == 1    rescue nil end
+    def can_share?()    Integer(@hash['usage']['canshare']) == 1    rescue nil end
 
     # @return [Boolean]
-    def has_people?() Integer(@info['people']['haspeople']) == 1 rescue nil end
+    def has_people?() Integer(@hash['people']['haspeople']) == 1 rescue nil end
 
     # @return [Boolean]
-    def faved?() Integer(@info['is_faved']) == 1 rescue nil end
+    def faved?() Integer(@hash['is_faved']) == 1 rescue nil end
 
     # @return [Array<Flickrie::Media::Note>]
-    def notes() @info['notes']['note'].map { |hash| Note.new(hash) } rescue nil end
+    def notes() @hash['notes']['note'].map { |info| Note.new(info) } rescue nil end
 
     # @return [Array<Flickrie::User>]
-    def favorites() @info['person'].map { |info| User.new(info) } rescue nil end
+    def favorites() @hash['person'].map { |info| User.new(info) } rescue nil end
 
-    def [](key) @info[key] end
+    def [](key) @hash[key] end
     # Returns the raw hash from the response. Useful if something isn't available by methods.
     #
     # @return [Hash]
-    def hash() @info end
+    def hash() @hash end
 
     # Same as calling `Flickrie.get_(photo|video)_info(id)`.
     #
     # @return [self]
-    def get_info(params = {}, info = nil)
-      info ||= Flickrie.client.get_media_info(id, params).body['photo']
-      @info.update(info)
-
-      # Fixes
-      @info['title'] = @info['title']['_content']
-      @info['description'] = @info['description']['_content']
-      @info['comments_count'] = @info.delete('comments')['_content']
-      @info['dates']['uploaded'] = @info.delete('dateuploaded')
-      @info['tags'] = @info['tags']['tag']
+    def get_info(params = {})
+      hash = Flickrie.client.get_media_info(id, params).body['photo']
+      self.class.fix_info(hash)
+      @hash.deep_merge!(hash)
 
       self
     end
 
-    # Same as calling `Flickrie.get_(photo|video)_info(id)`.
+    # Same as calling `Flickrie.get_(photo|video)_exif(id)`.
     #
     # @return [self]
-    def get_exif(params = {}, info = nil)
-      info ||= Flickrie.client.get_media_exif(id, params).body['photo']
-      @info.update(info)
+    def get_exif(params = {})
+      hash = Flickrie.client.get_media_exif(id, params).body['photo']
+      @hash.deep_merge!(hash)
 
       self
     end
 
-    # Same as calling `Flickrie.get_(photo|video)_info(id)`.
+    # Same as calling `Flickrie.get_(photo|video)_favorites(id)`.
     #
     # @return [self]
-    def get_favorites(params = {}, info = nil)
-      info ||= Flickrie.client.get_media_favorites(id, params).body['photo']
-      @info.update(info)
+    def get_favorites(params = {})
+      hash = Flickrie.client.get_media_favorites(id, params).body['photo']
+      @hash.deep_merge!(hash)
 
       self
     end
 
-    def initialize(info = {})
-      @info = info
-    end
-
-    # @private
-    module ClassMethods
-      def from_set(hash)
-        hash['photo'].map do |info|
-          info['owner'] = {
-            'nsid' => hash['owner'],
-            'username' => hash['ownername'],
-            'iconserver' => info.delete('iconserver'),
-            'iconfarm' => info.delete('iconfarm')
-          }
-          if info['place_id']
-            geo_info = %w[latitude longitude accuracy context place_id woeid]
-            info['location'] = geo_info.inject({}) do |location, geo|
-              location.update(geo => info.delete(geo))
-            end
-            info['geoperms'] = {
-              'isfamily' => info['geo_is_family'],
-              'isfriend' => info['geo_is_friend'],
-              'iscontact' => info['geo_is_contact'],
-              'ispublic' => info['geo_is_public']
-            }
-          end
-          info['dates'] = {
-            'uploaded' => info.delete('dateupload'),
-            'lastupdate' => info.delete('lastupdate'),
-            'taken' => info.delete('datetaken'),
-            'takengranularity' => info.delete('datetakengranularity'),
-          }
-
-          unless info['tags'].nil?
-            info['tags'] = info['tags'].split(' ').map do |tag_content|
-              {'_content' => tag_content, 'machine_tag' => 0}
-            end
-          end
-          unless info['machine_tags'].nil?
-            info['tags'] ||= []
-            info['tags'] += info.delete('machine_tags').split(' ').map do |tag_content|
-              {'_content' => tag_content, 'machine_tag' => 1}
-            end
-          end
-
-          new(info)
-        end
-      end
-
-      def from_info(info)
-        new('media' => info['media']).get_info({}, info)
-      end
-
-      def from_user(hash)
-        if hash['photo'].first
-          hash['owner'] = hash['photo'].first['owner']
-          hash['ownername'] = hash['photo'].first['ownername']
-        end
-        hash['photo'].each do |info|
-          info['visibility'] = {
-            'ispublic' => info.delete('ispublic'),
-            'isfriend' => info.delete('isfriend'),
-            'isfamily' => info.delete('isfamily')
-          }
-        end
-
-        from_set(hash)
-      end
-
-      def from_sizes(info)
-        new.get_sizes({}, info)
-      end
-
-      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)
-        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_exif(info)
-        new.get_exif({}, info)
-      end
-    end
-    extend(ClassMethods)
-
-    # @private
-    def self.included(klass)
-      klass.extend(ClassMethods)
-    end
-
-    # @private
-    def self.new(info)
-      eval(info['media'].capitalize).new(info)
+    def initialize(hash = {})
+      @hash = hash
     end
   end
 end

data/lib/flickrie/photo.rb

@@ -4,7 +4,7 @@ module Flickrie
     # @!parse attr_reader \
     #   :size, :width, :height, :source_url, :rotation
 
-    SIZES = {
+    FLICKR_SIZES = {
       'Square 75'  => 'sq',
       'Thumbnail'  => 't',
       'Square 150' => 'q',
@@ -14,6 +14,8 @@ module Flickrie
       'Medium 640' => 'z',
       'Medium 800' => 'c',
       'Large 1024' => 'l',
+      'Large 1600' => 'h',
+      'Large 2048' => 'k',
       'Original'   => 'o'
     }
 
@@ -52,35 +54,44 @@ module Flickrie
     # @return [self]
     def square75()   square(75)   end
     # @return [self]
-    def square75!()  square!(75)  end
-    # @return [self]
     def square150()  square(150)  end
     # @return [self]
-    def square150!() square!(150) end
-    # @return [self]
     def small240()   small(240)   end
     # @return [self]
-    def small240!()  small!(240)  end
-    # @return [self]
     def small320()   small(320)   end
     # @return [self]
-    def small320!()  small!(320)  end
-    # @return [self]
     def medium500()  medium(500)  end
     # @return [self]
-    def medium500!() medium!(500) end
-    # @return [self]
     def medium640()  medium(640)  end
     # @return [self]
-    def medium640!() medium!(640) end
-    # @return [self]
     def medium800()  medium(800)  end
     # @return [self]
-    def medium800!() medium!(800) end
-    # @return [self]
     def large1024()  large(1024)  end
     # @return [self]
+    def large1600()  large(1600)  end
+    # @return [self]
+    def large2048()  large(2048)  end
+
+    # @return [self]
+    def square75!()  square!(75)  end
+    # @return [self]
+    def square150!() square!(150) end
+    # @return [self]
+    def small240!()  small!(240)  end
+    # @return [self]
+    def small320!()  small!(320)  end
+    # @return [self]
+    def medium500!() medium!(500) end
+    # @return [self]
+    def medium640!() medium!(640) end
+    # @return [self]
+    def medium800!() medium!(800) end
+    # @return [self]
     def large1024!() large!(1024) end
+    # @return [self]
+    def large1600!() large!(1600) end
+    # @return [self]
+    def large2048!() large!(2048) end
 
     # @return [self]
     def largest!() @size = largest_size; self end
@@ -89,56 +100,35 @@ module Flickrie
 
     # @return [Array<String>]
     def available_sizes
-      SIZES.select { |_,v| @info["url_#{v}"] }.keys
+      FLICKR_SIZES.select { |_,v| @hash["url_#{v}"] }.keys
     end
 
     # @return [Fixnum]
-    def width() flickr_size.min rescue nil end
+    def width() Integer(@hash["width_#{size_abbr}"]) rescue nil end
     # @return [Fixnum]
-    def height() flickr_size.max rescue nil end
+    def height() Integer(@hash["height_#{size_abbr}"]) rescue nil end
     # @return [String]
-    def source_url() @info["url_#{size_abbr}"] end
+    def source_url() @hash["url_#{size_abbr}"] end
 
     # @return [Fixnum]
-    def rotation() Integer(@info['rotation']) rescue nil end
+    def rotation() Integer(@hash['rotation']) rescue nil end
 
     # Same as calling `Flickrie.get_photo_sizes(photo.id)`.
     #
     # @return [self]
-    def get_sizes(params = {}, info = nil)
-      info ||= Flickrie.client.get_media_sizes(id, params).body['sizes']
-      @info['usage'] ||= {}
-      @info['usage'].update \
-        'canblog'     => info['canblog'],
-        'canprint'    => info['canprint'],
-        'candownload' => info['candownload']
-      flickr_sizes = {
-        'Square'       => SIZES['Square 75'],
-        'Large Square' => SIZES['Square 150'],
-        'Thumbnail'    => SIZES['Thumbnail'],
-        'Small'        => SIZES['Small 240'],
-        'Small 320'    => SIZES['Small 320'],
-        'Medium'       => SIZES['Medium 500'],
-        'Medium 640'   => SIZES['Medium 640'],
-        'Medium 800'   => SIZES['Medium 800'],
-        'Large'        => SIZES['Large 1024'],
-        'Original'     => SIZES['Original']
-      }
-      info['size'].each do |size_info|
-        size_abbr = flickr_sizes[size_info['label']]
-        @info["width_#{size_abbr}"] = size_info['width']
-        @info["height_#{size_abbr}"] = size_info['height']
-        @info["url_#{size_abbr}"] = size_info['source']
-      end
+    def get_sizes(params = {})
+      hash = Flickrie.client.get_media_sizes(id, params).body['sizes']
+      self.class.fix_sizes(hash)
+      @hash.deep_merge!(hash)
 
       largest!
     end
 
     private
 
-    def initialize(info = {}, size = nil)
-      super(info)
-      @size = size || largest_size
+    def initialize(info = {})
+      super
+      @size = largest_size
     end
 
     def largest_size
@@ -146,11 +136,35 @@ module Flickrie
     end
 
     def size_abbr
-      SIZES[size]
+      FLICKR_SIZES[size]
     end
 
-    def flickr_size
-      [Integer(@info["width_#{size_abbr}"]), Integer(@info["height_#{size_abbr}"])]
+    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.1.2"
+  VERSION = "1.2.0"
 end

data/lib/flickrie/video.rb

@@ -31,20 +31,11 @@ module Flickrie
     # Same as calling `Flickrie.get_video_sizes(video.id)`
     #
     # @return [self]
-    def get_sizes(params = {}, info = nil)
-      info ||= Flickrie.client.get_media_sizes(id, params).body['sizes']
-      @info['usage'] ||= {}
-      @info['usage'].update \
-        'canblog'     => info['canblog'],
-        'canprint'    => info['canprint'],
-        'candownload' => info['candownload']
-      info['size'].each do |hash|
-        case hash['label']
-        when 'Video Player' then @video['source_url'] = hash['source']
-        when 'Site MP4'     then @video['download_url'] = hash['source']
-        when 'Mobile MP4'   then @video['mobile_download_url'] = hash['source']
-        end
-      end
+    def get_sizes(params = {})
+      hash = Flickrie.client.get_media_sizes(id, params).body['sizes']
+      self.class.fix_sizes(hash)
+      @hash.deep_merge!(hash)
+      @video = @hash['video']
 
       self
     end
@@ -52,18 +43,34 @@ module Flickrie
     # Same as calling `Flickrie.get_video_info(video.id)`.
     #
     # @return [self]
-    def get_info(params = {}, info = nil)
+    def get_info(params = {})
       super
-      @video = @info['video']
+      @video = @hash['video']
 
       self
     end
 
     private
 
-    def initialize(info = {})
+    def initialize(hash = {})
       super
-      @video = info['video'] || {}
+      @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.1.2
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-22 00:00:00.000000000 Z
+date: 2012-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &70239060903700 !ruby/object:Gem::Requirement
+  requirement: &70097994385000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70239060903700
+  version_requirements: *70097994385000
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70239060902580 !ruby/object:Gem::Requirement
+  requirement: &70097994381440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,10 +38,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70239060902580
+  version_requirements: *70097994381440
 - !ruby/object:Gem::Dependency
   name: simple_oauth
-  requirement: &70239060900520 !ruby/object:Gem::Requirement
+  requirement: &70097994393820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -49,10 +49,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70239060900520
+  version_requirements: *70097994393820
 - !ruby/object:Gem::Dependency
   name: multi_xml
-  requirement: &70239060899720 !ruby/object:Gem::Requirement
+  requirement: &70097994389540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,10 +60,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70239060899720
+  version_requirements: *70097994389540
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70239060898920 !ruby/object:Gem::Requirement
+  requirement: &70097994402680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,10 +71,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70239060898920
+  version_requirements: *70097994402680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70239060897880 !ruby/object:Gem::Requirement
+  requirement: &70097994408960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +82,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70239060897880
+  version_requirements: *70097994408960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70239060826840 !ruby/object:Gem::Requirement
+  requirement: &70097994407960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -96,10 +96,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70239060826840
+  version_requirements: *70097994407960
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70239060825260 !ruby/object:Gem::Requirement
+  requirement: &70097994405700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -107,7 +107,7 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *70239060825260
+  version_requirements: *70097994405700
 description: This gem wraps the Flickr API with a nice object-oriented interface.
 email: janko.marohnic@gmail.com
 executables: []
@@ -116,9 +116,11 @@ extra_rdoc_files: []
 files:
 - lib/flickrie/api_methods.rb
 - lib/flickrie/client.rb
+- lib/flickrie/core_ext.rb
 - lib/flickrie/instance.rb
 - lib/flickrie/license.rb
 - lib/flickrie/location.rb
+- lib/flickrie/media/class_methods.rb
 - lib/flickrie/media/exif.rb
 - lib/flickrie/media/note.rb
 - lib/flickrie/media/tag.rb
@@ -159,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1105222983264993041
+      hash: -2517221758157184130
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11