imgurapi 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 344fb356417a799b6cc13e4a6e08ba78809ce7f0
-  data.tar.gz: e39fdbdd13ed1315a705cb67d87486e21d0966c5
+  metadata.gz: c69afc57eef5284296e36c8b5836e69011b015fc
+  data.tar.gz: 7fb7e32ee6c569746ef56d29f80dadaead0ea1e1
 SHA512:
-  metadata.gz: b113935848a157b42a1307c770b37e10d340427b5f9234f7d0a7ea8dcf58a5fd5ff7cf703d5c4e665f0463ca160528a240952c7f2f40f9dd02bd64e04a1f5c9b
-  data.tar.gz: 604d743f0769a33675f7f6d2bc478fe20aed80a161814fef1654bf4051816a6f2272173539dbc879e850af497866a36d4b1643d344c7c9870216fc618296fbd2
+  metadata.gz: e6977d3bb8ef0296b2ff178507b6f669fb0914dd47948bc6c95d9a7a590622fa4ec7ab297d4c8b2eca0604f73255b86c38e232e0d945560028a8ead62870443b
+  data.tar.gz: caed10efce8328a7ba2109ead917bb18af4045b503cbcaf45f06dcf68559e5130d12708039fe5c7604511c5deb8c6c926f68ee16485da15e76f817f1dda0508b

data/lib/imgur/communication.rb

@@ -2,6 +2,7 @@ module Imgur
   Communication = Struct.new(:session) do
 
     API_VERSION = 3
+    MAX_ATTEMPTS = 3
 
     # RESTful network call
     def call(method, endpoint, params = nil)
@@ -13,27 +14,26 @@ module Imgur
     private
 
     # Processes RESTful response according the status code
-    def request(&block)
-      3.times do
-        response = yield
-
-        case response.status
-        when 200, 404
-          return parse_message(response.body)['data']
-        when 401, 500
-          error_message = parse_message response.body
-          raise "Unauthorized: #{error_message['error']['message']}"
-        when 403
-          get_new_and_reset_token
-
-          request &block # and retry the request
-        else
-          puts response.body
-          raise "Response code #{response.status} not recognized"
-        end
+    def request(attempt = 0, &block)
+      if attempt == MAX_ATTEMPTS
+        raise "Retried #{MAX_ATTEMPTS} times but could not get an access_token"
       end
 
-      raise "Retried 3 times but could not get an access_token"
+      response = yield
+
+      case response.status
+      when 200, 404
+        return parse_message(response.body)['data']
+      when 401, 500
+        error_message = parse_message response.body
+        raise "Unauthorized: #{error_message['error']['message']}"
+      when 403
+        get_new_and_reset_token
+
+        request attempt + 1, &block # and retry the request once more
+      else
+        raise "Response code #{response.status} not recognized"
+      end
     end
 
     def get_new_and_reset_token

data/lib/imgur/session.rb

@@ -14,6 +14,11 @@ module Imgur
       @refresh_token = options[:refresh_token]
     end
 
+    # Singleton initializer to allow access_token reuse
+    def self.instance(options)
+      @@session ||= new(options)
+    end
+
     %w(Account Image).each do |clazz|
       define_method clazz.downcase do
         Imgur::Api.const_get(clazz).new(self)

data/lib/imgur/version.rb

@@ -1,5 +1,5 @@
 module Imgur
 
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imgurapi
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Daniel Cruz Horts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-04 00:00:00.000000000 Z
+date: 2015-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday