ayn-flickr_fu 0.3.6 → 0.3.7

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 3
-:patch: 6
+:patch: 7

data/flickr_fu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flickr_fu}
-  s.version = "0.3.6"
+  s.version = "0.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Wyrosdick", "Maciej Bilas"]
-  s.date = %q{2009-09-15}
+  s.date = %q{2009-09-16}
   s.description = %q{Provides a ruby interface to flickr via the REST api}
   s.email = %q{ayn@andrewng.com}
   s.extra_rdoc_files = [

data/lib/flickr/photo.rb

@@ -4,7 +4,7 @@ class Flickr::Photos::Photo
   attr_accessor :license_id, :uploaded_at, :taken_at, :owner_name, :icon_server, :original_format, :updated_at, :geo, :tags, :machine_tags, :o_dims, :views, :media, :url_l # extra attributes
   attr_accessor :info_added, :description, :original_secret, :owner_username, :owner_realname, :url_photopage, :notes # info attributes
   attr_accessor :comments # comment attributes
-  
+
   # create a new instance of a flickr photo.
   # 
   # Params
@@ -55,22 +55,21 @@ class Flickr::Photos::Photo
   #       :original - original image, either a jpg, gif or png, depending on source format
   #
   def image_url(size = :medium)
-	# It turns out that flickr always stores all the sizes of the picture even when getSizes call returns otherwise.
-	# Not calling getSizes is also very important for performance reasons.
-	# Retrieving 30 search results means calling the API 31 times if you call getSizes every time.
-	# Mind that you still need to call getSizes if you go out for the original image.
-	if size == :original
-	  size_hash[size.to_s].source if size_hash.has_key? size.to_s
-	else
-	  key = "_#{size_key(size.to_sym)}"
-	  key = "" if key == "_"
-	  "http://farm#{farm}.static.flickr.com/#{server}/#{id}_#{secret}#{key}.jpg"
-	end
+    # It turns out that flickr always stores all the sizes of the picture even when getSizes call returns otherwise.
+    # Not calling getSizes is also very important for performance reasons.
+    # Retrieving 30 search results means calling the API 31 times if you call getSizes every time.
+    # Mind that you still need to call getSizes if you go out for the original image.
+    if size == :original
+      size_hash[size.to_s].source if size_hash.has_key? size.to_s
+    else
+      key = "_#{size_key(size.to_sym)}"
+      key = "" if key == "_"
+      "http://farm#{farm}.static.flickr.com/#{server}/#{id}_#{secret}#{key}.jpg"
+    end
   end
 
   def photopage_url
-	# Keeping the same convention as image_url (foo_url)
-	url_photopage
+    "http://www.flickr.com/photos/#{owner}/#{id}/"
   end
 
   def video_url
@@ -106,7 +105,7 @@ class Flickr::Photos::Photo
       f
     end
   end
-  
+
   # Add tags to a photo.
   # 
   # Params
@@ -117,7 +116,7 @@ class Flickr::Photos::Photo
     @flickr.send_request('flickr.photos.addTags', {:photo_id => self.id, :tags => tags}, :post)
     true
   end
-  
+
   # Add comment to a photo as the currently authenticated user.
   #
   # Params
@@ -128,7 +127,7 @@ class Flickr::Photos::Photo
     @flickr.send_request('flickr.photos.comments.addComment', {:photo_id => self.id, :comment_text => message}, :post)
     true
   end
-  
+
   # Add a note to a photo. Coordinates and sizes are in pixels, based on the 500px image size shown on individual photo pages.
   # 
   # Params
@@ -147,7 +146,7 @@ class Flickr::Photos::Photo
     @flickr.send_request('flickr.photos.notes.add', {:photo_id => self.id, :note_x => x, :note_y => y, :note_w => w, :note_h => h, :note_text => message}, :post)
     true
   end
-  
+
   # Rotate a photo.
   # 
   # Params
@@ -158,7 +157,7 @@ class Flickr::Photos::Photo
     @flickr.send_request('flickr.photos.transform.rotate', {:photo_id => self.id, :degrees => degrees}, :post)
     true
   end
-  
+
   # return the license associated with the photo
   # 
   def license
@@ -187,7 +186,7 @@ class Flickr::Photos::Photo
     end
     @location = location
   end
-  
+
   # Sets the license for a photo.
   # 
   # Params
@@ -197,7 +196,7 @@ class Flickr::Photos::Photo
     @flickr.send_request('flickr.photos.licenses.setLicense', {:photo_id => self.id, :license_id => license_id}, :post)
     true
   end
-  
+
   def description # :nodoc:
     attach_info
     @description
@@ -229,31 +228,31 @@ class Flickr::Photos::Photo
         self.comments = []
       else
         rsp = @flickr.send_request('flickr.photos.comments.getList', :photo_id => self.id)
-        
+
         self.comments = []
-        
+
         rsp.comments.comment.each do |comment|
           self.comments << Flickr::Photos::Comment.new(:id => comment[:id],
-            :comment => comment.to_s,
-            :author => comment[:author],
-            :author_name => comment[:authorname],
-            :permalink => comment[:permalink],
-            :created_at => (Time.at(comment[:datecreate].to_i) rescue nil))
+          :comment => comment.to_s,
+          :author => comment[:author],
+          :author_name => comment[:authorname],
+          :permalink => comment[:permalink],
+          :created_at => (Time.at(comment[:datecreate].to_i) rescue nil))
         end
       end
 
       self.comments
     end
   end
-  
+
   def sizes # :nodoc:
     @sizes ||= begin
       rsp = @flickr.send_request('flickr.photos.getSizes', :photo_id => self.id)
-      
+
       _sizes = []
       rsp.sizes.size.each do |size|
         _sizes << Flickr::Photos::Size.new(:label => size[:label], :width => size[:width],
-          :height => size[:height], :source => size[:source], :url => size[:url])
+        :height => size[:height], :source => size[:source], :url => size[:url])
       end
       _sizes
     end
@@ -277,7 +276,7 @@ class Flickr::Photos::Photo
 
   private
   attr_accessor :comment_count
-  
+
   # convert the size to the key used in the flickr url
   def size_key(size)
     case size.to_sym
@@ -308,13 +307,13 @@ class Flickr::Photos::Photo
 
       rsp.photo.notes.note.each do |note|
         self.notes << Flickr::Photos::Note.new(:id => note[:id],
-		  :note => note.to_s,
-		  :author => note[:author],
-		  :author_name => note[:authorname],
-		  :x => note[:x],
-		  :y => note[:y],
-		  :width => note[:w],
-		  :height => note[:h])
+        :note => note.to_s,
+        :author => note[:author],
+        :author_name => note[:authorname],
+        :x => note[:x],
+        :y => note[:y],
+        :width => note[:w],
+        :height => note[:h])
       end if rsp.photo.notes.note
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ayn-flickr_fu
 version: !ruby/object:Gem::Version 
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors: 
 - Ben Wyrosdick
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-15 00:00:00 -07:00
+date: 2009-09-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency