test/test_suite.rb @@ -1,6 +1,4 @@ -*.sw? .DS_Store -coverage rdoc pkg nbproject .gitignore @@ -2,56 +2,54 @@ require 'rubygems' require 'rake' begin - require 'jeweler' - Jeweler::Tasks.new do |gem| - gem.name = "rflickr" - gem.summary = "rFlickr is a Ruby interface to the Flickr API" - gem.email = "contact@digitalpardoe.co.uk" - gem.homepage = "http://github.com/digitalpardoe/rflickr" - gem.authors = ["digital:pardoe"] - gem.description = "rFlickr is a clone of the original RubyForge based rflickr, a Ruby implementation of the Flickr API. It includes a faithful albeit old reproduction of the published API." - - # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings - end + require 'jeweler' + Jeweler::Tasks.new do |gem| + gem.name = "rflickr" + gem.summary = "rFlickr is a Ruby interface to the Flickr API" + gem.email = "contact@digitalpardoe.co.uk" + gem.homepage = "http://github.com/digitalpardoe/rflickr" + gem.authors = ["digital:pardoe"] + gem.description = "rFlickr is a clone of the original RubyForge based rflickr, a Ruby implementation of the Flickr API. It includes a faithful albeit old reproduction of the published API." + end rescue LoadError - puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com" + puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com" end require 'rake/testtask' Rake::TestTask.new(:test) do |test| - test.libs << 'lib' << 'test' - test.pattern = 'test/**/*_test.rb' - test.verbose = true + test.libs << 'lib' << 'test' + test.pattern = 'test/**/*_test.rb' + test.verbose = true end begin - require 'rcov/rcovtask' - Rcov::RcovTask.new do |test| - test.libs << 'test' - test.pattern = 'test/**/*_test.rb' - test.verbose = true - end + require 'rcov/rcovtask' + Rcov::RcovTask.new do |test| + test.libs << 'test' + test.pattern = 'test/**/*_test.rb' + test.verbose = true + end rescue LoadError - task :rcov do - abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov" - end + task :rcov do + abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov" + end end - task :default => :test require 'rake/rdoctask' Rake::RDocTask.new do |rdoc| - if File.exist?('VERSION.yml') - config = YAML.load(File.read('VERSION.yml')) - version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}" - else - version = "" - end - - rdoc.rdoc_dir = 'rdoc' - rdoc.title = "rflickr #{version}" - rdoc.rdoc_files.include('README*') - rdoc.rdoc_files.include('lib/**/*.rb') + if File.exist?('VERSION.yml') + config = YAML.load(File.read('VERSION.yml')) + version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}" + else + version = "" + end + + rdoc.rdoc_dir = 'rdoc' + rdoc.title = "rflickr #{version}" + rdoc.rdoc_files.include('README*') + rdoc.rdoc_files.include('LICENSE*') + rdoc.rdoc_files.include('lib/**/*.rb') end Rakefile @@ -1,5 +1,3 @@ -#!/usr/bin/env ruby - # rFlickr: A Ruby based Flickr API implementation. # Copyright (C) 2009, Alex Pardoe (digital:pardoe) # @@ -45,7 +43,7 @@ class Flickr::Auth < Flickr::APIBase args['frob'] = self.frob args['api_sig'] = @flickr.sign(args) return "http://flickr.com/services/auth/?"+ - args.to_a.map{|arr| arr.join('=')}.join('&') + args.to_a.map{|arr| arr.join('=')}.join('&') end def frob=(frob) @frob = frob end @@ -63,20 +61,20 @@ class Flickr::Auth < Flickr::APIBase # # Backwwards compatible with old token storage. @token = token.include?('<') ? - Flickr::Token.from_xml(REXML::Document.new(token)) : - @token = checkToken(token) + 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', - 'frob'=>frob) + 'frob'=>frob) @token = Flickr::Token.from_xml(res) end def getFullToken(mini_token) res = flickr.call_unauth_method('flickr.auth.getFullToken', - 'mini_token' => mini_token) + 'mini_token' => mini_token) @token = Flickr::Token.from_xml(res) end lib/flickr/auth.rb @@ -1,5 +1,3 @@ -#!/usr/bin/env ruby - # rFlickr: A Ruby based Flickr API implementation. # Copyright (C) 2009, Alex Pardoe (digital:pardoe) # @@ -36,7 +34,7 @@ class Flickr attr_reader :api_key attr_accessor :async, :debug, :caching, :auth_mode -############################### CACHE ACCESSORS ########################### + ############################### CACHE ACCESSORS ########################### def ticket_cache_lookup(id) @ticket_by_id[id] if @caching end def ticket_cache_store(ticket) @@ -82,23 +80,23 @@ class Flickr def group_cache_store(group) @group_by_id[group.id] = group if @caching end -############################################################################ + ############################################################################ def debug(*args) $stderr.puts(sprintf(*args)) if @debug end def Flickr.todo [ - 'Refactor, especially more Class.from_xml methods', - 'More logical OO design, wrap the API methods to make transparent', - 'Class & method documentation', - 'Unit tests', - 'Implement missing methods (see flickr.reflection.missing_methods)' + 'Refactor, especially more Class.from_xml methods', + 'More logical OO design, wrap the API methods to make transparent', + 'Class & method documentation', + 'Unit tests', + 'Implement missing methods (see flickr.reflection.missing_methods)' ] end + def todo() Flickr.todo+reflection.missing_methods.map{|m| 'Implement '+m} end - def initialize(token_cache=nil,api_key=API_KEY, shared_secret=SHARED_SECRET, @@ -112,7 +110,7 @@ class Flickr @endpoint=endpoint proto,host,port,path,user,pass=parse_url(@endpoint) raise ProtoUnknownError.new("Unhandled protocol '#{proto}'") if - proto.downcase != 'http' + proto.downcase != 'http' @client=XMLRPC::Client.new(host,path,port) clear_cache end @@ -155,7 +153,7 @@ class Flickr def call_method(method,args={}) @auth_mode ? call_auth_method(method,args) : - call_unauth_method(method,args) + call_unauth_method(method,args) end def call_unauth_method(method,args={}) @@ -168,7 +166,7 @@ class Flickr begin tries -= 1; str = @async ? @client.call_async(method,args) : - @client.call(method,args) + @client.call(method,args) debug('RETURN: %s',str) return REXML::Document.new(str) rescue Timeout::Error => te @@ -180,7 +178,7 @@ class Flickr end rescue REXML::ParseException => pe return REXML::Document.new('<rsp>'+str+'</rsp>'). - elements['/rsp'] + elements['/rsp'] rescue XMLRPC::FaultException => fe $stderr.puts "ERR: #{fe.faultString} (#{fe.faultCode})" raise fe @@ -251,11 +249,11 @@ class Flickr::Token end def to_xml - return "<auth><token>#{self.token}</token>"+ - "<perms>#{self.perms}</perms>"+ - "<user nsid=\"#{self.user.nsid}\" "+ - "username=\"#{self.user.username}\" "+ - "fullname=\"#{self.user.realname}\" /></auth>" + return "<auth><token>#{self.token}</token>"+ + "<perms>#{self.perms}</perms>"+ + "<user nsid=\"#{self.user.nsid}\" "+ + "username=\"#{self.user.username}\" "+ + "fullname=\"#{self.user.realname}\" /></auth>" end end @@ -272,10 +270,10 @@ end class Flickr::Person attr_accessor :nsid, :username, :realname, :mbox_sha1sum, :location, - :photosurl, :profileurl, :photos_firstdate, :photos_firstdatetaken, - :photos_count, :info_fetched, :isadmin, :ispro, :iconserver, - :bandwidth_max, :bandwidth_used, :filesize_max, :upload_fetched, - :friend, :family, :ignored + :photosurl, :profileurl, :photos_firstdate, :photos_firstdatetaken, + :photos_count, :info_fetched, :isadmin, :ispro, :iconserver, + :bandwidth_max, :bandwidth_used, :filesize_max, :upload_fetched, + :friend, :family, :ignored def initialize(flickr, nsid, username) @flickr = flickr @@ -307,11 +305,11 @@ class Flickr::Person p.username = username p.isadmin = cond_attr(att,'isadmin') && - cond_attr(att,'isadmin') == '1' + cond_attr(att,'isadmin') == '1' p.ispro = cond_attr(att,'ispro') && - cond_attr(att,'ispro') == '1' + cond_attr(att,'ispro') == '1' p.iconserver = cond_attr(att,'iconserver') && - cond_attr(att,'iconserver').to_i + cond_attr(att,'iconserver').to_i p.realname = cond_text(els,'/person/realname') p.mbox_sha1sum = cond_text(els,'/person/mbox_sha1sum') p.location = cond_text(els,'/person/location') @@ -321,7 +319,7 @@ class Flickr::Person p.photos_firstdate = Time.at(tstr.to_i) if tstr tstr = cond_text(els, '/person/photos/firstdatetaken') p.photos_firstdatetaken = Time.gm(*ParseDate.parsedate(tstr)) if - tstr + tstr p.photos_count = cond_text(els,'/person/photos/count') p.photos_count = p.photos_count if p.photos_count @@ -330,14 +328,14 @@ class Flickr::Person if els['/user/bandwidth'] att = els['/user/bandwidth'].attributes p.bandwidth_max = cond_attr(att,'max') && - cond_attr(att,'max').to_i + cond_attr(att,'max').to_i p.bandwidth_used = cond_attr(att,'used') && - cond_attr(att,'used').to_i + cond_attr(att,'used').to_i end if els['/user/filesize'] att = els['/user/filesize'].attributes p.filesize_max = cond_attr(att,'max') && - cond_attr(att,'max').to_i + cond_attr(att,'max').to_i end p.upload_fetched = true if p.bandwidth_max @@ -374,11 +372,11 @@ end class Flickr::Photo attr_accessor :id, :owner_id, :secret, :server, :title, :ispublic, - :isfriend, :isfamily, :ownername, :dateadded, - :license_id, :description, :dates, :taken, - :lastupdate, :takengranularity, :cancomment, :canaddmeta, - :comments, :rotation, :notes, :urls, :permaddmeta, - :permcomment, :originalformat, :farm + :isfriend, :isfamily, :ownername, :dateadded, + :license_id, :description, :dates, :taken, + :lastupdate, :takengranularity, :cancomment, :canaddmeta, + :comments, :rotation, :notes, :urls, :permaddmeta, + :permcomment, :originalformat, :farm attr_reader :flickr @@ -388,7 +386,7 @@ class Flickr::Photo def max_size sizes[:Original] || sizes[:Large] || sizes[:Medium] || - sizes[:Small] + sizes[:Small] end def initialize(flickr,id) @@ -410,8 +408,8 @@ class Flickr::Photo base = "http://farm#{@farm}.static.flickr.com" ext = (size == 'o') ? self.originalformat : 'jpg' return size ? - "#{base}/#@server/#{@id}_#{@secret}_#{size}.#{ext}" : - "#{base}/#@server/#{@id}_#{@secret}.jpg" + "#{base}/#@server/#{@id}_#{@secret}_#{size}.#{ext}" : + "#{base}/#@server/#{@id}_#{@secret}.jpg" end def delete() @flickr.photos.delete(self) end @@ -424,10 +422,10 @@ class Flickr::Photo photo ||= Flickr::Photo.new(flickr,phid) photo.owner_id ||= att['owner'] || (xml.elements['owner'] && - xml.elements['owner'].attributes['nsid']) + xml.elements['owner'].attributes['nsid']) photo.secret = att['secret'] if att['secret'] photo.originalformat = att['originalformat'] if - att['originalformat'] + att['originalformat'] photo.server = att['server'].to_i if att['server'] photo.title = att['title'] || cond_text(xml.elements,'title') photo.license_id = att['license'] @@ -438,10 +436,10 @@ class Flickr::Photo photo.isfriend = (att['isfriend'].to_i == 1) if att['isfriend'] photo.isfamily = (att['isfamily'].to_i == 1) if att['isfamily'] photo.ownername = att['ownername'] || (xml.elements['owner'] && - xml.elements['owner'].attributes['username']) + xml.elements['owner'].attributes['username']) photo.description = cond_text(xml.elements,'description') photo.dateadded = Time.at(att['dateadded'].to_i) if - att['dateadded'] + att['dateadded'] if xml.elements['exif'] list = [] xml.elements.each('exif') do |el| @@ -521,7 +519,7 @@ class Flickr::Exif att['tag'],att['label']) exif.raw=element.elements['raw'].text if element.elements['raw'] exif.clean=element.elements['clean'].text if - element.elements['clean'] + element.elements['clean'] return exif end end @@ -571,13 +569,13 @@ class Flickr::SubCategory end class Flickr::Group -# The privacy attribute is 1 for private groups, 2 for invite-only public -# groups and 3 for open public groups. + # The privacy attribute is 1 for private groups, 2 for invite-only public + # groups and 3 for open public groups. PRIVACY = [nil,:private,:invite,:public] attr_accessor :nsid, :name, :members, :online, :chatnsid, :inchat, - :description, :privacy, :eighteenplus, :fully_fetched, :admin, - :photo_count, :iconserver + :description, :privacy, :eighteenplus, :fully_fetched, :admin, + :photo_count, :iconserver def initialize(flickr,nsid, name=nil, members=nil, online=nil, chatnsid=nil, inchat=nil) @@ -609,10 +607,10 @@ end class Flickr::Context attr_reader :prev_id,:prev_secret,:prev_title,:prev_url, - :next_id,:next_secret,:next_title,:next_url + :next_id,:next_secret,:next_title,:next_url def initialize(prev_id,prev_secret,prev_title,prev_url, - next_id,next_secret,next_title,next_url) + next_id,next_secret,next_title,next_url) @prev_id = prev_id @prev_secret = prev_secret @prev_title = prev_title @@ -643,7 +641,7 @@ class Flickr::License def self.from_xml(xml) att = xml.attributes return Flickr::License.new(att['id'],att['name'], - att['url']) + att['url']) end end @@ -682,8 +680,8 @@ class Flickr::Count def self.from_xml(xml) att = xml.attributes return Flickr::Count.new(att['count'].to_i, - Time.at(att['fromdate'].to_i), - Time.at(att['todate'].to_i)) + Time.at(att['fromdate'].to_i), + Time.at(att['todate'].to_i)) end end @@ -710,7 +708,7 @@ end class Flickr::PhotoSet < Array attr_accessor :id, :title, :url, :server, :primary_id, - :photo_count, :description, :secret, :owner + :photo_count, :description, :secret, :owner def initialize(id,flickr) @id = id @@ -746,7 +744,7 @@ class Flickr::PhotoSet < Array set.photo_count = att['photos'].to_i set.title = xml.elements['title'].text if xml.elements['title'] set.description = xml.elements['description'].text if - xml.elements['description'] + xml.elements['description'] if xml.elements['photo'] set.clear xml.elements.each('photo') do |el| @@ -798,9 +796,9 @@ class Flickr::PhotoPool < Array pool.perpage = att['perpage'].to_i if att['perpage'] pool.total = att['total'].to_i if att['total'] if xml.elements['photo'] -# I'd like to clear the pool, but I can't because I don't know if I'm -# parsing the full set or just a single "page". -# pool.clear + # I'd like to clear the pool, but I can't because I don't know if I'm + # parsing the full set or just a single "page". + # pool.clear xml.elements.each('photo') do |el| pool.<<(Flickr::Photo.from_xml(el,flickr),true) end lib/flickr/base.rb @@ -23,9 +23,9 @@ require 'flickr/base' class Flickr::Contacts < Flickr::APIBase def getList(filter=nil) res = filter ? - @flickr.call_method('flickr.contacts.getList') : - @flickr.call_method('flickr.contacts.getList', - 'filter'=>filter) + @flickr.call_method('flickr.contacts.getList') : + @flickr.call_method('flickr.contacts.getList', + 'filter'=>filter) list = [] res.elements['/contacts'].each_element do |e| att = e.attributes @@ -50,7 +50,7 @@ class Flickr::Contacts < Flickr::APIBase def getPublicList(user) user = user.nsid if user.class == Flickr::Person res = @flickr.call_method('flickr.contacts.getPublicList', - 'user_id'=>user) + 'user_id'=>user) list = [] res.elements['/contacts'].each_element do |e| att = e.attributes lib/flickr/contacts.rb @@ -26,7 +26,7 @@ class Flickr::Groups < Flickr::APIBase # category can be a Category or nsid string def browse(category=nil) category=category.id if (category.class == Flickr::Category || - category.class == Flickr::SubCategory ) + category.class == Flickr::SubCategory ) args = category ? {'cat_id' => category } : {} res = @flickr.call_method('flickr.groups.browse',args) @@ -89,7 +89,7 @@ class Flickr::Groups < Flickr::APIBase att = e.attributes nsid = att['nsid'] g = @flickr.group_cache_lookup(nsid) || - Flickr::Group.new(@flickr,nsid) + Flickr::Group.new(@flickr,nsid) g.name = att['name'] g.eighteenplus = att['eighteenplus'].to_i == 1 lib/flickr/groups.rb @@ -27,13 +27,13 @@ class Flickr::Interestingness < Flickr::APIBase args['date'] = date if date.is_a?(String) args['date'] = date.to_s if date.is_a?(Date) args['date'] = @flickr.mysql_date(date) if - date.is_a?(Time) + date.is_a?(Time) end extras = extras.join(',') if extras.class == Array args['extras'] = extras if extras args['per_page'] = per_page if per_page args['page'] = page if page - res = @flickr.call_method('flickr.interestingness.getList',args) + res = @flickr.call_method('flickr.interestingness.getList',args) return Flickr::PhotoSet.from_xml(res.root,@flickr) end end lib/flickr/interestingness.rb @@ -23,7 +23,7 @@ require 'flickr/base' class Flickr::Licenses < Flickr::APIBase def getInfo return @flickr.license_cache_lookup if - @flickr.license_cache_lookup + @flickr.license_cache_lookup list = {} res = @flickr.call_method('flickr.photos.licenses.getInfo') res.elements['/licenses'].each_element do |el| lib/flickr/licenses.rb @@ -39,14 +39,14 @@ class Flickr::People < Flickr::APIBase def getInfo(user) user = user.nsid if user.class == Flickr::Person res = @flickr.call_method('flickr.people.getInfo', - 'user_id'=>user) + 'user_id'=>user) person = Flickr::Person.from_xml(res,@flickr) return person end # user can be a Person or an nsid def getPublicGroups(user) - require 'flickr/groups' + require 'flickr/groups' groups = @flickr.groups user = user.nsid if user.class == Flickr::Person res = @flickr.call_method('flickr.people.getPublicGroups', @@ -57,7 +57,7 @@ class Flickr::People < Flickr::APIBase nsid = att['nsid'] g = @flickr.group_cache_lookup(nsid) || - Flickr::Group.new(@flickr,nsid) + Flickr::Group.new(@flickr,nsid) g.name = att['name'] g.eighteenplus = att['eighteenplus'].to_i == 1 @@ -92,7 +92,7 @@ class Flickr::People < Flickr::APIBase def getUploadStatus(user) user = user.nsid if user.class == Flickr::Person res = @flickr.call_method('flickr.people.getUploadStatus', - 'user_id'=>user) + 'user_id'=>user) person = Flickr::Person.from_xml(res,@flickr) return person end lib/flickr/people.rb @@ -22,22 +22,22 @@ require 'flickr/base' class Flickr::Photos < Flickr::APIBase def upload - require 'flickr/upload' + require 'flickr/upload' @upload ||= Flickr::Upload.new(@flickr) end def licenses - require 'flickr/licenses' + require 'flickr/licenses' @licenses ||= Flickr::Licenses.new(@flickr) end def notes - require 'flickr/notes' + require 'flickr/notes' @notes ||= Flickr::Notes.new(@flickr) end def transform - require 'flickr/transform' + require 'flickr/transform' @transform ||= Flickr::Transform.new(@flickr) end @@ -79,7 +79,7 @@ class Flickr::Photos < Flickr::APIBase att = set.attributes psid = att['id'] set = @flickr.photoset_cache_lookup(psid) || - Flickr::PhotoSet.new(att['id'],@flickr) + Flickr::PhotoSet.new(att['id'],@flickr) set.title = att['title'] @flickr.photoset_cache_store(set) @@ -90,7 +90,7 @@ class Flickr::Photos < Flickr::APIBase ppid = att['id'] p = @flickr.photopool_cache_lookup(ppid) || - Flickr::PhotoPool.new(ppid,@flickr) + Flickr::PhotoPool.new(ppid,@flickr) p.title = att['title'] @flickr.photopool_cache_store(ppid) list << p @@ -106,8 +106,8 @@ class Flickr::Photos < Flickr::APIBase att = perms.attributes phid = att['id'] photo = (photo.class == Flickr::Photo) ? photo : - (@flickr.photo_cache_lookup(phid) || - Flickr::Photo.new(@flickr,phid)) + (@flickr.photo_cache_lookup(phid) || + Flickr::Photo.new(@flickr,phid)) photo.ispublic = (att['ispublic'].to_i == 1) photo.isfriend = (att['isfriend'].to_i == 1) photo.isfamily = (att['isfamily'].to_i == 1) @@ -120,12 +120,12 @@ class Flickr::Photos < Flickr::APIBase perm_addmeta) photo = photo.id if photo.class == Flickr::Photo args = { - 'photo_id' => photo, - 'is_public' => (is_public == true || is_public == 1) ? 1 : 0, - 'is_friend' => (is_friend == true || is_friend == 1) ? 1 : 0, - 'is_family' => (is_family == true || is_family == 1) ? 1 : 0, - 'perm_comment' => perm_comment, - 'perm_addmeta' => perm_addmeta + 'photo_id' => photo, + 'is_public' => (is_public == true || is_public == 1) ? 1 : 0, + 'is_friend' => (is_friend == true || is_friend == 1) ? 1 : 0, + 'is_family' => (is_family == true || is_family == 1) ? 1 : 0, + 'perm_comment' => perm_comment, + 'perm_addmeta' => perm_addmeta } res = @flickr.call_method('flickr.photos.setPerms',args) end @@ -135,11 +135,11 @@ class Flickr::Photos < Flickr::APIBase args = {} args['count'] = count if count args['just_friends'] = just_friends ? '1' : '0' if - just_friends != nil + just_friends != nil args['single_photo'] = single_photo ? '1' : '0' if - single_photo != nil + single_photo != nil args['include_self'] = include_self ? '1' : '0' if - include_self != nil + include_self != nil res= @flickr.call_method('flickr.photos.getContactsPhotos',args) return Flickr::PhotoList.from_xml(res,@flickr) end @@ -153,14 +153,14 @@ class Flickr::Photos < Flickr::APIBase args['count'] = count if count args['user_id'] = user args['just_friends'] = just_friends ? '1' : '0' if - just_friends != nil + just_friends != nil args['single_photo'] = single_photo ? '1' : '0' if - single_photo != nil + single_photo != nil args['include_self'] = include_self ? '1' : '0' if - include_self != nil + include_self != nil res=@flickr.call_method('flickr.photos.getContactsPublicPhotos', - args) - return Flickr::PhotoList.from_xml(res,@flickr) + args) + return Flickr::PhotoList.from_xml(res,@flickr) end def getContext(photo) @@ -174,7 +174,7 @@ class Flickr::Photos < Flickr::APIBase args = {} args['dates'] = dates.map{|d| d.to_i}.join(',') if dates args['taken_dates'] = taken_dates.map{|d| d.to_i}.join(',') if - taken_dates + taken_dates res = @flickr.call_method('flickr.photos.getCounts',args) list = [] res.elements['/photocounts'].each_element('photocount') do |el| @@ -232,8 +232,8 @@ class Flickr::Photos < Flickr::APIBase def getSizes(photo) photo_id = (photo.class == Flickr::Photo) ? photo.id : photo photo = (photo.class == Flickr::Photo) ? photo : - (@flickr.photo_cache_lookup(photo_id) || - Flickr::Photo.new(@flickr,photo_id)) + (@flickr.photo_cache_lookup(photo_id) || + Flickr::Photo.new(@flickr,photo_id)) res = @flickr.call_method('flickr.photos.getSizes', 'photo_id' => photo_id ) photo.sizes = {} @@ -250,12 +250,12 @@ class Flickr::Photos < Flickr::APIBase photo = photo.id if photo.class == Flickr::Photo date_posted = date_posted.to_i if date_posted.class == Time date_taken = @flickr.mysql_datetime(date_taken) if - date_taken.class == Time + date_taken.class == Time args = {'photo_id' => photo} args['date_posted'] = date_posted if date_posted args['date_taken'] = date_taken if date_taken args['date_taken_granularity'] = date_taken_granularity if - date_taken_granularity + date_taken_granularity @flickr.call_method('flickr.photos.setDates',args) end @@ -268,19 +268,19 @@ class Flickr::Photos < Flickr::APIBase end def search(user=nil,tags=nil,tag_mode=nil,text=nil,min_upload_date=nil, - max_upload_date=nil,min_taken_date=nil,max_taken_date=nil, - license=nil,extras=nil,per_page=nil,page=nil,sort=nil) + max_upload_date=nil,min_taken_date=nil,max_taken_date=nil, + license=nil,extras=nil,per_page=nil,page=nil,sort=nil) user = user.nsid if user.respond_to?(:nsid) tags = tags.join(',') if tags.class == Array min_upload_date = min_upload_date.to_i if - min_upload_date.class == Time + min_upload_date.class == Time max_upload_date = max_upload_date.to_i if - max_upload_date.class == Time + max_upload_date.class == Time min_taken_date = @flickr.mysql_datetime(min_taken_date) if - min_taken_date.class == Time + min_taken_date.class == Time max_taken_date = @flickr.mysql_datetime(max_taken_date) if - max_taken_date.class == Time + max_taken_date.class == Time license = license.id if license.class == Flickr::License extras = extras.join(',') if extras.class == Array lib/flickr/photos.rb @@ -33,9 +33,9 @@ class Flickr::PhotoSets < Flickr::APIBase def create(title,primary_photo, description = nil) primary_photo = primary_photo.id if - primary_photo.class == Flickr::Photo + primary_photo.class == Flickr::Photo args = { 'title' => title, 'primary_photo_id' => - primary_photo} + primary_photo} args['description'] = description if description res = @flickr.call_method('flickr.photosets.create',args) id = res.elements['/photoset'].attributes['id'] @@ -64,7 +64,7 @@ class Flickr::PhotoSets < Flickr::APIBase def editPhotos(photoset,primary_photo,photos) photoset = photoset.id if photoset.class == Flickr::PhotoSet primary_photo = primary_photo.id if - primary_photo.class == Flickr::Photo + primary_photo.class == Flickr::Photo photos=photos.map{|p| p.id if p.class==Flickr::Photo}.join(',') args = {'photoset_id' => photoset, 'primary_photo_id' => primary_photo, @@ -119,6 +119,6 @@ class Flickr::PhotoSets < Flickr::APIBase photosets=photosets.map { |ps| (ps.class==Flickr::PhotoSet) ? ps.id : ps}.join(',') @flickr.call_method('flickr.photosets.orderSets', - 'photoset_ids' => photosets) + 'photoset_ids' => photosets) end end lib/flickr/photosets.rb @@ -61,7 +61,7 @@ class Flickr::Pools < Flickr::APIBase att = el.attributes nsid = att['nsid'] g = @flickr.group_cache_lookup(nsid) || - Flickr::Group.new(@flickr,nsid,att['name']) + Flickr::Group.new(@flickr,nsid,att['name']) g.name = att['name'] g.admin = att['admin'].to_i == 1 g.privacy = Flickr::Group::PRIVACY[att['privacy'].to_i] @@ -79,7 +79,7 @@ class Flickr::Pools < Flickr::APIBase group = group.id.to_s if group.class == Flickr::PhotoPool args = { 'group_id' => group } args['tags'] = tags.map{|t| t.clean if t.class == - Flick::Tag}.join(',') if tags + Flick::Tag}.join(',') if tags args['extras'] = extras.join(',') if extras.class == Array args['per_page'] = per_page if per_page args['page'] = page if page lib/flickr/pools.rb @@ -22,7 +22,7 @@ require 'flickr/base' class Flickr::Method attr_reader :name,:authenticated,:description,:response,:explanation, - :arguments, :errors + :arguments, :errors def initialize(name,authenticated,description,response,explanation) @name = name @@ -54,11 +54,11 @@ class Flickr::Reflection < Flickr::APIBase els = res.elements att = res.root.attributes desc = els['/method/description'] ? - els['/method/description'].text : nil + els['/method/description'].text : nil resp = els['/method/response'] ? - els['/method/response'].text : nil + els['/method/response'].text : nil expl = els['/method/explanation'] ? - els['/method/explanation'].text : nil + els['/method/explanation'].text : nil meth = Flickr::Method.new(att['name'],att['needslogin'].to_i==1, desc,resp,expl) els['/method/arguments'].each_element do |el| lib/flickr/reflection.rb @@ -28,8 +28,8 @@ class Flickr::Tags < Flickr::APIBase xml = res.root phid = xml.attributes['id'] photo = (photo.class == Flickr::Photo) ? photo : - (@flickr.photo_cache_lookup(phid) || - Flickr::Photo.new(@flickr,phid)) + (@flickr.photo_cache_lookup(phid) || + Flickr::Photo.new(@flickr,phid)) if xml.elements['tags'] tags = [] xml.elements['tags'].each_element do |el| lib/flickr/tags.rb @@ -54,10 +54,10 @@ class Flickr::FormPart 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}" + attributes.map{|k,v| "#{k}=\"#{v}\""}). + join('; ') + "\r\n"+ + (@mime_type ? "Content-Type: #{@mime_type}\r\n" : '')+ + "\r\n#{data}" end end @@ -66,26 +66,26 @@ class Flickr::MultiPartForm def initialize(boundary=nil) @boundary = boundary || - "----------------------------Ruby#{rand(1000000000000)}" + "----------------------------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" + parts.map{|p| p.to_s}.join("\r\n--#@boundary\r\n")+ + "\r\n--#@boundary--\r\n" end end 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. + # 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']) + att['msg']) $stderr.puts "ERR: #{fe.faultString} (#{fe.faultCode})" raise fe end @@ -96,7 +96,7 @@ class Flickr::Upload < Flickr::APIBase parts = [] parts << Flickr::FormPart.new('title',title) if title parts << Flickr::FormPart.new('description',description) if - description + description parts << Flickr::FormPart.new('tags',tags.join(',')) if tags parts << Flickr::FormPart.new('is_public', is_public ? '1' : '0') if is_public != nil @@ -109,7 +109,7 @@ class Flickr::Upload < Flickr::APIBase parts << Flickr::FormPart.new('api_key',@flickr.api_key) parts << Flickr::FormPart.new('auth_token', - @flickr.auth.token.token) + @flickr.auth.token.token) parts << Flickr::FormPart.new('api_sig',sig) parts << Flickr::FormPart.new('photo',data,mimetype) @@ -133,10 +133,10 @@ class Flickr::Upload < Flickr::APIBase def send_form(form) headers = {"Content-Type" => - "multipart/form-data; boundary=" + form.boundary} + "multipart/form-data; boundary=" + form.boundary} http = Net::HTTP.new('www.flickr.com', 80) -# http.read_timeout = 900 # 15 minutes max upload time + # http.read_timeout = 900 # 15 minutes max upload time tries = 3 begin res=http.post('/services/upload/',form.to_s,headers) @@ -156,7 +156,7 @@ class Flickr::Upload < Flickr::APIBase data = f.read f.close return upload_image_async(data,mt,filename,title,description, - tags, is_public,is_friend,is_family) + tags, is_public,is_friend,is_family) end @@ -167,7 +167,7 @@ class Flickr::Upload < Flickr::APIBase data = f.read f.close return upload_image(data,mt,filename,title,description,tags, - is_public,is_friend,is_family) + is_public,is_friend,is_family) end def upload_image_async(data,mimetype,filename,title=nil,description=nil, @@ -175,10 +175,10 @@ class Flickr::Upload < Flickr::APIBase form = Flickr::MultiPartForm.new sig = make_signature(title,description, tags, is_public, - is_friend, is_family, true) + is_friend, is_family, true) form.parts += prepare_parts(data,mimetype,filename,title, - description, tags, is_public, is_friend, - is_family, sig, true) + 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) @@ -191,10 +191,10 @@ class Flickr::Upload < Flickr::APIBase form = Flickr::MultiPartForm.new sig = make_signature(title,description, tags, is_public, - is_friend, is_family) + is_friend, is_family) form.parts += prepare_parts(data,mimetype,filename,title, - description, tags, is_public, is_friend, - is_family, sig) + 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 @@ -212,11 +212,11 @@ class Flickr::Upload < Flickr::APIBase att = tick.attributes tid = att['id'] t = @flickr.ticket_cache_lookup(tid) || - Flickr::Ticket.new(tid,self) + 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)) + (att['invalid'].to_i == 1)) @flickr.ticket_cache_store(t) tickets << t end lib/flickr/upload.rb @@ -50,8 +50,8 @@ class Flickr::Urls < Flickr::APIBase nsid = els['/group'].attributes['id'] g = @flickr.group_cache_lookup(nsid) || - Flickr::Group.new(@flickr,nsid, - els['/group/groupname'].text) + Flickr::Group.new(@flickr,nsid, + els['/group/groupname'].text) @flickr.group_cache_store(g) return g end @@ -61,8 +61,8 @@ class Flickr::Urls < Flickr::APIBase els = res.elements nsid = els['/user'].attributes['id'] p = @flickr.person_cache_lookup(nsid) || - Flickr::Person.new(@flickr,nsid, - els['/user/username'].text) + Flickr::Person.new(@flickr,nsid, + els['/user/username'].text) @flickr.person_cache_store(p) return p end lib/flickr/urls.rb @@ -6,39 +6,40 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["digital:pardoe"] - s.date = %q{2009-04-09} + s.date = %q{2009-05-23} s.description = %q{rFlickr is a clone of the original RubyForge based rflickr, a Ruby implementation of the Flickr API. It includes a faithful albeit old reproduction of the published API.} s.email = %q{contact@digitalpardoe.co.uk} s.extra_rdoc_files = [ "LICENSE", - "README.markdown" + "README.markdown" ] s.files = [ - "LICENSE", - "README.markdown", - "Rakefile", - "VERSION.yml", - "lib/flickr.rb", - "lib/flickr/auth.rb", - "lib/flickr/base.rb", - "lib/flickr/blogs.rb", - "lib/flickr/contacts.rb", - "lib/flickr/favorites.rb", - "lib/flickr/groups.rb", - "lib/flickr/interestingness.rb", - "lib/flickr/licenses.rb", - "lib/flickr/notes.rb", - "lib/flickr/people.rb", - "lib/flickr/photos.rb", - "lib/flickr/photosets.rb", - "lib/flickr/pools.rb", - "lib/flickr/reflection.rb", - "lib/flickr/tags.rb", - "lib/flickr/transform.rb", - "lib/flickr/upload.rb", - "lib/flickr/urls.rb", - "test/rflickr_test.rb", - "test/test_helper.rb" + ".gitignore", + "LICENSE", + "README.markdown", + "Rakefile", + "VERSION.yml", + "lib/flickr.rb", + "lib/flickr/auth.rb", + "lib/flickr/base.rb", + "lib/flickr/blogs.rb", + "lib/flickr/contacts.rb", + "lib/flickr/favorites.rb", + "lib/flickr/groups.rb", + "lib/flickr/interestingness.rb", + "lib/flickr/licenses.rb", + "lib/flickr/notes.rb", + "lib/flickr/people.rb", + "lib/flickr/photos.rb", + "lib/flickr/photosets.rb", + "lib/flickr/pools.rb", + "lib/flickr/reflection.rb", + "lib/flickr/tags.rb", + "lib/flickr/transform.rb", + "lib/flickr/upload.rb", + "lib/flickr/urls.rb", + "rflickr.gemspec", + "test/test_suite.rb" ] s.has_rdoc = true s.homepage = %q{http://github.com/digitalpardoe/rflickr} @@ -47,8 +48,7 @@ Gem::Specification.new do |s| s.rubygems_version = %q{1.3.1} s.summary = %q{rFlickr is a Ruby interface to the Flickr API} s.test_files = [ - "test/rflickr_test.rb", - "test/test_helper.rb" + "test/test_suite.rb" ] if s.respond_to? :specification_version then rflickr.gemspec test/rflickr_test.rb test/test_helper.rb 425271ce349544422683feb2c364f1a58804b924 Alex Pardoe digital.pardoe@gmail.com http://github.com/digitalpardoe/rflickr/commit/4a98600d101cbde547f89cc285ae7406fa0ed2f1 4a98600d101cbde547f89cc285ae7406fa0ed2f1 2009-05-23T09:34:46-07:00 2009-05-23T09:34:46-07:00 Cleanup to prepare for re-development. f653a82497173d110de353a57a70c7c06bd50a6d Alex Pardoe digital.pardoe@gmail.com