markoa-r2flickr 0.1.1 → 0.1.1.4

data/lib/flickr.rb

@@ -17,3 +17,4 @@ require 'flickr/upload'
 require 'flickr/urls'
 require 'flickr/tags'
 require 'flickr/interestingness'
+require 'flickr/comments'

data/lib/flickr/auth.rb

@@ -1,23 +1,27 @@
 #!/usr/bin/env ruby
 
 require 'flickr/base'
+require 'flickr/token_cache'
 
 class Flickr::Auth < Flickr::APIBase
-	attr_accessor :cache_file, :token
+	attr_accessor :token_cache, :token
 
 	def clear_cache
 		@token = nil
 		@frob = nil
 	end
 
-	def initialize(flickr,cache_file=nil)
+	def initialize(flickr, token_cache=nil)
 		super(flickr)
 		@frob = nil
 		@token = nil
-		@cache_file = cache_file
-		if @cache_file && File.exists?(@cache_file)
-			load_token
+		@token_cache = case token_cache
+		when String
+			Flickr::FileTokenCache.new token_cache
+		else
+			token_cache
 		end
+		@token = @token_cache.load_token if @token_cache
 	end
 
 	def login_link(perms='delete')
@@ -31,22 +35,6 @@ class Flickr::Auth < Flickr::APIBase
 	def frob=(frob) @frob = frob end
 	def frob() return @frob || getFrob end
 
-	def cache_token
-		File.open(@cache_file,'w'){ |f| f.write @token.to_xml } if token
-	end
-
-	def load_token
-		token = nil
-		File.open(@cache_file,'r'){ |f| token = f.read }
-		# Dirt stupid check to see if it's probably XML or
-		# not.  If it is, then we don't call checkToken.
-		#
-		# Backwwards compatible with old token storage.
-		@token = token.include?('<') ?
-			Flickr::Token.from_xml(REXML::Document.new(token)) :
-			@token = checkToken(token)
-	end
-
 	def getToken(frob=nil)
 		frob ||= @frob
 		res=@flickr.call_unauth_method('flickr.auth.getToken',
@@ -54,6 +42,10 @@ class Flickr::Auth < Flickr::APIBase
 		@token = Flickr::Token.from_xml(res)
 	end
 
+	def cache_token
+		@token_cache.cache_token(@token) if @token_cache
+	end
+
 	def getFullToken(mini_token)
 		res = flickr.call_unauth_method('flickr.auth.getFullToken',
 				'mini_token' => mini_token)
@@ -66,11 +58,4 @@ class Flickr::Auth < Flickr::APIBase
 		return @frob
 	end
 
-	def checkToken(token=nil)
-		token ||= @token
-		token = token.token if token.class == Flickr::Token
-		res = @flickr.call_unauth_method('flickr.auth.checkToken',
-			'auth_token' => token)
-		@token = Flickr::Token.from_xml(res)
-	end
 end

data/lib/flickr/base.rb

@@ -110,6 +110,7 @@ class Flickr
 		@photosets = nil
 		@test = nil
 		@urls = nil
+		@comments = nil
 
 		@ticket_by_id = {}
 		@person_by_nsid = {}
@@ -133,6 +134,7 @@ class Flickr
 	def test() @test ||= Test.new(self) end
 	def urls() @urls ||= Urls.new(self) end
 	def tags() @tags ||= Tags.new(self) end
+	def comments() @comments ||= Comments.new(self) end
 	def interestingness() @interestingness ||= Interestingness.new(self) end
 
 	def call_method(method,args={})
@@ -791,3 +793,21 @@ class Flickr::PhotoPool < Array
 		return pool
 	end
 end
+
+class Flickr::Comment
+	attr_accessor :id, :authorid, :authorname, :datecreated, :permalink, :text
+
+	def self.from_xml(xml, flickr=nil)
+		att = xml.attributes
+		c = new
+		c.id = att['id']
+		c.authorid = att['author']
+		c.authorname = att['authorname']
+		c.datecreated = Time.at(att['datecreate'].to_i)
+		c.permalink = att['permalink']
+		c.text = xml.text
+		c
+	end
+
+end
+

data/lib/flickr/comments.rb

@@ -0,0 +1,35 @@
+require 'flickr/base'
+
+class Flickr::Comments < Flickr::APIBase
+
+	def add(photo, comment)
+		photo = photo.id if photo.class == Flickr::Photo
+		res = @flickr.call_method('flickr.photos.comments.addComment',
+			'photo_id' => photo, 'comment_text' => comment)
+		xml = res.root
+		xml.attributes['id']
+	end
+
+	def delete(comment_id)
+		@flickr.call_method('flickr.photos.comments.deleteComment',
+			'comment_id' => comment_id)
+	end
+
+	def edit(comment_id, comment)
+		@flickr.call_method('flickr.photos.comments.editComment',
+			'comment_id' => comment_id, 'comment_text' => comment)
+	end
+
+	def list(photo)
+		photo = photo.id if photo.class == Flickr::Photo
+		res = @flickr.call_method('flickr.photos.comments.getList',
+			'photo_id' => photo)
+		rv = []
+		res.elements['//comments'].each_element do |e|
+			rv << Flickr::Comment.from_xml(e, @flickr)
+		end
+		rv
+	end
+
+
+end

data/lib/flickr/token_cache.rb

@@ -0,0 +1,33 @@
+require 'flickr/base'
+
+class Flickr::BaseTokenCache < Flickr::APIBase
+
+	def load_token
+		nil
+	end
+
+	def cache_token(token)
+		nil
+	end
+
+end
+
+class Flickr::FileTokenCache < Flickr::BaseTokenCache
+
+	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 cache_token(token)
+		File.open(@cache_file,'w'){ |f| f.write token.to_xml } if token
+	end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: markoa-r2flickr
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.1.4
 platform: ruby
 authors: 
 - Marko Anastasov
@@ -40,9 +40,11 @@ files:
 - lib/flickr/reflection.rb
 - lib/flickr/tags.rb
 - lib/flickr/test.rb
+- lib/flickr/token_cache.rb
 - lib/flickr/transform.rb
 - lib/flickr/upload.rb
 - lib/flickr/urls.rb
+- lib/flickr/comments.rb
 - lib/flickr.rb
 - examples/album_test.rb
 - examples/comics-reorder.rb