flickraw 0.7.1 → 0.8

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006 Hank Lords <hanklords@gmail.com>
+Copyright (c) 2006 Mael Clerambault <maelclerambault@yahoo.fr>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -13,11 +13,23 @@ The github repository: http://github.com/hanklords/flickraw/tree/master
 Type this in a console (you might need to be superuser)
  gem install flickraw
 
-You can recreate this documentation by typing this in the source directory:
+This will recreate the documentation by fetching the methods descriptions from flickr and then virtually plugging them in standard rdoc documentation.
  rake rdoc
 
+= Features
+
+* Small single file: flickraw.rb is less than 300 lines
+* Complete support of flickr API. This doesn't require an update of the library
+* Ruby syntax similar to the flickr api
+* Flickr authentication
+* Photo upload
+* Proxy support
+* Delayed library loading (for rails users)
+
 = Usage
 
+== Simple
+
  require 'flickraw'
 
  list   = flickr.photos.getRecent
@@ -35,6 +47,75 @@ You can recreate this documentation by typing this in the source directory:
  original = sizes.find {|s| s.label == 'Original' }
  original.width       # => "800"
 
+== Authentication
+
+  require 'flickraw'
+
+  FlickRaw.api_key="... Your API key ..."
+  FlickRaw.shared_secret="... Your shared secret ..."
+
+  frob = flickr.auth.getFrob
+  auth_url = FlickRaw.auth_url :frob => frob, :perms => 'read'
+
+  puts "Open this url in your process to complete the authication process : #{auth_url}"
+  puts "Press Enter when you are finished."
+  STDIN.getc
+
+  begin
+    auth = flickr.auth.getToken :frob => frob
+    login = flickr.test.login
+    puts "You are now authenticated as #{login.username} with token #{auth.token}"
+  rescue FlickRaw::FailedResponse => e
+    puts "Authentication failed : #{e.msg}"
+  end
+
+You don't need to do that each time, you can reuse your token:
+
+  require 'flickraw'
+
+  FlickRaw.api_key="... Your API key ..."
+  FlickRaw.shared_secret="... Your shared secret ..."
+
+  auth = flickr.auth.checkToken :auth_token => "... Your saved token ..."
+
+  # From here you are logged:
+  puts auth.user.username
+
+== Upload
+
+  require 'flickraw'
+
+  FlickRaw.api_key="... Your API key ..."
+  FlickRaw.shared_secret="... Your shared secret ..."
+
+  PHOTO_PATH='photo.jpg'
+
+  # You need to be authentified to do that, see the previous examples.
+  flickr.upload_photo PHOTO_PATH, :title => "Title", :description => "This is the description"
+
+== Flickraw Options
+
+You can pass some options to modify flickraw behavior:
+
+  FlickrawOptions = {
+    "api_key" => "... Your API key ...",
+    "shared_secret" => "... Your shared secret ...",
+    "auth_token" => "... Your saved token..."  # if you set this you will be automatically loggued
+    "lazyload" => true,     # This delay the loading of the library until the first call
+
+    # Proxy support. alternatively, you can use the http_proxy environment variable
+    "proxy_host" => "proxy_host",
+    "proxy_port" => "proxy_port",
+    "proxy_user" => "proxy_user",
+    "proxy_password" => "proxy_password",
+
+    "timeout" => 5,                # Set the request timeout
+    "auth_token" => "SAVED_TOKEN"  # Set the initial token
+  }
+
+  require 'flickraw'
+
+
 See the _examples_ directory to find more examples.
 
 = Notes

data/lib/flickraw.rb

@@ -1,3 +1,4 @@
+# encoding: ascii-8bit
 # Copyright (c) 2006 Mael Clerambault <maelclerambault@yahoo.fr>
 #
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -23,64 +24,67 @@
 require 'net/http'
 require 'digest/md5'
 require 'json'
-require 'cgi'
 
-FlickrawOptions = {} if not Object.const_defined? :FlickrawOptions
-if ENV['http_proxy'] and not FlickrawOptions[:proxy_host]
+FlickRawOptions = {} if not Object.const_defined? :FlickRawOptions # :nodoc:
+FlickRawOptions['api_key'] ||= '7b124df89b638e545e3165293883ef62'
+if ENV['http_proxy'] and not FlickRawOptions['proxy_host']
   proxy = URI.parse ENV['http_proxy']
-  FlickrawOptions.update(:proxy_host => proxy.host, :proxy_port => proxy.port, :proxy_user => proxy.user, :proxy_password => proxy.password)
+  FlickRawOptions.update('proxy_host' => proxy.host, 'proxy_port' => proxy.port, 'proxy_user' => proxy.user, 'proxy_password' => proxy.password)
 end
 
 module FlickRaw
-  VERSION='0.7.1'
+  VERSION='0.8'
 
   FLICKR_HOST='api.flickr.com'.freeze
-
-  # Path of flickr REST API
   REST_PATH='/services/rest/?'.freeze
-
-  # Path of flickr auth page
-  AUTH_PATH='/services/auth/?'.freeze
-
-  # Path of flickr upload
   UPLOAD_PATH='/services/upload/'.freeze
-
-  @api_key = '7b124df89b638e545e3165293883ef62'
-
-  module SimpleOStruct # :nodoc:
-    def __attr_define(k,v)
-      instance_variable_set "@#{k}", v
-      meta = class << self; self; end
-      meta.class_eval { attr_reader k.to_s }
-    end
-  end
-
-  class Response # :nodoc:
-    include SimpleOStruct
-    def initialize(h)
-      h.each {|k, v| __attr_define k, Response.structify(v, k) }
+  REPLACE_PATH='/services/replace/'.freeze
+
+  AUTH_PATH='http://flickr.com/services/auth/?'.freeze
+  PHOTO_SOURCE_URL='http://farm%s.static.flickr.com/%s/%s_%s%s.%s'.freeze
+  URL_PROFILE='http://www.flickr.com/people/'.freeze
+  URL_PHOTOSTREAM='http://www.flickr.com/photos/'.freeze
+  URL_SHORT="http://flic.kr/p/".freeze
+
+  class Response
+    def self.build(h, type) # :nodoc:
+      if type =~ /s$/ and (a = h[$`]).is_a? Array
+        ResponseList.new(h, type, a.collect {|e| Response.build(e, $`)})
+      elsif h.keys == ["_content"]
+        h["_content"]
+      else
+        Response.new(h, type)
+      end
     end
 
-    def self.structify(obj, name = '')
-      if obj.is_a? Hash
-        if name =~ /s$/ and obj[$`].is_a? Array
-          list = structify obj.delete($`)
-          list.extend SimpleOStruct
-          list.instance_eval { obj.each {|kv, vv| __attr_define kv, vv } }
-          list
-        elsif obj.keys == ['_content']
-          obj['_content'].to_s
-        else
-          Response.new obj
+    attr_reader :flickr_type
+    def initialize(h, type) # :nodoc:
+      @flickr_type, @h = type, {}
+      methods = "class << self;"
+      h.each {|k,v|
+        @h[k] = case v
+          when Hash  then Response.build(v, k)
+          when Array then v.collect {|e| Response.build(e, k)}
+          else v
         end
-      elsif obj.is_a? Array
-        obj.collect {|e| structify e}
-      else
-        obj
-      end
+        methods << "def #{k}; @h['#{k}'] end;"
+      }
+      eval methods << "end"
     end
+    def [](k); @h[k] end
+    def to_s; @h["_content"] || super end
+    def inspect; @h.inspect end
+    def to_hash; @h end
+  end
 
-    def to_s; @_content || super end
+  class ResponseList < Response
+    include Enumerable
+    def initialize(h, t, a); super(h, t); @a = a end
+    def [](k); k.is_a?(Fixnum) ? @a[k] : super(k) end
+    def each; @a.each{|e| yield e} end
+    def to_a; @a end
+    def inspect; @a.inspect end
+    def size; @a.size end
   end
 
   class FailedResponse < StandardError
@@ -143,19 +147,29 @@ module FlickRaw
   class Flickr < Request
     def self.build(methods); methods.each { |m| build_request m } end
 
-    def initialize # :nodoc:
+    def initialize(token = FlickRawOptions['auth_token']) # :nodoc:
       Flickr.build(call('flickr.reflection.getMethods')) if Flickr.flickr_objects.empty?
       super self
-      @token = nil
+      @token = token
     end
 
     # This is the central method. It does the actual request to the flickr server.
     #
     # Raises FailedResponse if the response status is _failed_.
     def call(req, args={})
-      path = REST_PATH + build_args(args, req).collect { |a, v| "#{a}=#{v}" }.join('&')
-      http_response = open_flickr {|http| http.get(path, 'User-Agent' => "Flickraw/#{VERSION}") }
-      parse_response(http_response, req)
+      http_response = open_flickr do |http|
+        request = Net::HTTP::Post.new(REST_PATH, 'User-Agent' => "Flickraw/#{VERSION}")
+        request.set_form_data(build_args(args, req))
+        http.request(request)
+      end
+
+      json = JSON.load(http_response.body.empty? ? "{}" : http_response.body)
+      raise FailedResponse.new(json['message'], json['code'], req) if json.delete('stat') == 'fail'
+      type, json = json.to_a.first if json.size == 1 and json.all? {|k,v| v.is_a? Hash}
+
+      res = Response.build json, type
+      @token = res.token if res.respond_to? :flickr_type and res.flickr_type == "auth"
+      res
     end
 
     # Use this to upload the photo in _file_.
@@ -163,12 +177,43 @@ module FlickRaw
     #  flickr.upload_photo '/path/to/the/photo', :title => 'Title', :description => 'This is the description'
     #
     # See http://www.flickr.com/services/api/upload.api.html for more information on the arguments.
-    def upload_photo(file, args={})
+    def upload_photo(file, args={}); upload_flickr(UPLOAD_PATH, file, args) end
+
+    # Use this to replace the photo with :photo_id with the photo in _file_.
+    #
+    #  flickr.replace_photo '/path/to/the/photo', :photo_id => id
+    #
+    # See http://www.flickr.com/services/api/replace.api.html for more information on the arguments.
+    def replace_photo(file, args={}); upload_flickr(REPLACE_PATH, file, args) end
+
+    private
+    def build_args(args={}, req = nil)
+      full_args = {:api_key => FlickRaw.api_key, :format => 'json', :nojsoncallback => "1"}
+      full_args[:method] = req if req
+      full_args[:auth_token] = @token if @token
+      args.each {|k, v|
+        v = v.to_s.encode("utf-8").force_encoding("ascii-8bit") if RUBY_VERSION >= "1.9"
+        full_args[k.to_sym] = v.to_s
+      }
+      full_args[:api_sig] = FlickRaw.api_sig(full_args) if FlickRaw.shared_secret
+      full_args
+    end
+
+    def open_flickr
+      Net::HTTP::Proxy(FlickRawOptions['proxy_host'], FlickRawOptions['proxy_port'], FlickRawOptions['proxy_user'], FlickRawOptions['proxy_password']).start(FLICKR_HOST) {|http|
+        http.read_timeout = FlickRawOptions['timeout'] if FlickRawOptions['timeout']
+        yield http
+      }
+    end
+
+    def upload_flickr(method, file, args={})
       photo = File.open(file, 'rb') { |f| f.read }
       boundary = Digest::MD5.hexdigest(photo)
 
       header = {'Content-type' => "multipart/form-data, boundary=#{boundary} ", 'User-Agent' => "Flickraw/#{VERSION}"}
       query = ''
+
+      file = file.to_s.encode("utf-8").force_encoding("ascii-8bit") if RUBY_VERSION >= "1.9"
       build_args(args).each { |a, v|
         query <<
           "--#{boundary}\r\n" <<
@@ -184,70 +229,70 @@ module FlickRaw
         "\r\n" <<
         "--#{boundary}--"
 
-      http_response = open_flickr {|http| http.post(UPLOAD_PATH, query, header) }
+      http_response = open_flickr {|http| http.post(method, query, header) }
       xml = http_response.body
       if xml[/stat="(\w+)"/, 1] == 'fail'
         msg = xml[/msg="([^"]+)"/, 1]
         code = xml[/code="([^"]+)"/, 1]
         raise FailedResponse.new(msg, code, 'flickr.upload')
       end
-      Response.structify( {:stat => 'ok', :photoid => xml[/<photoid>(\w+)<\/photoid>/, 1], :ticketid => xml[/<ticketid>([^<]+)<\/ticketid>/, 1]})
-    end
-
-    private
-    def parse_response(response, req = nil)
-      json = JSON.load(response.body)
-      raise FailedResponse.new(json['message'], json['code'], req) if json.delete('stat') == 'fail'
-      name, json = json.to_a.first if json.size == 1
-
-      res = Response.structify json, name
-      lookup_token(req, res)
-      res
-    end
-
-    def build_args(args={}, req = nil)
-      full_args = {:api_key => FlickRaw.api_key, :format => 'json', :nojsoncallback => 1}
-      full_args[:method] = req if req
-      full_args[:auth_token] = @token if @token
-      args.each {|k, v| full_args[k.to_sym] = v.to_s }
-      full_args[:api_sig] = FlickRaw.api_sig(full_args) if FlickRaw.shared_secret
-      args.each {|k, v| full_args[k.to_sym] = CGI.escape(v.to_s) } if req
-      full_args
-    end
-
-    def lookup_token(req, res)
-      token_reqs = ['flickr.auth.getToken', 'flickr.auth.getFullToken', 'flickr.auth.checkToken']
-      @token = res.token if token_reqs.include?(req) and res.respond_to?(:token)
-    end
-
-    def open_flickr
-      Net::HTTP::Proxy(FlickrawOptions[:proxy_host], FlickrawOptions[:proxy_port], FlickrawOptions[:proxy_user], FlickrawOptions[:proxy_password]).start(FLICKR_HOST) {|http|
-        http.read_timeout = FlickrawOptions[:timeout] if FlickrawOptions[:timeout]
-        yield http
-      }
+      type = xml[/<(\w+)/, 1]
+      h = {
+        "secret" => xml[/secret="([^"]+)"/, 1],
+        "originalsecret" => xml[/originalsecret="([^"]+)"/, 1],
+        "_content" => xml[/>([^<]+)<\//, 1]
+      }.delete_if {|k,v| v.nil? }
+      Response.build(h, type)
     end
   end
 
   class << self
     # Your flickr API key, see http://www.flickr.com/services/api/keys for more information
-    attr_accessor :api_key
+    def api_key; FlickRawOptions['api_key'] end
+    def api_key=(key); FlickRawOptions['api_key'] = key end
 
     # The shared secret of _api_key_, see http://www.flickr.com/services/api/keys for more information
-    attr_accessor :shared_secret
+    def shared_secret; FlickRawOptions['shared_secret'] end
+    def shared_secret=(key); FlickRawOptions['shared_secret'] = key end
 
     # Returns the flickr auth URL.
     def auth_url(args={})
-      full_args = {:api_key => FlickRaw.api_key, :perms => 'read'}
+      full_args = {:api_key => api_key, :perms => 'read'}
       args.each {|k, v| full_args[k.to_sym] = v }
-      full_args[:api_sig] = api_sig(full_args) if FlickRaw.shared_secret
+      full_args[:api_sig] = api_sig(full_args) if shared_secret
 
-      'http://' + FLICKR_HOST + AUTH_PATH + full_args.collect { |a, v| "#{a}=#{v}" }.join('&')
+      AUTH_PATH + full_args.collect { |a, v| "#{a}=#{v}" }.join('&')
     end
 
     # Returns the signature of hsh. This is meant to be passed in the _api_sig_ parameter.
     def api_sig(hsh)
       Digest::MD5.hexdigest(FlickRaw.shared_secret + hsh.sort{|a, b| a[0].to_s <=> b[0].to_s }.flatten.join)
     end
+
+    BASE58_ALPHABET="123456789abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ".freeze
+    def base58(id)
+      id = id.to_i
+      alphabet = BASE58_ALPHABET.split(//)
+      base = alphabet.length
+      begin
+        id, m = id.divmod(base)
+        r = alphabet[m] + (r || '')
+      end while id > 0
+      r
+    end
+
+    def url(r);   PHOTO_SOURCE_URL % [r.farm, r.server, r.id, r.secret, "",   "jpg"]   end
+    def url_m(r); PHOTO_SOURCE_URL % [r.farm, r.server, r.id, r.secret, "_m", "jpg"] end
+    def url_s(r); PHOTO_SOURCE_URL % [r.farm, r.server, r.id, r.secret, "_s", "jpg"] end
+    def url_t(r); PHOTO_SOURCE_URL % [r.farm, r.server, r.id, r.secret, "_t", "jpg"] end
+    def url_b(r); PHOTO_SOURCE_URL % [r.farm, r.server, r.id, r.secret, "_b", "jpg"] end
+    def url_o(r); PHOTO_SOURCE_URL % [r.farm, r.server, r.id, r.originalsecret, "_o", r.originalformat] end
+    def url_profile(r); URL_PROFILE + (r.owner.respond_to?(:nsid) ? r.owner.nsid : r.owner) + "/" end
+    def url_photostream(r); URL_PHOTOSTREAM + (r.owner.respond_to?(:nsid) ? r.owner.nsid : r.owner) + "/" end
+    def url_photopage(r); url_photostream(r) + r.id end
+    def url_photosets(r); url_photostream(r) + "sets/" end
+    def url_photoset(r); url_photosets(r) + r.id end
+    def url_short(r); URL_SHORT + base58(r.id) end
   end
 end
 
@@ -259,4 +304,4 @@ end
 def flickr; $flickraw ||= FlickRaw::Flickr.new end
 
 # Load the methods if the option lazyload is not specified
-flickr if not FlickrawOptions[:lazyload]
+flickr if not FlickRawOptions['lazyload']

data/test/test.rb

@@ -3,52 +3,371 @@
 require 'test/unit'
 require 'lib/flickraw'
 
-# utf8 hack
-def u(str)
-  str.gsub(/\\+u([0-9a-fA-F]{4,4})/u){["#$1".hex ].pack('U*')}
-end
-
 class Basic < Test::Unit::TestCase
-  def test_known
-    known_methods = ["flickr.activity.userComments", "flickr.activity.userPhotos", "flickr.auth.checkToken", "flickr.auth.getFrob", "flickr.auth.getFullToken", "flickr.auth.getToken", "flickr.blogs.getList", "flickr.blogs.postPhoto", "flickr.contacts.getList", "flickr.contacts.getPublicList", "flickr.favorites.add", "flickr.favorites.getList", "flickr.favorites.getPublicList", "flickr.favorites.remove", "flickr.groups.browse", "flickr.groups.getInfo", "flickr.groups.pools.add", "flickr.groups.pools.getContext", "flickr.groups.pools.getGroups", "flickr.groups.pools.getPhotos", "flickr.groups.pools.remove", "flickr.groups.search", "flickr.interestingness.getList", "flickr.people.findByEmail", "flickr.people.findByUsername", "flickr.people.getInfo", "flickr.people.getPublicGroups", "flickr.people.getPublicPhotos", "flickr.people.getUploadStatus", "flickr.photos.addTags", "flickr.photos.comments.addComment", "flickr.photos.comments.deleteComment", "flickr.photos.comments.editComment", "flickr.photos.comments.getList", "flickr.photos.delete", "flickr.photos.geo.getLocation", "flickr.photos.geo.getPerms", "flickr.photos.geo.removeLocation", "flickr.photos.geo.setLocation", "flickr.photos.geo.setPerms", "flickr.photos.getAllContexts", "flickr.photos.getContactsPhotos", "flickr.photos.getContactsPublicPhotos", "flickr.photos.getContext", "flickr.photos.getCounts", "flickr.photos.getExif", "flickr.photos.getFavorites", "flickr.photos.getInfo", "flickr.photos.getNotInSet", "flickr.photos.getPerms", "flickr.photos.getRecent", "flickr.photos.getSizes", "flickr.photos.getUntagged", "flickr.photos.getWithGeoData", "flickr.photos.getWithoutGeoData", "flickr.photos.licenses.getInfo", "flickr.photos.licenses.setLicense", "flickr.photos.notes.add", "flickr.photos.notes.delete", "flickr.photos.notes.edit", "flickr.photos.recentlyUpdated", "flickr.photos.removeTag", "flickr.photos.search", "flickr.photos.setDates", "flickr.photos.setMeta", "flickr.photos.setPerms", "flickr.photos.setTags", "flickr.photos.transform.rotate", "flickr.photos.upload.checkTickets", "flickr.photosets.addPhoto", "flickr.photosets.comments.addComment", "flickr.photosets.comments.deleteComment", "flickr.photosets.comments.editComment", "flickr.photosets.comments.getList", "flickr.photosets.create", "flickr.photosets.delete", "flickr.photosets.editMeta", "flickr.photosets.editPhotos", "flickr.photosets.getContext", "flickr.photosets.getInfo", "flickr.photosets.getList", "flickr.photosets.getPhotos", "flickr.photosets.orderSets", "flickr.photosets.removePhoto", "flickr.reflection.getMethodInfo", "flickr.reflection.getMethods", "flickr.tags.getHotList", "flickr.tags.getListPhoto", "flickr.tags.getListUser", "flickr.tags.getListUserPopular", "flickr.tags.getListUserRaw", "flickr.tags.getRelated", "flickr.test.echo", "flickr.test.login", "flickr.test.null", "flickr.urls.getGroup", "flickr.urls.getUserPhotos", "flickr.urls.getUserProfile", "flickr.urls.lookupGroup", "flickr.urls.lookupUser"]
-    found_methods = flickr.reflection.getMethods
-    assert_instance_of Array, found_methods
-    known_methods.each { |m| assert found_methods.include?(m), m}
+  def test_request
+    flickr_objects = %w{activity auth blogs collections commons contacts
+       favorites groups interestingness machinetags panda
+       people photos photosets places prefs reflection tags
+       test urls
+    }
+    assert_equal FlickRaw::Flickr.flickr_objects, flickr_objects
+    flickr_objects.each {|o|
+      assert_respond_to  flickr, o
+      assert_kind_of FlickRaw::Request, eval("flickr." + o)
+    }
   end
-
-  def test_found
-    found_methods = flickr.reflection.getMethods
-    found_methods.each { |m|
-      assert_nothing_raised {
-        begin
-          eval m
-        rescue FlickRaw::FailedResponse
-        end
-      }
+  
+  def test_known
+    known_methods = %w{
+      flickr.activity.userComments
+      flickr.activity.userPhotos
+      flickr.auth.checkToken
+      flickr.auth.getFrob
+      flickr.auth.getFullToken
+      flickr.auth.getToken
+      flickr.blogs.getList
+      flickr.blogs.getServices
+      flickr.blogs.postPhoto
+      flickr.collections.getInfo
+      flickr.collections.getTree
+      flickr.commons.getInstitutions
+      flickr.contacts.getList
+      flickr.contacts.getListRecentlyUploaded
+      flickr.contacts.getPublicList
+      flickr.favorites.add
+      flickr.favorites.getList
+      flickr.favorites.getPublicList
+      flickr.favorites.remove
+      flickr.groups.browse
+      flickr.groups.getInfo
+      flickr.groups.members.getList
+      flickr.groups.pools.add
+      flickr.groups.pools.getContext
+      flickr.groups.pools.getGroups
+      flickr.groups.pools.getPhotos
+      flickr.groups.pools.remove
+      flickr.groups.search
+      flickr.interestingness.getList
+      flickr.machinetags.getNamespaces
+      flickr.machinetags.getPairs
+      flickr.machinetags.getPredicates
+      flickr.machinetags.getRecentValues
+      flickr.machinetags.getValues
+      flickr.panda.getList
+      flickr.panda.getPhotos
+      flickr.people.findByEmail
+      flickr.people.findByUsername
+      flickr.people.getInfo
+      flickr.people.getPublicGroups
+      flickr.people.getPublicPhotos
+      flickr.people.getUploadStatus
+      flickr.photos.addTags
+      flickr.photos.comments.addComment
+      flickr.photos.comments.deleteComment
+      flickr.photos.comments.editComment
+      flickr.photos.comments.getList
+      flickr.photos.comments.getRecentForContacts
+      flickr.photos.delete
+      flickr.photos.geo.batchCorrectLocation
+      flickr.photos.geo.correctLocation
+      flickr.photos.geo.getLocation
+      flickr.photos.geo.getPerms
+      flickr.photos.geo.photosForLocation
+      flickr.photos.geo.removeLocation
+      flickr.photos.geo.setContext
+      flickr.photos.geo.setLocation
+      flickr.photos.geo.setPerms
+      flickr.photos.getAllContexts
+      flickr.photos.getContactsPhotos
+      flickr.photos.getContactsPublicPhotos
+      flickr.photos.getContext
+      flickr.photos.getCounts
+      flickr.photos.getExif
+      flickr.photos.getFavorites
+      flickr.photos.getInfo
+      flickr.photos.getNotInSet
+      flickr.photos.getPerms
+      flickr.photos.getRecent
+      flickr.photos.getSizes
+      flickr.photos.getUntagged
+      flickr.photos.getWithGeoData
+      flickr.photos.getWithoutGeoData
+      flickr.photos.licenses.getInfo
+      flickr.photos.licenses.setLicense
+      flickr.photos.notes.add
+      flickr.photos.notes.delete
+      flickr.photos.notes.edit
+      flickr.photos.recentlyUpdated
+      flickr.photos.removeTag
+      flickr.photos.search
+      flickr.photos.setContentType
+      flickr.photos.setDates
+      flickr.photos.setMeta
+      flickr.photos.setPerms
+      flickr.photos.setSafetyLevel
+      flickr.photos.setTags
+      flickr.photos.transform.rotate
+      flickr.photos.upload.checkTickets
+      flickr.photosets.addPhoto
+      flickr.photosets.comments.addComment
+      flickr.photosets.comments.deleteComment
+      flickr.photosets.comments.editComment
+      flickr.photosets.comments.getList
+      flickr.photosets.create
+      flickr.photosets.delete
+      flickr.photosets.editMeta
+      flickr.photosets.editPhotos
+      flickr.photosets.getContext
+      flickr.photosets.getInfo
+      flickr.photosets.getList
+      flickr.photosets.getPhotos
+      flickr.photosets.orderSets
+      flickr.photosets.removePhoto
+      flickr.places.find
+      flickr.places.findByLatLon
+      flickr.places.getChildrenWithPhotosPublic
+      flickr.places.getInfo
+      flickr.places.getInfoByUrl
+      flickr.places.getPlaceTypes
+      flickr.places.getShapeHistory
+      flickr.places.getTopPlacesList
+      flickr.places.placesForBoundingBox
+      flickr.places.placesForContacts
+      flickr.places.placesForTags
+      flickr.places.placesForUser
+      flickr.places.resolvePlaceId
+      flickr.places.resolvePlaceURL
+      flickr.places.tagsForPlace
+      flickr.prefs.getContentType
+      flickr.prefs.getGeoPerms
+      flickr.prefs.getHidden
+      flickr.prefs.getPrivacy
+      flickr.prefs.getSafetyLevel
+      flickr.reflection.getMethodInfo
+      flickr.reflection.getMethods
+      flickr.tags.getClusterPhotos
+      flickr.tags.getClusters
+      flickr.tags.getHotList
+      flickr.tags.getListPhoto
+      flickr.tags.getListUser
+      flickr.tags.getListUserPopular
+      flickr.tags.getListUserRaw
+      flickr.tags.getRelated
+      flickr.test.echo
+      flickr.test.login
+      flickr.test.null
+      flickr.urls.getGroup
+      flickr.urls.getUserPhotos
+      flickr.urls.getUserProfile
+      flickr.urls.lookupGroup
+      flickr.urls.lookupUser
     }
+    found_methods = flickr.reflection.getMethods
+    assert_instance_of FlickRaw::ResponseList, found_methods
+    assert_equal known_methods, found_methods.to_a
   end
-
-  def test_photos
+  
+  def test_list
     list = flickr.photos.getRecent :per_page => '10'
-    assert_instance_of Array, list
+    assert_instance_of FlickRaw::ResponseList, list
     assert_equal(list.size, 10)
+  end
+  
+  def people(user)
+    assert_equal "41650587@N02", user.id
+    assert_equal "41650587@N02", user.nsid
+    assert_equal "ruby_flickraw", user.username
+  end
+  
+  def photo(info)
+    assert_equal "3839885270", info.id
+    assert_equal "41650587@N02", info.owner
+    assert_equal "6fb8b54e06", info.secret
+    assert_equal "2485", info.server
+    assert_equal 3, info.farm
+    assert_equal "cat", info.title
+    assert_equal 1, info.ispublic
+  end
 
-    id = secret = info = nil
-    assert_nothing_raised(NoMethodError) {
-      id = list[0].id
-      secret = list[0].secret
-    }
+  # favorites
+  def test_favorites_getPublicList
+    list = flickr.favorites.getPublicList :user_id => "41650587@N02"
+    assert_equal 1, list.size
+    assert_equal "3829093290", list[0].id
+  end
+  
+  # groups
+  def test_groups_getInfo
+    info = flickr.groups.getInfo :group_id => "51035612836@N01"
+    assert_equal "51035612836@N01", info.id
+    assert_equal "Flickr API", info.name
+  end
+  
+  def test_groups_search
+    list = flickr.groups.search :text => "Flickr API"
+    assert list.any? {|g| g.nsid == "51035612836@N01"}
+  end
+  
+  # panda
+  def test_panda_getList
+    pandas = flickr.panda.getList
+    assert_equal ["ling ling", "hsing hsing", "wang wang"], pandas.to_a
+  end
+  
+  def test_panda_getList
+    pandas = flickr.panda.getPhotos :panda_name => "wang wang"
+    assert_equal "wang wang", pandas.panda
+    assert_respond_to pandas[0], :title
+  end
+  
+  # people
+  def test_people_findByEmail
+    user = flickr.people.findByEmail :find_email => "flickraw@yahoo.com"
+    people user
+  end
+    
+  def test_people_findByUsername
+    user = flickr.people.findByUsername :username => "ruby_flickraw"
+    people user
+  end
+  
+  def test_people_getInfo
+    user = flickr.people.getInfo :user_id => "41650587@N02"
+    people user
+    assert_equal "Flickraw", user.realname
+    assert_equal "http://www.flickr.com/photos/41650587@N02/", user.photosurl
+    assert_equal "http://www.flickr.com/people/41650587@N02/", user.profileurl
+    assert_equal "http://m.flickr.com/photostream.gne?id=41630239", user.mobileurl
+    assert_equal 0, user.ispro
+  end
+  
+  def test_people_getPublicGroups
+    groups = flickr.people.getPublicGroups :user_id => "41650587@N02"
+    assert groups.to_a.empty?
+  end
+  
+  def test_people_getPublicPhotos
+    info = flickr.people.getPublicPhotos :user_id => "41650587@N02"
+    assert_equal 1, info.size
+    assert_equal "1", info.total
+    assert_equal 1, info.pages
+    assert_equal 1, info.page
+    photo info[0]
+  end
+  
+  # photos
+  def test_photos_getInfo
+    id = "3839885270"
+    info = nil
     assert_nothing_raised(FlickRaw::FailedResponse) {
-      info = flickr.photos.getInfo :photo_id => id, :secret => secret
+      info = flickr.photos.getInfo(:photo_id => id)
+    }
+
+     %w{id secret server farm license owner title description dates comments tags media}.each {|m|
+      assert_respond_to info, m
+      assert_not_nil info[m]
     }
-    assert_respond_to info, :id
-    assert_respond_to info, :secret
-    assert_respond_to info, :title
-    assert_respond_to info, :description
-    assert_respond_to info, :owner
-    assert_respond_to info, :dates
-    assert_respond_to info, :comments
-    assert_respond_to info, :tags
+
+    assert_equal id, info.id
+    assert_equal "cat", info.title
+    assert_equal "This is my cat", info.description
+    assert_equal "ruby_flickraw", info.owner["username"]
+    assert_equal "Flickraw", info.owner["realname"]
+    assert_equal %w{cat pet}, info.tags.map {|t| t.to_s}.sort
+  end
+  
+  def test_photos_getExif
+    info = flickr.photos.getExif :photo_id => "3839885270"
+    assert_equal "Canon DIGITAL IXUS 55", info.exif.find {|f| f.tag == "Model"}.raw
+    assert_equal "1/60", info.exif.find {|f| f.tag == "ExposureTime"}.raw
+    assert_equal "4.9", info.exif.find {|f| f.tag == "FNumber"}.raw
+    assert_equal "1600", info.exif.find {|f| f.tag == "ImageWidth"}.raw
+    assert_equal "1200", info.exif.find {|f| f.tag == "ImageHeight"}.raw
+  end
+  
+  def test_photos_getSizes
+    info = flickr.photos.getSizes :photo_id => "3839885270"
+    assert_equal "http://www.flickr.com/photos/41650587@N02/3839885270/sizes/l/", info.find {|f| f.label == "Large"}.url
+    assert_equal "http://farm3.static.flickr.com/2485/3839885270_6fb8b54e06_b.jpg", info.find {|f| f.label == "Large"}.source
+  end
+  
+  def test_photos_search
+    info = flickr.photos.search :user_id => "41650587@N02"
+    photo info[0]
+  end
+  
+  # photos.comments
+  def test_photos_comments_getList
+    comments = flickr.photos.comments.getList :photo_id => "3839885270"
+    assert_equal 1, comments.size
+    assert_equal "3839885270", comments.photo_id
+    assert_equal "41630239-3839885270-72157621986549875", comments[0].id
+    assert_equal "41650587@N02", comments[0].author
+    assert_equal "ruby_flickraw", comments[0].authorname
+    assert_equal "http://www.flickr.com/photos/41650587@N02/3839885270/#comment72157621986549875", comments[0].permalink
+    assert_equal "This is a cute cat !", comments[0].to_s
+  end
+  
+  # tags
+  def test_tags_getListPhoto
+    tags = flickr.tags.getListPhoto :photo_id => "3839885270"
+    assert_equal 2, tags.tags.size
+    assert_equal "3839885270", tags.id
+    assert_equal %w{cat pet}, tags.tags.map {|t| t.to_s}.sort
+  end
+  
+  def test_tags_getListUser
+    tags =  flickr.tags.getListUser :user_id => "41650587@N02"
+    assert_equal "41650587@N02", tags.id
+    assert_equal %w{cat pet}, tags.tags.sort
+  end
+  
+  # urls
+  def test_urls_getGroup
+    info = flickr.urls.getGroup :group_id => "51035612836@N01"
+    assert_equal "51035612836@N01", info.nsid
+    assert_equal "http://www.flickr.com/groups/api/", info.url
+  end
+  
+  def test_urls_getUserPhotos
+    info = flickr.urls.getUserPhotos :user_id => "41650587@N02"
+    assert_equal "41650587@N02", info.nsid
+    assert_equal "http://www.flickr.com/photos/41650587@N02/", info.url
+  end
+  
+  def test_urls_getUserProfile
+    info = flickr.urls.getUserProfile :user_id => "41650587@N02"
+    assert_equal "41650587@N02", info.nsid
+    assert_equal "http://www.flickr.com/people/41650587@N02/", info.url
+  end
+  
+  def test_urls_lookupGroup
+    info = flickr.urls.lookupGroup :url => "http://www.flickr.com/groups/api/"
+    assert_equal "51035612836@N01", info.id
+    assert_equal "Flickr API", info.groupname
+  end
+  
+  def test_urls_lookupUser
+    info = flickr.urls.lookupUser :url => "http://www.flickr.com/photos/41650587@N02/"
+    assert_equal "41650587@N02", info.id
+    assert_equal "ruby_flickraw", info.username
+  end
+  
+  def test_urls
+    id = "3839885270"
+    info = flickr.photos.getInfo(:photo_id => id)
+
+    assert_equal "http://farm3.static.flickr.com/2485/3839885270_6fb8b54e06.jpg", FlickRaw.url(info)
+    assert_equal "http://farm3.static.flickr.com/2485/3839885270_6fb8b54e06_m.jpg", FlickRaw.url_m(info)
+    assert_equal "http://farm3.static.flickr.com/2485/3839885270_6fb8b54e06_s.jpg", FlickRaw.url_s(info)
+    assert_equal "http://farm3.static.flickr.com/2485/3839885270_6fb8b54e06_t.jpg", FlickRaw.url_t(info)
+    assert_equal "http://farm3.static.flickr.com/2485/3839885270_6fb8b54e06_b.jpg", FlickRaw.url_b(info)
+
+    assert_equal "http://www.flickr.com/people/41650587@N02/", FlickRaw.url_profile(info)
+    assert_equal "http://www.flickr.com/photos/41650587@N02/", FlickRaw.url_photostream(info)
+    assert_equal "http://www.flickr.com/photos/41650587@N02/3839885270", FlickRaw.url_photopage(info)
+    assert_equal "http://www.flickr.com/photos/41650587@N02/sets/", FlickRaw.url_photosets(info)
+    assert_equal "http://flic.kr/p/6Rjq7s", FlickRaw.url_short(info)
   end
 
   def test_url_escape
@@ -64,6 +383,6 @@ class Basic < Test::Unit::TestCase
     assert_nothing_raised {
       echo = flickr.test.echo :utf8_text => utf8_text
     }
-    assert_equal u(echo.utf8_text), utf8_text
+    assert_equal echo.utf8_text, utf8_text
   end
 end

data/test/test_upload.rb

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+
+require 'test/unit'
+require 'lib/flickraw'
+
+# FlickRaw.shared_secret = # Shared secret
+# flickr.auth.checkToken :auth_token => # Auth token
+
+class Upload < Test::Unit::TestCase
+  def test_upload
+
+    path = File.dirname(__FILE__) + '/image testée.jpg'
+    u = info = nil
+    title = "Titre de l'image testée"
+    description = "Ceci est la description de l'image testée"
+    assert_nothing_raised {
+      u = flickr.upload_photo path,
+        :title => title,
+        :description => description
+    }
+
+    assert_nothing_raised {
+      info = flickr.photos.getInfo :photo_id => u.to_s
+    }
+
+    assert_equal title, info.title
+    assert_equal description, info.description
+
+    assert_nothing_raised {flickr.photos.delete :photo_id => u.to_s}
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flickraw
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: "0.8"
 platform: ruby
 authors: 
 - Mael Clerambault
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-08 00:00:00 +02:00
+date: 2010-01-03 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -27,13 +27,16 @@ files:
 - LICENSE
 - README.rdoc
 - rakefile
-- examples/flickr_KDE.rb
-- examples/upload.rb
 - examples/auth.rb
+- examples/flickr_KDE.rb
 - examples/interestingness.rb
+- examples/upload.rb
+- test/test_upload.rb
 - test/test.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://hanklords.github.com/flickraw/
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -54,9 +57,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: flickraw
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Flickr library with a syntax close to the syntax described on http://www.flickr.com/services/api
-test_files: 
-- test/test.rb
+test_files: []
+