commonthread-flickr_fu 0.2.1 → 0.2.2

data/flickr_fu.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "flickr_fu"
-  s.version  = "0.2.1"
+  s.version  = "0.2.2"
   s.date     = "2008-12-30"
   s.summary  = "Provides a ruby interface to flickr via the REST api"
   s.email    = "ben@commonthread.com"

data/lib/flickr/photo.rb

@@ -76,7 +76,7 @@ class Flickr::Photos::Photo
   #       :original - original image, either a jpg, gif or png, depending on source format
   # 
   def save_as(filename, size = :medium)
-    format = size.to_sym == :original ? self.original_format : 'jpg'
+    format = size.to_sym == :original ? (self.original_format || 'jpg') : 'jpg'
     filename = "#{filename}.#{format}"
 
     if File.exists?(filename) or not self.url(size)
@@ -186,12 +186,10 @@ class Flickr::Photos::Photo
     @comments ||= begin
       if @comment_count == 0
         self.comments = []
-        self.comments_added = true
-      elsif not self.comments_added
+      else
         rsp = @flickr.send_request('flickr.photos.comments.getList', :photo_id => self.id)
         
         self.comments = []
-        self.comments_added = true
         
         rsp.comments.comment.each do |comment|
           self.comments << Flickr::Photos::Comment.new(:id => comment[:id],
@@ -201,7 +199,9 @@ class Flickr::Photos::Photo
             :permalink => comment[:permalink],
             :created_at => (Time.at(comment[:datecreate].to_i) rescue nil))
         end
-      end        
+      end
+
+      self.comments
     end
   end
   

data/lib/flickr_fu.rb

@@ -3,6 +3,7 @@ require 'xml_magic'
 require 'net/http'
 require 'cgi'
 require 'uri'
+require 'open-uri'
 require 'mime/types'
 require 'digest/md5'
 require 'yaml'
@@ -22,4 +23,4 @@ class Object
     yield(value)
     value
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: commonthread-flickr_fu
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Ben Wyrosdick