Add new data option to Characters

Author: mattantonelli

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xivapi (0.2.4)
+    xivapi (0.2.5)
       rest-client (~> 2.0.2)
 
 GEM

README.md

@@ -7,7 +7,7 @@ A Ruby library for [XIVAPI](https://www.xivapi.com/).
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'xivapi', git: 'https://github.com/xivapi/xivapi-ruby.git', tag: 'v0.2.4'
+gem 'xivapi', git: 'https://github.com/xivapi/xivapi-ruby.git', tag: 'v0.2.5'
 ```
 
 And then run:

lib/xivapi/request.rb

@@ -94,22 +94,17 @@ def market_categories
   # @param columns [String, Array <String>] One or more columns to limit results to
   # @return [OpenStruct] The requested character
   def character(id: nil, all_data: false, poll: false, data: [], columns: [])
-    if all_data
-      data = ALL_CHARACTER_DATA
-    else
-      data = [*data].join(',')
-    end
-
-    params = { data: data, columns: [*columns].join(',') }
+    params = { data: character_data(all_data, data), columns: [*columns].join(',') }
     request_cached(self, "character/#{id}", :character, params, poll)
   end
 
   # @param ids [String, Array<Integer>] Character IDs
   # @param all_data [true, false] Return the full set of character data
+  # @param data [String, Array <String>] Additional data to request, see: https://xivapi.com/docs/Character#character
   # @param columns [String, Array <String>] One or more columns to limit results to
   # @return [Array<OpenStruct>] The requested characters
-  def characters(ids: nil, all_data: false, columns: [])
-    body = { ids: [*ids].join(','), data: all_data ? ALL_CHARACTER_DATA : nil, columns: [*columns].join(',') }
+  def characters(ids: nil, all_data: false, data: [], columns: [])
+    body = { ids: [*ids].join(','), data: character_data(all_data, data), columns: [*columns].join(',') }
     request(self, 'characters', {}, body)
   end
 
@@ -201,4 +196,9 @@ def lodestone(category)
   def patch_list
     request(self, 'patchlist')
   end
+
+  private
+  def character_data(all_data, data)
+    all_data ? ALL_CHARACTER_DATA : [*data].join(',')
+  end
 end

lib/xivapi/version.rb

@@ -1,4 +1,4 @@
 module XIVAPI
   # Gem version
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end