bnet 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83441fb0f7b201fd909da8e13e1a16a60e8ccd31
-  data.tar.gz: 6db7f0ed49edcf0151f65a1f22e4d0e6fcc60b9c
+  metadata.gz: 6579c6af8e90cabd36c994dada112e6ea966ea3e
+  data.tar.gz: 4cb4347e3015db6adfa60214fb6ab0d3fcf01257
 SHA512:
-  metadata.gz: 4243c63304e6b2613d8fd9db052646e1dac73219794304f2a0deb0c5d6dc44522bbfefa9a479d5b2887bde67360b12c28fa67ad2c2328e6a8735340c93949fac
-  data.tar.gz: c675bcc2dd54da3aad5af621cc5245ca6805a2be31657fb50774464b2923a61d5c06b7621d80cd64558903d6520d29ac50ecdc5f01d8512e5763f05e69500787
+  metadata.gz: a472e1e583b1719d1016b2be5b73f9b0720ecda1073fbdd3afbad37a65a4839ab9f752ae08dc59a66237a3bd99d0216d94676e3ef8b8c986ed2d04044037b2c4
+  data.tar.gz: 69767dabae0858fac67bcda254f9482af8f873dfa8352b55a25ab1b9489a58808ed5d34d12ccb5778d344dada87738ec1b81bac9f39dc669a8a0f6898087a6d7

data/README.md

@@ -14,7 +14,7 @@ This is a work in progress : [TODO-LIST](https://github.com/keikun17/bnet-masher
 
 ## Configuration
 
-    # initializer file (cnonfig/initializer/bnet_initializer.rb)
+    # initializer file (config/initializer/bnet_initializer.rb)
     Bnet.configuration.api_key = 'your_api_key'
 
 ## Diablo
@@ -60,9 +60,20 @@ This is a work in progress : [TODO-LIST](https://github.com/keikun17/bnet-masher
     #
     # Returns a Hero object with the following attributes
     #
-    #  :paragon_level, :seasonal, :name, :hero_id,
-    #  :level, :hardcore, :gender, :dead, :hero_class, :last_update,
-    #  :active_skills, :passive_skills, :region, :battle_tag, :career
+    #    :life, :damage, :attack_speed, :armor, :strength, :dexterity, :vitality,
+    #    :intelligence, :physical_resist, :fire_resist, :cold_resist,
+    #    :lightning_resist, :poison_resist, :arcane_resist, :crit_damage,
+    #    :block_chance, :block_amount_min, :block_amount_max, :damage_increase,
+    #    :crit_chance, :damage_reduction, :thorns, :life_steal, :life_per_kill,
+    #    :gold_find, :magic_find, :life_on_Hit, :primary_resource,
+    #    :secondary_resource
+    #
+    #  and the following misc attributes
+    #
+    #    :paragon_level, :seasonal, :name, :hero_id,
+    #    :level, :hardcore, :gender, :dead, :hero_class, :last_update,
+    #    :active_skills, :passive_skills, :region, :battle_tag, :career,
+    #    :items
 
     Bnet::Diablo3::Hero.find(battle_tag: 'PlayerOne-1309', region: 'us', hero_id: 1304986)
 

data/TODO.md

@@ -5,7 +5,7 @@
 - [ ] Bnet::Community                             [ ] doc
 - [ ] Bnet::Diablo3                               [ ] doc
 - [ ] Bnet::Starcraft2                            [ ] doc
-- [ ] Bnet::Wow                                   [ ] doc
+- [ ] Bnet::WOW                                   [ ] doc
 - [ ] Bnet::Rails                                 [ ] doc
 
 ### Diablo
@@ -13,7 +13,7 @@
 - [x] Bnet::Diabo3::Career                        [x] doc
   - [x] Heroes (as `Hero`)                        [x] doc
 - [x] Bnet::Diabo3::Hero                          [x] doc
-  - [x] Bnet::Diablo3::Skill                      [ ] doc
+  - [x] Bnet::Diablo3::Skill
 - [ ] Bnet::Diablo3::Data                         [ ] doc
   - [ ] Items                                     [ ] doc
   - [ ] Followers                                 [ ] doc

data/bnet.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.0"
 
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", "~> 3.1"
   spec.add_development_dependency "rspec-nc"
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-rspec"

data/lib/bnet.rb

@@ -19,6 +19,7 @@ require "bnet/bnet_resource"
 require 'bnet/account'
 require 'bnet/diablo3'
 require 'bnet/diablo3/career'
+require 'bnet/diablo3/item'
 require 'bnet/diablo3/hero'
 require 'bnet/diablo3/skill'
 # require 'bnet/community'

data/lib/bnet/diablo3/hero.rb

@@ -2,7 +2,17 @@ class Bnet::Diablo3::Hero < Bnet::BnetResource
 
   attr_accessor :paragon_level, :seasonal, :name, :hero_id,
     :level, :hardcore, :gender, :dead, :hero_class, :last_update,
-    :active_skills, :passive_skills, :region, :battle_tag, :career
+    :active_skills, :passive_skills, :region, :battle_tag, :career,
+    :items,
+
+    # stats
+    :life, :damage, :attack_speed, :armor, :strength, :dexterity, :vitality,
+    :intelligence, :physical_resist, :fire_resist, :cold_resist,
+    :lightning_resist, :poison_resist, :arcane_resist, :crit_damage,
+    :block_chance, :block_amount_min, :block_amount_max, :damage_increase,
+    :crit_chance, :damage_reduction, :thorns, :life_steal, :life_per_kill,
+    :gold_find, :magic_find, :life_on_Hit, :primary_resource,
+    :secondary_resource
 
   PARAMS_MAPPING = {
     "paragonLevel" => :paragon_level,
@@ -14,7 +24,7 @@ class Bnet::Diablo3::Hero < Bnet::BnetResource
     "gender" => :gender,
     "dead" => :dead,
     "class" => :hero_class,
-    "last-updated" => :last_updated
+    "last-updated" => :last_updated,
   }
 
 
@@ -99,33 +109,87 @@ class Bnet::Diablo3::Hero < Bnet::BnetResource
 
   # Create an instance by passing in the args from the response
   def self.from_api(response)
-    bnet_resource = super(response)
+    hero = super(response)
 
-    if bnet_resource && response["skills"]
-      bnet_resource.active_skills = response["skills"]["active"].collect do |active|
+    if hero
+      assign_skills_from_raw_skills(hero, response["skills"]) if response["skills"]
+      assign_stats_from_raw_stats(hero, response["stats"]) if response["stats"]
+      assign_items_from_raw_items(hero, response["items"]) if response["items"]
+    end
+
+    return hero
+  end
 
-        skill = Bnet::Diablo3::Skill.new
-        if active["skill"]
-          skill.name = active["skill"]["name"]
-        end
-        if active["rune"]
-          skill.rune = active["rune"]["name"]
-        end
+  private
 
-        skill
+  def self.assign_items_from_raw_items(hero, raw_items)
+    hero.items = raw_items.collect do |location, item_props|
+      item = Bnet::Diablo3::Item.new
+      item.location = location
+      item.item_id = item_props["id"]
+      item.name = item_props["name"]
+      item
+    end
+
+    return hero
+  end
 
+  def self.assign_skills_from_raw_skills(hero, raw_skills)
+    hero.active_skills = raw_skills["active"].collect do |active|
+      skill = Bnet::Diablo3::Skill.new
+      if active["skill"]
+        skill.name = active["skill"]["name"]
       end
+      if active["rune"]
+        skill.rune = active["rune"]["name"]
+      end
+
+      skill
+    end
 
-      bnet_resource.passive_skills = response["skills"]["passive"].collect do |passive|
-        skill =  Bnet::Diablo3::Skill.new
-        if passive["skill"]
-          skill.name = passive["skill"]["name"]
-        end
-        skill
+    hero.passive_skills = raw_skills["passive"].collect do |passive|
+      skill =  Bnet::Diablo3::Skill.new
+      if passive["skill"]
+        skill.name = passive["skill"]["name"]
       end
+      skill
     end
 
-    bnet_resource
+    return hero
+  end
+
+  def self.assign_stats_from_raw_stats(hero, raw_stats)
+    hero.life               = raw_stats["life"]
+    hero.damage             = raw_stats["damage"]
+    hero.attack_speed       = raw_stats["attackSpeed"]
+    hero.armor              = raw_stats["armor"]
+    hero.strength           = raw_stats["strength"]
+    hero.dexterity          = raw_stats["dexterity"]
+    hero.vitality           = raw_stats["vitality"]
+    hero.intelligence       = raw_stats["intelligence"]
+    hero.physical_resist    = raw_stats["physicalResist"]
+    hero.fire_resist        = raw_stats["fireResist"]
+    hero.cold_resist        = raw_stats["coldResist"]
+    hero.lightning_resist   = raw_stats["lightningResist"]
+    hero.poison_resist      = raw_stats["poisonResist"]
+    hero.arcane_resist      = raw_stats["arcaneResist"]
+    hero.crit_damage        = raw_stats["critDamage"]
+    hero.block_chance       = raw_stats["blockChance"]
+    hero.block_amount_min   = raw_stats["blockAmountMin"]
+    hero.block_amount_max   = raw_stats["blockAmountMax"]
+    hero.damage_increase    = raw_stats["damageIncrease"]
+    hero.crit_chance        = raw_stats["critChance"]
+    hero.damage_reduction   = raw_stats["damageReduction"]
+    hero.thorns             = raw_stats["thorns"]
+    hero.life_steal         = raw_stats["lifeSteal"]
+    hero.life_per_kill      = raw_stats["lifePerKill"]
+    hero.gold_find          = raw_stats["goldFind"]
+    hero.magic_find         = raw_stats["magicFind"]
+    hero.life_on_Hit        = raw_stats["lifeOnHit"]
+    hero.primary_resource   = raw_stats["primaryResource"]
+    hero.secondary_resource = raw_stats["secondaryResource"]
+
+    return hero
   end
 
 end

data/lib/bnet/diablo3/item.rb

@@ -0,0 +1,3 @@
+class Bnet::Diablo3::Item
+  attr_accessor :item_id, :location, :name
+end

data/lib/bnet/version.rb

@@ -1,3 +1,3 @@
 module Bnet
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/bnet/diablo3/hero_spec.rb

@@ -20,17 +20,69 @@ describe Bnet::Diablo3::Hero do
         expect(subject.hero_class).to eq('wizard')
       end
 
+      it "assigns items" do
+        expect(subject.items).to match([
+          an_object_having_attributes(location: "head", name: "Leoric's Crown", item_id: "Unique_Helm_002_x1" ),
+          an_object_having_attributes(location: "torso"),
+          an_object_having_attributes(location: "feet"),
+          an_object_having_attributes(location: "hands"),
+          an_object_having_attributes(location: "shoulders"),
+          an_object_having_attributes(location: "legs"),
+          an_object_having_attributes(location: "bracers"),
+          an_object_having_attributes(location: "mainHand"),
+          an_object_having_attributes(location: "offHand"),
+          an_object_having_attributes(location: "waist"),
+          an_object_having_attributes(location: "rightFinger"),
+          an_object_having_attributes(location: "leftFinger"),
+          an_object_having_attributes(location: "neck")
+        ])
+      end
+
+      it "assigns stats" do
+        expect(subject).to have_attributes({
+          life:                 266712,
+          damage:               412878.0,
+          attack_speed:         1.284000051021576,
+          armor:                5327,
+          strength:             77,
+          dexterity:            77,
+          vitality:             3089,
+          intelligence:         7189,
+          physical_resist:      1021,
+          fire_resist:          1152,
+          cold_resist:          897,
+          lightning_resist:     1190,
+          poison_resist:        897,
+          arcane_resist:        1040,
+          crit_damage:          3.18,
+          block_chance:         0.0,
+          block_amount_min:     0,
+          block_amount_max:     0,
+          damage_increase:      0.0,
+          crit_chance:          0.38500000075,
+          damage_reduction:     0.0,
+          thorns:               0.0,
+          life_steal:           0.0,
+          life_per_kill:        6701.0,
+          gold_find:            2.03,
+          magic_find:           0.0,
+          life_on_Hit:          6542.0,
+          primary_resource:     133,
+          secondary_resource:   0
+        })
+      end
+
       it "assigns skills" do
         expect(subject.active_skills.map(&:name)).
           to match_array([ "Magic Missile", "Arcane Orb",
                            "Hydra", "Familiar", "Magic Weapon",
                            "Teleport" ])
 
-        expect(subject.active_skills.map(&:rune)).
-          to match_array([ "Seeker", "Frozen Orb", "Frost Hydra", "Sparkflint",
-                           "Force Weapon", "Fracture"])
+          expect(subject.active_skills.map(&:rune)).
+            to match_array([ "Seeker", "Frozen Orb", "Frost Hydra", "Sparkflint",
+                             "Force Weapon", "Fracture"])
 
-        expect(subject.passive_skills.map(&:name)).
+            expect(subject.passive_skills.map(&:name)).
           to match_array([ "Elemental Exposure", "Prodigy", "Astral Presence",
                            "Cold Blooded" ])
       end

data/spec/bnet/diablo3/item_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe Bnet::Diablo3::Item do
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bnet
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Buddy Magsipoc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2014-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rspec-nc
   requirement: !ruby/object:Gem::Requirement
@@ -216,6 +216,7 @@ files:
 - lib/bnet/diablo3.rb
 - lib/bnet/diablo3/career.rb
 - lib/bnet/diablo3/hero.rb
+- lib/bnet/diablo3/item.rb
 - lib/bnet/diablo3/skill.rb
 - lib/bnet/starcraft2.rb
 - lib/bnet/starcraft2/profile.rb
@@ -230,6 +231,7 @@ files:
 - spec/bnet/api_spec.rb
 - spec/bnet/diablo3/career_spec.rb
 - spec/bnet/diablo3/hero_spec.rb
+- spec/bnet/diablo3/item_spec.rb
 - spec/bnet/diablo3/skill_spec.rb
 - spec/bnet/diablo3_spec.rb
 - spec/bnet/starcraft2/profile_spec.rb
@@ -271,6 +273,7 @@ test_files:
 - spec/bnet/api_spec.rb
 - spec/bnet/diablo3/career_spec.rb
 - spec/bnet/diablo3/hero_spec.rb
+- spec/bnet/diablo3/item_spec.rb
 - spec/bnet/diablo3/skill_spec.rb
 - spec/bnet/diablo3_spec.rb
 - spec/bnet/starcraft2/profile_spec.rb