upflickr 0.1.7 → 0.1.8

data/CHANGELOG

@@ -1,3 +1,8 @@
+v0.1.8 - 08-07-2010
+  -fixed timeout bug
+  -better timeout handling
+  -fixed repeat-upload bug
+
 v0.1.7 - 06-15-2010
   -LICENSE
   -contact info

data/lib/upflickr.rb

@@ -244,25 +244,30 @@ class Upflickr
   end
 
   def post_form(url, query, headers)
-    Net::HTTP.start(url.host, url.port) {|con|
-      con.read_timeout = 10
-      begin
-        return con.post(url.path, query, headers)
-      rescue => e
-        puts "UPFLICKR: POSTING Failed #{e}... #{Time.now}"
+    begin 
+      Net::HTTP.new(url.host, url.port).start do |http|
+        return http.post(url.path, query, headers)
       end
-    }
+    rescue Timeout::Error
+      puts "UPFLICKR: Timeout::Error"
+      return false
+    rescue => e
+      puts "UPFLICKR: #{e}"
+      return false
+    end
   end 
 
-  def upload(params)
+  def upload(params_in)
     if self.check_attr(true) == true
-      params['api_key'] = @api_key
-      params['auth_token'] = @token
-      p2s = {}
-      params.each do |k,v|
+	  params = {}
+	  p2s = {}
+      params_in['api_key'] = @api_key
+      params_in['auth_token'] = @token
+      params_in.each do |k,v|
         if k == 'photo'
           params['photo'] = File.open(v, 'r')
         else
+		  params[k] = v
           p2s[k] = v
         end
       end
@@ -282,6 +287,7 @@ class Upflickr
 
       # Do the actual POST, given the right inputs
       data = self.post_form(url, query, headers)
+      return false if data == false
       doc = REXML::Document.new(data.read_body)
       if doc.elements["//rsp"].attributes['stat'] == "ok"
         return doc.elements["//photoid"].text.strip

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: upflickr
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Ben Baker-Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-15 00:00:00 -05:00
+date: 2010-08-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 description: 
-email: bbakersmith@gmail.com
+email: bitsynthesis@gmail.com
 executables: []
 
 extensions: []