battle_pet 0.1.7 → 0.2.0

data/lib/battle_pet.rb

@@ -11,8 +11,6 @@ class BattlePet
                    tw: 'tw.battle.net',
                    cn: 'www.battlenet.com.cn'}
 
-  PET_NAMES = YAML.load File.read(File.join(File.dirname(__FILE__), 'battle_pet.yml'))
-  
   def initialize(id, locale = :us)
     data = BattlePet.parse_data_from_api(id, locale)
     set_attributes(data, locale)
@@ -31,7 +29,7 @@ class BattlePet
   
   def set_attributes(data, locale)
     @id = data["speciesId"]
-    @name = BattlePet.find_name(id, locale)
+    @name = data["name"]
     @description = data["description"]
     @source = data["source"]
     @can_battle = data["canBattle"]
@@ -45,10 +43,6 @@ class BattlePet
     REGION_HOSTS[locale] || REGION_HOSTS[:us]
   end
   
-  def self.find_name(id, locale)
-    PET_NAMES[id] && PET_NAMES[id]["name"][locale.to_s]
-  end
-
   def acquire_abilities(abilities)
     results = {}
     abilities.each { |ability| results[ability['requiredLevel']] = Ability.new(ability) }

data/test/data/mechanical_squirrel_cn.json

@@ -1 +1 @@
-{"speciesId":39,"petTypeId":9,"creatureId":2671,"canBattle":true,"icon":"inv_pet_mechanicalsquirrel","description":"��е�������ڵ��߼��������ĸ�������Ҫ���ɼ��������˨���Ա�����ȡ�á�","source":"רҵ���ܣ�����","abilities":[{"slot":2,"order":2,"requiredLevel":4,"id":459,"name":"��������","icon":"inv_gizmo_02","cooldown":0,"rounds":1,"petTypeId":9,"isPassive":false,"hideHints":false},{"slot":0,"order":3,"requiredLevel":10,"id":202,"name":"ʹ��","icon":"spell_druid_thrash","cooldown":0,"rounds":1,"petTypeId":7,"isPassive":false,"hideHints":false},{"slot":0,"order":0,"requiredLevel":1,"id":384,"name":"��ȭ","icon":"inv_misc_desecrated_plategloves","cooldown":0,"rounds":1,"petTypeId":9,"isPassive":false,"hideHints":false},{"slot":1,"order":1,"requiredLevel":2,"id":389,"name":"��Ƶ","icon":"inv_gizmo_03","cooldown":0,"rounds":1,"petTypeId":9,"isPassive":false,"hideHints":false},{"slot":2,"order":5,"requiredLevel":20,"id":278,"name":"�޸�","icon":"ability_repair","cooldown":5,"rounds":3,"petTypeId":9,"isPassive":false,"hideHints":true},{"slot":1,"order":4,"requiredLevel":15,"id":392,"name":"ǿ������","icon":"inv_misc_wartornscrap_plate","cooldown":4,"rounds":1,"petTypeId":9,"isPassive":false,"hideHints":true}]}
+{"speciesId":39,"petTypeId":9,"creatureId":2671,"name":"机械松鼠","canBattle":true,"icon":"inv_pet_mechanicalsquirrel","description":"机械松鼠体内的逻辑运算中心告诉它，要多多采集坚果和螺栓，以备冬季取用。","source":"专业技能：工程","abilities":[{"slot":2,"order":2,"requiredLevel":4,"id":459,"name":"旋紧发条","icon":"inv_gizmo_02","cooldown":0,"rounds":1,"petTypeId":9,"isPassive":false,"hideHints":false},{"slot":0,"order":3,"requiredLevel":10,"id":202,"name":"痛击","icon":"spell_druid_thrash","cooldown":0,"rounds":1,"petTypeId":7,"isPassive":false,"hideHints":false},{"slot":0,"order":0,"requiredLevel":1,"id":384,"name":"铁拳","icon":"inv_misc_desecrated_plategloves","cooldown":0,"rounds":1,"petTypeId":9,"isPassive":false,"hideHints":false},{"slot":1,"order":1,"requiredLevel":2,"id":389,"name":"超频","icon":"inv_gizmo_03","cooldown":0,"rounds":1,"petTypeId":9,"isPassive":false,"hideHints":false},{"slot":2,"order":5,"requiredLevel":20,"id":278,"name":"修复","icon":"ability_repair","cooldown":5,"rounds":3,"petTypeId":9,"isPassive":false,"hideHints":true},{"slot":1,"order":4,"requiredLevel":15,"id":392,"name":"强化护甲","icon":"inv_misc_wartornscrap_plate","cooldown":4,"rounds":1,"petTypeId":9,"isPassive":false,"hideHints":true}]}

data/test/data/mechanical_squirrel_us.json

@@ -1 +1 @@
-{"speciesId":39,"petTypeId":9,"creatureId":2671,"canBattle":true,"icon":"inv_pet_mechanicalsquirrel","description":"A mechanical squirrel's logic center tells it to collect and store both nuts and bolts for the winter.","source":"Profession: Engineering","abilities":[{"slot":2,"order":2,"requiredLevel":4,"id":459,"name":"Wind-Up","icon":"inv_gizmo_02","cooldown":0,"rounds":1,"petTypeId":9,"isPassive":false,"hideHints":false},{"slot":0,"order":3,"requiredLevel":10,"id":202,"name":"Thrash","icon":"spell_druid_thrash","cooldown":0,"rounds":1,"petTypeId":7,"isPassive":false,"hideHints":false},{"slot":0,"order":0,"requiredLevel":1,"id":384,"name":"Metal Fist","icon":"inv_misc_desecrated_plategloves","cooldown":0,"rounds":1,"petTypeId":9,"isPassive":false,"hideHints":false},{"slot":1,"order":1,"requiredLevel":2,"id":389,"name":"Overtune","icon":"inv_gizmo_03","cooldown":0,"rounds":1,"petTypeId":9,"isPassive":false,"hideHints":false},{"slot":2,"order":5,"requiredLevel":20,"id":278,"name":"Repair","icon":"ability_repair","cooldown":5,"rounds":3,"petTypeId":9,"isPassive":false,"hideHints":true},{"slot":1,"order":4,"requiredLevel":15,"id":392,"name":"Extra Plating","icon":"inv_misc_wartornscrap_plate","cooldown":4,"rounds":1,"petTypeId":9,"isPassive":false,"hideHints":true}]}
+{"speciesId":39,"petTypeId":9,"creatureId":2671,"name":"Mechanical Squirrel","canBattle":true,"icon":"inv_pet_mechanicalsquirrel","description":"A mechanical squirrel's logic center tells it to collect and store both nuts and bolts for the winter.","source":"Profession: Engineering","abilities":[{"slot":2,"order":2,"requiredLevel":4,"id":459,"name":"Wind-Up","icon":"inv_gizmo_02","cooldown":0,"rounds":1,"petTypeId":9,"isPassive":false,"hideHints":false},{"slot":0,"order":3,"requiredLevel":10,"id":202,"name":"Thrash","icon":"spell_druid_thrash","cooldown":0,"rounds":1,"petTypeId":7,"isPassive":false,"hideHints":false},{"slot":0,"order":0,"requiredLevel":1,"id":384,"name":"Metal Fist","icon":"inv_misc_desecrated_plategloves","cooldown":0,"rounds":1,"petTypeId":9,"isPassive":false,"hideHints":false},{"slot":1,"order":1,"requiredLevel":2,"id":389,"name":"Overtune","icon":"inv_gizmo_03","cooldown":0,"rounds":1,"petTypeId":9,"isPassive":false,"hideHints":false},{"slot":2,"order":5,"requiredLevel":20,"id":278,"name":"Repair","icon":"ability_repair","cooldown":5,"rounds":3,"petTypeId":9,"isPassive":false,"hideHints":true},{"slot":1,"order":4,"requiredLevel":15,"id":392,"name":"Extra Plating","icon":"inv_misc_wartornscrap_plate","cooldown":4,"rounds":1,"petTypeId":9,"isPassive":false,"hideHints":true}]}

data/test/test_battle_pet.rb

@@ -15,13 +15,6 @@ class BattlePetTest < Test::Unit::TestCase
     assert_equal 'us.battle.net', BattlePet.host(:ca)
   end
 
-  def test_find_name
-    assert_equal '机械松鼠', BattlePet.find_name(39, :cn)
-    assert_equal 'Adder', BattlePet.find_name(635, :us)
-    assert_equal nil, BattlePet.find_name(1, :cn)
-    assert_equal nil, BattlePet.find_name(39, :ca)
-  end
-
   def test_check_patch
     (1..864).to_a.sample(5) { |i| assert_equal '5.0', BattlePet.check_patch(i) }
     (865..1013).to_a.sample(5) { |i| assert_equal '5.1', BattlePet.check_patch(i) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: battle_pet
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-05-31 00:00:00.000000000 Z
 dependencies: []
 description: A simple gem to get data from WoW BattlePet API
 email: zwt315@163.com
@@ -18,7 +18,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/battle_pet.rb
-- lib/battle_pet.yml
 - lib/battle_pet/ability.rb
 - lib/battle_pet/type.rb
 - test/data/mechanical_squirrel_cn.json