ruby-lol 0.9.1 → 0.9.3

data/spec/lol/champion_request_spec.rb

@@ -12,7 +12,7 @@ describe ChampionRequest do
     let(:request) { ChampionRequest.new "api_key", "euw" }
 
     subject do
-      expect(request).to receive(:perform_request).with(request.api_url("v1.1", "champion")).and_return(load_fixture("champion", "v1.1", "get"))
+      expect(request).to receive(:perform_request).with(request.api_url("champion")).and_return(load_fixture("champion", ChampionRequest.api_version, "get"))
 
       request.get
     end
@@ -26,7 +26,7 @@ describe ChampionRequest do
     end
 
     it "fetches champions from the API" do
-      expect(subject.size).to eq(load_fixture("champion", "v1.1", "get")["champions"].size)
+      expect(subject.size).to eq(load_fixture("champion", ChampionRequest.api_version, "get")["champions"].size)
     end
   end
 end

data/spec/lol/champion_statistics_summary_spec.rb

@@ -18,9 +18,21 @@ describe ChampionStatisticsSummary do
   end
 
   describe 'stats attribute' do
-    it_behaves_like 'collection attribute' do
+    it_behaves_like 'plain attribute' do
       let(:attribute) { 'stats' }
-      let(:attribute_class) { ChampionStatistic }
+      let(:attribute_value) { 'asd' }
+    end
+
+    context 'when is passed as an hash' do
+      subject { ChampionStatisticsSummary.new stats: { 'FooBar' => 'baz' } }
+
+      it 'will convert the hash in an openstruct object' do
+        expect(subject.stats).to be_a OpenStruct
+      end
+
+      it 'will convert each hash key in underscore' do
+        expect(subject.stats.foo_bar).to eq 'baz'
+      end
     end
   end
 end

data/spec/lol/game_request_spec.rb

@@ -12,7 +12,7 @@ describe GameRequest do
     let(:request) { GameRequest.new "api_key", "euw" }
 
     subject do
-      expect(request.class).to receive(:get).with(request.api_url('v1.2', "game/by-summoner/1/recent")).and_return load_fixture('game', 'v1.2', 'get')
+      expect(request.class).to receive(:get).with(request.api_url("game/by-summoner/1/recent")).and_return load_fixture('game', GameRequest.api_version, 'get')
 
       request.recent 1
     end
@@ -26,7 +26,7 @@ describe GameRequest do
     end
 
     it 'fetches games from the API' do
-      expect(subject.size).to eq load_fixture('game', 'v1.1', 'get')['games'].size
+      expect(subject.size).to eq load_fixture('game', GameRequest.api_version, 'get')['games'].size
     end
   end
 

data/spec/lol/league_entry_spec.rb

@@ -13,7 +13,7 @@ describe LeagueEntry do
       let(:valid_attributes) { { player_or_team_id: 123456 } }
     end
 
-    %w(player_or_team_id player_or_team_name league_name queue_type tier rank league_points wins losses is_hot_streak is_veteran is_fresh_blood is_inactive last_played time_until_decay).each do |attribute|
+    %w(player_or_team_id player_or_team_name league_name queue_type tier rank league_points wins is_hot_streak is_veteran is_fresh_blood is_inactive last_played time_until_decay).each do |attribute|
       describe "#{attribute} attribute" do
         it_behaves_like 'plain attribute' do
           let(:attribute) { attribute }
@@ -33,7 +33,6 @@ describe LeagueEntry do
       "rank" : "II",
       "leaguePoints" : 84,
       "wins" : 35,
-      "losses" : 0,
       "isHotStreak" : false,
       "isVeteran" : false,
       "isFreshBlood" : false,

data/spec/lol/league_request_spec.rb

@@ -12,7 +12,7 @@ describe LeagueRequest do
     let(:request) { LeagueRequest.new "api_key", "euw" }
 
     subject do
-      expect(request.class).to receive(:get).with(request.api_url("v2.1", "league/by-summoner/123")).and_return(load_fixture("league", "v2.1", "get"))
+      expect(request.class).to receive(:get).with(request.api_url("league/by-summoner/123")).and_return(load_fixture("league", LeagueRequest.api_version, "get"))
 
       request.get(123)
     end

data/spec/lol/league_spec.rb

@@ -10,10 +10,10 @@ describe League do
 
   context "initialization" do
     it_behaves_like 'Lol model' do
-      let(:valid_attributes) { { timestamp: 123456 } }
+      let(:valid_attributes) { { name: 'foo' } }
     end
 
-    %w(timestamp name tier queue).each do |attribute|
+    %w(name tier queue).each do |attribute|
       describe "#{attribute} attribute" do
         it_behaves_like 'plain attribute' do
           let(:attribute) { attribute }
@@ -23,7 +23,7 @@ describe League do
     end
 
     it "fills entries with LeagueEntry objects" do
-      league = League.new(load_fixture("league", "v2.1", "get")["123"])
+      league = League.new(load_fixture("league", "v2.2", "get")["123"])
       expect(league.entries.map(&:class).uniq).to eq([LeagueEntry])
     end
   end

data/spec/lol/player_statistic_spec.rb

@@ -8,7 +8,7 @@ describe PlayerStatistic do
     let(:valid_attributes) { { wins: 1 } }
   end
 
-  %w(losses modify_date_str player_stat_summary_type wins).each do |attribute|
+  %w(aggregated_stats losses modify_date_str player_stat_summary_type wins).each do |attribute|
     describe "#{attribute} attribute" do
       it_behaves_like 'plain attribute' do
         let(:attribute) { attribute }
@@ -18,9 +18,21 @@ describe PlayerStatistic do
   end
 
   describe 'aggregated_stats attribute' do
-    it_behaves_like 'collection attribute' do
+    it_behaves_like 'plain attribute' do
       let(:attribute) { 'aggregated_stats' }
-      let(:attribute_class) { AggregatedStatistic }
+      let(:attribute_value) { 'asd' }
+    end
+
+    context 'when is passed as an hash' do
+      subject { PlayerStatistic.new aggregated_stats: { 'FooBar' => 'baz' } }
+
+      it 'will convert the hash in an openstruct object' do
+        expect(subject.aggregated_stats).to be_a OpenStruct
+      end
+
+      it 'will convert each hash key in underscore' do
+        expect(subject.aggregated_stats.foo_bar).to eq 'baz'
+      end
     end
   end
 

data/spec/lol/request_spec.rb

@@ -44,27 +44,32 @@ describe Request do
 
   describe "api_url" do
     it "defaults on Request#region" do
-      expect(subject.api_url("foo", "bar")).to match(/\/euw\//)
+      expect(subject.api_url("bar")).to match(/\/euw\//)
     end
 
-    it "requires an api_key a version and a path" do
-      expect { subject.api_url "foo" }.to raise_error(ArgumentError)
+    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 "returns a full fledged api url" do
-      expect(subject.api_url("foo", "bar")).to eq("http://prod.api.pvp.net/api/lol/euw/foo/bar?api_key=api_key")
+      expect(subject.api_url("bar")).to eq("http://prod.api.pvp.net/api/lol/euw/v1.1/bar?api_key=api_key")
     end
 
     it "has lol if url is different from v2.1" do
-      expect(subject.api_url("v1.2", "foo")).to eq("http://prod.api.pvp.net/api/lol/euw/v1.2/foo?api_key=api_key")
+      expect(subject.api_url("foo")).to eq("http://prod.api.pvp.net/api/lol/euw/v1.1/foo?api_key=api_key")
     end
 
     it "does not have lol only url is v2.1" do
-      expect(subject.api_url("v2.1", "foo")).to eq("http://prod.api.pvp.net/api/euw/v2.1/foo?api_key=api_key")
+      expect(Request).to receive(:api_version).at_least(:once).and_return("v2.1")
+      expect(subject.api_url("foo")).to eq("http://prod.api.pvp.net/api/euw/v2.1/foo?api_key=api_key")
     end
 
     it "optionally accept query string parameters" do
-      expect(subject.api_url("v2.1", "foo", a: 'b')).to eq("http://prod.api.pvp.net/api/euw/v2.1/foo?a=b&api_key=api_key")
+      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

data/spec/lol/stats_request_spec.rb

@@ -11,10 +11,10 @@ describe StatsRequest do
   end
 
   describe "#summary" do
-    let(:fixture) { load_fixture 'stats', 'v1.1', 'get' }
+    let(:fixture) { load_fixture 'stats', StatsRequest.api_version, 'get' }
 
     subject do
-      expect(request.class).to receive(:get).with(request.api_url('v1.1', "stats/by-summoner/1/summary")).and_return fixture
+      expect(request.class).to receive(:get).with(request.api_url("stats/by-summoner/1/summary")).and_return fixture
 
       request.summary 1
     end
@@ -32,11 +32,11 @@ describe StatsRequest do
     end
 
     it 'fetches PlayerStatistics from the API' do
-      expect(subject.size).to eq load_fixture('stats', 'v1.1', 'get')['playerStatSummaries'].size
+      expect(subject.size).to eq load_fixture('stats', StatsRequest.api_version, 'get')['playerStatSummaries'].size
     end
 
     it 'optionally accepts a season' do
-      expect(request.class).to receive(:get).with(request.api_url('v1.1', 'stats/by-summoner/1/summary', season: '1')).and_return fixture
+      expect(request.class).to receive(:get).with(request.api_url('stats/by-summoner/1/summary', season: '1')).and_return fixture
       request.summary '1', season: '1'
     end
 
@@ -46,10 +46,10 @@ describe StatsRequest do
   end
 
   describe "#ranked" do
-    let(:fixture) { load_fixture 'ranked_stats', 'v1.1', 'get' }
+    let(:fixture) { load_fixture 'ranked_stats', StatsRequest.api_version, 'get' }
 
     subject do
-      expect(request.class).to receive(:get).with(request.api_url('v1.1', "stats/by-summoner/1/ranked")).and_return fixture
+      expect(request.class).to receive(:get).with(request.api_url("stats/by-summoner/1/ranked")).and_return fixture
       request.ranked 1
     end
 
@@ -62,11 +62,11 @@ describe StatsRequest do
     end
 
     it 'fetches RankedStatisticsSummary from the API' do
-      expect(subject.champions.size).to eq load_fixture('ranked_stats', 'v1.1', 'get')['champions'].size
+      expect(subject.champions.size).to eq load_fixture('ranked_stats', StatsRequest.api_version, 'get')['champions'].size
     end
 
     it 'optionally accepts a season' do
-      expect(request.class).to receive(:get).with(request.api_url('v1.1', 'stats/by-summoner/1/ranked', season: '1')).and_return fixture
+      expect(request.class).to receive(:get).with(request.api_url('stats/by-summoner/1/ranked', season: '1')).and_return fixture
 
       request.ranked '1', season: '1'
     end

data/spec/lol/summoner_request_spec.rb

@@ -9,15 +9,15 @@ describe SummonerRequest do
   end
 
   let(:request)   { SummonerRequest.new "api_key", "euw" }
-  let(:by_name)   { load_fixture("summoner-by-name", "v1.1", "get") }
-  let(:name)      { load_fixture("summoner-name", "v1.1", "get") }
-  let(:summoner)  { load_fixture("summoner", "v1.1", "get") }
-  let(:runes)     { load_fixture("summoner-runes", "v1.1", "get") }
-  let(:masteries) { load_fixture("summoner-masteries", "v1.1", "get") }
+  let(:by_name)   { load_fixture("summoner-by-name", SummonerRequest.api_version, "get") }
+  let(:name)      { load_fixture("summoner-name", SummonerRequest.api_version, "get") }
+  let(:summoner)  { load_fixture("summoner", SummonerRequest.api_version, "get") }
+  let(:runes)     { load_fixture("summoner-runes", SummonerRequest.api_version, "get") }
+  let(:masteries) { load_fixture("summoner-masteries", SummonerRequest.api_version, "get") }
 
   describe "#by_name" do
     subject do
-      expect(request.class).to receive(:get).with(request.api_url("v1.1", "summoner/by-name/foo")).and_return(by_name)
+      expect(request.class).to receive(:get).with(request.api_url("summoner/by-name/foo")).and_return(by_name)
 
       request.by_name "foo"
     end
@@ -29,7 +29,7 @@ describe SummonerRequest do
 
   describe "#name" do
     subject do
-      expect(request.class).to receive(:get).with(request.api_url("v1.1", "summoner/foo,bar/name")).and_return(name)
+      expect(request.class).to receive(:get).with(request.api_url("summoner/foo,bar/name")).and_return(name)
 
       request.name "foo", "bar"
     end
@@ -41,7 +41,7 @@ describe SummonerRequest do
 
   describe "#get" do
     subject do
-      expect(request.class).to receive(:get).with(request.api_url("v1.1", "summoner/foo")).and_return(summoner)
+      expect(request.class).to receive(:get).with(request.api_url("summoner/foo")).and_return(summoner)
 
       request.get "foo"
     end
@@ -53,7 +53,7 @@ describe SummonerRequest do
 
   describe "#runes" do
     subject do
-      expect(request.class).to receive(:get).with(request.api_url("v1.1", "summoner/foo/runes")).and_return(runes)
+      expect(request.class).to receive(:get).with(request.api_url("summoner/foo/runes")).and_return(runes)
 
       request.runes "foo"
     end
@@ -65,7 +65,7 @@ describe SummonerRequest do
 
   describe "#masteries" do
     subject do
-      expect(request.class).to receive(:get).with(request.api_url("v1.1", "summoner/foo/masteries")).and_return(masteries)
+      expect(request.class).to receive(:get).with(request.api_url("summoner/foo/masteries")).and_return(masteries)
 
       request.masteries "foo"
     end

data/spec/lol/team_request_spec.rb

@@ -12,10 +12,10 @@ describe TeamRequest do
 
   describe "get" do
     let(:request) { TeamRequest.new "api_key", "euw" }
-    let(:fixture) { load_fixture 'team', 'v2.1', 'get' }
+    let(:fixture) { load_fixture 'team', TeamRequest.api_version, 'get' }
 
     subject do
-      expect(request.class).to receive(:get).with(request.api_url('v2.1', "team/by-summoner/1")).and_return fixture
+      expect(request.class).to receive(:get).with(request.api_url("team/by-summoner/1")).and_return fixture
       request.get 1
     end
 

data/spec/spec_helper.rb

@@ -53,6 +53,6 @@ def summoners
 end
 
 RSpec.configure do |c|
-  c.fail_fast = true
+#  c.fail_fast = true
   c.filter_run_excluding :remote => true
 end

data/spec/support/model_helpers.rb

@@ -110,4 +110,4 @@ shared_examples 'collection attribute' do
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lol
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.3
 platform: ruby
 authors:
 - Giovanni Intini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-24 00:00:00.000000000 Z
+date: 2013-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -241,12 +241,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- TODO.md
 - demo/demo.rb
 - lib/lol.rb
-- lib/lol/aggregated_statistic.rb
 - lib/lol/champion.rb
 - lib/lol/champion_request.rb
-- lib/lol/champion_statistic.rb
 - lib/lol/champion_statistics_summary.rb
 - lib/lol/client.rb
 - lib/lol/game.rb
@@ -278,6 +277,7 @@ files:
 - lib/lol/version.rb
 - ruby-lol.gemspec
 - spec/acceptance_spec.rb
+- spec/api_version_spec.rb
 - spec/fixtures/v1.1/get-champion.json
 - spec/fixtures/v1.1/get-game.json
 - spec/fixtures/v1.1/get-ranked_stats.json
@@ -288,12 +288,13 @@ files:
 - spec/fixtures/v1.1/get-summoner-runes.json
 - spec/fixtures/v1.1/get-summoner.json
 - spec/fixtures/v1.2/get-game.json
+- spec/fixtures/v1.2/get-ranked_stats.json
+- spec/fixtures/v1.2/get-stats.json
 - spec/fixtures/v2.1/get-league.json
 - spec/fixtures/v2.1/get-team.json
-- spec/lol/aggregated_statistic_spec.rb
+- spec/fixtures/v2.2/get-league.json
 - spec/lol/champion_request_spec.rb
 - spec/lol/champion_spec.rb
-- spec/lol/champion_statistic_spec.rb
 - spec/lol/champion_statistics_summary_spec.rb
 - spec/lol/client_spec.rb
 - spec/lol/game_request_spec.rb
@@ -349,6 +350,7 @@ specification_version: 4
 summary: Ruby wrapper to Riot Games API
 test_files:
 - spec/acceptance_spec.rb
+- spec/api_version_spec.rb
 - spec/fixtures/v1.1/get-champion.json
 - spec/fixtures/v1.1/get-game.json
 - spec/fixtures/v1.1/get-ranked_stats.json
@@ -359,12 +361,13 @@ test_files:
 - spec/fixtures/v1.1/get-summoner-runes.json
 - spec/fixtures/v1.1/get-summoner.json
 - spec/fixtures/v1.2/get-game.json
+- spec/fixtures/v1.2/get-ranked_stats.json
+- spec/fixtures/v1.2/get-stats.json
 - spec/fixtures/v2.1/get-league.json
 - spec/fixtures/v2.1/get-team.json
-- spec/lol/aggregated_statistic_spec.rb
+- spec/fixtures/v2.2/get-league.json
 - spec/lol/champion_request_spec.rb
 - spec/lol/champion_spec.rb
-- spec/lol/champion_statistic_spec.rb
 - spec/lol/champion_statistics_summary_spec.rb
 - spec/lol/client_spec.rb
 - spec/lol/game_request_spec.rb

data/lib/lol/aggregated_statistic.rb

@@ -1,21 +0,0 @@
-require 'lol/model'
-
-module Lol
-  class AggregatedStatistic < Lol::Model
-    # @!attribute [r] id
-    #   @return [Fixnum] Statistic Type Id
-    attr_reader :id
-
-    # @!attribute [r] name
-    #   @return [String] Statistic Type name
-    attr_reader :name
-
-    # @!attribute [r] count
-    #   @return [Fixnum] Statistic value
-    attr_reader :count
-
-    private
-
-    attr_writer :id, :name, :count
-  end
-end

data/lib/lol/champion_statistic.rb

@@ -1,25 +0,0 @@
-require 'lol/model'
-
-module Lol
-  class ChampionStatistic < Lol::Model
-    # @!attribute [r] c
-    #   @return [Fixnum] Count of samples (games) that make up the aggregated value, where relevant.
-    attr_reader :c
-
-    # @!attribute [r] id
-    #   @return [Fixnum] Aggregated stat type Id
-    attr_reader :id
-
-    # @!attribute [r] name
-    #   @return [String] Aggregated stat type Name
-    attr_reader :name
-
-    # @!attribute [r] value
-    #   @return [Fixnum] Aggregated stat type Value
-    attr_reader :value
-
-    private
-
-    attr_writer :id, :name, :c, :value
-  end
-end