demacia 0.0.1 → 0.0.3

data/lib/Demacia.rb

@@ -10,8 +10,8 @@ module Demacia
 
 		# Initializes the Caller with an api key (needed)
 		# Params:
-		# +key+:: the api key provided by riot 
-		# +region+:: the region where the requests have to be made. Can be one of the following : tr,br,na,euw,eune
+		# - +key+:: the api key provided by riot 
+		# - +region+:: the region where the requests have to be made. Can be one of the following : tr,br,na,euw,eune
 		def initialize(key, region)
 			@api_key = key
 			@region = region
@@ -21,53 +21,17 @@ module Demacia
 
 		# Gets a summoner's info from riot's API based on its name
 		# Params:
-		# +name+:: The summoner name (nickname). NOT the account name
+		# - +name+:: The summoner name (nickname). NOT the account name
 		def summoner_by_name(name)
 			encoded_name = HTMLEntities.new.encode name
-			summoner = Demacia::Summoner.new(@entry_point+"summoner/by-name/"+encoded_name+@api_suffix)
+			summoner = Demacia::Summoner.new(@entry_point+"summoner/by-name/"+encoded_name+@api_suffix, @region)
 		end
 
 		# Gets a summoner's info from riot's API based on its id
 		# Params:
 		# +id+:: The summoner id from riot's api
 		def summoner_by_id(id)
-			summoner = Demacia::Summoner.new(@entry_point+"summoner/"+id+@api_suffix)
-		end
-
-		# Gets a summoner's info and masteries from riot's API based on its name
-		# Params:
-		# +name+:: The summoner name from riot's api
-		def summoner_masteries_by_name(name)
-			summoner = summoner_by_name(name)
-			summoner.load_masteries(@entry_point+"summoner/"+summoner.id.to_s+"/masteries"+@api_suffix)
-			summoner
-		end
-
-		# Gets a summoner's info and masteries from riot's API based on its id
-		# Params:
-		# +id+:: The summoner id from riot's api
-		def summoner_masteries_by_id(id)
-			summoner = summoner_by_id(id)
-			summoner.load_masteries(@entry_point+"summoner/"+summoner.id.to_s+"/masteries"+@api_suffix)
-			summoner
-		end
-
-		# Gets a summoner's info and runes from riot's API based on its name
-		# Params:
-		# +name+:: The summoner name from riot's api
-		def summoner_runes_by_name(name)
-			summoner = summoner_by_name(name)
-			summoner.load_runes(@entry_point+"summoner/"+summoner.id.to_s+"/runes"+@api_suffix)
-			summoner
-		end
-
-		# Gets a summoner's info and runes from riot's API based on its id
-		# Params:
-		# +id+:: The summoner id from riot's api
-		def summoner_runes_by_id(id)
-			summoner = summoner_by_id(id)
-			summoner.load_runes(@entry_point+"summoner/"+summoner.id.to_s+"/runes"+@api_suffix)
-			summoner
+			summoner = Demacia::Summoner.new(@entry_point+"summoner/"+id+@api_suffix, @region)
 		end
 	end
 end

data/lib/demacia/Page.rb

@@ -7,10 +7,20 @@ module Demacia
 		# Params:
 		# +name+:: The page's name
 		# +current+:: A boolean that tells us if this is the currently used page
-		def initialize(name, current)
+		def initialize(name, current, talents)
 			@name = name
 			@current = current
-			talents = Array.new
+			@talents = talents
+		end
+
+		def to_s
+			is_used = current ? "yes" : "no"
+			return_string = "\nTalent page name:\t"+@name+
+							"\nCurrently used:\t"+is_used+
+							"\nTalents :\n"
+			talents.each do |talent|
+				return_string << "\t"+ talent.to_s
+			end
 		end
 	end
 end

data/lib/demacia/Summoner.rb

@@ -4,56 +4,93 @@ require 'openssl'
 require 'Page'
 require 'Talent'
 require 'Rune'
+require 'Tome'
 
 module Demacia
 	class Summoner
-		attr_accessor :masteries, :runes, :profile_icon, :name, :id, :level
+		attr_accessor :masteries, :runes, :profile_icon, :name, :id, :level, :region
 
 		# Class constructor, gets the basic Summoner info from riot api. Does not auto load the masteries nor runes
 		# Params:
-		# +query_string+:: The full query string forged from name, entry point and method
-		def initialize(query_string)
+		# - +query_string+:: The full query string forged from name, entry point and method
+		# - +region+:: The region in wich the summoner resides
+		def initialize(query_string, region)
 			answer_string = open(query_string).read
 			parsed_answer = JSON.parse(answer_string)
-			puts parsed_answer
 			@level = parsed_answer["summonerLevel"]
 			@profile_icon = parsed_answer["profileIconId"]
 			@name = parsed_answer["name"]
 			@id = parsed_answer["id"]
-			puts parsed_answer["id"]
+			@region = region
 		end
 
-		# Loads masteries based on a query to query string.
+		# Loads masteries based on an api key
 		# Params:
-		# +query_string+:: the full query string forged from name, entry point and method
-		def load_masteries(query_string)
+		# - +key+:: the api key
+		def load_masteries!(key)
 			@masteries = Array.new
-			answer_string = open(query_string).read
-			parsed_answer = JSON.parse(answer_string)
-			parsed_answer["pages"].each do |key, page| 
-				page_buffer = Demacia::Page.new(page["name"], page["current"])
-				page["talents"].each do |talent_key, talent|
-					talent_buffer = Demacia::Talent.new(talent["id"], talent["name"], talent["rank"])
-					page_buffer.talents << talent_buffer
+			begin
+				answer_string = open("http://prod.api.pvp.net/api/lol/" + @region +"/v1.1/summoner/"+@id.to_s+"/masteries?api_key="+key).read
+				parsed_answer = JSON.parse(answer_string)
+				parsed_answer["pages"].each do |page| 
+					talents_buffer = Array.new
+					page["talents"].each do |talent|
+						talent_buffer = Demacia::Talent.new(talent["id"], talent["name"], talent["rank"])
+						talents_buffer << talent_buffer
+					end
+					page_buffer = Demacia::Page.new(page["name"], page["current"], talents_buffer)
+					@masteries << page_buffer
 				end
-				@masteries << page_buffer
+			rescue Exception => e
+				puts "An error occured when retreiving the summoner's masteries : "
+				puts e.message
 			end
 		end
 
-		# Loads runes based on a query to query string. The runes are sorted by their slot id
+		# Loads runes based on an api key. The runes are sorted by their slot id
 		# Params:
-		# +query_string+:: the full query string forged from name, entry point and method
-		def load_runes(query_string)
+		# - +key+:: the full query string forged from name, entry point and method
+		def load_runes!(key)
 			@runes = Array.new
-			answer_string = open(query_string).read
+			begin
+				answer_string = open("http://prod.api.pvp.net/api/lol/" + @region +"/v1.1/summoner/"+@id.to_s+"/runes?api_key="+key).read
+				parsed_answer = JSON.parse(answer_string)
+				parsed_answer["pages"].each do |page|
+					runes_buffer = Array.new
+					page["slots"].each do |slot|
+						rune_buffer = slot["rune"]
+						rune_out = Rune.new(rune_buffer["id"],rune_buffer["description"],rune_buffer["name"],rune_buffer["tier"], slot["runeSlotId"])
+						runes_buffer << rune_out
+					end
+					runes_buffer.sort { |a, b| a.slot_id <=> b.slot_id }
+					tome_buffer = Tome.new(page["id"], page["name"], page["current"], runes_buffer)
+					@runes << tome_buffer
+				end
+			rescue Exception => e
+				puts "An error occured when retreiving the summoner's runes : "
+				puts e.message
+			end
+		end
+
+		def get_last_ten_games(key)
+			answer_string = open("http://prod.api.pvp.net/api/lol/" + @region +"/v1.1/game/by-summoner"+@id.to_s+"/recent?api_key="+key).read
 			parsed_answer = JSON.parse(answer_string)
+		end
 
-			parsed_answer["pages"].each do |key, page|
-				rune_buffer = page["rune"]
-				rune_out = Rune.new(rune_buffer["id"],rune_buffer["description"],rune_buffer["name"],rune_buffer["tier"], page["runeSlotId"])
-				@runes << rune_out
+		# Prints the summoner info to the console in a friendly way
+		def to_s
+			return_string = "\t\tSummoner\n"+
+			 				"\nName:\t\t"+@name+
+							"\nID:\t\t"+@id.to_s+
+							"\nLevel:\t\t"+@level.to_s+
+							"\nIcon ID:\t"+@profile_icon.to_s
+			if masteries.nil? || masteries.empty?
+				return_string << "\nNo masteries"
+			else
+				masteries.each do |page|
+					return_string << "\tMastery Page\n\t"+ page.to_s
+				end
 			end
-			@runes.sort { |a, b| a.slot_id <=> b.slot_id }
 		end
 	end
 end

data/lib/demacia/Talent.rb

@@ -13,5 +13,11 @@ module Demacia
 			@name = name
 			@rank = rank
 		end
+
+		def to_s
+			return_string = "\nTalent id: \t"+@id.to_s + 
+							"\nTalent name:\t"+@name + 
+							"\nTalent rank:\t"+@rank.to_s
+		end
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: demacia
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
-dependencies: []
+date: 2013-12-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: openuri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: openuri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: For Demacia!
 email: paul.forti@gmail.com
 executables: []