cloudsight 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fd9cb63d16322fabb673abe3da859ef57382cb4
-  data.tar.gz: c83cf57f6ebc7a618b858b602abc234a56f166a9
+  metadata.gz: a2fe5db87751bdc8c72c250868e949cf1b045576
+  data.tar.gz: eeb791589e465b21e8cbeffa9a64d8eb3927134b
 SHA512:
-  metadata.gz: eb0623535da6c8e2657172f2a57f96d54c572dfec4e877d7256b906f8a94fdb0d17aa271231826b7f6c2184ea829b715a2eacae47f0027cc662d7df887fb295c
-  data.tar.gz: 12c945044957ef0c4e8fa2dc7833e6c0050be84537549b12deaa0548cc9f979aee2510f028c9a8b4fcfbd7db5d0305f70cd0c179376e717b31dc1213e7731ae3
+  metadata.gz: 9c8302acc57e8c5317b2163682c0c2ea9842031311ac775f4897cdd5e9a2b14040916e9e66b1786f1ff23a38520cc93286c7d0ae202b513d0606e731f3898d09
+  data.tar.gz: 89d7a1386a9e85a10876eb0ef880d0d888284073ae88fe992492a4c5698c8db0cf1f9895b356edeed7170b6be725e854d4cc5b19ed56cbb63573d723e57eb592

data/lib/cloudsight.rb

@@ -40,31 +40,31 @@ module Cloudsight
   end
 
   class Util
-    def self.wrap_request &block
-      RestClient.reset_before_execution_procs
-      RestClient.add_before_execution_proc do |req, params|
-        if params[:payload]
-          filtered_payload = params[:payload].dup
-          filtered_payload.delete('image_request[image]')
-        end
-
-        if Cloudsight.api_key
-          req.add_field 'Authorization', "CloudSight #{Cloudsight.api_key}"
-        else
-          oauth = SimpleOAuth::Header.new(params[:method], params[:url], filtered_payload, Cloudsight.oauth_options || {})
-          req.add_field 'Authorization', oauth.to_s
-        end
-      end
+    def self.post(url, params, headers = {})
+      headers['Authorization'] = authorization_header(:post, url, params)
+      RestClient.post(url, params, headers)
+    rescue RestClient::Exception => e
+      e.response
+    end
 
-      begin
-        retval = yield
-      rescue RestClient::Exception => e
-        retval = e.response
-      end
+    def self.get(url, headers = {})
+      headers['Authorization'] = authorization_header(:get, url)
+      RestClient.get(url, headers)
+    rescue RestClient::Exception => e
+      e.response
+    end
 
-      RestClient.reset_before_execution_procs
+    def self.authorization_header(http_method, url, params = {})
+      if Cloudsight.api_key
+        "CloudSight #{Cloudsight.api_key}"
+      else
+        # Exclude image file when generating OAuth header
+        filtered_payload = params.dup
+        filtered_payload.delete('image_request[image]')
 
-      return retval
+        oauth = SimpleOAuth::Header.new(http_method, url, filtered_payload, Cloudsight.oauth_options || {})
+        oauth.to_s
+      end
     end
   end
 
@@ -86,7 +86,7 @@ module Cloudsight
       params['image_request[remote_image_url]'] = options[:url] if options.has_key?(:url)
       params['image_request[image]'] = options[:file] if options.has_key?(:file)
 
-      response = Util.wrap_request { RestClient.post(url, params) }
+      response = Util.post(url, params)
       data = JSON.parse(response.body)
       raise ResponseException.new(data['error']) if data['error']
       raise UnexpectedResponseException.new(response.body) unless data['token']
@@ -97,7 +97,7 @@ module Cloudsight
     def self.repost(token, options = {})
       url = "#{Cloudsight::base_url}/image_requests/#{token}/repost"
 
-      response = Util.wrap_request { RestClient.post(url, options) }
+      response = Util.post(url, options)
       return true if response.code == 200 and response.body.to_s.strip.empty?
 
       data = JSON.parse(response.body)
@@ -112,7 +112,7 @@ module Cloudsight
     def self.get(token, options = {})
       url = "#{Cloudsight::base_url}/image_responses/#{token}"
 
-      response = Util.wrap_request { RestClient.get(url) }
+      response = Util.get(url)
       data = JSON.parse(response.body)
       raise ResponseException.new(data['error']) if data['error']
       raise UnexpectedResponseException.new(response.body) unless data['status']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudsight
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Brad Folkens