flickraw 0.8.4 → 0.9

data/README.rdoc

@@ -5,26 +5,25 @@ It maps exactly the methods described in {the official api documentation}[http:/
 It also tries to present the data returned in a simple and intuitive way.
 The methods are fetched from flickr when loading the library by using introspection capabilities. So it is always up-to-date with regards to new methods added by flickr.
 
-The rubyforge project : http://rubyforge.org/projects/flickraw
-
-The github repository: http://github.com/hanklords/flickraw/tree/master
+The github repository: http://github.com/hanklords/flickraw
 
 = Installation
 Type this in a console (you might need to be superuser)
  gem install flickraw
 
 This will recreate the documentation by fetching the methods descriptions from flickr and then virtually plugging them in standard rdoc documentation.
- rake rdoc
+ $ cd flickraw
+ $ rake rdoc
 
 = Features
 
-* Small single file: flickraw.rb is less than 300 lines
+* Small single file: flickraw.rb is less than 400 lines
+* Minimal dependencies
 * 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)
 * Flickr URLs helpers
 
 = Usage
@@ -42,14 +41,14 @@ This will recreate the documentation by fetching the methods descriptions from f
  secret = list[0].secret
  info = flickr.photos.getInfo :photo_id => id, :secret => secret
 
- info.title           # => "PICT986"
- info.dates.taken     # => "2006-07-06 15:16:18"
+ puts info.title           # => "PICT986"
+ puts info.dates.taken     # => "2006-07-06 15:16:18"
 
 
  sizes = flickr.photos.getSizes :photo_id => id
 
  original = sizes.find {|s| s.label == 'Original' }
- original.width       # => "800"
+ puts original.width       # => "800" -- may fail if they have no original marked image
 
 == Authentication
 
@@ -58,32 +57,34 @@ This will recreate the documentation by fetching the methods descriptions from f
   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'
+  token = flickr.get_request_token(:perms => 'delete')
+  auth_url = flickr.get_authorize_url(token['oauth_token'], :perms => 'delete')
 
   puts "Open this url in your process to complete the authication process : #{auth_url}"
-  puts "Press Enter when you are finished."
-  STDIN.getc
+  puts "Copy here the number given when you complete the process."
+  verify = gets.strip
 
   begin
-    auth = flickr.auth.getToken :frob => frob
+    flickr.get_access_token(token['oauth_token'], token['oauth_token_secret'], verify)
     login = flickr.test.login
-    puts "You are now authenticated as #{login.username} with token #{auth.token}"
+    puts "You are now authenticated as #{login.username} with token #{flickr.access_token} and secret #{flickr.access_secret}"
   rescue FlickRaw::FailedResponse => e
     puts "Authentication failed : #{e.msg}"
   end
 
-You don't need to do that each time, you can reuse your token:
+If the user has already been authenticated, you can reuse the access token and access secret:
 
   require 'flickraw'
 
   FlickRaw.api_key="... Your API key ..."
   FlickRaw.shared_secret="... Your shared secret ..."
 
-  auth = flickr.auth.checkToken :auth_token => "... Your saved token ..."
+  flickr.access_token = "... Your access token ..."
+  flickr.access_secret = "... Your access secret ..."
 
   # From here you are logged:
-  puts auth.user.username
+  login = flickr.test.login
+  puts "You are now authenticated as #{login.username}"
 
 == Upload
 
@@ -97,27 +98,10 @@ You don't need to do that each time, you can reuse your token:
   # 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
-  }
+== Proxy
 
   require 'flickraw'
+  FlickRaw.proxy = "http://user:pass@proxy.example.com:3129/"
 
 == Flickr URL Helpers
 
@@ -136,22 +120,22 @@ There are some helpers to build flickr urls :
 === url_photopage
 
   info = flickr.photos.getInfo(:photo_id => "3839885270")
-  FlickRaw.url_photopage(photo) # => "http://www.flickr.com/photos/41650587@N02/3839885270"
+  FlickRaw.url_photopage(info) # => "http://www.flickr.com/photos/41650587@N02/3839885270"
 
 === url_photoset, url_photosets
 
   info = flickr.photos.getInfo(:photo_id => "3839885270")
-  FlickRaw.url_photosets(photo) # => "http://www.flickr.com/photos/41650587@N02/sets/"
+  FlickRaw.url_photosets(info) # => "http://www.flickr.com/photos/41650587@N02/sets/"
 
-=== url_short
+=== url_short, url_short_m, url_short_s, url_short_t
 
   info = flickr.photos.getInfo(:photo_id => "3839885270")
-  FlickRaw.url_short(photo) # => "http://flic.kr/p/6Rjq7s"
+  FlickRaw.url_short(info) # => "http://flic.kr/p/6Rjq7s"
 
 === url_photostream
 
   info = flickr.photos.getInfo(:photo_id => "3839885270")
-  FlickRaw.url_photostream(photo) # => "http://flic.kr/p/6Rjq7s"
+  FlickRaw.url_photostream(info) # => "http://www.flickr.com/photos/41650587@N02/"
 
 
 See the _examples_ directory to find more examples.
@@ -167,9 +151,10 @@ instead of
    require 'flickraw'
 
 This way it it doesn't fetch available flickr methods each time it is loaded.
-The flickraw-cached gem is on rubyforge and should be up-to-date with regard to flickr api most of the time.
+The flickraw-cached gem is on rubygems.org and should be up-to-date with regard to flickr api most of the time.
 
 = Notes
+
 If you want to use the api authenticated with several user at the same time, you must pass the authentication token explicitely each time.
 This is because it is keeping the authentication token internally.
 As an alternative, you can create new Flickr objects besides Kernel.flickr which is created for you. Use Flickr.new to this effect.

data/examples/auth.rb

@@ -8,18 +8,17 @@ SHARED_SECRET=''
 FlickRaw.api_key=API_KEY
 FlickRaw.shared_secret=SHARED_SECRET
 
-frob = flickr.auth.getFrob
-auth_url = FlickRaw.auth_url :frob => frob, :perms => 'read'
+token = flickr.get_request_token(:perms => 'delete')
+auth_url = flickr.get_authorize_url(token['oauth_token'], :perms => 'delete')
 
 puts "Open this url in your process to complete the authication process : #{auth_url}"
-puts "Press Enter when you are finished."
-STDIN.getc
+puts "Copy here the number given when you complete the process."
+verify = gets.strip
 
 begin
-  flickr.auth.getToken :frob => frob
+  flickr.get_access_token(token['oauth_token'], token['oauth_token_secret'], verify)
   login = flickr.test.login
-  puts "You are now authenticated as #{login.username}"
+  puts "You are now authenticated as #{login.username} with token #{flickr.access_token} and secret #{flickr.access_secret}"
 rescue FlickRaw::FailedResponse => e
   puts "Authentication failed : #{e.msg}"
 end
-

data/examples/search.rb

@@ -0,0 +1,22 @@
+require 'flickraw'
+
+# search for pictures taken within 60 miles of new brunswick, between 1890-1920
+
+# FlickRaw.api_key="..."
+# FlickRaw.shared_secret="..."
+
+new_b = flickr.places.find :query => "new brunswick"
+latitude = new_b[0]['latitude'].to_f
+longitude = new_b[0]['longitude'].to_f
+
+# within 60 miles of new brunswick, let's use a bbox
+radius = 1
+args = {}
+args[:bbox] = "#{longitude - radius},#{latitude - radius},#{longitude + radius},#{latitude + radius}"
+
+# requires a limiting factor, so let's give it one
+args[:min_taken_date] = '1890-01-01 00:00:00'
+args[:max_taken_date] = '1920-01-01 00:00:00'
+args[:accuracy] = 1 # the default is street only granularity [16], which most images aren't...
+discovered_pictures = flickr.photos.search args
+discovered_pictures.each{|p| url = FlickRaw.url p; puts url}

data/examples/sinatra.rb

@@ -0,0 +1,22 @@
+require 'flickraw'
+require 'sinatra'
+
+FlickRaw.api_key = API_KEY
+FlickRaw.shared_secret = SHARED_SECRET
+enable :sessions
+
+get '/authenticate' do
+  token = flickr.get_request_token(:oauth_callback => to('authenticated'))
+  session[:token] = token
+  redirect flickr.get_authorize_url(token['oauth_token'], :perms => 'delete')
+end
+
+get '/authenticated' do
+  token = session[:token]
+  flickr.get_access_token(token['oauth_token'], token['oauth_token_secret'], params['oauth_verifier'])
+  login = flickr.test.login
+  %{
+You are now authenticated as <b>#{login.username}</b>
+with token <b>#{flickr.access_token}</b> and secret <b>#{flickr.access_secret}</b>.
+}
+end

data/examples/upload.rb

@@ -2,21 +2,16 @@ require 'flickraw'
 
 # This is how to upload photos on flickr.
 # You need to be authentified to do that.
+
 API_KEY=''
 SHARED_SECRET=''
+ACCESS_TOKEN=''
+ACCESS _SECRET=''
 PHOTO_PATH='photo.jpg'
 
-FlickRaw.api_key=API_KEY
-FlickRaw.shared_secret=SHARED_SECRET
-
-frob = flickr.auth.getFrob
-auth_url = FlickRaw.auth_url :frob => frob, :perms => 'write'
-
-puts "Open this url in your process to complete the authication process : #{auth_url}"
-puts "Press Enter when you are finished."
-STDIN.getc
-
-flickr.auth.getToken :frob => frob
-login = flickr.test.login
+FlickRaw.api_key = API_KEY
+FlickRaw.shared_secret = SHARED_SECRET
+flickr.access_token = ACCESS_TOKEN
+flickr.access_secret = ACCESS_SECRET
 
 flickr.upload_photo PHOTO_PATH, :title => 'Title', :description => 'This is the description'

data/flickraw_rdoc.rb

@@ -1,5 +1,6 @@
 require "rdoc"
 require "rdoc/parser/ruby"
+require "nokogiri"
 require "cgi"
 
 FLICKR_API_URL='http://www.flickr.com/services/api'
@@ -66,11 +67,7 @@ module RDoc
     end
 
     def flickr_method_comment(info)
-      description = CGI.unescapeHTML(info.method.description.to_s)
-#       description.gsub!( /<\/?(\w+)>/ ) {|b|
-#         return b if ['em', 'b', 'tt'].include? $1
-#         return ''
-#       }
+      description = Nokogiri::HTML(info.method.description.to_s).text
 
       if info.respond_to? :arguments
         args = info.arguments.select { |arg| arg.name != 'api_key' }

data/lib/flickraw.rb

@@ -20,30 +20,140 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-
 require 'net/http'
-require 'digest/md5'
 require 'json'
 
-FlickRawOptions = {} if not Object.const_defined? :FlickRawOptions # :nodoc:
-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)
-end
-
 module FlickRaw
-  VERSION='0.8.4'
+  VERSION='0.9'
+  USER_AGENT = "Flickraw/#{VERSION}"
+
+  FLICKR_OAUTH_REQUEST_TOKEN='http://www.flickr.com/services/oauth/request_token'.freeze
+  FLICKR_OAUTH_AUTHORIZE='http://www.flickr.com/services/oauth/authorize'.freeze
+  FLICKR_OAUTH_ACCESS_TOKEN='http://www.flickr.com/services/oauth/access_token'.freeze
 
-  FLICKR_HOST='api.flickr.com'.freeze
-  REST_PATH='/services/rest/?'.freeze
-  UPLOAD_PATH='/services/upload/'.freeze
-  REPLACE_PATH='/services/replace/'.freeze
+  REST_PATH='http://api.flickr.com/services/rest/'.freeze
+  UPLOAD_PATH='http://api.flickr.com/services/upload/'.freeze
+  REPLACE_PATH='http://api.flickr.com/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 OAuth # :nodoc: all
+    class FailedResponse < StandardError
+      def initialize(str)
+        @response = OAuth.parse_response(str)
+        super(@response['oauth_problem'])
+      end
+    end
+  
+    class << self
+      def escape(v); URI.escape(v.to_s, /[^a-zA-Z0-9\-\.\_\~]/) end
+      def parse_response(text); Hash[text.split("&").map {|s| s.split("=")}] end
+    end
+    
+    attr_accessor :user_agent
+    attr_reader :proxy
+    def proxy=(url); @proxy = URI.parse(url || '') end
+    
+    def initialize(consumer_key, consumer_secret)
+      @consumer_key, @consumer_secret = consumer_key, consumer_secret
+      self.proxy = nil
+    end
+
+    def sign(method, url, params, token_secret = nil, consumer_secret = @consumer_secret)
+      params_norm = params.map {|k,v| OAuth.escape(k) + "=" + OAuth.escape(v) }.sort.join("&")
+      text = method.to_s.upcase + "&" + OAuth.escape(url) + "&" + OAuth.escape(params_norm)
+      key = consumer_secret.to_s + "&" + token_secret.to_s
+      digest = OpenSSL::Digest::Digest.new("sha1")
+      [OpenSSL::HMAC.digest(digest, key, text)].pack('m0').gsub(/\n$/,'')
+    end
+    
+    def authorization_header(url, params)
+      params_norm = params.map {|k,v| OAuth.escape(k) + "=\"" + OAuth.escape(v) + "\""}.sort.join(", ")
+      "OAuth realm=\"" + url.to_s + "\", " + params_norm
+    end
+    
+    def gen_timestamp; Time.now.to_i end
+    def gen_nonce; [OpenSSL::Random.random_bytes(32)].pack('m0').gsub(/\n$/,'') end
+    def gen_default_params
+      { :oauth_version => "1.0", :oauth_signature_method => "HMAC-SHA1",
+        :oauth_consumer_key => @consumer_key, :oauth_nonce => gen_nonce,
+        :oauth_timestamp => gen_timestamp }
+    end
+    
+    def request_token(url, oauth_params = {})
+      r = post_form(url, nil, {:oauth_callback => "oob"}.merge(oauth_params))
+      OAuth.parse_response(r.body)
+    end
+    
+    def authorize_url(url, oauth_params = {})
+      params_norm = oauth_params.map {|k,v| OAuth.escape(k) + "=" + OAuth.escape(v)}.sort.join("&")
+      url =  URI.parse(url)
+      url.query = url.query ? url.query + "&" + params_norm : params_norm
+      url.to_s
+    end
+    
+    def access_token(url, token_secret, oauth_params = {})
+      r = post_form(url, token_secret, oauth_params)
+      OAuth.parse_response(r.body)
+    end
+        
+    def post_form(url, token_secret, oauth_params = {}, params = {})
+      oauth_params = gen_default_params.merge(oauth_params)
+      oauth_params[:oauth_signature] = sign(:post, url, params.merge(oauth_params), token_secret)
+      url = URI.parse(url)
+      r = Net::HTTP.start(url.host, url.port, @proxy.host, @proxy.port, @proxy.user, @proxy.password) { |http| 
+        request = Net::HTTP::Post.new(url.path)
+        request['User-Agent'] = @user_agent if @user_agent
+        request['Authorization'] = authorization_header(url, oauth_params)
+        request.form_data = params
+        http.request(request)
+      }
+      
+      raise FailedResponse.new(r.body) if r.is_a? Net::HTTPClientError
+      r
+    end
+    
+    def post_multipart(url, token_secret, oauth_params = {}, params = {})
+      oauth_params = gen_default_params.merge(oauth_params)
+      params_signed = params.reject {|k,v| v.is_a? File}.merge(oauth_params)
+      oauth_params[:oauth_signature] = sign(:post, url, params_signed, token_secret)
+      url = URI.parse(url)
+      r = Net::HTTP.start(url.host, url.port, @proxy.host, @proxy.port, @proxy.user, @proxy.password) { |http| 
+        boundary = "FlickRaw#{gen_nonce}"
+        request = Net::HTTP::Post.new(url.path)
+        request['User-Agent'] = @user_agent if @user_agent
+        request['Content-type'] = "multipart/form-data, boundary=#{boundary}"
+        request['Authorization'] = authorization_header(url, oauth_params)
+
+        request.body = ''
+        params.each { |k, v|
+          if v.is_a? File
+            basename = File.basename(v.path).to_s
+            basename = basename.encode("utf-8").force_encoding("ascii-8bit") if RUBY_VERSION >= "1.9"
+            filename = basename
+            request.body << "--#{boundary}\r\n" <<
+              "Content-Disposition: form-data; name=\"#{k}\"; filename=\"#{filename}\"\r\n" <<
+              "Content-Transfer-Encoding: binary\r\n" <<
+              "Content-Type: image/jpeg\r\n\r\n" <<
+              v.read << "\r\n"
+          else
+            request.body << "--#{boundary}\r\n" <<
+              "Content-Disposition: form-data; name=\"#{k}\"\r\n\r\n" <<
+              "#{v}\r\n"
+          end
+        }
+        
+        request.body << "--#{boundary}--"
+        http.request(request)
+      }
+      
+      raise FailedResponse.new(r.body) if r.is_a? Net::HTTPClientError
+      r      
+    end    
+  end
 
   class Response
     def self.build(h, type) # :nodoc:
@@ -89,6 +199,7 @@ module FlickRaw
     def inspect; @a.inspect end
     def size; @a.size end
     def marshal_dump; [@h, @flickr_type, @a] end
+    alias length size
   end
 
   class FailedResponse < StandardError
@@ -150,25 +261,53 @@ module FlickRaw
 
   # Root class of the flickr api hierarchy.
   class Flickr < Request
+    # Authenticated access token
+    attr_accessor :access_token
+    
+    # Authenticated access token secret
+    attr_accessor :access_secret
+    
     def self.build(methods); methods.each { |m| build_request m } end
 
-    def initialize(token = FlickRawOptions['auth_token']) # :nodoc:
+    def initialize # :nodoc:
+      raise "No API key or secret defined !" if FlickRaw.api_key.nil? or FlickRaw.shared_secret.nil?
+      @oauth_consumer = OAuth.new(FlickRaw.api_key, FlickRaw.shared_secret)
+      @oauth_consumer.proxy = FlickRaw.proxy
+      @oauth_consumer.user_agent = USER_AGENT
+      
       Flickr.build(call('flickr.reflection.getMethods')) if Flickr.flickr_objects.empty?
       super self
-      @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={}, &block)
-      @token = nil if req == "flickr.auth.getFrob"
-      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
-      process_response(req, http_response)
+      http_response = @oauth_consumer.post_form(REST_PATH, @access_secret, {:oauth_token => @access_token}, build_args(args, req))
+      process_response(req, http_response.body)
+    end
+
+    # Get an oauth request token.
+    #
+    #    token = flickr.get_request_token(:oauth_callback => "http://example.com")
+    def get_request_token(args = {})
+      request_token = @oauth_consumer.request_token(FLICKR_OAUTH_REQUEST_TOKEN, args)
+    end
+    
+    # Get the oauth authorize url.
+    #
+    #  auth_url = flickr.get_authorize_url(token['oauth_token'], :perms => 'delete')
+    def get_authorize_url(token, args = {})
+      @oauth_consumer.authorize_url(FLICKR_OAUTH_AUTHORIZE, args.merge(:oauth_token => token))
+    end
+
+    # Get an oauth access token.
+    #
+    #  flickr.get_access_token(token['oauth_token'], token['oauth_token_secret'], oauth_verifier)
+    def get_access_token(token, secret, verify)
+      access_token = @oauth_consumer.access_token(FLICKR_OAUTH_ACCESS_TOKEN, secret, :oauth_token => token, :oauth_verifier => verify)
+      @access_token, @access_secret = access_token['oauth_token'], access_token['oauth_token_secret']
+      access_token
     end
 
     # Use this to upload the photo in _file_.
@@ -186,97 +325,58 @@ module FlickRaw
     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
+    def build_args(args={}, method = nil)
+      full_args = {'format' => 'json', :nojsoncallback => "1"}
+      full_args['method'] = method if method
       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[k.to_s] = v
       }
-      full_args[:api_sig] = FlickRaw.api_sig(full_args) if FlickRaw.shared_secret
       full_args
     end
 
-    def process_response(req, http_response)
-      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
+    def process_response(req, response)
+      if response =~ /^<\?xml / # upload_photo returns xml data whatever we ask
+        if response[/stat="(\w+)"/, 1] == 'fail'
+          msg = response[/msg="([^"]+)"/, 1]
+          code = response[/code="([^"]+)"/, 1]
+          raise FailedResponse.new(msg, code, req)
+        end
+        
+        type = response[/<(\w+)/, 1]
+        h = {
+          "secret" => response[/secret="([^"]+)"/, 1],
+          "originalsecret" => response[/originalsecret="([^"]+)"/, 1],
+          "_content" => response[/>([^<]+)<\//, 1]
+        }.delete_if {|k,v| v.nil? }
+        
+        Response.build h, type
+      else
+        json = JSON.load(response.empty? ? "{}" : response)
+        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}
 
-    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.key?('timeout')
-        yield http
-      }
+        Response.build json, type
+      end
     end
 
     def upload_flickr(method, file, args={})
-      photo = 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" <<
-          "Content-Disposition: form-data; name=\"#{a}\"\r\n\r\n" <<
-          "#{v}\r\n"
-      }
-      query <<
-        "--#{boundary}\r\n" <<
-        "Content-Disposition: form-data; name=\"photo\"; filename=\"#{file}\"\r\n" <<
-        "Content-Transfer-Encoding: binary\r\n" <<
-        "Content-Type: image/jpeg\r\n\r\n" <<
-        photo <<
-        "\r\n" <<
-        "--#{boundary}--"
-
-      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
-      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)
+      args = build_args(args)
+      args['photo'] = open(file, 'rb')
+      http_response = @oauth_consumer.post_multipart(method, @access_secret, {:oauth_token => @access_token}, args)
+      process_response(method, http_response.body)
     end
   end
 
   class << self
     # Your flickr API key, see http://www.flickr.com/services/api/keys for more information
-    def api_key; FlickRawOptions['api_key'] end
-    def api_key=(key); FlickRawOptions['api_key'] = key end
-
+    attr_accessor :api_key
+    
     # The shared secret of _api_key_, see http://www.flickr.com/services/api/keys for more information
-    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 => api_key, :perms => 'read'}
-      args.each {|k, v| full_args[k.to_sym] = v }
-      full_args[:api_sig] = api_sig(full_args) if shared_secret
-
-      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
+    attr_accessor :shared_secret
+    
+    # Use a proxy
+    attr_accessor :proxy
 
     BASE58_ALPHABET="123456789abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ".freeze
     def base58(id)
@@ -324,9 +424,3 @@ end
 #  recent_photos = flickr.photos.getRecent
 #  puts recent_photos[0].title
 def flickr; $flickraw ||= FlickRaw::Flickr.new end
-
-# Load the methods if the option lazyload is not specified
-begin
-flickr
-rescue
-end if not FlickRawOptions['lazyload']

data/rakefile

@@ -1,36 +1,15 @@
 require 'rake/clean'
 require 'rake/rdoctask'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
 require 'rake/testtask'
 
-FlickRawOptions = {'lazyload' => true}
-require './lib/flickraw'
-require './flickraw_rdoc' if RUBY_VERSION >= "1.9"
+lib = File.dirname(__FILE__)
+$:.unshift lib unless $:.include?(lib)
 
-PKG_FILES = FileList["lib/flickraw.rb", "flickraw_rdoc.rb", "LICENSE", "README.rdoc", "rakefile", "examples/*.rb", "test/*.rb"].to_a
-
-spec = Gem::Specification.new do |s|
-  s.summary = "Flickr library with a syntax close to the syntax described on http://www.flickr.com/services/api"
-  s.name = "flickraw"
-  s.author = "Mael Clerambault"
-  s.email =  "maelclerambault@yahoo.fr"
-  s.homepage = "http://hanklords.github.com/flickraw/"
-  s.version = FlickRaw::VERSION
-  s.files = PKG_FILES
-  s.add_dependency 'json', '>= 1.1.1'
-end
-
-Rake::GemPackageTask.new(spec).define
-
-desc "Create default gemspec file"
-file "flickraw.gemspec" do
-  open("flickraw.gemspec", "w") {|g| g.puts spec.to_ruby }
-end
-task :gem => ["flickraw.gemspec"]
-CLOBBER.add "flickraw.gemspec"
+require 'lib/flickraw'
+require 'flickraw_rdoc' if RUBY_VERSION >= "1.9"
 
 Rake::RDocTask.new do |rd|
+  rd.main = "README.rdoc"
   rd.rdoc_files.include "README.rdoc", "lib/flickraw.rb"
 end
 

data/test/test.rb

@@ -1,13 +1,19 @@
 # -*- coding: utf-8 -*-
 
+lib = File.expand_path('../../lib/', __FILE__)
+$:.unshift lib unless $:.include?(lib)
+
 require 'test/unit'
 require 'flickraw'
 
+# FlickRaw.shared_secret = # Shared secret
+# flickr.auth.checkToken :auth_token => # Auth token
+
 class Basic < Test::Unit::TestCase
   def test_request
     flickr_objects = %w{activity auth blogs collections commons contacts
        favorites galleries groups interestingness machinetags panda
-       people photos photosets places prefs reflection stats tags
+       people photos photosets places prefs push reflection stats tags
        test urls
     }
     assert_equal FlickRaw::Flickr.flickr_objects, flickr_objects
@@ -25,6 +31,7 @@ class Basic < Test::Unit::TestCase
       flickr.auth.getFrob
       flickr.auth.getFullToken
       flickr.auth.getToken
+      flickr.auth.oauth.getAccessToken
       flickr.blogs.getList
       flickr.blogs.getServices
       flickr.blogs.postPhoto
@@ -35,6 +42,7 @@ class Basic < Test::Unit::TestCase
       flickr.contacts.getListRecentlyUploaded
       flickr.contacts.getPublicList
       flickr.favorites.add
+      flickr.favorites.getContext
       flickr.favorites.getList
       flickr.favorites.getPublicList
       flickr.favorites.remove
@@ -162,6 +170,10 @@ class Basic < Test::Unit::TestCase
       flickr.prefs.getHidden
       flickr.prefs.getPrivacy
       flickr.prefs.getSafetyLevel
+      flickr.push.getSubscriptions
+      flickr.push.getTopics
+      flickr.push.subscribe
+      flickr.push.unsubscribe
       flickr.reflection.getMethodInfo
       flickr.reflection.getMethods
       flickr.stats.getCollectionDomains
@@ -199,7 +211,7 @@ class Basic < Test::Unit::TestCase
     }
     found_methods = flickr.reflection.getMethods
     assert_instance_of FlickRaw::ResponseList, found_methods
-    assert_equal known_methods, found_methods.to_a
+    assert_equal known_methods.sort, found_methods.to_a.sort
   end
   
   def test_list

data/test/test_upload.rb

@@ -1,10 +1,15 @@
 # -*- coding: utf-8 -*-
 
+lib = File.expand_path('../../lib/', __FILE__)
+$:.unshift lib unless $:.include?(lib)
+
 require 'test/unit'
 require 'flickraw'
 
+# FlickRaw.api_key = # API key
 # FlickRaw.shared_secret = # Shared secret
-# flickr.auth.checkToken :auth_token => # Auth token
+# flickr.access_token = # Auth token
+# flickr.access_secret = # Auth token secret
 
 class Upload < Test::Unit::TestCase
   def test_upload

metadata

@@ -4,9 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 8
-  - 4
-  version: 0.8.4
+  - 9
+  version: "0.9"
 platform: ruby
 authors: 
 - Mael Clerambault
@@ -14,24 +13,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 +01:00
+date: 2011-09-20 00:00:00 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 1
-        version: 1.1.1
-  type: :runtime
-  version_requirements: *id001
+dependencies: []
+
 description: 
 email: maelclerambault@yahoo.fr
 executables: []
@@ -41,17 +26,18 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/flickraw.rb
-- flickraw_rdoc.rb
-- LICENSE
-- README.rdoc
-- rakefile
-- examples/flickr_KDE.rb
 - examples/auth.rb
 - examples/interestingness.rb
+- examples/search.rb
+- examples/sinatra.rb
 - examples/upload.rb
 - test/test_upload.rb
 - test/test.rb
+- lib/flickraw.rb
+- flickraw_rdoc.rb
+- LICENSE
+- README.rdoc
+- rakefile
 has_rdoc: true
 homepage: http://hanklords.github.com/flickraw/
 licenses: []

data/examples/flickr_KDE.rb

@@ -1,23 +0,0 @@
-#!/usr/bin/ruby
-# Chooses a photo from the current interesting
-# photo and set it as the background image on
-# your first KDE desktop.
-
-require 'flickraw'
-require 'open-uri'
-DESKTOP=1
-
-list = flickr.interestingness.getList
-photo = list[rand(100)]
-sizes = flickr.photos.getSizes(:photo_id => photo.id)
-original = sizes.find {|s| s.label == 'Original' }
-
-url = original.source
-file = File.basename url
-full_path = File.join(Dir.pwd, file)
-
-open url do |remote|
-  open(file, 'wb') { |local| local << remote.read }
-end
-
-`dcop kdesktop KBackgroundIface setWallpaper #{DESKTOP} #{full_path} 7`