Tweaks

* Add custom exception for rate limited response
  * Rate limit is exceptionally hard to trigger, even without an API
    key, so not going to add internal rate limiting at the moment
* Add extra per_page argument for users manually calling paginator
  * Remove extra calculation for limit parameter
* Add columns and minify params to Content endpoint

Author: mattantonelli

lib/xivapi/exceptions.rb

@@ -4,16 +4,22 @@ def initialize(response)
       if response.headers[:content_type] == 'application/problem+json'
         message = JSON.parse(response)['Message']
       else
-        message = 'Error contacting the API'
+        message = 'Error contacting the API.'
       end
 
       super(message)
     end
   end
 
+  class RateLimitError < StandardError
+    def initialize
+      super('Too many requests.')
+    end
+  end
+
   class ContentNotAvailable < StandardError
     def initialize
-      super('Content is not currently available on XIVAPI')
+      super('Content is not currently available on XIVAPI.')
     end
   end
 

lib/xivapi/http.rb

@@ -12,7 +12,11 @@ def request(client, endpoint, params = {})
         body = JSON.parse(response.body)
         objectify(body)
       rescue RestClient::ExceptionWithResponse => e
-        raise XIVAPI::RequestError.new(e.response)
+        if e.http_code == 429
+          raise XIVAPI::RateLimitError.new
+        else
+          raise XIVAPI::RequestError.new(e.response)
+        end
       rescue RestClient::Exception => e
         raise e
       end

lib/xivapi/paginator.rb

@@ -3,9 +3,9 @@ class Paginator
     include Enumerable
     include XIVAPI::HTTP
 
-    def initialize(client, params, endpoint, limit)
+    def initialize(client, params, endpoint, limit, per_page = nil)
       @client = client
-      @params = params.merge(limit: [limit, 100].min)
+      @params = params.merge(limit: per_page || limit)
       @endpoint = endpoint
       @limit = limit
     end

lib/xivapi/request.rb

@@ -13,11 +13,12 @@ def search(indexes: [], string: '', string_column: 'Name_en', string_algo: 'wild
   end
 
   # Content
-  def content(name: nil, ids: [], limit: 100, columns: [])
+  def content(name: nil, ids: [], minify: false, limit: 100, columns: [])
     if name.nil?
       request(self, 'content')
     elsif [*ids].size == 1
-      request("#{name.capitalize}/#{[*ids].first}")
+      params = { minify: minify ? 1 : 0, columns: [*columns].join(',') }
+      request(self, "#{name.capitalize}/#{[*ids].first}", params)
     else
       params = { ids: [*ids].join(','), columns: [*columns].join(',') }
       XIVAPI::Paginator.new(self, params, name.capitalize, limit)