ruby-lol 0.9.11 → 0.9.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f96a74077c549229c2719763486c3bcd9bd8da25
-  data.tar.gz: 32f1aeb7a7aed7c6e0bab87f3ffeb23d286473e2
+  metadata.gz: b41e63342b89011c396472e3fbb587e38330d193
+  data.tar.gz: 7ae6f9ce17f6ca158dd64e5846f74754158db8a2
 SHA512:
-  metadata.gz: 4623f57302ba2cd3faf1620d138397cceaa81217713c57d0319f1298e31f752ae7ff2b4da124adf154ba73f6061b873bfd952e3e877dd79a98ee750fb62599c1
-  data.tar.gz: af511b335a6fe0412e53e1bc2939cdbbdd9fb8917dddc0f1717fd3b4031b1e0611d8f9c3f938a3bc7b2ea65428aec3b71c5cacdedb93dc1a37d454646ca22d62
+  metadata.gz: ab7f044aa9d234d80b24dd53fdb0d59d4fe2fdc9aeb681034086b010364535084538ef95162d31c288028dbd7694da9d5f749bbf41e9ef15048996073ca817f1
+  data.tar.gz: 181b8ecd33721fc0ed9b32621a185357d1fe6b7a5c2cc29b92002eec29f9772d8e8d84dc47550f636f1cb560287df637ee39e5fd1608fb6f23791e97b340748f

data/.travis.yml

@@ -1,4 +1,5 @@
 rvm: 2.0.0
+services: redis-server
 addons:
     code_climate:
-        repo_token: c98576197ae22bdd3bede9cd3cdfdad33fac26bfdddb1e5f2bbc4fb535812185
+        repo_token: c98576197ae22bdd3bede9cd3cdfdad33fac26bfdddb1e5f2bbc4fb535812185

data/demo/demo.rb

@@ -6,11 +6,9 @@ require "lol"
 
 include Lol
 
-client = Client.new "18b7c486-0d5a-459f-9d60-cf8776b154c6"
-intinig = client.summoner.by_name "intinig"
+client = Client.new ENV["RIOT_GAMES_API_KEY"], region: "euw", redis: "redis://localhost:6379"
+intinig = client.summoner.by_name("intinig").first
 leagues = client.league.get intinig.id
-my_league = leagues.first
-
-my_league.entries.select {|entry| entry.player_or_team_name == "intinig"}.each do |entry|
-  ap entry
+leagues.map(&:entries).each do |league_entry|
+  ap league_entry
 end

data/lib/lol/request.rb

@@ -40,7 +40,7 @@ module Lol
     # @return [String] raw response of the call
     def perform_request url
       if cached? && result = store.get(url)
-        return result
+        return JSON.parse(result)
       end
 
       response = self.class.get(url)
@@ -48,7 +48,7 @@ module Lol
       raise InvalidAPIResponse.new(response["status"]["message"]) if response.is_a?(Hash) && response["status"]
 
       if cached?
-        store.set url, response
+        store.set url, response.to_json
         store.expire url, ttl
       end
 

data/lib/lol/version.rb

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

data/spec/lol/request_spec.rb

@@ -51,56 +51,70 @@ describe Request do
       expect { subject.perform_request "foo"}.to raise_error(NotFound)
     end
 
-    it "is cached" do
-      class FakeRedis < Redis
-        def initialize options = {}
-          @store = {}
+    context "caching" do
+      before :all 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
+      end
 
-        def get key
-          @store[key]
-        end
+      let(:fake_redis) { FakeRedis.new }
+      let(:request) { Request.new "api_key", "euw", {redis: fake_redis, ttl: 60, cached: true }}
+      before :each do
+        expect(request.class).to receive(:get).with("/foo").and_return({foo: "bar"})
+        first_result = request.perform_request "/foo"
+      end
 
-        def set key, val
-          @store[key] = val
-        end
+      it "is cached" do
+        expect(request.class).not_to receive(:get)
+        request.perform_request "/foo"
 
-        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"
+      it "serializes cached responses" do
+        expect(JSON).to receive(:parse)
+        request.perform_request "/foo"
+      end
 
-      expect(fake_redis.get("/foo:ttl")).to eq(60)
+      it "sets ttl" do
+        expect(fake_redis.get("/foo:ttl")).to eq(60)
+      end
     end
   end
 
-  describe "api_url" do
-    it "defaults on Request#region" do
-      expect(subject.api_url("bar")).to match(/\/euw\//)
-    end
+    describe "api_url" do
+      it "defaults on Request#region" do
+        expect(subject.api_url("bar")).to match(/\/euw\//)
+      end
 
-    it "defaults on Reques.api_version" do
-      expect(subject.api_url("bar")).to match(/\/v1.1\//)
-    end
+      it "defaults on Reques.api_version" do
+        expect(subject.api_url("bar")).to match(/\/v1.1\//)
+      end
 
-    it "a path" do
-      expect { subject.api_url }.to raise_error(ArgumentError)
-    end
+      it "a path" do
+        expect { subject.api_url }.to raise_error(ArgumentError)
+      end
 
-    it "returns a full fledged api url" do
-      expect(subject.api_url("bar")).to eq("http://prod.api.pvp.net/api/lol/euw/v1.1/bar?api_key=api_key")
-    end
+      it "returns a full fledged api url" do
+        expect(subject.api_url("bar")).to eq("http://prod.api.pvp.net/api/lol/euw/v1.1/bar?api_key=api_key")
+      end
 
-    it "optionally accept query string parameters" do
-      expect(subject.api_url("foo", a: 'b')).to eq("http://prod.api.pvp.net/api/lol/euw/v1.1/foo?a=b&api_key=api_key")
+      it "optionally accept query string parameters" do
+        expect(subject.api_url("foo", a: 'b')).to eq("http://prod.api.pvp.net/api/lol/euw/v1.1/foo?a=b&api_key=api_key")
+      end
     end
   end
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lol
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 0.9.12
 platform: ruby
 authors:
 - Giovanni Intini