fixing spell_id parsing in TibiaSpellsSpell

- fixing tests
- updating testdata for spells/overviewall

Author: tobiasehlert

src/TibiaSpellsOverview_test.go

@@ -27,7 +27,7 @@ func TestOverviewAll(t *testing.T) {
 
 	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", firstSpell.Name)
@@ -43,7 +43,7 @@ func TestOverviewAll(t *testing.T) {
 	assert.True(firstSpell.TypeRune)
 	assert.True(firstSpell.PremiumOnly)
 
-	findPersonSpell := spellsOverviewJson.Spells.Spells[53]
+	findPersonSpell := spellsOverviewJson.Spells.Spells[60]
 	assert.Equal("Find Person", findPersonSpell.Name)
 	assert.Equal("findperson", findPersonSpell.Spell)
 	assert.Equal("exiva \"name\"", findPersonSpell.Formula)

src/TibiaSpellsSpell.go

@@ -80,7 +80,7 @@ func TibiaSpellsSpellImpl(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
 
@@ -94,11 +94,12 @@ func TibiaSpellsSpellImpl(spell string, BoxContentHTML string) (*SpellInformatio
 			return false
 		}
 
-		// Get the name and image
+		// Get the name, spell_id and image
 		subma2 := SpellNameAndImageRegex.FindAllStringSubmatch(NameAndImageSection, -1)
 		if len(subma2) > 0 {
 			SpellName = TibiaDataSanitize0026String(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) {
@@ -275,7 +276,7 @@ func TibiaSpellsSpellImpl(spell string, BoxContentHTML string) (*SpellInformatio
 	return &SpellInformationResponse{
 		SpellData{
 			Name:                SpellName,
-			Spell:               strings.ToLower(SpellName),
+			Spell:               SpellID,
 			ImageURL:            SpellImageURL,
 			Description:         SpellDescription,
 			HasSpellInformation: SpellsHasSpellSection,

src/TibiaSpellsSpell_test.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"io"
+	"log"
 	"testing"
 
 	"github.com/TibiaData/tibiadata-api-go/src/static"
@@ -28,9 +29,11 @@ func TestFindPerson(t *testing.T) {
 	assert := assert.New(t)
 	spell := findPersonJson.Spell
 
+	log.Print(spell)
+
 	assert.Empty(spell.Description)
 	assert.Equal("Find Person", spell.Name)
-	assert.Equal("find person", spell.Spell)
+	assert.Equal("findperson", spell.Spell)
 	assert.True(spell.HasSpellInformation)
 	assert.NotNil(spell.SpellInformation)
 	assert.Equal("exiva 'name'", spell.SpellInformation.Formula)
@@ -78,7 +81,7 @@ func TestHeavyMagicMissileRune(t *testing.T) {
 
 	assert.Empty(spell.Description)
 	assert.Equal("Heavy Magic Missile Rune", spell.Name)
-	assert.Equal("heavy magic missile rune", spell.Spell)
+	assert.Equal("heavymagicmissilerune", spell.Spell)
 	assert.True(spell.HasSpellInformation)
 	assert.NotNil(spell.SpellInformation)
 	assert.Equal("adori vis", spell.SpellInformation.Formula)
@@ -180,7 +183,7 @@ func TestBruiseBane(t *testing.T) {
 
 	assert.Empty(spell.Description)
 	assert.Equal("Bruise Bane", spell.Name)
-	assert.Equal("bruise bane", spell.Spell)
+	assert.Equal("bruisebane", spell.Spell)
 	assert.True(spell.HasSpellInformation)
 	assert.NotNil(spell.SpellInformation)
 	assert.Equal("exura infir ico", spell.SpellInformation.Formula)
@@ -223,7 +226,7 @@ func TestCurePoisonRune(t *testing.T) {
 
 	assert.Empty(spell.Description)
 	assert.Equal("Cure Poison Rune", spell.Name)
-	assert.Equal("cure poison rune", spell.Spell)
+	assert.Equal("curepoisonrune", spell.Spell)
 	assert.True(spell.HasSpellInformation)
 	assert.NotNil(spell.SpellInformation)
 	assert.Equal("adana pox", spell.SpellInformation.Formula)
@@ -262,7 +265,7 @@ func TestConvinceCreatureRune(t *testing.T) {
 
 	assert.Empty(spell.Description)
 	assert.Equal("Convince Creature Rune", spell.Name)
-	assert.Equal("convince creature rune", spell.Spell)
+	assert.Equal("convincecreaturerune", spell.Spell)
 	assert.True(spell.HasSpellInformation)
 	assert.NotNil(spell.SpellInformation)
 	assert.Equal("adeta sio", spell.SpellInformation.Formula)