Fix league request methods

lib/lol/league.rb

@@ -25,9 +25,8 @@ class League < Model
 
     attr_writer :timestamp, :name, :tier, :queue, :participant_id
 
-    def entries= list
-      @entries = []
-      list.each {|entry| @entries << LeagueEntry.new(entry)}
+    def entries=(entries)
+      @entries = entries.map(&LeagueEntry.method(:new))
     end
   end
 end

lib/lol/league_request.rb

@@ -9,39 +9,48 @@ def self.api_version
     # Retrieves leagues data for summoner, including leagues for all of summoner's teams
     # @param [Array<String>]
     # @return Hash{String => Array<League>}
-    def get *summoner_ids
-      perform_request(api_url("league/by-summoner/#{summoner_ids.join(",")}")).each_with_object({}) do |(s, l), returns|
-        returns[s] = l.map {|data| League.new data}
-      end
+    def get(*summoner_ids)
+      perform_league_request("league/by-summoner/#{summoner_ids.join(",")}")
     end
 
     # Retrieves leagues entry data for summoner, including league entries for all of summoner's teams
     # @param [Array<String>]
-    # @return [Array]
+    # @return Hash{String => Array<League>}
     # TODO: Change name to entries?
-    def get_entries *summoner_ids
-      perform_request(api_url("league/by-summoner/#{summoner_ids.join(',')}/entry")).map { |e| LeagueEntry.new e }
+    def get_entries(*summoner_ids)
+      perform_league_request("league/by-summoner/#{summoner_ids.join(',')}/entry")
     end
 
     # Retrieves leagues data for team
     # @param [Array<String>]
-    # @return [Array]
-    def by_team *team_ids
-      perform_request(api_url("league/by-team/#{team_ids.join(',')}")).map { |l| League.new l }
+    # @return Hash{String => Array<League>}
+    def by_team(*team_ids)
+      perform_league_request("league/by-team/#{team_ids.join(',')}")
     end
 
     # Retrieves leagues entry data for team
     # @param [Array<String>]
-    # @return [Array]
+    # @return Hash{String => Array<League>}
     # TODO: Change name to?
-    def entries_by_team *team_ids
-      perform_request(api_url("league/by-team/#{team_ids.join(',')}/entry")).map { |e| LeagueEntry.new e }
+    def entries_by_team(*team_ids)
+      perform_league_request("league/by-team/#{team_ids.join(',')}/entry")
     end
 
     # Retrieves challenger tier leagues
-    # @return [Array]
+    # @return [League]
     def challenger
-      perform_request(api_url('league/challenger')).map { |l| League.new l }
+      league_json = perform_request(api_url('league/challenger'))
+      League.new(league_json)
     end
+
+  private
+
+    def perform_league_request(partial_url)
+      url = api_url(partial_url)
+      perform_request(url).each_with_object({}) do |(summoner_id, leagues), entries_hash|
+        entries_hash[summoner_id] = leagues.map(&League.method(:new))
+      end
+    end
+
   end
 end