flickrie 1.3.0 → 1.3.1

data/lib/flickrie/api_methods.rb

@@ -95,8 +95,7 @@ module Flickrie
     #
     # @note This method requires authentication with "read" permissions.
     def photos_from_user(nsid, params = {})
-      media_from_user(nsid, params).
-        select { |media| media.is_a?(Photo) }
+      media_from_user(nsid, params).select { |media| media.is_a?(Photo) }
     end
     # Fetches videos from the Flickr user with the given NSID.
     #
@@ -106,8 +105,7 @@ module Flickrie
     #
     # @note This method requires authentication with "read" permissions.
     def videos_from_user(nsid, params = {})
-      media_from_user(nsid, params).
-        select { |media| media.is_a?(Video) }
+      media_from_user(nsid, params).select { |media| media.is_a?(Video) }
     end
 
     # Fetches public photos and videos from the Flickr user with the given
@@ -126,8 +124,7 @@ module Flickrie
     # @return [Flickrie::Collection<Flickrie::Photo>]
     # @api_method [flickr.people.getPublicPhotos](http://www.flickr.com/services/api/flickr.people.getPublicPhotos.html)
     def public_photos_from_user(nsid, params = {})
-      public_media_from_user(nsid, params).
-        select { |media| media.is_a?(Photo) }
+      public_media_from_user(nsid, params).select { |media| media.is_a?(Photo) }
     end
     # Fetches public videos from the Flickr user with the given NSID.
     #
@@ -135,8 +132,7 @@ module Flickrie
     # @return [Flickrie::Collection<Flickrie::Video>]
     # @api_method [flickr.people.getPublicPhotos](http://www.flickr.com/services/api/flickr.people.getPublicPhotos.html)
     def public_videos_from_user(nsid, params = {})
-      public_media_from_user(nsid, params).
-        select { |media| media.is_a?(Video) }
+      public_media_from_user(nsid, params).select { |media| media.is_a?(Video) }
     end
 
     # Returns the upload status of the user who is currently authenticated.
@@ -505,7 +501,7 @@ module Flickrie
     # @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']['photoset'], nsid)
+      Set.from_user(response.body['photosets'], nsid)
     end
 
     # Fetches photos and videos from a set with the given ID.

data/lib/flickrie/collection.rb

@@ -3,26 +3,34 @@ if Flickrie.pagination == :will_paginate
 end
 
 module Flickrie
-  # You can think of this as a richer Array. It defines some pagination attributes
-  # (you can evem use it with [will_paginate](https://github.com/mislav/will_paginate),
-  # see {Flickrie.pagination}). It also has the method {#find} which finds by ID
-  # (just like ActiveRecord).
-  class Collection < (defined?(WillPaginate) ? WillPaginate::Collection : Array)
-    attr_reader :current_page, :per_page, :total_entries, :total_pages
+  if Flickrie.pagination == :will_paginate
+    const_set(:Collection, Class.new(WillPaginate::Collection) do
+      def initialize(hash)
+        current_page = Integer(hash['page'])
+        per_page = Integer(hash['per_page'] || hash['perpage'])
+        total_entries = Integer(hash['total'])
+        super(current_page, per_page, total_entries)
+      end
+    end)
+  else
+    const_set(:Collection, Class.new(Array) do
+      attr_reader :current_page, :per_page, :total_entries, :total_pages
 
-    def initialize(params)
-      hash = params[:pagination]
-      if defined?(WillPaginate)
-        @current_page = WillPaginate::PageNumber(Integer(hash['page']))
-      else
+      def initialize(hash)
         @current_page = Integer(hash['page'])
+        @per_page = Integer(hash['per_page'] || hash['perpage'])
+        @total_entries = Integer(hash['total'])
+        @total_pages = Integer(hash['pages'])
       end
-      @per_page = Integer(hash['per_page'] || hash['perpage'])
-      @total_entries = Integer(hash['total'])
-      @total_pages = Integer(hash['pages'])
+    end)
+  end
 
-      Array.instance_method(:initialize).bind(self).call(params[:array])
-    end
+  # You can think of this as a richer Array. It defines some pagination attributes
+  # (you can even use it with [will_paginate](https://github.com/mislav/will_paginate),
+  # see {Flickrie.pagination}). It also has the method {#find} which finds by ID
+  # (just like ActiveRecord).
+  class Collection
+    # @!parse attr_reader :current_page, :per_page, :total_entries, :total_pages
 
     # Finds an object by ID (just like ActiveRecord does). This is just a
     # shorthand for

data/lib/flickrie/media/class_methods.rb

@@ -3,18 +3,17 @@ module Flickrie
     # @private
     module ClassMethods
       def from_set(hash)
-        hash['photo'].map! do |individual_hash|
-          individual_hash['owner'] = {
+        collection = hash.delete('photo').map do |media_hash|
+          media_hash['owner'] = {
             'id' => hash['owner'],
             'nsid' => hash['owner'],
             'username' => hash['ownername'],
           }
-          fix_extras(individual_hash)
-          new(individual_hash)
+          fix_extras(media_hash)
+          new(media_hash)
         end
 
-        Collection.new :array => hash.delete('photo'),
-                       :pagination => hash
+        Collection.new(hash).replace(collection)
       end
 
       def from_info(hash)
@@ -23,19 +22,18 @@ module Flickrie
       end
 
       def from_user(hash)
-        hash['photo'].map! do |individual_hash|
-          individual_hash['owner'] = {
-            'id' => individual_hash['owner'],
-            'nsid' => individual_hash.delete('owner'),
-            'username' => individual_hash.delete('ownername')
+        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(individual_hash)
-          fix_visibility(individual_hash)
-          new(individual_hash)
+          fix_extras(media_hash)
+          fix_visibility(media_hash)
+          new(media_hash)
         end
 
-        Collection.new :array => hash.delete('photo'),
-                       :pagination => hash
+        Collection.new(hash).replace(collection)
       end
 
       def from_sizes(hash)
@@ -48,8 +46,8 @@ module Flickrie
       end
 
       def from_contacts(hash)
-        hash['photo'].each do |individual_hash|
-          individual_hash['ownername'] = individual_hash.delete('username')
+        hash['photo'].each do |media_hash|
+          media_hash['ownername'] = media_hash.delete('username')
         end
 
         from_user(hash)

data/lib/flickrie/media.rb

@@ -142,8 +142,13 @@ module Flickrie
     # @return [Array<Flickrie::Media::Note>]
     def notes() @hash['notes']['note'].map { |info| Note.new(info) } rescue nil end
 
-    # @return [Array<Flickrie::User>]
-    def favorites() @hash['person'].map { |info| User.new(info) } rescue nil end
+    # @return [Flickrie::Collection<Flickrie::User>]
+    def favorites
+      collection = @hash['person'].map { |info| User.new(info) }
+      Collection.new(@hash).replace(collection)
+    rescue
+      nil
+    end
 
     def [](key) @hash[key] end
     # Returns the raw hash from the response. Useful if something isn't available by methods.

data/lib/flickrie/set.rb

@@ -8,38 +8,38 @@ module Flickrie
     #   :created_at, :updated_at, :url, :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 primary_media_id() @info['primary'] end
+    def primary_media_id() @hash['primary'] end
     alias primary_photo_id primary_media_id
     alias primary_video_id primary_media_id
 
     # @return [Fixnum]
-    def views_count()    Integer(@info['count_views'])    rescue nil end
+    def views_count()    Integer(@hash['count_views'])    rescue nil end
     # @return [Fixnum]
-    def comments_count() Integer(@info['count_comments']) rescue nil end
+    def comments_count() Integer(@hash['count_comments']) rescue nil end
     # @return [Fixnum]
-    def photos_count()   Integer(@info['count_photos'])   rescue nil end
+    def photos_count()   Integer(@hash['count_photos'])   rescue nil end
     # @return [Fixnum]
-    def videos_count()   Integer(@info['count_videos'])   rescue nil end
+    def videos_count()   Integer(@hash['count_videos'])   rescue nil end
     # @return [Fixnum]
     def media_count
       photos_count + videos_count rescue nil
     end
 
     # @return [Flickrie::User]
-    def owner() User.new('nsid' => @info['owner']) if @info['owner'] end
+    def owner() User.new('nsid' => @hash['owner']) if @hash['owner'] end
 
     # Same as calling `Flickrie.photos_from_set(set.id)`.
     #
@@ -61,59 +61,64 @@ module Flickrie
     end
 
     # @return [Boolean]
-    def can_comment?() Integer(@info['can_comment']) == 1 rescue nil end
+    def can_comment?() Integer(@hash['can_comment']) == 1 rescue nil end
 
     # @return [Boolean]
-    def needs_interstitial?() Integer(@info['needs_interstitial']) == 1 rescue nil end
+    def needs_interstitial?() Integer(@hash['needs_interstitial']) == 1 rescue nil end
     # @return [Boolean]
-    def visibility_can_see_set?() Integer(@info['visibility_can_see_set']) == 1 rescue nil end
+    def visibility_can_see_set?() Integer(@hash['visibility_can_see_set']) == 1 rescue nil end
 
     # @return [Time]
-    def created_at() Time.at(Integer(@info['date_create'])) rescue nil end
+    def created_at() Time.at(Integer(@hash['date_create'])) rescue nil end
     # @return [Time]
-    def updated_at() Time.at(Integer(@info['date_update'])) rescue nil end
+    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 [](key) @info[key] end
+    def [](key) @hash[key] end
     # @return [Hash]
-    def hash() @info end
+    def hash() @hash end
 
     # Same as calling `Flickrie.get_set_info(set.id)`
     #
     # @return [self]
-    def get_info(params = {}, info = nil)
-      info ||= Flickrie.client.get_set_info(id, params).body['photoset']
-      @info.update(info)
-
-      # Fixes
-      @info['title'] = @info['title']['_content']
-      @info['description'] = @info['description']['_content']
+    def get_info(params = {})
+      hash ||= Flickrie.client.get_set_info(id, params).body['photoset']
+      self.class.fix_info(hash)
+      @hash.update(hash)
 
       self
     end
 
     private
 
-    def initialize(info = {})
-      @info = info
+    def initialize(hash = {})
+      @hash = hash
+    end
+
+    def self.from_info(hash)
+      fix_info(hash)
+      new(hash)
     end
 
-    def self.from_info(info)
-      new.get_info({}, info)
+    def self.fix_info(hash)
+      hash['title'] = hash['title']['_content']
+      hash['description'] = hash['description']['_content']
     end
 
-    def self.from_user(info, user_nsid)
-      info.map do |info|
-        info['count_photos'] = info.delete('photos')
-        info['count_videos'] = info.delete('videos')
-        info['title'] = info['title']['_content']
-        info['description'] = info['description']['_content']
-        info['owner'] = user_nsid
+    def self.from_user(hash, user_nsid)
+      collection = hash.delete('photoset').map do |set_hash|
+        set_hash['count_photos'] = set_hash.delete('photos')
+        set_hash['count_videos'] = set_hash.delete('videos')
+        set_hash['title'] = set_hash['title']['_content']
+        set_hash['description'] = set_hash['description']['_content']
+        set_hash['owner'] = user_nsid
 
-        new(info)
+        new(set_hash)
       end
+
+      Collection.new(hash).replace(collection)
     end
   end
 end

data/lib/flickrie/version.rb

@@ -1,3 +1,3 @@
 module Flickrie
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flickrie
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-30 00:00:00.000000000 Z
+date: 2012-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &70354735471460 !ruby/object:Gem::Requirement
+  requirement: &70205943354860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70354735471460
+  version_requirements: *70205943354860
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70354735469600 !ruby/object:Gem::Requirement
+  requirement: &70205943340760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,10 +38,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70354735469600
+  version_requirements: *70205943340760
 - !ruby/object:Gem::Dependency
   name: simple_oauth
-  requirement: &70354735467340 !ruby/object:Gem::Requirement
+  requirement: &70205943338120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -49,10 +49,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70354735467340
+  version_requirements: *70205943338120
 - !ruby/object:Gem::Dependency
   name: multi_xml
-  requirement: &70354735466580 !ruby/object:Gem::Requirement
+  requirement: &70205943336520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,10 +60,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70354735466580
+  version_requirements: *70205943336520
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70354740714520 !ruby/object:Gem::Requirement
+  requirement: &70205943335000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,10 +71,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70354740714520
+  version_requirements: *70205943335000
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70354740713980 !ruby/object:Gem::Requirement
+  requirement: &70205943333720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +82,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70354740713980
+  version_requirements: *70205943333720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70354740713460 !ruby/object:Gem::Requirement
+  requirement: &70205943325680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -96,10 +96,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70354740713460
+  version_requirements: *70205943325680
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70354740712620 !ruby/object:Gem::Requirement
+  requirement: &70205943322700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -107,7 +107,7 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *70354740712620
+  version_requirements: *70205943322700
 description: This gem wraps the Flickr API with a nice object-oriented interface.
 email: janko.marohnic@gmail.com
 executables: []
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4020731564119486214
+      hash: -3848221286022942563
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11