dustin-r2flickr 0.1.1.6 → 0.1.1.7

data/lib/flickr/tags.rb

@@ -1,59 +1,59 @@
 require 'flickr/base'
 
 class Flickr::Tags < Flickr::APIBase
-	def getListPhoto(photo)
-		photo = photo.id if photo.class == Flickr::Photo
-		res = @flickr.call_method('flickr.tags.getListPhoto',
-			'photo_id'=>photo)
-		xml = res.root
-		phid = xml.attributes['id']
-		photo = (photo.class == Flickr::Photo) ? photo :
-			(@flickr.photo_cache_lookup(phid) ||
-			 	Flickr::Photo.new(@flickr,phid))
-		if xml.elements['tags']
-			tags = []
-			xml.elements['tags'].each_element do |el|
-				tags << Flickr::Tag.from_xml(el,photo)
-			end
-		end
-		photo.tags = tags
-		return tags
-	end
+  def getListPhoto(photo)
+    photo = photo.id if photo.class == Flickr::Photo
+    res = @flickr.call_method('flickr.tags.getListPhoto',
+                        'photo_id'=>photo)
+    xml = res.root
+    phid = xml.attributes['id']
+    photo = (photo.class == Flickr::Photo) ? photo :
+      (@flickr.photo_cache_lookup(phid) ||
+       Flickr::Photo.new(@flickr,phid))
+    if xml.elements['tags']
+      tags = []
+      xml.elements['tags'].each_element do |el|
+        tags << Flickr::Tag.from_xml(el,photo)
+      end
+    end
+    photo.tags = tags
+    return tags
+  end
 
-	def getListUserPopular(user,count = nil)
-		user = user.nsid if user.class == Flickr::Person
-		args = { 'user_id' => user }
-		args['count'] = count if count
+  def getListUserPopular(user,count = nil)
+    user = user.nsid if user.class == Flickr::Person
+    args = { 'user_id' => user }
+    args['count'] = count if count
 
-		res = @flickr.call_method('flickr.tags.getListUserPopular',args)
-		tags = {}
-		res.elements['/who/tags'].each_element do |tag|
-			att = tag.attributes
-			tags[tag.text]=att['count'].to_i
-		end
-		return tags
-	end
+    res = @flickr.call_method('flickr.tags.getListUserPopular',args)
+    tags = {}
+    res.elements['/who/tags'].each_element do |tag|
+      att = tag.attributes
+      tags[tag.text]=att['count'].to_i
+    end
+    return tags
+  end
 
-	def getListUser(user)
-		user = user.nsid if user.class == Flickr::Person
-		args = { 'user_id' => user }
+  def getListUser(user)
+    user = user.nsid if user.class == Flickr::Person
+    args = { 'user_id' => user }
 
-		res = @flickr.call_method('flickr.tags.getListUser',args)
-		tags = []
-		res.elements['/who/tags'].each_element do |tag|
-			tags << tag.text
-		end
-		return tags
-	end
+    res = @flickr.call_method('flickr.tags.getListUser',args)
+    tags = []
+    res.elements['/who/tags'].each_element do |tag|
+      tags << tag.text
+    end
+    return tags
+  end
 
-	def getRelated(tag)
-		args = { 'tag' => tag }
+  def getRelated(tag)
+    args = { 'tag' => tag }
 
-		res = @flickr.call_method('flickr.tags.getRelated',args)
-		tags = []
-		res.elements['/tags'].each_element do |tag|
-			tags << tag.text
-		end
-		return tags
-	end
+    res = @flickr.call_method('flickr.tags.getRelated',args)
+    tags = []
+    res.elements['/tags'].each_element do |tag|
+      tags << tag.text
+    end
+    return tags
+  end
 end

data/lib/flickr/test.rb

@@ -1,19 +1,20 @@
 require 'flickr/base'
 
 class Flickr::Test < Flickr::APIBase
-	# This has to be a Hash
-	def echo(args)
-		return @flickr.call_method('flickr.test.echo',args)
-	end
+  
+  # This has to be a Hash
+  def echo(args)
+    return @flickr.call_method('flickr.test.echo',args)
+  end
 
-	def login
-		res = @flickr.call_method('flickr.test.login')
-		nsid = res.elements['/user'].attributes['id']
-		name = res.elements['/user/username'].text
-		p = @flickr.person_cache_lookup(nsid) ||
-			Flickr::Person.new(@flickr,nsid,name)
-		p.name = name
-		@flickr.person_cache_store(p)
-		return p
-	end
+  def login
+    res = @flickr.call_method('flickr.test.login')
+    nsid = res.elements['/user'].attributes['id']
+    name = res.elements['/user/username'].text
+    p = @flickr.person_cache_lookup(nsid) ||
+      Flickr::Person.new(@flickr,nsid,name)
+    p.name = name
+    @flickr.person_cache_store(p)
+    return p
+  end
 end

data/lib/flickr/token_cache.rb

@@ -2,32 +2,32 @@ require 'flickr/base'
 
 class Flickr::BaseTokenCache < Flickr::APIBase
 
-	def load_token
-		nil
-	end
+  def load_token
+    nil
+  end
 
-	def cache_token(token)
-		nil
-	end
+  def cache_token(token)
+    nil
+  end
 
 end
 
 class Flickr::FileTokenCache < Flickr::BaseTokenCache
 
-	def initialize(filename)
-		@cache_file = filename
-	end
+  def initialize(filename)
+    @cache_file = filename
+  end
 
-	def load_token
-		token = nil
-		File.open(@cache_file,'r'){ |f| token = f.read }
-		@token = Flickr::Token.from_xml(REXML::Document.new(token))
-	rescue Errno::ENOENT
-		nil
-	end
+  def load_token
+    token = nil
+    File.open(@cache_file,'r'){ |f| token = f.read }
+    @token = Flickr::Token.from_xml(REXML::Document.new(token))
+  rescue Errno::ENOENT
+    nil
+  end
 
-	def cache_token(token)
-		File.open(@cache_file,'w'){ |f| f.write token.to_xml } if token
-	end
+  def cache_token(token)
+    File.open(@cache_file,'w'){ |f| f.write token.to_xml } if token
+  end
 
-end
+end

data/lib/flickr/transform.rb

@@ -1,9 +1,11 @@
 require 'flickr/base'
 
 class Flickr::Transform < Flickr::APIBase
-	def rotate(photo,degrees)
-		photo = photo.id if photo.class == Flickr::Photo
-		@flickr.call_method('flickr.photos.transform.rotate',
-			'photo_id' => photo, 'degrees' => degrees)
-	end
+  
+  def rotate(photo,degrees)
+    photo = photo.id if photo.class == Flickr::Photo
+    @flickr.call_method('flickr.photos.transform.rotate',
+                        'photo_id' => photo, 'degrees' => degrees)
+  end
+
 end

data/lib/flickr/upload.rb

@@ -3,58 +3,59 @@ require 'mime/types'
 require 'net/http'
 
 class Flickr::Ticket
-	attr_reader :id
-	attr_accessor :complete, :invalid, :photoid
-
-	COMPLETE=[:incomplete,:completed,:failed]
-
-	def initialize(id,upload)
-		@id = id
-		@upload = upload
-	end
-
-	def check
-		t = @upload.checkTickets(self)[0]
-		self.complete = t.complete
-		self.invalid = t.invalid
-		self.photoid = t.photoid
-		return t
-	end
+
+  attr_reader :id
+  attr_accessor :complete, :invalid, :photoid
+
+  COMPLETE=[:incomplete,:completed,:failed]
+
+  def initialize(id,upload)
+    @id = id
+    @upload = upload
+  end
+
+  def check
+    t = @upload.checkTickets(self)[0]
+    self.complete = t.complete
+    self.invalid = t.invalid
+    self.photoid = t.photoid
+    return t
+  end
 end
 
 class Flickr::FormPart
-	attr_reader :data, :mime_type, :attributes
-
-	def initialize(name,data,mime_type=nil)
-		@attributes = {}
-		@attributes['name'] = name
-		@data = data
-		@mime_type = mime_type
-	end
-
-	def to_s
-		([ "Content-Disposition: form-data" ] +
-		attributes.map{|k,v| "#{k}=\"#{v}\""}).
-		join('; ') + "\r\n"+
-		(@mime_type ? "Content-Type: #{@mime_type}\r\n" : '')+
-		"\r\n#{data}"
-	end
+  attr_reader :data, :mime_type, :attributes
+
+  def initialize(name,data,mime_type=nil)
+    @attributes = {}
+    @attributes['name'] = name
+    @data = data
+    @mime_type = mime_type
+  end
+
+  def to_s
+    ([ "Content-Disposition: form-data" ] +
+     attributes.map{|k,v| "#{k}=\"#{v}\""}).
+     join('; ') + "\r\n"+
+     (@mime_type ? "Content-Type: #{@mime_type}\r\n" : '')+
+                "\r\n#{data}"
+  end
 end
 
 class Flickr::MultiPartForm
-	attr_accessor :boundary, :parts
-
-	def initialize(boundary=nil)
-		@boundary = boundary ||
-		    "----------------------------Ruby#{rand(1000000000000)}"
-		@parts = []
-	end
-
-	def to_s
-		"--#@boundary\r\n"+
-		parts.map{|p| p.to_s}.join("\r\n--#@boundary\r\n")+
-		"\r\n--#@boundary--\r\n"
-	end
+  attr_accessor :boundary, :parts
+
+  def initialize(boundary=nil)
+    @boundary = boundary ||
+                "----------------------------Ruby#{rand(1000000000000)}"
+    @parts = []
+  end
+
+  def to_s
+    "--#@boundary\r\n" + parts.map{|p| p.to_s}.join("\r\n--#@boundary\r\n") +
+    "\r\n--#@boundary--\r\n"
+  end
+
 end
 
 class Flickr::Upload < Flickr::APIBase
@@ -62,144 +63,143 @@ class Flickr::Upload < Flickr::APIBase
   # TODO: It would probably be better if we wrapped the fault
   # in something more meaningful. At the very least, a broad
   # division of errors, such as retryable and fatal. 
-	def error(el)
-		att = el.attributes
-		fe = XMLRPC::FaultException.new(att['code'].to_i,
-				att['msg'])
-		$stderr.puts "ERR: #{fe.faultString} (#{fe.faultCode})"
-		raise fe
-	end
-
-	def prepare_parts(data,mimetype,filename,title=nil,description=nil,
-			tags=nil, is_public=nil,is_friend=nil,is_family=nil,
-			sig=nil, async=nil)
-		parts = []
-		parts << Flickr::FormPart.new('title',title) if title
-		parts << Flickr::FormPart.new('description',description) if
-			description
-		parts << Flickr::FormPart.new('tags',tags.join(',')) if tags
-		parts << Flickr::FormPart.new('is_public',
-			is_public ?  '1' : '0') if is_public != nil
-		parts << Flickr::FormPart.new('is_friend',
-			is_friend ?  '1' : '0') if is_friend != nil
-		parts << Flickr::FormPart.new('is_family',
-			is_family ?  '1' : '0') if is_family != nil
-		parts << Flickr::FormPart.new('async',
-			async ?  '1' : '0') if async != nil
-
-		parts << Flickr::FormPart.new('api_key',@flickr.api_key)
-		parts << Flickr::FormPart.new('auth_token',
-				@flickr.auth.token.token)
-		parts << Flickr::FormPart.new('api_sig',sig)
-
-		parts << Flickr::FormPart.new('photo',data,mimetype)
-		parts.last.attributes['filename'] = filename
-		return parts
-	end
-
-	def make_signature(title=nil,description=nil, tags=nil,
-			is_public=nil,is_friend=nil,is_family=nil,async=nil)
-		args = {'api_key' => @flickr.api_key,
-			'auth_token' => @flickr.auth.token.token}
-		args['title'] = title if title
-		args['description'] = description if description
-		args['tags'] = tags.join(',') if tags
-		args['is_public'] = (is_public ? '1' : '0') if is_public != nil
-		args['is_friend'] = (is_friend ? '1' : '0') if is_friend != nil
-		args['is_family'] = (is_family ? '1' : '0') if is_family != nil
-		args['async'] = (async ? '1' : '0') if async != nil
-		args['api_sig'] = @flickr.sign(args)
-	end
-
-	def send_form(form)
-		headers = {"Content-Type" =>
-			"multipart/form-data; boundary=" + form.boundary}
-
-		http = Net::HTTP.new('www.flickr.com', 80)
-#		http.read_timeout = 900 # 15 minutes max upload time
-		tries = 3
-		begin
-			res=http.post('/services/upload/',form.to_s,headers)
-		rescue Timeout::Error => err
-			tries -= 1
-			$stderr.puts "Timed out, will retry #{tries} more."
-			retry if tries > 0
-			raise err
-		end
-		return res
-	end
-
-	def upload_file_async(filename,title=nil,description=nil,tags=nil,
-			is_public=nil,is_friend=nil,is_family=nil)
-		mt = MIME::Types.of(filename)
-		f = File.open(filename,'rb')
-		data = f.read
-		f.close
-		return upload_image_async(data,mt,filename,title,description,
-				tags, is_public,is_friend,is_family)
-	end
-
-
-	def upload_file(filename,title=nil,description=nil,tags=nil,
-			is_public=nil,is_friend=nil,is_family=nil)
-		mt = MIME::Types.of(filename)
-		f = File.open(filename,'rb')
-		data = f.read
-		f.close
-		return upload_image(data,mt,filename,title,description,tags, 
-				is_public,is_friend,is_family)
-	end
-
-	def upload_image_async(data,mimetype,filename,title=nil,description=nil,
-			tags=nil, is_public=nil,is_friend=nil,is_family=nil)
-		form = Flickr::MultiPartForm.new
-
-		sig = make_signature(title,description, tags, is_public,
-				is_friend, is_family, true)
-		form.parts += prepare_parts(data,mimetype,filename,title,
-				description, tags, is_public, is_friend,
-				is_family, sig, true)
-		res = REXML::Document.new(send_form(form).body)
-		error(res.elements['/rsp/err']) if res.elements['/rsp/err']
-		t = Flickr::Ticket.new(res.elements['/rsp/ticketid'].text, self)
-		@flickr.ticket_cache_store(t)
-		return t
-	end
-
-	def upload_image(data,mimetype,filename,title=nil,description=nil,
-			tags=nil, is_public=nil,is_friend=nil,is_family=nil)
-		form = Flickr::MultiPartForm.new
-
-		sig = make_signature(title,description, tags, is_public,
-				is_friend, is_family)
-		form.parts += prepare_parts(data,mimetype,filename,title,
-				description, tags, is_public, is_friend,
-				is_family, sig)
-		res = REXML::Document.new(send_form(form).body)
-		error(res.elements['/rsp/err']) if res.elements['/rsp/err']
-		val = res.elements['/rsp/photoid'].text
-		return val
-	end
-
-	def checkTickets(tickets)
-		tickets = [tickets] if tickets.class != Array
-		targ = tickets.map{|t|
-			t.id.to_s if t.class == Flickr::Ticket }.join(',')
-		res = @flickr.call_method('flickr.photos.upload.checkTickets',
-			'tickets' => targ)
-		tickets = []
-		res.elements['/uploader'].each_element('ticket') do |tick|
-			att = tick.attributes
-			tid = att['id']
-			t = @flickr.ticket_cache_lookup(tid) ||
-				Flickr::Ticket.new(tid,self)
-			t.complete = Flickr::Ticket::COMPLETE[att['complete'].to_i]
-			t.photoid = att['photoid']
-			t.invalid = true if (att['invalid'] &&
-				(att['invalid'].to_i == 1))
-			@flickr.ticket_cache_store(t)
-			tickets << t
-		end
-		return tickets
-	end
+  def error(el)
+    att = el.attributes
+    fe = XMLRPC::FaultException.new(att['code'].to_i,
+                                    att['msg'])
+    $stderr.puts "ERR: #{fe.faultString} (#{fe.faultCode})"
+    raise fe
+  end
+
+  def prepare_parts(data,mimetype,filename,title=nil,description=nil,
+                    tags=nil, is_public=nil,is_friend=nil,is_family=nil,
+                    sig=nil, async=nil)
+    parts = []
+    parts << Flickr::FormPart.new('title',title) if title
+    parts << Flickr::FormPart.new('description',description) if
+    description
+    parts << Flickr::FormPart.new('tags',tags.join(',')) if tags
+    parts << Flickr::FormPart.new('is_public',
+                                  is_public ?  '1' : '0') if is_public != nil
+    parts << Flickr::FormPart.new('is_friend',
+                                  is_friend ?  '1' : '0') if is_friend != nil
+    parts << Flickr::FormPart.new('is_family',
+                                  is_family ?  '1' : '0') if is_family != nil
+    parts << Flickr::FormPart.new('async',
+                                  async ?  '1' : '0') if async != nil
+
+    parts << Flickr::FormPart.new('api_key',@flickr.api_key)
+    parts << Flickr::FormPart.new('auth_token',
+                                  @flickr.auth.token.token)
+    parts << Flickr::FormPart.new('api_sig',sig)
+
+    parts << Flickr::FormPart.new('photo',data,mimetype)
+    parts.last.attributes['filename'] = filename
+    return parts
+  end
+
+  def make_signature(title=nil,description=nil, tags=nil,
+                     is_public=nil,is_friend=nil,is_family=nil,async=nil)
+    args = {'api_key' => @flickr.api_key,
+                        'auth_token' => @flickr.auth.token.token}
+    args['title'] = title if title
+    args['description'] = description if description
+    args['tags'] = tags.join(',') if tags
+    args['is_public'] = (is_public ? '1' : '0') if is_public != nil
+    args['is_friend'] = (is_friend ? '1' : '0') if is_friend != nil
+    args['is_family'] = (is_family ? '1' : '0') if is_family != nil
+    args['async'] = (async ? '1' : '0') if async != nil
+    args['api_sig'] = @flickr.sign(args)
+  end
+
+  def send_form(form)
+    headers = {"Content-Type" => "multipart/form-data; boundary=" + form.boundary}
+
+    http = Net::HTTP.new('www.flickr.com', 80)
+    # http.read_timeout = 900 # 15 minutes max upload time
+    tries = 3
+    begin
+      res=http.post('/services/upload/',form.to_s,headers)
+    rescue Timeout::Error => err
+      tries -= 1
+      $stderr.puts "Timed out, will retry #{tries} more."
+      retry if tries > 0
+      raise err
+    end
+    return res
+  end
+
+  def upload_file_async(filename,title=nil,description=nil,tags=nil,
+                        is_public=nil,is_friend=nil,is_family=nil)
+    mt = MIME::Types.of(filename)
+    f = File.open(filename,'rb')
+    data = f.read
+    f.close
+    return upload_image_async(data,mt,filename,title,description,
+                              tags, is_public,is_friend,is_family)
+  end
+
+
+  def upload_file(filename,title=nil,description=nil,tags=nil,
+                  is_public=nil,is_friend=nil,is_family=nil)
+    mt = MIME::Types.of(filename)
+    f = File.open(filename,'rb')
+    data = f.read
+    f.close
+    return upload_image(data,mt,filename,title,description,tags, 
+                        is_public,is_friend,is_family)
+  end
+
+  def upload_image_async(data,mimetype,filename,title=nil,description=nil,
+                         tags=nil, is_public=nil,is_friend=nil,is_family=nil)
+    form = Flickr::MultiPartForm.new
+
+    sig = make_signature(title,description, tags, is_public,
+                         is_friend, is_family, true)
+    form.parts += prepare_parts(data,mimetype,filename,title,
+                                description, tags, is_public, is_friend,
+                                is_family, sig, true)
+    res = REXML::Document.new(send_form(form).body)
+    error(res.elements['/rsp/err']) if res.elements['/rsp/err']
+    t = Flickr::Ticket.new(res.elements['/rsp/ticketid'].text, self)
+    @flickr.ticket_cache_store(t)
+    return t
+  end
+
+  def upload_image(data,mimetype,filename,title=nil,description=nil,
+                   tags=nil, is_public=nil,is_friend=nil,is_family=nil)
+    form = Flickr::MultiPartForm.new
+
+    sig = make_signature(title,description, tags, is_public,
+                         is_friend, is_family)
+    form.parts += prepare_parts(data,mimetype,filename,title,
+                                description, tags, is_public, is_friend,
+                                is_family, sig)
+    res = REXML::Document.new(send_form(form).body)
+    error(res.elements['/rsp/err']) if res.elements['/rsp/err']
+    val = res.elements['/rsp/photoid'].text
+    return val
+  end
+
+  def checkTickets(tickets)
+    tickets = [tickets] if tickets.class != Array
+    targ = tickets.map{|t|
+      t.id.to_s if t.class == Flickr::Ticket }.join(',')
+      res = @flickr.call_method('flickr.photos.upload.checkTickets',
+                        'tickets' => targ)
+      tickets = []
+      res.elements['/uploader'].each_element('ticket') do |tick|
+        att = tick.attributes
+        tid = att['id']
+        t = @flickr.ticket_cache_lookup(tid) ||
+          Flickr::Ticket.new(tid,self)
+        t.complete = Flickr::Ticket::COMPLETE[att['complete'].to_i]
+        t.photoid = att['photoid']
+        t.invalid = true if (att['invalid'] &&
+                             (att['invalid'].to_i == 1))
+        @flickr.ticket_cache_store(t)
+        tickets << t
+      end
+      return tickets
+  end
 end