fix spell_id parsing and test

Author: tobiasehlert

src/TibiaSpellsOverviewV3.go

@@ -29,7 +29,6 @@ type Spells struct {
 	Spells               []Spell `json:"spell_list"`
 }
 
-//
 // The base includes two levels: Spells and Information
 type SpellsOverviewResponse struct {
 	Spells      Spells      `json:"spells"`
@@ -57,11 +56,12 @@ func TibiaSpellsOverviewV3Impl(vocationName string, BoxContentHTML string) Spell
 
 		s.Find("td").Each(func(index int, s2 *goquery.Selection) {
 			selectionText := s2.Text()
+			selectionHtml, _ := s2.Html()
 
 			switch index {
 			case 0:
-				spellBuilder.Name = selectionText
-				spellBuilder.Spell = selectionText[0:strings.Index(selectionText, " (")]
+				spellBuilder.Name = selectionText[0:strings.Index(selectionText, " (")]
+				spellBuilder.Spell = selectionHtml[strings.Index(selectionHtml, "amp;spell=")+10 : strings.Index(selectionHtml, "&vocation")]
 				spellBuilder.Formula = selectionText[strings.Index(selectionText, " (")+2 : strings.Index(selectionText, ")")]
 			case 1:
 				switch selectionText {

src/TibiaSpellsOverviewV3_test.go

@@ -17,11 +17,11 @@ func TestOverviewAll(t *testing.T) {
 	spellsOverviewJson := TibiaSpellsOverviewV3Impl("", string(data))
 	assert := assert.New(t)
 
-	assert.Equal(142, len(spellsOverviewJson.Spells.Spells))
+	assert.Equal(152, len(spellsOverviewJson.Spells.Spells))
 
 	firstSpell := spellsOverviewJson.Spells.Spells[0]
-	assert.Equal("Animate Dead Rune (adana mort)", firstSpell.Name)
-	assert.Equal("Animate Dead Rune", firstSpell.Spell)
+	assert.Equal("Animate Dead Rune", firstSpell.Name)
+	assert.Equal("animatedeadrune", firstSpell.Spell)
 	assert.Equal("adana mort", firstSpell.Formula)
 	assert.Equal(27, firstSpell.Level)
 	assert.Equal(600, firstSpell.Mana)
@@ -33,9 +33,9 @@ func TestOverviewAll(t *testing.T) {
 	assert.True(firstSpell.TypeRune)
 	assert.True(firstSpell.PremiumOnly)
 
-	findPersonSpell := spellsOverviewJson.Spells.Spells[53]
-	assert.Equal("Find Person (exiva \"name\")", findPersonSpell.Name)
-	assert.Equal("Find Person", findPersonSpell.Spell)
+	findPersonSpell := spellsOverviewJson.Spells.Spells[60]
+	assert.Equal("Find Person", findPersonSpell.Name)
+	assert.Equal("findperson", findPersonSpell.Spell)
 	assert.Equal("exiva \"name\"", findPersonSpell.Formula)
 	assert.Equal(8, findPersonSpell.Level)
 	assert.Equal(20, findPersonSpell.Mana)

src/TibiaSpellsSpellV3.go

@@ -57,7 +57,6 @@ type SpellsContainer struct {
 	Spell SpellData `json:"spell"`
 }
 
-//
 // The base includes two levels: Spell and Information
 type SpellInformationResponse struct {
 	Spells      SpellsContainer `json:"spells"`
@@ -85,19 +84,20 @@ func TibiaSpellsSpellV3Impl(spell string, BoxContentHTML string) SpellInformatio
 		// creating empty vars for later use
 		SpellsInfoVocation, SpellsInfoCity, RuneInfoVocation []string
 		// var SpellsInfoName, RuneInfoName string
-		SpellInformationSection, SpellName, SpellImageURL, SpellDescription, SpellsInfoFormula, SpellsInfoDamageType, RuneInfoDamageType                                                                                                                  string
+		SpellInformationSection, SpellName, SpellID, SpellImageURL, SpellDescription, SpellsInfoFormula, SpellsInfoDamageType, RuneInfoDamageType                                                                                                         string
 		SpellsInfoCooldownAlone, SpellsInfoCooldownGroup, SpellsInfoSoulPoints, SpellsInfoAmount, SpellsInfoLevel, SpellsInfoMana, SpellsInfoPrice, RuneInfoLevel, RuneInfoMagicLevel                                                                     int
 		SpellsInfoGroupAttack, SpellsInfoGroupHealing, SpellsInfoGroupSupport, SpellsInfoTypeInstant, SpellsInfoTypeRune, RuneInfoGroupAttack, RuneInfoGroupHealing, RuneInfoGroupSupport, SpellsInfoPremium, SpellsHasSpellSection, SpellsHasRuneSection bool
 	)
 
 	ReaderHTML.Find(".BoxContent").Each(func(index int, s *goquery.Selection) {
 		NameAndImageSection, _ := s.Find("table tr").First().Html()
 
-		// Get the name and image
+		// Get the name, spell_id and image
 		subma2 := SpellNameAndImageRegex.FindAllStringSubmatch(NameAndImageSection, -1)
 		if len(subma2) > 0 {
 			SpellName = subma2[0][2]
 			SpellImageURL = subma2[0][1]
+			SpellID = SpellImageURL[strings.Index(SpellImageURL, "library/")+8 : strings.Index(SpellImageURL, ".png")]
 		}
 
 		s.Find(".TableContainer").Each(func(index int, s *goquery.Selection) {
@@ -267,7 +267,7 @@ func TibiaSpellsSpellV3Impl(spell string, BoxContentHTML string) SpellInformatio
 		SpellsContainer{
 			SpellData{
 				Name:                SpellName,
-				Spell:               strings.ToLower(SpellName),
+				Spell:               SpellID,
 				ImageURL:            SpellImageURL,
 				Description:         SpellDescription,
 				HasSpellInformation: SpellsHasSpellSection,

src/TibiaSpellsSpellV3_test.go

@@ -19,7 +19,7 @@ func TestFindPerson(t *testing.T) {
 
 	assert.Empty(findPersonJson.Spells.Spell.Description)
 	assert.Equal("Find Person", findPersonJson.Spells.Spell.Name)
-	assert.Equal("find person", findPersonJson.Spells.Spell.Spell)
+	assert.Equal("findperson", findPersonJson.Spells.Spell.Spell)
 	assert.True(findPersonJson.Spells.Spell.HasSpellInformation)
 	assert.NotNil(findPersonJson.Spells.Spell.SpellInformation)
 	assert.Equal("exiva 'name'", findPersonJson.Spells.Spell.SpellInformation.Formula)
@@ -57,7 +57,7 @@ func TestHeavyMagicMissileRune(t *testing.T) {
 
 	assert.Empty(hmmJson.Spells.Spell.Description)
 	assert.Equal("Heavy Magic Missile Rune", hmmJson.Spells.Spell.Name)
-	assert.Equal("heavy magic missile rune", hmmJson.Spells.Spell.Spell)
+	assert.Equal("heavymagicmissilerune", hmmJson.Spells.Spell.Spell)
 	assert.True(hmmJson.Spells.Spell.HasSpellInformation)
 	assert.NotNil(hmmJson.Spells.Spell.SpellInformation)
 	assert.Equal("adori vis", hmmJson.Spells.Spell.SpellInformation.Formula)
@@ -139,7 +139,7 @@ func TestBruiseBane(t *testing.T) {
 
 	assert.Empty(bruisebaneJson.Spells.Spell.Description)
 	assert.Equal("Bruise Bane", bruisebaneJson.Spells.Spell.Name)
-	assert.Equal("bruise bane", bruisebaneJson.Spells.Spell.Spell)
+	assert.Equal("bruisebane", bruisebaneJson.Spells.Spell.Spell)
 	assert.True(bruisebaneJson.Spells.Spell.HasSpellInformation)
 	assert.NotNil(bruisebaneJson.Spells.Spell.SpellInformation)
 	assert.Equal("exura infir ico", bruisebaneJson.Spells.Spell.SpellInformation.Formula)
@@ -172,7 +172,7 @@ func TestCurePoisonRune(t *testing.T) {
 
 	assert.Empty(curepoisonruneJson.Spells.Spell.Description)
 	assert.Equal("Cure Poison Rune", curepoisonruneJson.Spells.Spell.Name)
-	assert.Equal("cure poison rune", curepoisonruneJson.Spells.Spell.Spell)
+	assert.Equal("curepoisonrune", curepoisonruneJson.Spells.Spell.Spell)
 	assert.True(curepoisonruneJson.Spells.Spell.HasSpellInformation)
 	assert.NotNil(curepoisonruneJson.Spells.Spell.SpellInformation)
 	assert.Equal("adana pox", curepoisonruneJson.Spells.Spell.SpellInformation.Formula)
@@ -201,7 +201,7 @@ func TestConvinceCreatureRune(t *testing.T) {
 
 	assert.Empty(convincecreatureruneJson.Spells.Spell.Description)
 	assert.Equal("Convince Creature Rune", convincecreatureruneJson.Spells.Spell.Name)
-	assert.Equal("convince creature rune", convincecreatureruneJson.Spells.Spell.Spell)
+	assert.Equal("convincecreaturerune", convincecreatureruneJson.Spells.Spell.Spell)
 	assert.True(convincecreatureruneJson.Spells.Spell.HasSpellInformation)
 	assert.NotNil(convincecreatureruneJson.Spells.Spell.SpellInformation)
 	assert.Equal("adeta sio", convincecreatureruneJson.Spells.Spell.SpellInformation.Formula)