ruby-lol 0.9.12 → 0.9.13

data/spec/fixtures/v1.4/get-summoner.json

@@ -0,0 +1 @@
+{"30743211":{"id":30743211,"name":"intinig","profileIconId":616,"summonerLevel":30,"revisionDate":1396368924000}}

data/spec/lol/champion_request_spec.rb

@@ -11,22 +11,39 @@ describe ChampionRequest do
   describe "get" do
     let(:request) { ChampionRequest.new "api_key", "euw" }
 
-    subject do
-      expect(request).to receive(:perform_request).with(request.api_url("champion")).and_return(load_fixture("champion", ChampionRequest.api_version, "get"))
+    context "specifying an id" do
+      subject do
+        expect(request).to receive(:perform_request).with(request.api_url("champion/266", "freeToPlay" => false)).and_return(load_fixture("champion-266", ChampionRequest.api_version, "get"))
 
-      request.get
-    end
+        request.get :id => 266
+      end
 
-    it "returns an array" do
-      expect(subject).to be_a(Array)
+      it "returns a champion" do
+        expect(subject).to be_a(Champion)
+      end
     end
 
-    it "returns an array of champions" do
-      expect(subject.map {|e| e.class}.uniq).to eq([Champion])
-    end
+    context "getting all" do
+      subject do
+        expect(request).to receive(:perform_request).with(request.api_url("champion", "freeToPlay" => false)).and_return(load_fixture("champion", ChampionRequest.api_version, "get"))
+
+        request.get
+      end
+
+      it "returns an array" do
+        expect(subject).to be_a(Array)
+      end
+
+      it "returns an array of champions" do
+        expect(subject.map {|e| e.class}.uniq).to eq([Champion])
+      end
+
+      it "fetches champions from the API" do
+        expect(subject.size).to eq(load_fixture("champion", ChampionRequest.api_version, "get")["champions"].size)
+      end
 
-    it "fetches champions from the API" do
-      expect(subject.size).to eq(load_fixture("champion", ChampionRequest.api_version, "get")["champions"].size)
     end
+
+
   end
 end

data/spec/lol/champion_spec.rb

@@ -8,7 +8,7 @@ describe Champion do
     let(:valid_attributes) { { id: 1 } }
   end
 
-  %w(id name active attack_rank defense_rank magic_rank difficulty_rank bot_enabled free_to_play bot_mm_enabled ranked_play_enabled).each do |attribute|
+  %w(id active bot_enabled free_to_play bot_mm_enabled ranked_play_enabled).each do |attribute|
     describe "#{attribute} attribute" do
       it_behaves_like 'plain attribute' do
         let(:attribute) { attribute }

data/spec/lol/client_spec.rb

@@ -19,30 +19,31 @@ describe Client 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)
+    context "caching" do
+      let(:client) { Client.new "foo", redis: "redis://dummy-url" }
+      let(:real_redis) { Client.new "foo", redis: "redis://localhost:6379" }
+
+      it "sets caching if redis is specified in the options" do
+        expect(client.cached?).to be_true
+      end
+
+      it "sets a default ttl of 15 * 60s" do
+        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
+        expect(real_redis.instance_variable_get(:@redis)).to be_a(Redis)
+      end
+
+      it "passes the redis_store to the request" do
+        champion_request = real_redis.champion
+        expect(champion_request.cache_store).to eq(real_redis.cache_store)
+      end
     end
   end
 

data/spec/lol/game_spec.rb

@@ -8,7 +8,7 @@ describe Game do
     let(:valid_attributes) { { game_id: 1 } }
   end
 
-  %w(champion_id game_id game_mode game_type invalid level map_id spell1 spell2 sub_type team_id).each do |attribute|
+  %w(champion_id game_id game_mode game_type invalid ip_earned level map_id spell1 spell2 sub_type team_id).each do |attribute|
     describe "#{attribute} attribute" do
       it_behaves_like 'plain attribute' do
         let(:attribute) { attribute }

data/spec/lol/mastery_page_spec.rb

@@ -15,14 +15,14 @@ describe MasteryPage do
     end
   end
 
-  describe "#talents" do
-    let(:fixture) { load_fixture("summoner-masteries", "v1.3", "get") }
-    let(:talents) { fixture["30743211"]["pages"].first["talents"] }
+  describe "#masteries" do
+    let(:fixture) { load_fixture("summoner-masteries", SummonerRequest.api_version, "get") }
+    let(:masteries) { fixture["30743211"]["pages"].first["masteries"] }
 
     subject { MasteryPage.new fixture["30743211"]["pages"].first }
 
     it "is populated by talents" do
-      expect(subject.talents.size).to eq(talents.size)
+      expect(subject.masteries.size).to eq(masteries.size)
     end
   end
 

data/spec/lol/{talent_spec.rb → mastery_spec.rb}

@@ -3,12 +3,12 @@ require "lol"
 
 include Lol
 
-describe Talent do
+describe Mastery do
   it_behaves_like 'Lol model' do
     let(:valid_attributes) { { id: 1 } }
   end
 
-  %w(id name rank).each do |attribute|
+  %w(id rank).each do |attribute|
     it_behaves_like "plain attribute" do
       let(:attribute) { attribute }
       let(:attribute_value) { "asd" }

data/spec/lol/model_spec.rb

@@ -5,7 +5,7 @@ include Lol
 
 describe Model do
   describe "#inspect" do
-    subject { Champion.new "name" => 'intinig' }
+    subject { Champion.new "id" => 212 }
     it "skips @raw" do
       expect(subject.inspect).not_to match(/@raw/)
     end

data/spec/lol/request_spec.rb

@@ -75,7 +75,7 @@ describe Request do
       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"})
+        expect(request.class).to receive(:get).with("/foo").and_return({foo: "bar"}).at_least(:once)
         first_result = request.perform_request "/foo"
       end
 
@@ -93,6 +93,11 @@ describe Request do
       it "sets ttl" do
         expect(fake_redis.get("/foo:ttl")).to eq(60)
       end
+
+      it "uses clean urls" do
+        expect(request).to receive(:clean_url).at_least(:once)
+        request.perform_request "/foo"
+      end
     end
   end
 

data/spec/lol/rune_page_spec.rb

@@ -16,7 +16,7 @@ describe RunePage do
   end
 
   describe "#slots" do
-    let(:fixture) { load_fixture("summoner-runes", "v1.3", "get") }
+    let(:fixture) { load_fixture("summoner-runes", SummonerRequest.api_version, "get") }
     let(:slots) { fixture["30743211"]["pages"].first["slots"] }
 
     subject { RunePage.new fixture["30743211"]["pages"].first }

data/spec/lol/rune_slot_spec.rb

@@ -13,14 +13,4 @@ describe RuneSlot do
     let(:attribute_value) { "asd" }
   end
 
-  describe "#rune" do
-    let(:fixture) { load_fixture("summoner-runes", "v1.3", "get") }
-    let(:rune) { fixture["30743211"]["pages"].first["slots"].first["rune"] }
-
-    subject { RuneSlot.new fixture["30743211"]["pages"].first["slots"].first }
-
-    it "is a Rune object" do
-      expect(subject.rune).to be_a(Rune)
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lol
 version: !ruby/object:Gem::Version
-  version: 0.9.12
+  version: 0.9.13
 platform: ruby
 authors:
 - Giovanni Intini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-29 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -283,6 +283,7 @@ files:
 - lib/lol/league.rb
 - lib/lol/league_entry.rb
 - lib/lol/league_request.rb
+- lib/lol/mastery.rb
 - lib/lol/mastery_page.rb
 - lib/lol/match_summary.rb
 - lib/lol/mini_series.rb
@@ -292,14 +293,12 @@ files:
 - lib/lol/ranked_statistics_summary.rb
 - lib/lol/request.rb
 - lib/lol/roster.rb
-- lib/lol/rune.rb
 - lib/lol/rune_page.rb
 - lib/lol/rune_slot.rb
 - lib/lol/static_request.rb
 - lib/lol/stats_request.rb
 - lib/lol/summoner.rb
 - lib/lol/summoner_request.rb
-- lib/lol/talent.rb
 - lib/lol/team.rb
 - lib/lol/team_member.rb
 - lib/lol/team_request.rb
@@ -309,14 +308,23 @@ files:
 - spec/acceptance_spec.rb
 - spec/api_version_spec.rb
 - spec/fixtures/v1.1/get-champion.json
+- spec/fixtures/v1.2/get-champion-266.json
+- spec/fixtures/v1.2/get-champion.json
 - spec/fixtures/v1.2/get-ranked_stats.json
 - spec/fixtures/v1.2/get-stats.json
 - spec/fixtures/v1.3/get-game.json
+- spec/fixtures/v1.3/get-ranked_stats.json
+- spec/fixtures/v1.3/get-stats.json
 - spec/fixtures/v1.3/get-summoner-by-name.json
 - spec/fixtures/v1.3/get-summoner-masteries.json
 - spec/fixtures/v1.3/get-summoner-name.json
 - spec/fixtures/v1.3/get-summoner-runes.json
 - spec/fixtures/v1.3/get-summoner.json
+- spec/fixtures/v1.4/get-summoner-by-name.json
+- spec/fixtures/v1.4/get-summoner-masteries.json
+- spec/fixtures/v1.4/get-summoner-name.json
+- spec/fixtures/v1.4/get-summoner-runes.json
+- spec/fixtures/v1.4/get-summoner.json
 - spec/fixtures/v1/get-champion-by-id.json
 - spec/fixtures/v1/get-champion.json
 - spec/fixtures/v1/get-item-by-id.json
@@ -341,6 +349,7 @@ files:
 - spec/lol/league_request_spec.rb
 - spec/lol/league_spec.rb
 - spec/lol/mastery_page_spec.rb
+- spec/lol/mastery_spec.rb
 - spec/lol/match_summary_spec.rb
 - spec/lol/mini_series_spec.rb
 - spec/lol/model_spec.rb
@@ -351,12 +360,10 @@ files:
 - spec/lol/roster_spec.rb
 - spec/lol/rune_page_spec.rb
 - spec/lol/rune_slot_spec.rb
-- spec/lol/rune_spec.rb
 - spec/lol/static_request_spec.rb
 - spec/lol/stats_request_spec.rb
 - spec/lol/summoner_request_spec.rb
 - spec/lol/summoner_spec.rb
-- spec/lol/talent_spec.rb
 - spec/lol/team_member_spec.rb
 - spec/lol/team_request_spec.rb
 - spec/lol/team_spec.rb
@@ -391,14 +398,23 @@ test_files:
 - spec/acceptance_spec.rb
 - spec/api_version_spec.rb
 - spec/fixtures/v1.1/get-champion.json
+- spec/fixtures/v1.2/get-champion-266.json
+- spec/fixtures/v1.2/get-champion.json
 - spec/fixtures/v1.2/get-ranked_stats.json
 - spec/fixtures/v1.2/get-stats.json
 - spec/fixtures/v1.3/get-game.json
+- spec/fixtures/v1.3/get-ranked_stats.json
+- spec/fixtures/v1.3/get-stats.json
 - spec/fixtures/v1.3/get-summoner-by-name.json
 - spec/fixtures/v1.3/get-summoner-masteries.json
 - spec/fixtures/v1.3/get-summoner-name.json
 - spec/fixtures/v1.3/get-summoner-runes.json
 - spec/fixtures/v1.3/get-summoner.json
+- spec/fixtures/v1.4/get-summoner-by-name.json
+- spec/fixtures/v1.4/get-summoner-masteries.json
+- spec/fixtures/v1.4/get-summoner-name.json
+- spec/fixtures/v1.4/get-summoner-runes.json
+- spec/fixtures/v1.4/get-summoner.json
 - spec/fixtures/v1/get-champion-by-id.json
 - spec/fixtures/v1/get-champion.json
 - spec/fixtures/v1/get-item-by-id.json
@@ -423,6 +439,7 @@ test_files:
 - spec/lol/league_request_spec.rb
 - spec/lol/league_spec.rb
 - spec/lol/mastery_page_spec.rb
+- spec/lol/mastery_spec.rb
 - spec/lol/match_summary_spec.rb
 - spec/lol/mini_series_spec.rb
 - spec/lol/model_spec.rb
@@ -433,12 +450,10 @@ test_files:
 - spec/lol/roster_spec.rb
 - spec/lol/rune_page_spec.rb
 - spec/lol/rune_slot_spec.rb
-- spec/lol/rune_spec.rb
 - spec/lol/static_request_spec.rb
 - spec/lol/stats_request_spec.rb
 - spec/lol/summoner_request_spec.rb
 - spec/lol/summoner_spec.rb
-- spec/lol/talent_spec.rb
 - spec/lol/team_member_spec.rb
 - spec/lol/team_request_spec.rb
 - spec/lol/team_spec.rb

data/lib/lol/rune.rb

@@ -1,23 +0,0 @@
-module Lol
-  class Rune < Model
-    # @!attribute [r] id
-    # @return [Fixnum] Rune id
-    attr_reader :id
-
-    # @!attribute [r] name
-    # @return [String] Rune name
-    attr_reader :name
-
-    # @!attribute [r] description
-    # @return [String] Rune description
-    attr_reader :description
-
-    # @!attribute [r] tier
-    # @return [Fixnum] Rune tier
-    attr_reader :tier
-
-    private
-
-    attr_writer :id, :name, :description, :tier
-  end
-end

data/spec/lol/rune_spec.rb

@@ -1,17 +0,0 @@
-require "spec_helper"
-require "lol"
-
-include Lol
-
-describe Rune do
-  it_behaves_like 'Lol model' do
-    let(:valid_attributes) { { id: 1 } }
-  end
-
-  %w(id name description tier).each do |attribute|
-    it_behaves_like "plain attribute" do
-      let(:attribute) { attribute }
-      let(:attribute_value) { "asd" }
-    end
-  end
-end