riot_lol_api 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6a772ad0df2c3b77665c7e5bb2dcaca2a328d39
-  data.tar.gz: 00315edee3ba9e66f7a40500cc1e880719e31542
+  metadata.gz: 1f0c729a9e5623a8a5ba0df115b092558d1db2bc
+  data.tar.gz: 6781933dc8c5b2c1d113f6d0255ceefd85cbacb0
 SHA512:
-  metadata.gz: 3d9a9be99cb55754463f53f6194aca7b00d83e461ab5daa151bc586d31ab901c3fa4c728a079b655a3cf2103cf6f5bf170ba09494515038361e6fb75e1e31e22
-  data.tar.gz: ceef6ac51199b40431239748c024d6e84f98c947b18084fb1b77dd6213af01425b01b5f5cc5d0fc43e861c9d3264f9f6b6639a335c58dd8ec54bf34b6bc231fa
+  metadata.gz: bb38c0b530d75258e241e3001a75cd793422f81befbfd53c22c30a8ce664b4b3cc80e049711bd4e2a09f0208decb97c029e8bafee1d9268e30f5bfd37e7aab85
+  data.tar.gz: 6a02d861420dc41f4d3e2761836151ff3d65ec977b3e8215b3743b6770fc2042815df85df905f49218301e62629abcd91542ca5ddd7779b6346dbaa50e0424c6

data/lib/core_ext/hash.rb

@@ -0,0 +1,29 @@
+require 'active_support/inflector'
+
+class Hash
+	def to_symbol
+		new_hash = {}
+		self.each do |k,v|
+			k_symbol = k.to_symbol
+			if v.class == Array
+				new_hash[k_symbol] = Array.new
+				if v[0].class == Hash
+					name_class = k.singularize.camelize
+					v.each do |tab|
+						new_hash[k_symbol] << Object.const_get("RiotLolApi::Model::#{name_class}").new(tab.to_symbol)
+					end
+				else
+					v.each do |tab|
+						new_hash[k_symbol] << tab
+					end
+				end
+			elsif v.class == Hash
+				name_class = k.singularize.camelize
+				new_hash[k_symbol] = Object.const_get("RiotLolApi::Model::#{name_class}").new(v.to_symbol)
+			else
+				new_hash[k_symbol] = v
+			end
+		end
+		new_hash
+	end
+end

data/lib/core_ext/string.rb

@@ -0,0 +1,5 @@
+class String
+  def to_symbol
+    self.gsub(/([a-z\d])([A-Z])/,'\1_\2').downcase.to_sym
+  end
+end

data/lib/riot_lol_api/client.rb

@@ -13,9 +13,14 @@ module RiotLolApi
 			end
 		end
 
-		def self.get url
+		def self.get url, data = nil
 			unless RiotLolApi::TOKEN.nil?
-				response = HTTParty.get(url, :query => {:api_key => RiotLolApi::TOKEN})
+				if data.nil?
+					data = {:api_key => RiotLolApi::TOKEN}
+				else
+					data.merge!({:api_key => RiotLolApi::TOKEN})
+				end
+				response = HTTParty.get(url, :query => data)
 				case response.code
 				  when 200
 				    JSON.parse(response.body)
@@ -32,13 +37,14 @@ module RiotLolApi
 			end
 		end
 
+		# SUMMONER
+
 		def get_summoner_by_name name
 			name = name.downcase
 			name.strip!
 			response = Client.get("https://prod.api.pvp.net/api/lol/#{@region}/v1.4/summoner/by-name/#{name}")
 			unless response.nil?
-				summoner = response[name]
-				RiotLolApi::Model::Summoner.new(:id_summoner => summoner["id"],:name => summoner["name"],:profile_icon_id => summoner["profileIconId"],:summoner_level => summoner["summonerLevel"],:revision_date_str => '',:revision_date => summoner["revisionDate"],:region => @region)
+				RiotLolApi::Model::Summoner.new(response[name].to_symbol.merge({:region => @region}))
 			else
 				nil
 			end
@@ -47,12 +53,28 @@ module RiotLolApi
 		def get_summoner_by_id id
 			response = Client.get("https://prod.api.pvp.net/api/lol/#{@region}/v1.4/summoner/#{id}")
 			unless response.nil?
-				summoner = response[id.to_s]
-				RiotLolApi::Model::Summoner.new(:id_summoner => summoner["id"],:name => summoner["name"],:profile_icon_id => summoner["profileIconId"],:summoner_level => summoner["summonerLevel"],:revision_date_str => '',:revision_date => summoner["revisionDate"],:region => @region)
+				RiotLolApi::Model::Summoner.new(response[id.to_s].to_symbol.merge({:region => @region}))
 			else
 				nil
 			end
 		end
 
+		# CHAMPION
+
+		def get_champion_by_id id, data = nil, local = 'fr_FR'
+			if data.nil?
+				data = {:local => local}
+			else
+				data.merge!({:local => local})
+			end
+			
+	        response = Client.get("https://prod.api.pvp.net/api/lol/static-data/#{@region}/v1.2/champion/#{id}",data)
+	        unless response.nil?
+				RiotLolApi::Model::Champion.new(response.to_symbol)
+	        else
+				nil
+	        end
+	    end
+
 	end
 end

data/lib/riot_lol_api/model/{player.rb → block.rb}

@@ -1,8 +1,8 @@
+require 'riot_lol_api/model/item'
+
 module RiotLolApi
   module Model
-    class Player
-
-      # attr :summoner_id, :team_id, :champion_id
+    class Block
 
       def initialize(options = {})
         options.each do |key, value|

data/lib/riot_lol_api/model/champion.rb

@@ -0,0 +1,22 @@
+require 'riot_lol_api/model/stat'
+require 'riot_lol_api/model/recommended'
+require 'riot_lol_api/model/image'
+require 'riot_lol_api/model/spell'
+require 'riot_lol_api/model/info'
+require 'riot_lol_api/model/passive'
+require 'riot_lol_api/model/skin'
+
+module RiotLolApi
+  module Model
+    class Champion
+
+      def initialize(options = {})
+        options.each do |key, value|
+          self.class.send(:attr_accessor, key.to_sym)
+          instance_variable_set("@#{key}", value)
+        end
+      end
+
+    end
+  end
+end

data/lib/riot_lol_api/model/{talent.rb → fellow_player.rb}

@@ -1,8 +1,6 @@
 module RiotLolApi
   module Model
-    class Talent
-
-      # attr :id_talent, :rank
+    class FellowPlayer
 
       def initialize(options = {})
         options.each do |key, value|

data/lib/riot_lol_api/model/game.rb

@@ -1,4 +1,4 @@
-require 'riot_lol_api/model/player'
+require 'riot_lol_api/model/fellow_player.rb'
 require 'riot_lol_api/model/stat'
 
 module RiotLolApi

data/lib/riot_lol_api/model/image.rb

@@ -0,0 +1,14 @@
+module RiotLolApi
+  module Model
+    class Image
+
+      def initialize(options = {})
+        options.each do |key, value|
+          self.class.send(:attr_accessor, key.to_sym)
+          instance_variable_set("@#{key}", value)
+        end
+      end
+
+    end
+  end
+end

data/lib/riot_lol_api/model/info.rb

@@ -0,0 +1,14 @@
+module RiotLolApi
+  module Model
+    class Info
+
+      def initialize(options = {})
+        options.each do |key, value|
+          self.class.send(:attr_accessor, key.to_sym)
+          instance_variable_set("@#{key}", value)
+        end
+      end
+
+    end
+  end
+end

data/lib/riot_lol_api/model/item.rb

@@ -0,0 +1,14 @@
+module RiotLolApi
+  module Model
+    class Item
+
+      def initialize(options = {})
+        options.each do |key, value|
+          self.class.send(:attr_accessor, key.to_sym)
+          instance_variable_set("@#{key}", value)
+        end
+      end
+
+    end
+  end
+end

data/lib/riot_lol_api/model/leveltip.rb

@@ -0,0 +1,14 @@
+module RiotLolApi
+  module Model
+    class Leveltip
+
+      def initialize(options = {})
+        options.each do |key, value|
+          self.class.send(:attr_accessor, key.to_sym)
+          instance_variable_set("@#{key}", value)
+        end
+      end
+
+    end
+  end
+end

data/lib/riot_lol_api/model/mastery.rb

@@ -1,5 +1,3 @@
-require 'riot_lol_api/model/talent'
-
 module RiotLolApi
   module Model
     class Mastery

data/lib/riot_lol_api/model/{rune.rb → page.rb}

@@ -1,10 +1,9 @@
+require 'riot_lol_api/model/mastery'
 require 'riot_lol_api/model/slot'
 
 module RiotLolApi
   module Model
-    class Rune
-
-      # attr :id_rune, :name, :current, :slots
+    class Page
 
       def initialize(options = {})
         options.each do |key, value|
@@ -15,4 +14,4 @@ module RiotLolApi
 
     end
   end
-end
+end

data/lib/riot_lol_api/model/passive.rb

@@ -0,0 +1,16 @@
+require 'riot_lol_api/model/image'
+
+module RiotLolApi
+  module Model
+    class Passive
+
+      def initialize(options = {})
+        options.each do |key, value|
+          self.class.send(:attr_accessor, key.to_sym)
+          instance_variable_set("@#{key}", value)
+        end
+      end
+
+    end
+  end
+end

data/lib/riot_lol_api/model/recommended.rb

@@ -0,0 +1,16 @@
+require 'riot_lol_api/model/block'
+
+module RiotLolApi
+  module Model
+    class Recommended
+
+      def initialize(options = {})
+        options.each do |key, value|
+          self.class.send(:attr_accessor, key.to_sym)
+          instance_variable_set("@#{key}", value)
+        end
+      end
+
+    end
+  end
+end

data/lib/riot_lol_api/model/skin.rb

@@ -0,0 +1,14 @@
+module RiotLolApi
+  module Model
+    class Skin
+
+      def initialize(options = {})
+        options.each do |key, value|
+          self.class.send(:attr_accessor, key.to_sym)
+          instance_variable_set("@#{key}", value)
+        end
+      end
+
+    end
+  end
+end

data/lib/riot_lol_api/model/spell.rb

@@ -0,0 +1,18 @@
+require 'riot_lol_api/model/leveltip'
+require 'riot_lol_api/model/image'
+require 'riot_lol_api/model/var'
+
+module RiotLolApi
+  module Model
+    class Spell
+
+      def initialize(options = {})
+        options.each do |key, value|
+          self.class.send(:attr_accessor, key.to_sym)
+          instance_variable_set("@#{key}", value)
+        end
+      end
+
+    end
+  end
+end

data/lib/riot_lol_api/model/summoner.rb

@@ -2,8 +2,6 @@ module RiotLolApi
   module Model
 	class Summoner
 
-		# attr :id_summoner, :name, :profile_icon_id, :summoner_level, :revision_date_str, :revision_date, :region
-
 		def initialize(options = {})
 			options.each do |key, value|
 				self.class.send(:attr_accessor, key.to_sym)
@@ -12,69 +10,39 @@ module RiotLolApi
 		end
 
 		def masteries
-			response = Client.get("https://prod.api.pvp.net/api/lol/#{@region}/v1.4/summoner/#{@id_summoner}/masteries")
+			response = Client.get("https://prod.api.pvp.net/api/lol/#{@region}/v1.4/summoner/#{@id}/masteries")
 			unless response.nil?
-				masteries = response[self.id_summoner.to_s]['pages']
-				# masteries
-				tab_masteries = Array.new
-				masteries.each do |mastery|
-					# talents
-					tab_talents = Array.new
-					unless mastery['masteries'].nil?
-						mastery['masteries'].each do |talent|
-							tab_talents << RiotLolApi::Model::Talent.new(:id_talent => talent['id'], :rank => talent['rank'])
-						end
-					end
-					tab_masteries << RiotLolApi::Model::Mastery.new(:id_mastery => mastery["id"], :name => mastery["name"], :current => mastery["current"], :talents => tab_talents)
+				tab_pages = Array.new
+				response[self.id.to_s]['pages'].each do |page|
+					tab_pages << RiotLolApi::Model::Page.new(page.to_symbol)
 				end
-				tab_masteries
+				tab_pages
 			else
 				nil
 			end
 		end
 
 		def runes
-			response = Client.get("https://prod.api.pvp.net/api/lol/#{@region}/v1.4/summoner/#{@id_summoner}/runes")
+			response = Client.get("https://prod.api.pvp.net/api/lol/#{@region}/v1.4/summoner/#{@id}/runes")
 			unless response.nil?
-				runes = response[self.id_summoner.to_s]['pages']
-				# runes
-				tab_runes = Array.new
-				runes.each do |rune|
-					# talents
-					tab_slots = Array.new
-					unless rune['slots'].nil?
-						rune['slots'].each do |slot|
-							tab_slots << RiotLolApi::Model::Slot.new(:id_slot => slot['runeId'], :rank => slot['runeSlotId'])
-						end
-					end
-					tab_runes << RiotLolApi::Model::Rune.new(:id_rune => rune["id"], :name => rune["name"], :current => rune["current"], :slots => tab_slots)
+				tab_pages = Array.new
+				response[self.id.to_s]['pages'].each do |page|
+					tab_pages << RiotLolApi::Model::Page.new(page.to_symbol)
 				end
-
-				tab_runes
+				tab_pages
 			else
 				nil
 			end
 		end
 
 		def games
-			response = Client.get("https://prod.api.pvp.net/api/lol/#{@region}/v1.3/game/by-summoner/#{@id_summoner}/recent")
+			response = Client.get("https://prod.api.pvp.net/api/lol/#{@region}/v1.3/game/by-summoner/#{@id}/recent")
 			unless response.nil?
 				games = response['games']
 
 				tab_games = Array.new
 				games.each do |game|
-
-					tab_fellow_players = Array.new
-					game['fellowPlayers'].each do |fellow_player|
-						tab_fellow_players << RiotLolApi::Model::Player.new(:summoner_id => fellow_player['summonerId'], :team_id => fellow_player['teamId'], :champion_id => fellow_player['championId'])
-					end
-
-					stat = game['stats']
-					tab_stats = RiotLolApi::Model::Stat.new(:nexus_killed => stat['nexusKilled'] || false, :neutral_minions_killed_your_jungle => stat['neutralMinionsKilledYourJungle'] || 0,:neutral_minions_killed_enemy_jungle => stat['neutralMinionsKilledEnemyJungle'] || 0,:neutral_minions_killed => stat['neutralMinionsKilled'] || 0, :minions_denied => stat['minionsDenied'] || 0,:largest_killing_spree => stat['largestKillingSpree'],:largest_multi_kill => stat['largestMultiKill'],:legendary_items_created => stat['legendaryItemsCreated'],:largest_critical_strike => stat['largestCriticalStrike'],:killing_sprees => stat['killingSprees'] || 0, :items_purchased => stat['itemsPurchased'] || 0, :first_blood => stat['firstBlood'], :double_kills => stat['doubleKills'], :consumables_purchased => stat['consumablesPurchased'], :combat_player_score => stat['combatPlayerScore'] || 0, :champions_killed => stat['championsKilled'] || 0, :barracks_killed => stat['barracksKilled'] || 0, :total_damage_dealt_to_champions => stat['totalDamageDealtToChampions'], :gold_earned => stat['goldEarned'], :item2 => stat['item2'], :item1 => stat['item1'], :ward_placed => stat['wardPlaced'], :total_damage_taken => stat['totalDamageTaken'], :item0 => stat['item0'], :physical_damage_dealt_player => stat['physicalDamageDealtPlayer'], :total_units_healed => stat['totalUnitsHealed'], :level => stat['level'], :magic_damage_dealt_to_champions => stat['magicDamageDealtToChampions'], :magic_damage_dealt_player => stat['magicDamageDealtPlayer'], :assists => stat['assists'], :magic_damage_taken => stat['magicDamageTaken'], :num_deaths => stat['numDeaths'], :total_time_crowd_control_dealt => stat['totalTimeCrowdControlDealt'], :physical_damage_taken => stat['physicalDamageTaken'], :win => stat['win'], :team => stat['team'], :sight_wards_bought => stat['sightWardsBought'], :total_damage_dealt => stat['totalDamageDealt'], :total_heal => stat['totalHeal'], :item4 => stat['item4'], :item3 => stat['item3'], :item6 => stat['item6'], :item5 => stat['item5'], :minions_killed => stat['minionsKilled'], :time_played => stat['timePlayed'], :physical_damage_dealt_to_champions => stat['physicalDamageDealtToChampions'], :true_damage_taken => stat['trueDamageTaken'], :gold_spent => stat['goldSpent'])
-
-					# nodeCapture
-
-					tab_games << RiotLolApi::Model::Game.new(:champion_id => game['championId'], :invalid => game['invalid'], :ip_earned => game['ipEarned'], :create_date => game['createDate'], :create_date_str => '', :fellow_players => tab_fellow_players, :game_id => game['gameId'], :game_mode => game['gameMode'], :game_type => game['gameType'], :level => game['level'], :map_id => game['mapId'], :spell1 => game['spell1'], :spell2 => game['spell2'], :stats => tab_stats, :sub_type => game['subType'], :team_id => game['teamId'])
+					tab_games << RiotLolApi::Model::Game.new(game.to_symbol)
 				end
 
 				tab_games

data/lib/riot_lol_api/model/var.rb

@@ -0,0 +1,14 @@
+module RiotLolApi
+  module Model
+    class Var
+
+      def initialize(options = {})
+        options.each do |key, value|
+          self.class.send(:attr_accessor, key.to_sym)
+          instance_variable_set("@#{key}", value)
+        end
+      end
+
+    end
+  end
+end

data/lib/riot_lol_api/model.rb

@@ -1,7 +1,7 @@
 require 'riot_lol_api/model/summoner'
-require 'riot_lol_api/model/mastery'
-require 'riot_lol_api/model/rune'
+require 'riot_lol_api/model/page'
 require 'riot_lol_api/model/game'
+require 'riot_lol_api/model/champion'
 
 module RiotLolApi
   module Model

data/lib/riot_lol_api/version.rb

@@ -1,3 +1,3 @@
 module RiotLolApi
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/riot_lol_api.rb

@@ -1,6 +1,8 @@
 require "riot_lol_api/version"
 require "riot_lol_api/client"
 require "riot_lol_api/model"
+require "core_ext/string"
+require "core_ext/hash"
 
 module RiotLolApi
   # Your code goes here...

data/spec/factories/champion.rb

@@ -0,0 +1,9 @@
+FactoryGirl.define do
+	factory :champion, :class => RiotLolApi::Model::Champion do
+		id 412
+		key "Thresh"
+		name "Thresh"
+		title "Garde aux chaînes" 
+		initialize_with { new(:id => id, :key => key, :name => name, :title => title) }
+	end
+end

data/spec/factories/page.rb

@@ -0,0 +1,10 @@
+FactoryGirl.define do
+	factory :page, :class => RiotLolApi::Model::Page do
+		id 37482369
+		name "support"
+		current false
+		masteries nil
+		slots nil
+		initialize_with { new(:id => id, :name => name, :current => current, :masteries => masteries, :slots => slots) }
+	end
+end

data/spec/factories/summoner.rb

@@ -1,12 +1,11 @@
 FactoryGirl.define do
 	factory :summoner, :class => RiotLolApi::Model::Summoner do
-		id_summoner 20639710
+		id 20639710
 		name "PacoLoco"
 		profile_icon_id 8
 		summoner_level 30
-		revision_date_str ''
 		revision_date 1398345588000
 		region "euw"
-		initialize_with { new(:id_summoner => id_summoner, :name => name, :profile_icon_id => profile_icon_id, :summoner_level => summoner_level, :revision_date_str => revision_date_str, :revision_date => revision_date, :region => region) }
+		initialize_with { new(:id => id, :name => name, :profile_icon_id => profile_icon_id, :summoner_level => summoner_level, :revision_date => revision_date, :region => region) }
 	end
 end

data/spec/mock_response/get_champion_by_id.json

@@ -0,0 +1,13 @@
+HTTP/1.1 200 OK
+Access-Control-Allow-Headers: Content-Type
+Access-Control-Allow-Methods: GET, POST, DELETE, PUT
+Access-Control-Allow-Origin: *
+Content-Type: application/json; charset=UTF-8
+Date: Tue, 27 May 2014 11:40:47 GMT
+Server: Jetty(9.1.1.v20140108)
+Vary: Accept-Encoding, User-Agent
+X-NewRelic-App-Data: PxQFWFFSDwQTVlhTBAcHX0YdFGQHBDcQUQxLA1tMXV1dORYzVBBGBxdCdhUSEVFRRRAEPhhQRw84HlpcDjpMEUQDTAtbFVBTRwRlTlQURD5LHGtOBQtZXkANDgxrHh1ESAEYA05WTVEJWgxaCw4YHwJJG1UGVApXVQJUAFJSCAMBBwVAag==
+transfer-encoding: chunked
+Connection: keep-alive
+
+{"id":412,"key":"Thresh","name":"Thresh","title":"Garde aux chaînes"}

data/spec/mock_response/get_champion_by_id_all_data.json

@@ -0,0 +1,13 @@
+HTTP/1.1 200 OK
+Access-Control-Allow-Headers: Content-Type
+Access-Control-Allow-Methods: GET, POST, DELETE, PUT
+Access-Control-Allow-Origin: *
+Content-Type: application/json; charset=UTF-8
+Date: Fri, 30 May 2014 15:33:01 GMT
+Server: Jetty(9.1.1.v20140108)
+Vary: Accept-Encoding, User-Agent
+X-NewRelic-App-Data: PxQFWFFSDwQTVlhTBAcHX0YdFGQHBDcQUQxLA1tMXV1dORYzVBBGBxdCdhUSEVFRRRAEPhhQRw84HlpcDjpMEUQDTAtbFVBTRwRlTlQURD5LHGtOBQtZXkANDgxrHh1ESAEYA05WTVIHUw5QCwkBHh5UFUNVBQUHUQEAWAMACQFTV1FTFWw=
+transfer-encoding: chunked
+Connection: keep-alive
+
+{"id":412,"key":"Thresh","name":"Thresh","title":"Garde aux chaînes","image":{"full":"Thresh.png","sprite":"champion3.png","group":"champion","x":48,"y":0,"w":48,"h":48},"skins":[{"id":412000,"name":"default","num":0},{"id":412001,"name":"Thresh des profondeurs","num":1},{"id":412002,"name":"Thresh du championnat","num":2}],"lore":"Thresh est un Grand faucheur dont les chaînes maléfiques retiennent l'âme des vivants. Une seconde d'hésitation quand vous apercevez son visage spectral et vous êtes perdu. Il ne laisse dans son sillage que des hommes creux ; l'âme, elle, est captive des lueurs glauques de sa lanterne. Le Garde aux chaînes prend un plaisir sadique à tourmenter ses victimes, avant comme après leur trépas. Sa lugubre tâche ne prend jamais fin et il arpente toutes terres pour faucher d'autres esprits encore.<br><br>Thresh se fraie un chemin lent mais déterminé dans Valoran. Il choisit ses victimes l'une après l'autre, concentre son attention sur chaque âme tour à tour. Il joue avec elles, érode lentement leur raison avec son humour tordu, dément. Une fois que Thresh s'intéresse à une âme, il ne prend plus de repos jusqu'à ce qu'il la possède enfin. Puis il traîne ses proies jusqu'aux Îles obscures pour des tourments ineffables. C'est là sa seule vocation.<br><br>On ne sait pas grand-chose du passé du Garde aux chaînes, et dans la plupart des cas il ne s'agit que de contes de bonne femme et de comptines. On y évoque un cruel geôlier des temps anciens qui prenait plaisir à torturer ses prisonniers. Patient et brutal, il utilisait toutes sortes de méthodes pour briser l'esprit de ses victimes avant que leur corps ne succombe à ces tortures. Les chaînes étaient l'outil préféré du bourreau pour inspirer la terreur. Leur cliquetis annonçait sa terrible approche et promettait la souffrance à celui qui l'entendait. Nul ne s'opposa à son horrible règne jusqu'à ce que ses prisonniers ne parviennent à s'échapper au cours d'une émeute de grande envergure. Ils le submergèrent et, sans remords, le pendirent avec ses propres chaînes. Ainsi commença la non-vie du spectre terrible que nous connaissons sous le nom de Thresh – du moins d'après les contes.<br><br>Thresh hante désormais le pays, laissant derrière lui un sillage d'horreur et de désespoir. Mais il y a un but derrière ses machinations funèbres, celui de trouver des âmes plus fortes que celles des misérables humains. Il n'aura ce qu'il veut que lorsqu'il aura brisé la volonté des plus puissants guerriers de Valoran.<br><br>''Rien n'est plus exaltant que de déchiqueter un esprit, morceau par morceau.''<br>-- Thresh","blurb":"Thresh est un Grand faucheur dont les chaînes maléfiques retiennent l'âme des vivants. Une seconde d'hésitation quand vous apercevez son visage spectral et vous êtes perdu. Il ne laisse dans son sillage que des hommes creux ; l'âme, elle, est captive ...","allytips":["La communication est essentielle quand vous utilisez la lanterne de Thresh. Informez vos alliés de votre manière de l'utiliser.","Les compétences Peine capitale et Fauchage peuvent être combinées pour effectuer de puissantes actions.","Thresh peut aussi collecter les âmes des unités qu'il n'a pas tuées. Positionnez-vous de façon à être près des morts pour maximiser votre collecte."],"enemytips":["La compétence Peine capitale de Thresh a un long délai d'incantation. Dès que vous voyez l'incantation commencer, esquivez.","Briser volontairement un mur de La boîte peut aider un allié vulnérable à s'échapper.","La défense et les dégâts de Thresh reposent sur sa capacité à collecter les âmes. Tentez de le punir lorsqu'il tente de les récupérer."],"tags":["Support","Fighter"],"partype":"Mana","info":{"attack":5,"defense":6,"magic":6,"difficulty":7},"stats":{"armor":16.0,"armorperlevel":0.0,"attackdamage":46.0,"attackdamageperlevel":2.2,"attackrange":450.0,"attackspeedoffset":0.0,"attackspeedperlevel":3.5,"crit":0.0,"critperlevel":0.0,"hp":411.0,"hpperlevel":89.0,"hpregen":6.0,"hpregenperlevel":0.55,"movespeed":335.0,"mp":200.0,"mpperlevel":44.0,"mpregen":5.0,"mpregenperlevel":0.7,"spellblock":30.0,"spellblockperlevel":0.0},"spells":[{"name":"Peine capitale","description":"Thresh ligote un ennemi dans ses chaînes et l'attire vers lui. Activer cette compétence une deuxième fois attire Thresh vers l'ennemi.","sanitizedDescription":"Thresh ligote un ennemi dans ses chaînes et l'attire vers lui. Activer cette compétence une deuxième fois attire Thresh vers l'ennemi.","tooltip":"<span class=\"colorFFFFFF\">Attrape un ennemi, puis le tire vers lui ou bondit vers lui.</span>  <br>Lance sa faux, infligeant {{ e1 }} <span class=\"color99FF99\">(+{{ a1 }})</span> pts de dégâts magiques à la première unité touchée et l'attirant vers lui pendant 1,5 sec. <br><br>Le délai de récupération de Peine capitale est réduit de 3 sec si un ennemi est touché.<br><br>Réactivez cette compétence pour que Thresh bondisse vers l'ennemi touché.","sanitizedTooltip":"Attrape un ennemi, puis le tire vers lui ou bondit vers lui. Lance sa faux, infligeant {{ e1 }} (+{{ a1 }}) pts de dégâts magiques à la première unité touchée et l'attirant vers lui pendant 1,5 sec. Le délai de récupération de Peine capitale est réduit de 3 sec si un ennemi est touché. Réactivez cette compétence pour que Thresh bondisse vers l'ennemi touché.","leveltip":{"label":["Dégâts","Récupération"],"effect":["{{ e1 }} -> {{ e1NL }}","{{ cooldown }} -> {{ cooldownnNL }}"]},"image":{"full":"ThreshQ.png","sprite":"spell9.png","group":"spell","x":48,"y":96,"w":48,"h":48},"resource":"{{ cost }} pts de mana","maxrank":5,"cost":[80,80,80,80,80],"costType":"Mana","costBurn":"80","cooldown":[20.0,18.0,16.0,14.0,12.0],"cooldownBurn":"20/18/16/14/12","effect":[[80,120,160,200,240],[1,1,1,1,2],[80,110,140,170,200],[3,3,3,3,3]],"effectBurn":["80/120/160/200/240","1/1.25/1.5/1.75/2","80/110/140/170/200","3"],"vars":[{"key":"a1","link":"spelldamage","coeff":[0.5]}],"range":[1075,1075,1075,1075,1075],"rangeBurn":"1075","key":"ThreshQ"},{"name":"Lien des ténèbres","description":"Thresh lance une lanterne qui protège les champions alliés proches contre les dégâts. Les alliés peuvent cliquer sur la lanterne pour foncer vers Thresh.","sanitizedDescription":"Thresh lance une lanterne qui protège les champions alliés proches contre les dégâts. Les alliés peuvent cliquer sur la lanterne pour foncer vers Thresh.","tooltip":"<span class=\"colorFFFFFF\">Crée une lanterne protectrice qu'un allié peut utiliser pour foncer vers vous.</span>  <br>Lancez la lanterne à un endroit. Si un allié proche de la lanterne clique dessus, il la ramasse et Thresh les attire tous les deux vers lui.<br><br>De plus, les alliés qui en approchent gagnent un bouclier qui dure 4 sec et qui absorbe jusqu'à {{ e1 }} <span class=\"color99FF99\">(+{{ a1 }})</span> pts de dégâts. Chaque allié ne profite du bouclier qu'une seule fois par utilisation de la compétence.","sanitizedTooltip":"Crée une lanterne protectrice qu'un allié peut utiliser pour foncer vers vous. Lancez la lanterne à un endroit. Si un allié proche de la lanterne clique dessus, il la ramasse et Thresh les attire tous les deux vers lui. De plus, les alliés qui en approchent gagnent un bouclier qui dure 4 sec et qui absorbe jusqu'à {{ e1 }} (+{{ a1 }}) pts de dégâts. Chaque allié ne profite du bouclier qu'une seule fois par utilisation de la compétence.","leveltip":{"label":["Absorption du bouclier","Récupération","Coût en mana"],"effect":["{{ e1 }} -> {{ e1NL }}","{{ cooldown }} -> {{ cooldownnNL }}","{{ cost }} -> {{ costnNL }}"]},"image":{"full":"ThreshW.png","sprite":"spell9.png","group":"spell","x":96,"y":96,"w":48,"h":48},"resource":"{{ cost }} pts de mana","maxrank":5,"cost":[50,55,60,65,70],"costType":"Mana","costBurn":"50/55/60/65/70","cooldown":[22.0,20.5,19.0,17.5,16.0],"cooldownBurn":"22/20.5/19/17.5/16","effect":[[60,95,130,165,200],[10,15,25,35,45],[2,2,2,2,2],[35,35,35,35,35]],"effectBurn":["60/95/130/165/200","10/15/25/35/45","2","35"],"vars":[{"key":"a1","link":"spelldamage","coeff":[0.4]}],"range":[950,950,950,950,950],"rangeBurn":"950","key":"ThreshW"},{"name":"Fauchage","description":"Les attaques de Thresh se chargent, infligeant davantage de dégâts s'il attend plus entre les attaques. À l'activation, Thresh effectue un fauchage avec sa chaîne, envoyant tous les ennemis touchés dans la direction du coup.","sanitizedDescription":"Les attaques de Thresh se chargent, infligeant davantage de dégâts s'il attend plus entre les attaques. À l'activation, Thresh effectue un fauchage avec sa chaîne, envoyant tous les ennemis touchés dans la direction du coup.","tooltip":"<span class=\"size14 colorFF9900\">Passive : </span><span class=\"colorFFFFFF\">chaque coup inflige de {{ f1 }} à {{ f2 }} pts de dégâts magiques supplémentaires, dégâts qui augmentent quand vous n'attaquez pas.</span><br>Les dégâts supplémentaires sont équivalents au nombre d'âmes collectées plus jusqu'à {{ e3 }}%<span class=\"color99FF99\"></span> de ses dégâts d'attaque. Le pourcentage dépend du temps écoulé depuis sa dernière attaque.<br><br><span class=\"size14 colorFF9900\">Active : </span><span class=\"colorFFFFFF\">envoie les ennemis proches dans la direction de votre choix.</span>  <br>Inflige {{ e1 }} <span class=\"color99FF99\">(+{{ a1 }})</span> pts de dégâts magiques sur une ligne qui part de derrière lui. Les ennemis touchés sont envoyés dans la direction du coup, puis ralentis de {{ e2 }}% pendant 1,5 sec.<br><br>Lancer vers l'avant pour repousser et vers l'arrière pour attirer.","sanitizedTooltip":"Passive : chaque coup inflige de {{ f1 }} à {{ f2 }} pts de dégâts magiques supplémentaires, dégâts qui augmentent quand vous n'attaquez pas. Les dégâts supplémentaires sont équivalents au nombre d'âmes collectées plus jusqu'à {{ e3 }}% de ses dégâts d'attaque. Le pourcentage dépend du temps écoulé depuis sa dernière attaque. Active : envoie les ennemis proches dans la direction de votre choix. Inflige {{ e1 }} (+{{ a1 }}) pts de dégâts magiques sur une ligne qui part de derrière lui. Les ennemis touchés sont envoyés dans la direction du coup, puis ralentis de {{ e2 }}% pendant 1,5 sec. Lancer vers l'avant pour repousser et vers l'arrière pour attirer.","leveltip":{"label":["Dégâts passifs","Dégâts actifs","Ralentissement","Coût en mana"],"effect":["{{ e3 }}% -> {{ e3NL }}%","{{ e1 }} -> {{ e1NL }}","{{ e2 }}% -> {{ e2NL }}%","{{ cost }} -> {{ costnNL }}"]},"image":{"full":"ThreshE.png","sprite":"spell9.png","group":"spell","x":144,"y":96,"w":48,"h":48},"resource":"{{ cost }} pts de mana","maxrank":5,"cost":[60,65,70,75,80],"costType":"Mana","costBurn":"60/65/70/75/80","cooldown":[9.0,9.0,9.0,9.0,9.0],"cooldownBurn":"9","effect":[[65,95,125,155,185],[20,25,30,35,40],[80,110,140,170,200]],"effectBurn":["65/95/125/155/185","20/25/30/35/40","80/110/140/170/200"],"vars":[{"key":"a1","link":"spelldamage","coeff":[0.4]}],"range":[800,800,800,800,800],"rangeBurn":"800","key":"ThreshE"},{"name":"La boîte","description":"Une prison dont les murs ralentissent et blessent les ennemis qui les brisent.","sanitizedDescription":"Une prison dont les murs ralentissent et blessent les ennemis qui les brisent.","tooltip":"<span class=\"colorFFFFFF\">Piège les ennemis entre des murs qui, s'ils sont brisés, ralentissent et infligent des dégâts.</span> <br>Crée une prison de murs spectraux autour de lui. Les champions ennemis qui traversent un mur subissent {{ e1 }} <span class=\"color99FF99\">(+{{ a1 }})</span> pts de dégâts magiques et sont ralentis de {{ e3 }}% pendant 2 sec, mais ils brisent ce mur.  <br><br>Dès qu'un mur est brisé, les murs restants n'infligent que la moitié des dégâts et leur ralentissement dure moitié moins longtemps. Un ennemi ne peut pas être affecté par plusieurs murs simultanément.","sanitizedTooltip":"Piège les ennemis entre des murs qui, s'ils sont brisés, ralentissent et infligent des dégâts. Crée une prison de murs spectraux autour de lui. Les champions ennemis qui traversent un mur subissent {{ e1 }} (+{{ a1 }}) pts de dégâts magiques et sont ralentis de {{ e3 }}% pendant 2 sec, mais ils brisent ce mur. Dès qu'un mur est brisé, les murs restants n'infligent que la moitié des dégâts et leur ralentissement dure moitié moins longtemps. Un ennemi ne peut pas être affecté par plusieurs murs simultanément.","leveltip":{"label":["Dégâts","Récupération"],"effect":["{{ e1 }} -> {{ e1NL }}","{{ cooldown }} -> {{ cooldownnNL }}"]},"image":{"full":"ThreshRPenta.png","sprite":"spell9.png","group":"spell","x":192,"y":96,"w":48,"h":48},"resource":"{{ cost }} pts de mana","maxrank":3,"cost":[100,100,100],"costType":"Mana","costBurn":"100","cooldown":[150.0,140.0,130.0],"cooldownBurn":"150/140/130","effect":[[250,400,550],[2,2,2],[99,99,99],[4,4,4],[6,6,6]],"effectBurn":["250/400/550","2","99","4","6"],"vars":[{"key":"a1","link":"spelldamage","coeff":[1.0]}],"range":[450,450,450],"rangeBurn":"450","key":"ThreshRPenta"}],"passive":{"name":"Damnation","description":"Thresh peut collecter les âmes des ennemis qui meurent près de lui, augmentant définitivement son armure et sa puissance.","sanitizedDescription":"Thresh peut collecter les âmes des ennemis qui meurent près de lui, augmentant définitivement son armure et sa puissance.","image":{"full":"Thresh_Passive.png","sprite":"passive3.png","group":"passive","x":48,"y":0,"w":48,"h":48}},"recommended":[{"champion":"Thresh","title":"Beginner","type":"riot-beginner","map":"1","mode":"CLASSIC","priority":false,"blocks":[{"type":"beginner_Starter","items":[{"id":1054,"count":1},{"id":2003,"count":1}]},{"type":"beginner_Advanced","recMath":true,"items":[{"id":1028,"count":1},{"id":3067,"count":1}]},{"type":"beginner_MovementSpeed","recMath":true,"items":[{"id":1001,"count":1},{"id":1029,"count":1},{"id":3047,"count":1}]},{"type":"beginner_LegendaryItem","recMath":true,"items":[{"id":3067,"count":1},{"id":3105,"count":1},{"id":3190,"count":1}]},{"type":"beginner_MoreLegendaryItems","items":[{"id":3110,"count":1},{"id":3068,"count":1},{"id":3050,"count":1},{"id":3083,"count":1}]}]},{"champion":"Thresh","title":"Map12","type":"riot","map":"12","mode":"ARAM","priority":false,"blocks":[{"type":"starting","items":[{"id":1001,"count":1},{"id":3096,"count":1},{"id":1004,"count":1},{"id":2003,"count":4}]},{"type":"essential","items":[{"id":3028,"count":1},{"id":3111,"count":1},{"id":3105,"count":1}]},{"type":"offensive","items":[{"id":3069,"count":1},{"id":3060,"count":1},{"id":3174,"count":1}]},{"type":"defensive","items":[{"id":3065,"count":1},{"id":3110,"count":1},{"id":3222,"count":1}]},{"type":"Consumables","items":[{"id":2003,"count":1},{"id":2004,"count":1}]}]},{"champion":"Thresh","title":"TaricDM","type":"riot","map":"8","mode":"ODIN","priority":false,"blocks":[{"type":"starting","items":[{"id":1001,"count":1},{"id":3067,"count":1},{"id":2003,"count":3}]},{"type":"essential","items":[{"id":3111,"count":1},{"id":3105,"count":1},{"id":3050,"count":1}]},{"type":"offensive","items":[{"id":3060,"count":1},{"id":3092,"count":1}]},{"type":"defensive","items":[{"id":3065,"count":1},{"id":3110,"count":1},{"id":3290,"count":1}]},{"type":"Consumables","items":[{"id":2003,"count":1},{"id":2004,"count":1}]}]},{"champion":"Thresh","title":"ThreshFB","type":"riot","map":"12","mode":"FIRSTBLOOD","priority":false,"blocks":[{"type":"starting","items":[{"id":2044,"count":1},{"id":2003,"count":1},{"id":3342,"count":1},{"id":3302,"count":1}]},{"type":"essential","items":[{"id":2049,"count":1},{"id":3105,"count":1},{"id":3117,"count":1},{"id":3097,"count":1}]},{"type":"offensive","items":[{"id":3068,"count":1},{"id":3050,"count":1},{"id":3023,"count":1}]},{"type":"defensive","items":[{"id":3222,"count":1},{"id":3190,"count":1},{"id":3401,"count":1}]},{"type":"Consumables","items":[{"id":2003,"count":1},{"id":2004,"count":1},{"id":2044,"count":1},{"id":2043,"count":1}]}]},{"champion":"Thresh","title":"ThreshSR","type":"riot","map":"1","mode":"CLASSIC","priority":false,"blocks":[{"type":"starting","items":[{"id":2044,"count":1},{"id":2003,"count":1},{"id":3341,"count":1},{"id":3301,"count":1}]},{"type":"essential","items":[{"id":2049,"count":1},{"id":3105,"count":1},{"id":3117,"count":1},{"id":3096,"count":1}]},{"type":"offensive","items":[{"id":3068,"count":1},{"id":3050,"count":1},{"id":3023,"count":1},{"id":3069,"count":1}]},{"type":"defensive","items":[{"id":3222,"count":1},{"id":3190,"count":1}]},{"type":"Consumables","items":[{"id":2003,"count":1},{"id":2004,"count":1},{"id":2044,"count":1},{"id":2043,"count":1}]}]},{"champion":"Thresh","title":"TaricTT","type":"riot","map":"10","mode":"CLASSIC","priority":false,"blocks":[{"type":"starting","items":[{"id":1001,"count":1},{"id":1054,"count":1}]},{"type":"essential","items":[{"id":3111,"count":1},{"id":3105,"count":1},{"id":3050,"count":1}]},{"type":"offensive","items":[{"id":3060,"count":1},{"id":3092,"count":1}]},{"type":"defensive","items":[{"id":3065,"count":1},{"id":3110,"count":1},{"id":3290,"count":1}]},{"type":"Consumables","items":[{"id":2003,"count":1},{"id":2004,"count":1}]}]}]}

data/spec/riot_lol_api_spec.rb

@@ -4,6 +4,28 @@ require 'pp'
 
 describe RiotLolApi::Client do
 
+	describe "can use string and hash ovewriting method" do
+
+		it "transform string CamelCase in to symbol" do
+			test = "lolApiTest"
+			expect(test.to_symbol).to eq :lol_api_test
+		end
+
+		it "transform hash keys CamelCase in to symbol" do
+			hash_test = {"lolApiTest" => "lol", "testLol" => "truc"}
+			expect(hash_test.to_symbol).to eq({:lol_api_test => "lol", :test_lol => "truc"})
+		end
+
+		it "Add instance of class to_symbol" do
+			hash_result = {"lolApiTest" => "lol", "testLol" => "truc", "masteries" => [{"id" => 4212,"rank" => 2},{"id" => 4233,"rank" => 3}], "stats" => {"truc" => 0, "machin" => 2}}.to_symbol
+			# Test Array
+			expect(hash_result[:masteries][0]).to be_a RiotLolApi::Model::Mastery
+			# Test Hash
+			expect(hash_result[:stats]).to be_a RiotLolApi::Model::Stat
+		end
+
+	end
+
 	describe "get_summoner_by_name" do
 
 		before(:each) do
@@ -21,14 +43,13 @@ describe RiotLolApi::Client do
 			expect(@summoner_test).to be_a RiotLolApi::Model::Summoner
 		end
 
-		it "should good attributes" do
+		it "should have good attributes" do
 			summoner = FactoryGirl.build(:summoner)
 
-			expect(@summoner_test.id_summoner).to eq(summoner.id_summoner)
+			expect(@summoner_test.id).to eq(summoner.id)
 			expect(@summoner_test.name).to eq(summoner.name)
 			expect(@summoner_test.profile_icon_id).to eq(summoner.profile_icon_id)
 			expect(@summoner_test.summoner_level).to eq(summoner.summoner_level)
-			expect(@summoner_test.revision_date_str).to eq(summoner.revision_date_str)
 			expect(@summoner_test.revision_date).to eq(summoner.revision_date)
 			expect(@summoner_test.region).to eq(summoner.region)
 		end
@@ -51,43 +72,42 @@ describe RiotLolApi::Client do
 			expect(@summoner_test).to be_a RiotLolApi::Model::Summoner
 		end
 
-		it "should good attributes" do
+		it "should have good attributes" do
 			summoner = FactoryGirl.build(:summoner)
 
-			expect(@summoner_test.id_summoner).to eq(summoner.id_summoner)
+			expect(@summoner_test.id).to eq(summoner.id)
 			expect(@summoner_test.name).to eq(summoner.name)
 			expect(@summoner_test.profile_icon_id).to eq(summoner.profile_icon_id)
 			expect(@summoner_test.summoner_level).to eq(summoner.summoner_level)
-			expect(@summoner_test.revision_date_str).to eq(summoner.revision_date_str)
 			expect(@summoner_test.revision_date).to eq(summoner.revision_date)
 			expect(@summoner_test.region).to eq(summoner.region)
 		end
 	end
 
-	describe "get summoner masteries" do
+	describe "get summoner masteries pages" do
 
 		before(:each) do
 			# Create summoner
 			summoner = FactoryGirl.build(:summoner)
 
 			api_response = File.read 'spec/mock_response/get_summoner_masteries_by_id.json'
-			stub_request(:get, "https://prod.api.pvp.net/api/lol/euw/v1.4/summoner/#{summoner.id_summoner}/masteries?api_key=#{RiotLolApi::TOKEN}").to_return(api_response)
+			stub_request(:get, "https://prod.api.pvp.net/api/lol/euw/v1.4/summoner/#{summoner.id}/masteries?api_key=#{RiotLolApi::TOKEN}").to_return(api_response)
 
-			@mastery_test = summoner.masteries
+			@page_test = summoner.masteries
 		end
 
-		it "should good attributes" do
-			tab_mastery = Array.new
-			tab_mastery << FactoryGirl.build(:mastery, :id_mastery => 37482369, :name => "support", :current => false, :talents => [RiotLolApi::Model::Talent.new(:id_talent => 4212,:rank => 2),RiotLolApi::Model::Talent.new(:id_talent => 4233,:rank => 3)])
-			tab_mastery << FactoryGirl.build(:mastery, :id_mastery => 37482370, :name => "jungler", :current => false, :talents => [RiotLolApi::Model::Talent.new(:id_talent => 4233,:rank => 3),RiotLolApi::Model::Talent.new(:id_talent => 4242,:rank => 1)])
-
-			@mastery_test.each_with_index do |mastery,i|
-				expect(mastery.id_mastery).to eq(tab_mastery[i].id_mastery)
-				expect(mastery.name).to eq(tab_mastery[i].name)
-				expect(mastery.current).to eq(tab_mastery[i].current)
-				mastery.talents.each_with_index do |talent,j|
-					expect(talent.id_talent).to eq(tab_mastery[i].talents[j].id_talent)
-					expect(talent.rank).to eq(tab_mastery[i].talents[j].rank)
+		it "should have good attributes" do
+			tab_pages = Array.new
+			tab_pages << FactoryGirl.build(:page, :id => 37482369, :name => "support", :current => false, :masteries => [RiotLolApi::Model::Mastery.new(:id => 4212,:rank => 2),RiotLolApi::Model::Mastery.new(:id => 4233,:rank => 3)])
+			tab_pages << FactoryGirl.build(:page, :id => 37482370, :name => "jungler", :current => false, :masteries => [RiotLolApi::Model::Mastery.new(:id => 4233,:rank => 3),RiotLolApi::Model::Mastery.new(:id => 4242,:rank => 1)])
+
+			@page_test.each_with_index do |page,i|
+				expect(page.id).to eq(tab_pages[i].id)
+				expect(page.name).to eq(tab_pages[i].name)
+				expect(page.current).to eq(tab_pages[i].current)
+				page.masteries.each_with_index do |mastery,j|
+					expect(mastery.id).to eq(tab_pages[i].masteries[j].id)
+					expect(mastery.rank).to eq(tab_pages[i].masteries[j].rank)
 				end
 			end
 		end
@@ -100,23 +120,23 @@ describe RiotLolApi::Client do
 			summoner = FactoryGirl.build(:summoner)
 
 			api_response = File.read 'spec/mock_response/get_summoner_runes_by_id.json'
-			stub_request(:get, "https://prod.api.pvp.net/api/lol/euw/v1.4/summoner/#{summoner.id_summoner}/runes?api_key=#{RiotLolApi::TOKEN}").to_return(api_response)
+			stub_request(:get, "https://prod.api.pvp.net/api/lol/euw/v1.4/summoner/#{summoner.id}/runes?api_key=#{RiotLolApi::TOKEN}").to_return(api_response)
 
 			@rune_test = summoner.runes
 		end
 
-		it "should good attributes" do
+		it "should have good attributes" do
 			tab_runes = Array.new
-			tab_runes << FactoryGirl.build(:rune, :id_rune => 6182779, :name => "ad", :current => true, :slots => [RiotLolApi::Model::Slot.new(:id_slot => 5253,:rank => 1),RiotLolApi::Model::Slot.new(:id_slot => 5253,:rank => 2)])
-			tab_runes << FactoryGirl.build(:rune, :id_rune => 6182780, :name => "ap", :current => false, :slots => [RiotLolApi::Model::Slot.new(:id_slot => 5245,:rank => 1),RiotLolApi::Model::Slot.new(:id_slot => 5245,:rank => 2)])
+			tab_runes << FactoryGirl.build(:page, :id => 6182779, :name => "ad", :current => true, :slots => [RiotLolApi::Model::Slot.new(:rune_slot_id => 1,:rune_id => 5253),RiotLolApi::Model::Slot.new(:rune_slot_id => 2,:rune_id => 5253)])
+			tab_runes << FactoryGirl.build(:page, :id => 6182780, :name => "ap", :current => false, :slots => [RiotLolApi::Model::Slot.new(:rune_slot_id => 1,:rune_id => 5245),RiotLolApi::Model::Slot.new(:rune_slot_id => 2,:rune_id => 5245)])
 
 			@rune_test.each_with_index do |rune,i|
-				expect(rune.id_rune).to eq(tab_runes[i].id_rune)
+				expect(rune.id).to eq(tab_runes[i].id)
 				expect(rune.name).to eq(tab_runes[i].name)
 				expect(rune.current).to eq(tab_runes[i].current)
 				rune.slots.each_with_index do |slot,j|
-					expect(slot.id_slot).to eq(tab_runes[i].slots[j].id_slot)
-					expect(slot.rank).to eq(tab_runes[i].slots[j].rank)
+					expect(slot.rune_slot_id).to eq(tab_runes[i].slots[j].rune_slot_id)
+					expect(slot.rune_id).to eq(tab_runes[i].slots[j].rune_id)
 				end
 			end
 		end
@@ -129,14 +149,14 @@ describe RiotLolApi::Client do
 			summoner = FactoryGirl.build(:summoner)
 
 			api_response = File.read 'spec/mock_response/get_summoner_games_by_id.json'
-			stub_request(:get, "https://prod.api.pvp.net/api/lol/euw/v1.3/game/by-summoner/#{summoner.id_summoner}/recent?api_key=#{RiotLolApi::TOKEN}").to_return(api_response)
+			stub_request(:get, "https://prod.api.pvp.net/api/lol/euw/v1.3/game/by-summoner/#{summoner.id}/recent?api_key=#{RiotLolApi::TOKEN}").to_return(api_response)
 
 			@game_tests = summoner.games
 		end
 
-		it "should good attributes" do
-			game = FactoryGirl.build(:game, :fellow_players => [RiotLolApi::Model::Player.new(:summoner_id => 228437,:team_id => 200, :champion_id => 102),RiotLolApi::Model::Player.new(:summoner_id => 25235641,:team_id => 100, :champion_id => 48)], :stats => 
-				RiotLolApi::Model::Stat.new(:nexus_killed => false, :neutral_minions_killed_your_jungle => 0,:neutral_minions_killed_enemy_jungle => 0,:neutral_minions_killed => 0, :minions_denied => 0, :legendary_items_created => nil,:largest_multi_kill => nil, :largest_killing_spree =>nil, :largest_critical_strike => nil, :killing_sprees => 0, :items_purchased => 0,:item5 => nil, :gold_earned => 5969, :gold_spent => 5630,:first_blood => nil,:double_kills => nil,:consumables_purchased => nil, :combat_player_score => 0, :champions_killed => 0, :barracks_killed => 0,:level => 13, :num_deaths => 2, :minions_killed => 10, :total_damage_dealt => 19848, :total_damage_taken => 16127, :team => 200, :win => false, :physical_damage_dealt_player => 7116, :magic_damage_dealt_player => 12732, :physical_damage_taken => 7806, :magic_damage_taken => 8069, :time_played => 1597, :total_heal => 9241, :total_units_healed => 4, :assists => 8, :item0 => 3301, :item1 => 2049, :item2 => 3047, :item3 => 3110, :item4 => 1057, :item6 => 3340, :sight_wards_bought => 1, :magic_damage_dealt_to_champions => 3100, :physical_damage_dealt_to_champions => 1230, :total_damage_dealt_to_champions => 4330, :true_damage_taken => 252, :ward_placed => 14, :total_time_crowd_control_dealt => 602))
+		it "should have good attributes" do
+			game = FactoryGirl.build(:game, :fellow_players => [RiotLolApi::Model::FellowPlayer.new(:summoner_id => 228437,:team_id => 200, :champion_id => 102),RiotLolApi::Model::FellowPlayer.new(:summoner_id => 25235641,:team_id => 100, :champion_id => 48)], :stats => 
+				RiotLolApi::Model::Stat.new(:ward_killed => nil, :vision_wards_bought => nil, :victory_point_total => nil, :unreal_kills => nil, :turrets_killed => nil, :true_damage_taken => nil, :true_damage_dealt_to_champions => nil, :true_damage_dealt_player => nil, :triple_kills => nil, :total_score_rank => nil, :total_player_score => nil, :team_objective => nil, :super_monster_killed => nil, :summon_spell2_cast => nil, :summon_spell1_cast => nil, :spell4_cast => nil, :spell3_cast => nil, :spell2_cast => nil, :spell1_cast => nil, :quadra_kills => nil, :penta_kills => nil, :objective_player_score => nil, :num_items_bought => nil, :node_neutralize_assist => nil, :node_neutralize => nil, :node_capture_assist => nil,:node_capture => nil, :nexus_killed => nil, :neutral_minions_killed_your_jungle => nil,:neutral_minions_killed_enemy_jungle => nil,:neutral_minions_killed => nil, :minions_denied => nil, :legendary_items_created => nil,:largest_multi_kill => nil, :largest_killing_spree =>nil, :largest_critical_strike => nil, :killing_sprees => nil, :items_purchased => nil,:item5 => nil, :gold_earned => 5969, :gold_spent => 5630,:first_blood => nil,:double_kills => nil,:consumables_purchased => nil, :combat_player_score => nil, :champions_killed => nil, :barracks_killed => nil,:level => 13, :num_deaths => 2, :minions_killed => 10, :total_damage_dealt => 19848, :total_damage_taken => 16127, :team => 200, :win => false, :physical_damage_dealt_player => 7116, :magic_damage_dealt_player => 12732, :physical_damage_taken => 7806, :magic_damage_taken => 8069, :time_played => 1597, :total_heal => 9241, :total_units_healed => 4, :assists => 8, :item0 => 3301, :item1 => 2049, :item2 => 3047, :item3 => 3110, :item4 => 1057, :item6 => 3340, :sight_wards_bought => 1, :magic_damage_dealt_to_champions => 3100, :physical_damage_dealt_to_champions => 1230, :total_damage_dealt_to_champions => 4330, :true_damage_taken => 252, :ward_placed => 14, :total_time_crowd_control_dealt => 602))
 
 			@game_tests.each do |game_test|
 				expect(game_test.game_id).to eq(game.game_id)
@@ -190,17 +210,105 @@ describe RiotLolApi::Client do
 				expect(game_test.stats.neutral_minions_killed_enemy_jungle).to eq(game.stats.neutral_minions_killed_enemy_jungle)
 				expect(game_test.stats.neutral_minions_killed_your_jungle).to eq(game.stats.neutral_minions_killed_your_jungle)
 				expect(game_test.stats.nexus_killed).to eq(game.stats.nexus_killed)
-
-				expect(game_test.stats.item6).to eq(game.stats.item6)
-				expect(game_test.stats.item6).to eq(game.stats.item6)
-				expect(game_test.stats.item6).to eq(game.stats.item6)
-				expect(game_test.stats.item6).to eq(game.stats.item6)
-				expect(game_test.stats.item6).to eq(game.stats.item6)
-				expect(game_test.stats.item6).to eq(game.stats.item6)
-				# ...
+				expect(game_test.stats.node_capture).to eq(game.stats.node_capture)
+				expect(game_test.stats.node_capture_assist).to eq(game.stats.node_capture_assist)
+				expect(game_test.stats.node_neutralize).to eq(game.stats.node_neutralize)
+				expect(game_test.stats.node_neutralize_assist).to eq(game.stats.node_neutralize_assist)
+				expect(game_test.stats.num_deaths).to eq(game.stats.num_deaths)
+				expect(game_test.stats.num_items_bought).to eq(game.stats.num_items_bought)
+				expect(game_test.stats.objective_player_score).to eq(game.stats.objective_player_score)
+				expect(game_test.stats.penta_kills).to eq(game.stats.penta_kills)
+				expect(game_test.stats.physical_damage_dealt_player).to eq(game.stats.physical_damage_dealt_player)
+				expect(game_test.stats.physical_damage_dealt_to_champions).to eq(game.stats.physical_damage_dealt_to_champions)
+				expect(game_test.stats.physical_damage_taken).to eq(game.stats.physical_damage_taken)
+				expect(game_test.stats.quadra_kills).to eq(game.stats.quadra_kills)
+				expect(game_test.stats.sight_wards_bought).to eq(game.stats.sight_wards_bought)
+				expect(game_test.stats.spell4_cast).to eq(game.stats.spell4_cast)
+				expect(game_test.stats.spell3_cast).to eq(game.stats.spell3_cast)
+				expect(game_test.stats.spell2_cast).to eq(game.stats.spell2_cast)
+				expect(game_test.stats.spell1_cast).to eq(game.stats.spell1_cast)
+				expect(game_test.stats.summon_spell1_cast).to eq(game.stats.summon_spell1_cast)
+				expect(game_test.stats.summon_spell2_cast).to eq(game.stats.summon_spell2_cast)
+				expect(game_test.stats.super_monster_killed).to eq(game.stats.super_monster_killed)
+				expect(game_test.stats.team).to eq(game.stats.team)
+				expect(game_test.stats.team_objective).to eq(game.stats.team_objective)
+				expect(game_test.stats.time_played).to eq(game.stats.time_played)
+				expect(game_test.stats.total_damage_dealt).to eq(game.stats.total_damage_dealt)
+				expect(game_test.stats.total_damage_dealt_to_champions).to eq(game.stats.total_damage_dealt_to_champions)
+				expect(game_test.stats.total_damage_taken).to eq(game.stats.total_damage_taken)
+				expect(game_test.stats.total_heal).to eq(game.stats.total_heal)
+				expect(game_test.stats.total_player_score).to eq(game.stats.total_player_score)
+				expect(game_test.stats.total_score_rank).to eq(game.stats.total_score_rank)
+				expect(game_test.stats.total_time_crowd_control_dealt).to eq(game.stats.total_time_crowd_control_dealt)
+				expect(game_test.stats.total_units_healed).to eq(game.stats.total_units_healed)
+				expect(game_test.stats.triple_kills).to eq(game.stats.triple_kills)
+				expect(game_test.stats.true_damage_dealt_player).to eq(game.stats.true_damage_dealt_player)
+				expect(game_test.stats.true_damage_dealt_to_champions).to eq(game.stats.true_damage_dealt_to_champions)
+				expect(game_test.stats.true_damage_taken).to eq(game.stats.true_damage_taken)
+				expect(game_test.stats.turrets_killed).to eq(game.stats.turrets_killed)
+				expect(game_test.stats.unreal_kills).to eq(game.stats.unreal_kills)
+				expect(game_test.stats.victory_point_total).to eq(game.stats.victory_point_total)
+				expect(game_test.stats.vision_wards_bought).to eq(game.stats.vision_wards_bought)
+				expect(game_test.stats.ward_killed).to eq(game.stats.ward_killed)
+				expect(game_test.stats.ward_placed).to eq(game.stats.ward_placed)
+				expect(game_test.stats.win).to eq(game.stats.win)
 			end
 		end
 
 	end
 
+	describe "get_champion_by_id" do
+
+		before(:each) do
+			# Create client
+			client = FactoryGirl.build(:client)
+			id_champion = 412
+
+			api_response = File.read 'spec/mock_response/get_champion_by_id.json'
+			stub_request(:get, "https://prod.api.pvp.net/api/lol/static-data/euw/v1.2/champion/#{id_champion}?local=fr_FR&api_key=#{RiotLolApi::TOKEN}").to_return(api_response)
+
+			@champion_test = client.get_champion_by_id(id_champion)
+		end
+
+		it "should get summoner object" do
+			expect(@champion_test).to be_a RiotLolApi::Model::Champion
+		end
+
+		it "should have good attributes" do
+			champion = FactoryGirl.build(:champion)
+
+			expect(@champion_test.id).to eq(champion.id)
+			expect(@champion_test.key).to eq(champion.key)
+			expect(@champion_test.name).to eq(champion.name)
+			expect(@champion_test.title).to eq(champion.title)
+		end
+	end
+
+	describe "get_champion_by_id_all_data" do
+
+		before(:each) do
+			# Create client
+			client = FactoryGirl.build(:client)
+			id_champion = 412
+
+			api_response = File.read 'spec/mock_response/get_champion_by_id_all_data.json'
+			stub_request(:get, "https://prod.api.pvp.net/api/lol/static-data/euw/v1.2/champion/#{id_champion}?local=fr_FR&champData=all&api_key=#{RiotLolApi::TOKEN}").to_return(api_response)
+
+			@champion_test = client.get_champion_by_id(id_champion,{:champData => 'all'})
+		end
+
+		it "should get summoner object" do
+			expect(@champion_test).to be_a RiotLolApi::Model::Champion
+		end
+
+		it "should have good attributes" do
+			champion = FactoryGirl.build(:champion)
+
+			expect(@champion_test.id).to eq(champion.id)
+			expect(@champion_test.key).to eq(champion.key)
+			expect(@champion_test.name).to eq(champion.name)
+			expect(@champion_test.title).to eq(champion.title)
+		end
+	end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riot_lol_api
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - francois_blanchard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,25 +109,39 @@ files:
 - README.md
 - Rakefile
 - lib/.DS_Store
+- lib/core_ext/hash.rb
+- lib/core_ext/string.rb
 - lib/riot_lol_api.rb
 - lib/riot_lol_api/client.rb
 - lib/riot_lol_api/model.rb
+- lib/riot_lol_api/model/block.rb
+- lib/riot_lol_api/model/champion.rb
+- lib/riot_lol_api/model/fellow_player.rb
 - lib/riot_lol_api/model/game.rb
+- lib/riot_lol_api/model/image.rb
+- lib/riot_lol_api/model/info.rb
+- lib/riot_lol_api/model/item.rb
+- lib/riot_lol_api/model/leveltip.rb
 - lib/riot_lol_api/model/mastery.rb
-- lib/riot_lol_api/model/player.rb
-- lib/riot_lol_api/model/rune.rb
+- lib/riot_lol_api/model/page.rb
+- lib/riot_lol_api/model/passive.rb
+- lib/riot_lol_api/model/recommended.rb
+- lib/riot_lol_api/model/skin.rb
 - lib/riot_lol_api/model/slot.rb
+- lib/riot_lol_api/model/spell.rb
 - lib/riot_lol_api/model/stat.rb
 - lib/riot_lol_api/model/summoner.rb
-- lib/riot_lol_api/model/talent.rb
+- lib/riot_lol_api/model/var.rb
 - lib/riot_lol_api/version.rb
 - riot_lol_api.gemspec
 - spec/.DS_Store
+- spec/factories/champion.rb
 - spec/factories/client.rb
 - spec/factories/game.rb
-- spec/factories/mastery.rb
-- spec/factories/rune.rb
+- spec/factories/page.rb
 - spec/factories/summoner.rb
+- spec/mock_response/get_champion_by_id.json
+- spec/mock_response/get_champion_by_id_all_data.json
 - spec/mock_response/get_summoner_by_id.json
 - spec/mock_response/get_summoner_by_name.json
 - spec/mock_response/get_summoner_games_by_id.json
@@ -161,11 +175,13 @@ specification_version: 4
 summary: Riot games api
 test_files:
 - spec/.DS_Store
+- spec/factories/champion.rb
 - spec/factories/client.rb
 - spec/factories/game.rb
-- spec/factories/mastery.rb
-- spec/factories/rune.rb
+- spec/factories/page.rb
 - spec/factories/summoner.rb
+- spec/mock_response/get_champion_by_id.json
+- spec/mock_response/get_champion_by_id_all_data.json
 - spec/mock_response/get_summoner_by_id.json
 - spec/mock_response/get_summoner_by_name.json
 - spec/mock_response/get_summoner_games_by_id.json

data/spec/factories/mastery.rb

@@ -1,9 +0,0 @@
-FactoryGirl.define do
-	factory :mastery, :class => RiotLolApi::Model::Mastery do
-		id_mastery 37482369
-		name "support"
-		current false
-		talents nil 
-		initialize_with { new(:id_mastery => id_mastery, :name => name, :current => current, :talents => talents) }
-	end
-end

data/spec/factories/rune.rb

@@ -1,9 +0,0 @@
-FactoryGirl.define do
-	factory :rune, :class => RiotLolApi::Model::Rune do
-		id_rune 37482369
-		name "support"
-		current false
-		slots nil 
-		initialize_with { new(:id_rune => id_rune, :name => name, :current => current, :slots => slots) }
-	end
-end