lib/redd/api_client.rb in redd-0.8.0.pre.1 vs lib/redd/api_client.rb in redd-0.8.0.pre.2

@@ -62,48 +62,48 @@
 
     def unmarshal(object)
       @unmarshaller.unmarshal(object)
     end
 
-    def model(verb, path, params = {})
+    def model(verb, path, options = {})
       # XXX: make unmarshal explicit in methods?
-      unmarshal(send(verb, path, params).body)
+      unmarshal(request(verb, path, options).body)
     end
 
-    private
-
-    # Makes sure a valid access is present, raising an error if nil
-    def ensure_access_is_valid
-      # Authenticate first if auto_login is enabled
-      authenticate if @access.nil? && @auto_login
-      # Refresh access if auto_refresh is enabled
-      refresh if @access.expired? && @auto_refresh
-      # Fuck it, panic
-      raise 'client access is nil, try calling #authenticate' if @access.nil?
-    end
-
-    def connection
-      super.auth("Bearer #{@access.access_token}")
-    end
-
     # Makes a request, ensuring not to break the rate limit by sleeping.
     # @see Client#request
-    def request(verb, path, params: {}, form: {})
+    def request(verb, path, raw: false, params: {}, **options)
       # Make sure @access is populated by a valid access
       ensure_access_is_valid
       # Setup base API params and make request
       api_params = { api_type: 'json', raw_json: 1 }.merge(params)
-      response = @rate_limiter.after_limit { super(verb, path, params: api_params, form: form) }
+      response = @rate_limiter.after_limit { super(verb, path, params: api_params, **options) }
       # Check for errors in the returned response
-      response_error = @error_handler.check_error(response)
+      response_error = @error_handler.check_error(response, raw: raw)
       raise response_error unless response_error.nil?
       # All done, return the response
       @failures = 0
       response
     rescue Redd::ServerError, HTTP::TimeoutError => e
       @failures += 1
       raise e if @failures > @max_retries
       warn "Redd got a #{e.class.name} error (#{e.message}), retrying..."
       retry
+    end
+
+    private
+
+    # Makes sure a valid access is present, raising an error if nil
+    def ensure_access_is_valid
+      # Authenticate first if auto_login is enabled
+      authenticate if @access.nil? && @auto_login
+      # Refresh access if auto_refresh is enabled
+      refresh if @access.expired? && @auto_refresh
+      # Fuck it, panic
+      raise 'client access is nil, try calling #authenticate' if @access.nil?
+    end
+
+    def connection
+      super.auth("Bearer #{@access.access_token}")
     end
   end
 end