flickraw 0.9.3 → 0.9.4

data/README.rdoc

@@ -9,6 +9,8 @@ The github repository: http://github.com/hanklords/flickraw
 
 = Installation
 Type this in a console (you might need to be superuser)
+
+ gem install json (This is only necessary on ruby 1.8)
  gem install flickraw
 
 This will recreate the documentation by fetching the methods descriptions from flickr and then virtually plugging them in standard rdoc documentation.

data/lib/flickraw.rb

@@ -5,7 +5,7 @@ require 'flickraw/response'
 require 'flickraw/api'
 
 module FlickRaw
-  VERSION='0.9.3'
+  VERSION='0.9.4'
   USER_AGENT = "FlickRaw/#{VERSION}"
 end
 

data/lib/flickraw/oauth.rb

@@ -1,5 +1,5 @@
 require 'openssl'
-require 'net/http'
+require 'net/https'
 
 module FlickRaw
   class OAuthClient
@@ -88,12 +88,13 @@ module FlickRaw
 
         request.body = ''
         params.each { |k, v|
-          if v.is_a? File
-            basename = File.basename(v.path).to_s
+          if v.respond_to? :read
+            basename = File.basename(v.path).to_s if v.respond_to? :path
+            basename ||= File.basename(v.base_uri).to_s if v.respond_to? :base_uri
+            basename ||= "unknown"
             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-Disposition: form-data; name=\"#{k}\"; filename=\"#{basename}\"\r\n" <<
               "Content-Transfer-Encoding: binary\r\n" <<
               "Content-Type: image/jpeg\r\n\r\n" <<
               v.read << "\r\n"
@@ -128,18 +129,18 @@ module FlickRaw
       default_oauth_params[:oauth_consumer_key] = @consumer_key
       default_oauth_params[:oauth_signature_method] = "PLAINTEXT" if url.scheme == 'https'
       oauth_params = default_oauth_params.merge(oauth_params)
-      params_signed = params.reject {|k,v| v.is_a? File}.merge(oauth_params)
+      params_signed = params.reject {|k,v| v.respond_to? :read}.merge(oauth_params)
       oauth_params[:oauth_signature] = sign(:post, url, params_signed, token_secret)
 
-      r = Net::HTTP.start(url.host, url.port,
-          @proxy.host, @proxy.port, @proxy.user, @proxy.password,
-          :use_ssl => url.scheme == 'https') { |http| 
+      http = Net::HTTP.new(url.host, url.port, @proxy.host, @proxy.port, @proxy.user, @proxy.password)
+      http.use_ssl = (url.scheme == 'https')
+      r = http.start {|agent|
         request = Net::HTTP::Post.new(url.path)
         request['User-Agent'] = @user_agent if @user_agent
         request['Authorization'] = OAuthClient.authorization_header(url, oauth_params)
 
         yield request
-        http.request(request)
+        agent.request(request)
       }
       
       raise FailedResponse.new(r.body) if r.is_a? Net::HTTPClientError

metadata

@@ -1,27 +1,22 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: flickraw
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.9.4
   prerelease: 
-  version: 0.9.3
 platform: ruby
-authors: 
+authors:
 - Mael Clerambault
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-09 00:00:00 Z
+date: 2011-11-09 00:00:00.000000000 Z
 dependencies: []
-
 description: 
 email: maelclerambault@yahoo.fr
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - examples/auth.rb
 - examples/interestingness.rb
 - examples/search.rb
@@ -41,30 +36,26 @@ files:
 - rakefile
 homepage: http://hanklords.github.com/flickraw/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Flickr library with a syntax close to the syntax described on http://www.flickr.com/services/api
 test_files: []
-