ruby-lol 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bcac1b72dd226f3ef709a14ae8be712cd5fedcb
-  data.tar.gz: cd08d35b7dc9e8b5c1df996bb08d515dee4ad1f0
+  metadata.gz: f96a74077c549229c2719763486c3bcd9bd8da25
+  data.tar.gz: 32f1aeb7a7aed7c6e0bab87f3ffeb23d286473e2
 SHA512:
-  metadata.gz: 636209f1b3f0e8aa9f9e14321296245b56ba7cec490b42ab729a23bb3a608d63c0da62784e28fbf6e2e051be0e1f213f95b9ac69a9e4db63f62a049ede78d978
-  data.tar.gz: 40cb048f2ab8c666badc91cd6a8c9d2f0a83c7d888d75cf4de99f16b9f920c3644758b0d34bab180049df93ffa70807f767fccc6107994b11efd84f638c529a9
+  metadata.gz: 4623f57302ba2cd3faf1620d138397cceaa81217713c57d0319f1298e31f752ae7ff2b4da124adf154ba73f6061b873bfd952e3e877dd79a98ee750fb62599c1
+  data.tar.gz: af511b335a6fe0412e53e1bc2939cdbbdd9fb8917dddc0f1717fd3b4031b1e0611d8f9c3f938a3bc7b2ea65428aec3b71c5cacdedb93dc1a37d454646ca22d62

data/README.md

@@ -1,5 +1,5 @@
 # ruby-lol
-[![Gem Version](https://badge.fury.io/rb/ruby-lol.png)](http://badge.fury.io/rb/ruby-lol) [![Coverage Status](https://coveralls.io/repos/mikamai/ruby-lol/badge.png)](https://coveralls.io/r/mikamai/ruby-lol) [![Build Status](https://travis-ci.org/mikamai/ruby-lol.png?branch=master)](https://travis-ci.org/mikamai/ruby-lol) [![Code Climate](https://codeclimate.com/repos/52a9908c56b102320a0166a4/badges/7e5d4ea4fe9e562f8e4d/gpa.png)](https://codeclimate.com/repos/52a9908c56b102320a0166a4/feed) [![Dependency Status](https://gemnasium.com/mikamai/ruby-lol.png)](https://gemnasium.com/mikamai/ruby-lol)
+[![Gem Version](https://badge.fury.io/rb/ruby-lol.png)](http://badge.fury.io/rb/ruby-lol) [![Coverage Status](https://coveralls.io/repos/mikamai/ruby-lol/badge.png)](https://coveralls.io/r/mikamai/ruby-lol) [![Build Status](https://travis-ci.org/mikamai/ruby-lol.png?branch=master)](https://travis-ci.org/mikamai/ruby-lol) [![Dependency Status](https://gemnasium.com/mikamai/ruby-lol.png)](https://gemnasium.com/mikamai/ruby-lol)
 
 
 ruby-lol is a wrapper to the [Riot Games API](https://developer.riotgames.com).
@@ -25,13 +25,12 @@ Or install it yourself as:
 ```ruby
 require 'lol'
 
-# defaults to euw
-client = Lol::Client.new "my_api_key"
+client = Lol::Client.new "my_api_key", "euw"
 # => <Lol::Client:0x007fd09d1abb00 @api_key="my_api_key", @region="euw">
 
-# na
-na_client = Lol::Client.new "my_api_key", :region => "na"
-# => <Lol::Client:0x007fd09d1abb00 @api_key="my_api_key", @region="na">
+# NEW! You can cache requests using Redis now
+# ttl defaults to 900
+client = Lol::Client.new "my_api_key", "euw", {redis: "redis://localhost:6379", ttl: 900}
 
 # Available Requests
 client.champion
@@ -119,8 +118,11 @@ client.static.champion.get(champData: 'lore')
 5. Create new Pull Request
 
 ## Changelog
-
- - 0.9.7 Updated LeagueReqeust to API v2.3
+ - 0.9.11 Added caching support via REDIS
+ - 0.9.7 Updated LeagueRequest to API v2.3
  - 0.9.6 Updated SummonerRequest and GameRequest to API v1.3
  - 0.9.5 Fixed documentation
  - 0.9.4 Completed support for updated API
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/mikamai/ruby-lol/trend.png)](https://bitdeli.com/free "Bitdeli Badge")

data/lib/lol.rb

@@ -1,6 +1,7 @@
 require 'active_support/core_ext/string/inflections'
 require 'httparty'
 require 'uri'
+require 'redis'
 
 module Lol
   # Takes a hash and returns a copy of it with the keys that have been underscored

data/lib/lol/client.rb

@@ -9,39 +9,43 @@ module Lol
     # @return [String] the API key that has been used
     attr_reader :api_key
 
+    # @!attribute [r] ttl
+    # @return [Fixnum] the ttl on cached requests
+    attr_reader :ttl
+
     # @return [ChampionRequest]
     def champion
-      @champion_request ||= ChampionRequest.new(api_key, region)
+      @champion_request ||= ChampionRequest.new(api_key, region, cache_store)
     end
 
     # @return [GameRequest]
     def game
-      @game_request ||= GameRequest.new(api_key, region)
+      @game_request ||= GameRequest.new(api_key, region, cache_store)
     end
 
     # @return [StatsRequest]
     def stats
-      @stats_request ||= StatsRequest.new(api_key, region)
+      @stats_request ||= StatsRequest.new(api_key, region, cache_store)
     end
 
     # @return [LeagueRequest]
     def league
-      @league_request ||= LeagueRequest.new(api_key, region)
+      @league_request ||= LeagueRequest.new(api_key, region, cache_store)
     end
 
     # @return [TeamRequest]
     def team
-      @team_request ||= TeamRequest.new(api_key, region)
+      @team_request ||= TeamRequest.new(api_key, region, cache_store)
     end
 
     # @return [SummonerRequest]
     def summoner
-      @summoner_request ||= SummonerRequest.new(api_key, region)
+      @summoner_request ||= SummonerRequest.new(api_key, region, cache_store)
     end
 
     # @return [StaticRequest]
     def static
-      @static_request ||= StaticRequest.new(api_key, region)
+      @static_request ||= StaticRequest.new(api_key, region, cache_store)
     end
 
     # Initializes a Lol::Client
@@ -52,7 +56,35 @@ module Lol
     def initialize api_key, options = {}
       @api_key = api_key
       @region = options.delete(:region) || "euw"
+      set_up_cache(options.delete(:redis), options.delete(:ttl))
     end
 
+    def set_up_cache(redis_url, ttl)
+      return @cached = false unless redis_url
+
+      @ttl = ttl || 900
+      @cached = true
+      @redis = Redis.new :url => redis_url
+    end
+
+    # Returns an options hash with cache keys
+    # @return [Hash]
+    def cache_store
+      {
+        redis:  @redis,
+        ttl:    @ttl,
+        cached: @cached,
+      }
+    end
+
+    # @return [Boolean] true if requests are cached
+    def cached?
+      @cached
+    end
+
+    # @return [Redis] the cache store (if available)
+    def redis
+      @redis
+    end
   end
 end

data/lib/lol/league_request.rb

@@ -13,5 +13,33 @@ module Lol
       perform_request(api_url("league/by-summoner/#{summoner_id}")).map {|l| League.new l}
     end
 
+    # Retrieves leagues entry data for summoner, including league entries for all of summoner's teams
+    # @param [String]
+    # @return [Array]
+    # TODO: Change name to entries?
+    def get_entries summoner_id
+      perform_request(api_url("league/by-summoner/#{summoner_id}/entry")).map { |e| LeagueEntry.new e }
+    end
+
+    # Retrieves leagues data for team
+    # @param [String]
+    # @return [Array]
+    def by_team team_id
+      perform_request(api_url("league/by-team/#{team_id}")).map { |l| League.new l }
+    end
+
+    # Retrieves leagues entry data for team
+    # @param [String]
+    # @return [Array]
+    # TODO: Change name to?
+    def entries_by_team team_id
+      perform_request(api_url("league/by-team/#{team_id}/entry")).map { |e| LeagueEntry.new e }
+    end
+
+    # Retrieves challenger tier leagues
+    # @return [Array]
+    def challenger
+      perform_request(api_url('league/challenger')).map { |l| League.new l }
+    end
   end
 end

data/lib/lol/request.rb

@@ -1,6 +1,7 @@
 module Lol
   class InvalidAPIResponse < StandardError; end
   class NotFound < StandardError; end
+  class InvalidCacheStore < StandardError; end
 
   # Encapsulates common methods for all requests
   # Request classes inherit from this
@@ -16,6 +17,9 @@ module Lol
     # @return [String] region
     attr_accessor :region
 
+    # @!attribute[r] cache_store
+    # @return [Object] the cache_store
+    attr_reader :cache_store
 
     # Stub method. Each subclass should have its own api version
     # @return [String] api version
@@ -35,17 +39,50 @@ module Lol
     # @param url [String] the url to call
     # @return [String] raw response of the call
     def perform_request url
+      if cached? && result = store.get(url)
+        return result
+      end
+
       response = self.class.get(url)
       raise NotFound.new("404 Not Found") if response.respond_to?(:code) && response.not_found?
       raise InvalidAPIResponse.new(response["status"]["message"]) if response.is_a?(Hash) && response["status"]
 
+      if cached?
+        store.set url, response
+        store.expire url, ttl
+      end
+
       response
     end
 
-    def initialize api_key, region
+    # @return [Redis] returns the cache store
+    def store
+      cache_store[:redis]
+    end
+
+    # @return [Boolean] true if the request should be cached
+    def cached?
+      cache_store[:cached]
+    end
+
+    # @return [Fixnum] the ttl to apply to cached keys
+    def ttl
+      cache_store[:ttl]
+    end
+
+    # Initializes a new Request
+    # @param api_key [String] the Riot Games API key
+    # @param region [String] the region you want to use in API calls
+    # @param cache_store [Hash]
+    # @option cache_store [Redis] :redis Redis instance to use
+    # @option cache_store [Boolean] :cached should the request be cached
+    # @option cacche_store [Fixnum] :ttl ttl for cache keys
+    # @return [Request]
+    def initialize api_key, region, cache_store = {}
+      @cache_store = cache_store
+      raise InvalidCacheStore if cached? && !store.is_a?(Redis)
       @api_key = api_key
       @region = region
     end
-
   end
 end

data/lib/lol/rune_page.rb

@@ -16,13 +16,13 @@ module Lol
     # @!attribute [r] current
     # @return [Array] array of Lol::RuneSlot
     attr_reader :slots
-  end
 
-  private
+    private
 
-  attr_writer :id, :name, :current
+    attr_writer :id, :name, :current
 
-  def slots= *runeslots
-    @slots = runeslots.flatten.map {|slot| RuneSlot.new slot}
+    def slots= *runeslots
+      @slots = runeslots.flatten.map {|slot| RuneSlot.new slot}
+    end
   end
 end

data/lib/lol/static_request.rb

@@ -11,13 +11,13 @@ module Lol
     # @param path [String] API path to call
     # @return [String] full fledged url
     def api_url path, params = {}
-      query_string = URI.encode_www_form params.merge api_key: api_key
-      File.join "http://prod.api.pvp.net/api/lol/static-data/#{region}/#{self.class.api_version}/", "#{path}?#{query_string}"
+      super(path,params).gsub(/api\/lol/, "api/lol/static-data")
     end
 
     STANDARD_ENDPOINTS.each do |endpoint|
       define_method(endpoint) { Proxy.new self, endpoint }
     end
+
     def realm
       Proxy.new self, 'realm'
     end

data/lib/lol/team_request.rb

@@ -13,5 +13,12 @@ module Lol
         Team.new team_data
       end
     end
+
+    # Retrieves the Teams for the given Team ID
+    # @return [Team]
+    def getbyid team_id
+      result = perform_request(api_url "team/#{team_id}")
+      Team.new result[team_id]
+    end
   end
 end

data/lib/lol/version.rb

@@ -1,3 +1,3 @@
 module Lol
-  VERSION = "0.9.10"
+  VERSION = "0.9.11"
 end

data/ruby-lol.gemspec

@@ -35,4 +35,5 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "httparty"
   spec.add_runtime_dependency "activesupport"
+  spec.add_runtime_dependency "redis"
 end

data/spec/api_version_spec.rb

@@ -19,4 +19,5 @@ describe "API Versions" do
   check_api_version(StatsRequest, "v1.2")
   check_api_version(SummonerRequest, "v1.3")
   check_api_version(TeamRequest, "v2.2")
+  check_api_version(StaticRequest, "v1")
 end

data/spec/fixtures/v2.2/getbyid-team.json

@@ -0,0 +1,286 @@
+{
+  "TEAM-c80824c9-c568-42de-bdbb-271543b209e1": {
+      "fullId" : "TEAM-c80824c9-c568-42de-bdbb-271543b209e1",
+      "name" : "Digimon Tamers",
+      "tag" : "TagMon",
+      "status" : "RANKED",
+      "teamStatSummary" : {
+        "fullId" : "TEAM-c80824c9-c568-42de-bdbb-271543b209e1",
+        "teamStatDetails" : [ {
+          "fullId" : "TEAM-c80824c9-c568-42de-bdbb-271543b209e1",
+          "teamStatType" : "RANKED_TEAM_3x3",
+          "wins" : 0,
+          "losses" : 0,
+          "averageGamesPlayed" : 0
+        }, {
+          "fullId" : "TEAM-c80824c9-c568-42de-bdbb-271543b209e1",
+          "teamStatType" : "RANKED_TEAM_5x5",
+          "wins" : 0,
+          "losses" : 0,
+          "averageGamesPlayed" : 0
+        } ]
+      },
+      "roster" : {
+        "ownerId" : 592670,
+        "memberList" : [ {
+          "playerId" : 592670,
+          "joinDate" : 1331623605000,
+          "inviteDate" : 1331623605000,
+          "status" : "MEMBER"
+        }, {
+          "playerId" : 580668,
+          "joinDate" : 1331623681000,
+          "inviteDate" : 1331623677000,
+          "status" : "MEMBER"
+        }, {
+          "playerId" : 19782302,
+          "joinDate" : 1331625157000,
+          "inviteDate" : 1331624042000,
+          "status" : "MEMBER"
+        }, {
+          "playerId" : 5908,
+          "joinDate" : 1331679340000,
+          "inviteDate" : 1331679337000,
+          "status" : "MEMBER"
+        }, {
+          "playerId" : 20453497,
+          "joinDate" : 1351309208000,
+          "inviteDate" : 1351309203000,
+          "status" : "MEMBER"
+        }, {
+          "playerId" : 20453514,
+          "joinDate" : 1352095946000,
+          "inviteDate" : 1352095943000,
+          "status" : "MEMBER"
+        } ]
+      },
+      "matchHistory" : [ {
+        "kills" : 12,
+        "deaths" : 31,
+        "opposingTeamKills" : 31,
+        "assists" : 19,
+        "gameMode" : "CLASSIC",
+        "opposingTeamName" : "Frenetic Array",
+        "win" : false,
+        "invalid" : false,
+        "mapId" : 1,
+        "gameId" : 576575490
+      }, {
+        "kills" : 25,
+        "deaths" : 15,
+        "opposingTeamKills" : 15,
+        "assists" : 53,
+        "gameMode" : "CLASSIC",
+        "opposingTeamName" : "Frenetic Array",
+        "win" : true,
+        "invalid" : false,
+        "mapId" : 1,
+        "gameId" : 576566324
+      }, {
+        "kills" : 15,
+        "deaths" : 8,
+        "opposingTeamKills" : 7,
+        "assists" : 27,
+        "gameMode" : "CLASSIC",
+        "opposingTeamName" : "Team Stacked",
+        "win" : true,
+        "invalid" : false,
+        "mapId" : 1,
+        "gameId" : 576536749
+      }, {
+        "kills" : 15,
+        "deaths" : 18,
+        "opposingTeamKills" : 18,
+        "assists" : 32,
+        "gameMode" : "CLASSIC",
+        "opposingTeamName" : "Team Mundane",
+        "win" : true,
+        "invalid" : false,
+        "mapId" : 1,
+        "gameId" : 576511761
+      }, {
+        "kills" : 12,
+        "deaths" : 21,
+        "opposingTeamKills" : 21,
+        "assists" : 28,
+        "gameMode" : "CLASSIC",
+        "opposingTeamName" : "Curse Gaming",
+        "win" : false,
+        "invalid" : false,
+        "mapId" : 1,
+        "gameId" : 576486880
+      }, {
+        "kills" : 35,
+        "deaths" : 25,
+        "opposingTeamKills" : 25,
+        "assists" : 81,
+        "gameMode" : "CLASSIC",
+        "opposingTeamName" : "Team Mundane",
+        "win" : true,
+        "invalid" : false,
+        "mapId" : 1,
+        "gameId" : 576438411
+      }, {
+        "kills" : 30,
+        "deaths" : 31,
+        "opposingTeamKills" : 31,
+        "assists" : 70,
+        "gameMode" : "CLASSIC",
+        "opposingTeamName" : "In Lucky We Trust",
+        "win" : true,
+        "invalid" : false,
+        "mapId" : 1,
+        "gameId" : 576354607
+      }, {
+        "kills" : 17,
+        "deaths" : 6,
+        "opposingTeamKills" : 6,
+        "assists" : 28,
+        "gameMode" : "CLASSIC",
+        "opposingTeamName" : "TicoGamers CR",
+        "win" : true,
+        "invalid" : false,
+        "mapId" : 1,
+        "gameId" : 576326147
+      }, {
+        "kills" : 26,
+        "deaths" : 14,
+        "opposingTeamKills" : 14,
+        "assists" : 70,
+        "gameMode" : "CLASSIC",
+        "opposingTeamName" : "The Blinters 5",
+        "win" : true,
+        "invalid" : false,
+        "mapId" : 1,
+        "gameId" : 576266814
+      }, {
+        "kills" : 15,
+        "deaths" : 26,
+        "opposingTeamKills" : 26,
+        "assists" : 28,
+        "gameMode" : "CLASSIC",
+        "opposingTeamName" : "We Da Bes",
+        "win" : false,
+        "invalid" : false,
+        "mapId" : 1,
+        "gameId" : 576041138
+      }, {
+        "kills" : 22,
+        "deaths" : 33,
+        "opposingTeamKills" : 33,
+        "assists" : 48,
+        "gameMode" : "CLASSIC",
+        "opposingTeamName" : "From Coal to Diamond",
+        "win" : false,
+        "invalid" : false,
+        "mapId" : 1,
+        "gameId" : 575986771
+      }, {
+        "kills" : 23,
+        "deaths" : 7,
+        "opposingTeamKills" : 7,
+        "assists" : 45,
+        "gameMode" : "CLASSIC",
+        "opposingTeamName" : "No Fuking Around Okay",
+        "win" : true,
+        "invalid" : false,
+        "mapId" : 1,
+        "gameId" : 575961469
+      }, {
+        "kills" : 20,
+        "deaths" : 10,
+        "opposingTeamKills" : 10,
+        "assists" : 29,
+        "gameMode" : "CLASSIC",
+        "opposingTeamName" : "Tube88",
+        "win" : true,
+        "invalid" : false,
+        "mapId" : 1,
+        "gameId" : 575905727
+      }, {
+        "kills" : 21,
+        "deaths" : 11,
+        "opposingTeamKills" : 11,
+        "assists" : 37,
+        "gameMode" : "CLASSIC",
+        "opposingTeamName" : "Resonate",
+        "win" : true,
+        "invalid" : false,
+        "mapId" : 1,
+        "gameId" : 575441369
+      }, {
+        "kills" : 13,
+        "deaths" : 24,
+        "opposingTeamKills" : 24,
+        "assists" : 27,
+        "gameMode" : "CLASSIC",
+        "opposingTeamName" : "Nobody Important Died",
+        "win" : false,
+        "invalid" : false,
+        "mapId" : 1,
+        "gameId" : 575390058
+      }, {
+        "kills" : 33,
+        "deaths" : 14,
+        "opposingTeamKills" : 14,
+        "assists" : 49,
+        "gameMode" : "CLASSIC",
+        "opposingTeamName" : "DIAMON FIVES PLS",
+        "win" : true,
+        "invalid" : false,
+        "mapId" : 1,
+        "gameId" : 575349088
+      }, {
+        "kills" : 16,
+        "deaths" : 5,
+        "opposingTeamKills" : 5,
+        "assists" : 20,
+        "gameMode" : "CLASSIC",
+        "opposingTeamName" : "Cute Asian Girls",
+        "win" : true,
+        "invalid" : false,
+        "mapId" : 1,
+        "gameId" : 340801031
+      }, {
+        "kills" : 4,
+        "deaths" : 19,
+        "opposingTeamKills" : 18,
+        "assists" : 12,
+        "gameMode" : "CLASSIC",
+        "opposingTeamName" : "HeIIo Kitty",
+        "win" : false,
+        "invalid" : false,
+        "mapId" : 1,
+        "gameId" : 340775336
+      }, {
+        "kills" : 24,
+        "deaths" : 7,
+        "opposingTeamKills" : 7,
+        "assists" : 56,
+        "gameMode" : "CLASSIC",
+        "opposingTeamName" : "Fluid Mechanics",
+        "win" : true,
+        "invalid" : false,
+        "mapId" : 1,
+        "gameId" : 340760658
+      }, {
+        "kills" : 33,
+        "deaths" : 21,
+        "opposingTeamKills" : 21,
+        "assists" : 89,
+        "gameMode" : "CLASSIC",
+        "opposingTeamName" : "Xerox Tryout",
+        "win" : true,
+        "invalid" : false,
+        "mapId" : 1,
+        "gameId" : 340678263
+      } ],
+      "createDate" : 1331623605000,
+      "modifyDate" : 1357872802000,
+      "lastJoinDate" : 1352095978000,
+      "secondLastJoinDate" : 1352095946000,
+      "thirdLastJoinDate" : 1351309219000,
+      "lastGameDate" : 1352190417000,
+      "lastJoinedRankedTeamQueueDate" : 1352188085000
+    }
+}

data/spec/lol/client_spec.rb

@@ -18,8 +18,45 @@ describe Client do
     it "defaults on EUW as a region" do
       expect(subject.region).to eq("euw")
     end
+
+    it "sets caching if redis is specified in the options" do
+      client = Client.new "foo", redis: "redis://dummy-url"
+      expect(client.cached?).to be_true
+    end
+
+    it "sets a default ttl of 15 * 60s" do
+      client = Client.new "foo", redis: "redis://dummy-url"
+      expect(client.ttl).to eq(15*60)
+    end
+
+    it "accepts a custom ttl" do
+      client = Client.new "foo", redis: "redis://dummy-url", ttl: 10
+      expect(client.ttl).to eq(10)
+    end
+
+    it "instantiates a redis client if redis is in the options" do
+      client = Client.new "foo", redis: "redis://localhost:6379"
+      expect(client.instance_variable_get(:@redis)).to be_a(Redis)
+    end
+
+    it "passes the redis_store to the request" do
+      client = Client.new "foo", redis: "redis://localhost:6379"
+      champion_request = client.champion
+      expect(champion_request.cache_store).to eq(client.cache_store)
+    end
   end
 
+  describe "#cached?" do
+    it "is true if @cached is true" do
+      subject.instance_variable_set(:@cached, true)
+      expect(subject.cached?).to be_true
+    end
+
+    it "is false if @cached is false" do
+      subject.instance_variable_set(:@cached, false)
+      expect(subject.cached?).to be_false
+    end
+  end
 
   describe "#champion" do
     it "returns an instance of ChampionRequest" do
@@ -27,7 +64,7 @@ describe Client do
     end
 
     it "initializes the ChampionRequest with the current API key and region" do
-      expect(ChampionRequest).to receive(:new).with(subject.api_key, subject.region)
+      expect(ChampionRequest).to receive(:new).with(subject.api_key, subject.region, subject.cache_store)
 
       subject.champion
     end
@@ -39,7 +76,7 @@ describe Client do
     end
 
     it "initializes the GameRequest with the current API key and region" do
-      expect(GameRequest).to receive(:new).with(subject.api_key, subject.region)
+      expect(GameRequest).to receive(:new).with(subject.api_key, subject.region, subject.cache_store)
 
       subject.game
     end
@@ -51,7 +88,7 @@ describe Client do
     end
 
     it "initializes the StatsRequest with the current API key and region" do
-      expect(StatsRequest).to receive(:new).with(subject.api_key, subject.region)
+      expect(StatsRequest).to receive(:new).with(subject.api_key, subject.region, subject.cache_store)
 
       subject.stats
     end
@@ -63,7 +100,7 @@ describe Client do
     end
 
     it "initializes the TeamRequest with the current API key and region" do
-      expect(TeamRequest).to receive(:new).with(subject.api_key, subject.region)
+      expect(TeamRequest).to receive(:new).with(subject.api_key, subject.region, subject.cache_store)
 
       subject.team
     end
@@ -75,7 +112,7 @@ describe Client do
     end
 
     it "initializes the LeagueRequest with the current API key and region" do
-      expect(LeagueRequest).to receive(:new).with(subject.api_key, subject.region)
+      expect(LeagueRequest).to receive(:new).with(subject.api_key, subject.region, subject.cache_store)
 
       subject.league
     end
@@ -87,7 +124,7 @@ describe Client do
     end
 
     it "initializes the SummonerRequest with the current API key and region" do
-      expect(SummonerRequest).to receive(:new).with(subject.api_key, subject.region)
+      expect(SummonerRequest).to receive(:new).with(subject.api_key, subject.region, subject.cache_store)
 
       subject.summoner
     end
@@ -99,7 +136,7 @@ describe Client do
     end
 
     it "initializes the StaticRequest with the current API key and region" do
-      expect(StaticRequest).to receive(:new).with(subject.api_key, subject.region)
+      expect(StaticRequest).to receive(:new).with(subject.api_key, subject.region, subject.cache_store)
 
       subject.static
     end

data/spec/lol/request_spec.rb

@@ -16,6 +16,16 @@ describe Request do
     it "correctly sets api key" do
       expect(ChampionRequest.new("api_key", "euw").api_key).to eq("api_key")
     end
+
+    it "sets the cache store" do
+      redis_store = Redis.new
+      c = ChampionRequest.new("api_key", "euw", redis_store)
+      expect(c.cache_store).to eq(redis_store)
+    end
+
+    it "returns an error if the cache store is not supported" do
+      expect { ChampionRequest.new "api_key", "euw", {cached: true, redis: "FOO"}}.to raise_error(InvalidCacheStore)
+    end
   end
 
   subject { Request.new "api_key", "euw"}
@@ -40,6 +50,36 @@ describe Request do
       expect(subject.class).to receive(:get).and_return(error401)
       expect { subject.perform_request "foo"}.to raise_error(NotFound)
     end
+
+    it "is cached" do
+      class FakeRedis < Redis
+        def initialize options = {}
+          @store = {}
+        end
+
+        def get key
+          @store[key]
+        end
+
+        def set key, val
+          @store[key] = val
+        end
+
+        def expire key, ttl
+          @store["#{key}:ttl"] = ttl
+        end
+      end
+
+      fake_redis = FakeRedis.new
+      request = Request.new "api_key", "euw", {redis: fake_redis, ttl: 60, cached: true}
+      expect(request.class).to receive(:get).with("/foo").and_return("foo")
+      first_result = request.perform_request "/foo"
+
+      expect(request.class).not_to receive(:get)
+      request.perform_request "/foo"
+
+      expect(fake_redis.get("/foo:ttl")).to eq(60)
+    end
   end
 
   describe "api_url" do

data/spec/lol/team_request_spec.rb

@@ -36,4 +36,26 @@ describe TeamRequest do
     end
   end
 
+  describe "getbyid" do
+    let(:request) { TeamRequest.new "api_key", "euw" }
+    let(:fixture) { load_fixture 'team', TeamRequest.api_version, 'getbyid' }
+
+    subject do
+      expect(request.class).to receive(:get).with(request.api_url("team/TEAM-c80824c9-c568-42de-bdbb-271543b209e1")).and_return fixture
+      request.getbyid "TEAM-c80824c9-c568-42de-bdbb-271543b209e1"
+    end
+
+    it 'requires a summoner' do
+      expect { request.getbyid }.to raise_error ArgumentError
+    end
+
+    it 'returns a Team' do
+      expect(subject).to be_a Lol::Team
+    end
+
+    it 'fetches Team from the API' do
+      expect(subject.full_id).to eq "TEAM-c80824c9-c568-42de-bdbb-271543b209e1"
+    end
+  end
+
 end

metadata

@@ -1,243 +1,257 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lol
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - Giovanni Intini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ZenTest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: autotest-growl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: autotest-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby wrapper to Riot Games API. Maps results to full blown ruby objects.
@@ -247,10 +261,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .autotest
-- .gitignore
-- .rspec
-- .travis.yml
+- ".autotest"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -315,6 +329,7 @@ files:
 - spec/fixtures/v1/get-summoner-spell-by-id.json
 - spec/fixtures/v1/get-summoner-spell.json
 - spec/fixtures/v2.2/get-team.json
+- spec/fixtures/v2.2/getbyid-team.json
 - spec/fixtures/v2.3/get-league.json
 - spec/lol/champion_request_spec.rb
 - spec/lol/champion_spec.rb
@@ -358,17 +373,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper to Riot Games API
@@ -396,6 +411,7 @@ test_files:
 - spec/fixtures/v1/get-summoner-spell-by-id.json
 - spec/fixtures/v1/get-summoner-spell.json
 - spec/fixtures/v2.2/get-team.json
+- spec/fixtures/v2.2/getbyid-team.json
 - spec/fixtures/v2.3/get-league.json
 - spec/lol/champion_request_spec.rb
 - spec/lol/champion_spec.rb