d3api 0.0.4 → 1.0.0

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+spec/cassettes/*

data/README.md

@@ -1,5 +1,5 @@
 [![Build
-Status](https://travis-ci.org/phereford/d3api.png)](https://travis-ci.org/phereford/d3api)
+Status](https://travis-ci.org/phereford/d3api.png?branch=master)](https://travis-ci.org/phereford/d3api)
 [![Code
 Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/phereford/d3api)
 
@@ -48,15 +48,16 @@ This will return a Career object with json values. I tried my best to
 implement nice methods to get through the values such as:
 ```    
 @career.heroes #=> returns an array of heroes 
-@career.lastHeroPlayed #=> returns the id of last hero played
-@career.lastUpdated 
+@career.last_hero_played #=> returns the id of last hero played
+@careerlast_updated.
 @career.artisans #=> returns a hash of your arisan information
-@career.kills['monsters'] #=> returns an integer
+@career.monster_kills #=> returns an integer
 ```
 
 There is a ton of data gleaned from the career object. Just look at
 [Blizzard's Diablo 3 api docs](https://github.com/Blizzard/d3-api-docs)
-for more information.
+for more information. You can also look through the respc tests to get a
+better idea of what the methods are to utilize.
 
 ### Hero
 
@@ -70,7 +71,7 @@ To get a user's Diablo 3 hero, you need to know 4 things:
 @hero = D3api::Hero.new :us, 'yojymbu', '1249', '30255685' #=>
 returns hero object
 @hero.name #=> Returns name of character
-@hero.heroClass #=> Returns class of character
+@hero.hero_class #=> Returns class of character
 @hero.skills #=> returns an array of hashes for active and passive
 skills
 @hero.items #=> returns an array of hashes
@@ -111,7 +112,6 @@ If you have any comments questions or concerns, please let me know.
 ## ToDos
 1. Implement Authentication per Blizzards protocol (allow 10,000
    unsigned requests or 50,000 signed requests).
-2. Rspec tests for api calls.
 
 ## Contributing
 

data/d3api.gemspec

@@ -23,4 +23,6 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rspec', '2.12.0'
   gem.add_development_dependency 'vcr', '~> 2.4.0'
+  gem.add_development_dependency 'pry'
+  gem.add_development_dependency 'simplecov'
 end

data/lib/d3api.rb

@@ -5,7 +5,19 @@ module D3api
 
   autoload :BaseModel, 'd3api/base_model'
   autoload :Career, 'd3api/career'
+
   autoload :Hero, 'd3api/hero'
+  autoload :HeroSet, 'd3api/hero_set'
+
+  autoload :EquippedItem, 'd3api/equipped_item'
+  autoload :EquippedItemSet, 'd3api/equipped_item_set'
+
+  autoload :HeroSkills, 'd3api/hero_skills'
+
+  autoload :HeroFollowerSet, 'd3api/hero_follower_set'
+  autoload :HeroFollower, 'd3api/hero_follower'
+
+  autoload :Skill, 'd3api/skill'
   autoload :Item, 'd3api/item'
   autoload :Follower, 'd3api/follower'
   autoload :Artisan, 'd3api/artisan'

data/lib/d3api/artisan.rb

@@ -1,15 +1,25 @@
 module D3api
   class Artisan < BaseModel
-    include D3api::Request
+    attr_accessor :slug, :name, :portrait, :training
 
-    def initialize(region, artisan_type)
+    def initialize(region=:us, artisan_type)
       json_response = find(region, artisan_type)
 
-      super json_response
+      values = super json_response
+
+      set_method(values)
     end
 
+    private
     def find(region, artisan_type)
-      get(:us, "data/artisan/#{artisan_type}")
+      get(region, "data/artisan/#{artisan_type}")
+    end
+
+    def set_method(values)
+      self.slug = values['slug']
+      self.name = values['name']
+      self.portrait = values['portrait']
+      self.training = nil
     end
   end
 end

data/lib/d3api/base_model.rb

@@ -1,23 +1,9 @@
 module D3api
   class BaseModel
-    extend D3api::Request
+    include D3api::Request
 
-    attr_accessor :value
-
-    def initialize(value)
-      @value = value
-      parsed_values = JSON.parse(value)
-      fields = parsed_values.keys.inject([]) do |result, element|
-        result << element.to_sym
-      end
-
-      fields.each do |field|
-        field = :heroClass if field == :class
-
-        self.class.send(:define_method, field) do
-          parsed_values[field.to_s]
-        end
-      end
+    def initialize(values)
+      JSON.parse(values)
     end
   end
 end

data/lib/d3api/career.rb

@@ -1,15 +1,45 @@
 module D3api
   class Career < BaseModel
-    include D3api::Request
+    attr_accessor :last_hero_played, :heroes, :last_updated,
+                  :artisans, :hardcore_artisans, :monster_kills,
+                  :elite_kills, :hardcore_monster_kills,
+                  :barbarian_time_played, :demon_hunter_time_played,
+                  :monk_time_played, :witch_doctor_time_played,
+                  :wizard_time_played, :fallen_heroes, :battle_tag,
+                  :progression, :hardcore_progression
 
     def initialize(region, battletag_name, battletag_code)
       json_response = find(region, battletag_name, battletag_code)
 
-      super json_response
+      values = super(json_response)
+
+      set_method(values)
+
     end
 
+    private
     def find(region, battletag_name, battletag_code)
       get(region, "profile/#{battletag_name}-#{battletag_code}/")
     end
+
+    def set_method(values)
+      self.last_hero_played = values['lastHeroPlayed']
+      self.heroes ||= D3api::HeroSet.new(values['heroes']).hero_set
+      self.last_updated = Time.at(values['lastUpdated'])
+      self.artisans = values['artisans']
+      self.hardcore_artisans = values['hardcoreArtisans']
+      self.monster_kills = values['kills']['monsters']
+      self.elite_kills = values['kills']['elites']
+      self.hardcore_monster_kills = values['kills']['hardcoreMonsters']
+      self.barbarian_time_played = values['timePlayed']['barbarian']
+      self.demon_hunter_time_played = values['timePlayed']['demon-hunter']
+      self.monk_time_played = values['timePlayed']['monk']
+      self.witch_doctor_time_played = values['timePlayed']['witch-doctor']
+      self.wizard_time_played = values['timePlayed']['wizard']
+      self.fallen_heroes = nil
+      self.battle_tag = values['battleTag']
+      self.progression = nil
+      self.hardcore_progression = nil
+    end
   end
 end

data/lib/d3api/connection.rb

@@ -9,7 +9,6 @@ module D3api
           c.request :url_encoded
           c.request :json
           c.response :json
-          c.response :logger
           c.adapter Faraday.default_adapter
         end
       end

data/lib/d3api/equipped_item.rb

@@ -0,0 +1,23 @@
+module D3api
+  class EquippedItem
+    attr_accessor :location, :name, :icon, :display_color,
+                  :tooltip_params, :id
+
+    def initialize(array)
+      location = array[0]
+      attributes = array[1]
+
+      set_method(location, attributes)
+    end
+
+    private
+    def set_method(location, attributes)
+      self.location = location
+      self.id = attributes['id']
+      self.name = attributes['name']
+      self.icon = attributes['icon']
+      self.display_color = attributes['displayColor']
+      self.tooltip_params = attributes['tooltipParams']
+    end
+  end
+end

data/lib/d3api/equipped_item_set.rb

@@ -0,0 +1,20 @@
+module D3api
+  class EquippedItemSet
+    attr_accessor :item_set
+
+    def initialize(*array)
+      equipped_items = []
+
+      array[0].each do |item|
+        equipped_items << EquippedItem.new(item)
+      end
+
+      set_method(equipped_items)
+    end
+
+    private
+    def set_method(equipped_items)
+      self.item_set = equipped_items
+    end
+  end
+end

data/lib/d3api/follower.rb

@@ -1,15 +1,25 @@
 module D3api
   class Follower < BaseModel
-    include D3api::Request
+    attr_accessor :slug, :name, :portrait, :skills
 
     def initialize(region, follower_type)
       json_response = find(region, follower_type)
 
-      super json_response
+      values = super json_response
+
+      set_method(values)
     end
 
+    private
     def find(region, follower_type)
-      get(:us, "data/follower/#{follower_type}")
+      get(region, "data/follower/#{follower_type}")
+    end
+
+    def set_method(values)
+      self.slug = values['slug']
+      self.name = values['name']
+      self.portrait = values['portrait']
+      self.skills = nil
     end
   end
 end

data/lib/d3api/hero.rb

@@ -1,15 +1,54 @@
 module D3api
   class Hero < BaseModel
     include D3api::Request
+    attr_accessor :id, :name, :hero_class, :gender,
+                  :level, :hardcore, :last_updated,
+                  :items, :active_skills, :passive_skills,
+                  :followers
 
     def initialize(region, battletag_name, battletag_id, hero_id)
       json_response = find(region, battletag_name, battletag_id, hero_id)
 
-      super json_response
+      values = super json_response
+
+      set_method(values)
     end
 
+    # stats class
+    # progress class
+    private
     def find(region, battletag_name, battletag_id, hero_id)
       get(region, "profile/#{battletag_name}-#{battletag_id}/hero/#{hero_id}")
     end
+
+    def set_method(values)
+      self.id = values['id']
+      self.name = values['name']
+      self.hero_class = values['class']
+      self.gender = determine_gender(values['gender'])
+      self.level = values['level']
+      self.hardcore = values['hardcore']
+      self.last_updated = Time.at(values['last-updated'])
+      self.items ||= D3api::EquippedItemSet
+        .new(values['items'])
+        .item_set
+      self.active_skills ||= D3api::HeroSkills
+        .new('active', values['skills']['active'])
+        .skill_set
+      self.passive_skills ||= D3api::HeroSkills
+        .new('passive', values['skills']['passive'])
+        .skill_set
+      self.followers ||= D3api::HeroFollowerSet
+        .new(values['followers'])
+        .follower_set
+    end
+
+    def determine_gender(gender)
+      if gender == 0
+        'Male'
+      else
+        'Female'
+      end
+    end
   end
 end

data/lib/d3api/hero_follower.rb

@@ -0,0 +1,22 @@
+module D3api
+  class HeroFollower
+    attr_accessor :follower_type, :slug, :level,
+                  :items, :skills
+
+    def initialize(follower_type, attributes)
+      follower_type = follower_type
+      attributes = attributes
+
+      set_method(follower_type, attributes)
+    end
+
+    private
+    def set_method(follower_type, attributes)
+      self.follower_type = follower_type
+      self.slug = attributes['slug']
+      self.level = attributes['level']
+      self.items ||= EquippedItemSet.new(attributes['items']).item_set
+      self.skills = nil
+    end
+  end
+end

data/lib/d3api/hero_follower_set.rb

@@ -0,0 +1,20 @@
+module D3api
+  class HeroFollowerSet
+    attr_accessor :follower_set
+
+    def initialize(follower_array)
+      followers = []
+
+      follower_array.each do |follower|
+        followers << D3api::HeroFollower.new(follower[0], follower[1])
+      end
+
+      set_method(followers)
+    end
+
+    private
+    def set_method(followers)
+      self.follower_set ||= followers
+    end
+  end
+end

data/lib/d3api/hero_set.rb

@@ -0,0 +1,19 @@
+module D3api
+  class HeroSet
+    attr_accessor :hero_set
+
+    def initialize(array)
+      heroes = []
+      array.each do |character|
+        heroes << character
+      end
+
+      set_method(heroes)
+    end
+
+    private
+    def set_method(heroes)
+      self.hero_set = heroes
+    end
+  end
+end

data/lib/d3api/hero_skills.rb

@@ -0,0 +1,19 @@
+module D3api
+  class HeroSkills
+    attr_accessor :skill_set
+
+    def initialize(skill_type, *attributes)
+      skill_set = []
+      attributes[0].each do |attribute|
+        skill_set << Skill.new(skill_type, attribute)
+      end
+
+      set_method(skill_set)
+    end
+
+    private
+    def set_method(skill_set)
+      self.skill_set = skill_set
+    end
+  end
+end

data/lib/d3api/item.rb

@@ -1,15 +1,46 @@
 module D3api
   class Item < BaseModel
-    include D3api::Request
+    attr_accessor :name, :icon, :tooltip_params, :display_color,
+                  :required_level, :item_level, :bonus_affixes,
+                  :attributes, :min_dps, :max_dps, :min_attacks_per_second,
+                  :max_attacks_per_second, :socket_effects, :salvage
 
     def initialize(region, item_hash)
       json_response = find(region, item_hash)
 
-      super json_response
+      values = super json_response
+
+      set_method(values)
     end
 
+    private
     def find(region, item_hash)
       get(region, "data/item/#{item_hash}")
     end
+
+    def set_method(values)
+      self.name = values['name']
+      self.icon = values['icon']
+      self.tooltip_params = values['tooltipParams']
+      self.display_color = values['displayColor']
+      self.required_level = values['requiredLevel']
+      self.item_level = values['itemLevel']
+      self.bonus_affixes = values['bonusAffixes']
+      self.attributes = values['attributes']
+
+      unless weapon(values)
+        self.min_dps = values['dps']['min']
+        self.max_dps = values['dps']['max']
+        self.min_attacks_per_second = values['attacksPerSecond']['min']
+        self.max_attacks_per_second = values['attacksPerSecond']['max']
+      end
+
+      self.salvage = nil
+      self.socket_effects = nil
+    end
+
+    def weapon(values)
+      values['dps'] == nil
+    end
   end
 end

data/lib/d3api/skill.rb

@@ -0,0 +1,38 @@
+module D3api
+  class Skill
+    attr_accessor :skill_type, :skill_slug, :skill_name, :skill_icon,
+                  :skill_tooltip_url, :skill_description,
+                  :skill_simple_description, :rune_slug, :rune_type,
+                  :rune_name, :rune_description, :rune_simple_description,
+                  :rune_tooltip_params, :rune_order
+
+    def initialize(skill_type, attributes)
+      skill_type = skill_type
+      skill = attributes['skill']
+      rune =  attributes['rune']
+
+      set_method(skill_type, skill, rune)
+    end
+
+    private
+    def set_method(skill_type, skill, rune)
+      self.skill_type = skill_type
+      self.skill_slug = skill['slug']
+      self.skill_name = skill['name']
+      self.skill_icon = skill['icon']
+      self.skill_tooltip_url = skill['tooltipUrl']
+      self.skill_description = skill['description']
+      self.skill_simple_description = skill['simpleDescription']
+
+      if skill_type == 'active'
+        self.rune_slug = rune['slug']
+        self.rune_type = rune['type']
+        self.rune_name = rune['name']
+        self.rune_description = rune['description']
+        self.rune_simple_description = rune['simpleDescription']
+        self.rune_tooltip_params = rune['tooltipParams']
+        self.rune_order = rune['order']
+      end
+    end
+  end
+end

data/lib/d3api/version.rb

@@ -1,3 +1,3 @@
 module D3api
-  VERSION = '0.0.4'
+  VERSION = '1.0.0'
 end

data/spec/d3api/artisan_spec.rb

@@ -1,31 +1,21 @@
 require 'spec_helper'
 
-describe D3api::Artisan, '.new' do
+describe D3api::Artisan do
   use_vcr_cassette
+  subject { D3api::Artisan.new(:us, 'blacksmith') }
 
-  it 'returns a response' do
-    @artisan = D3api::Artisan.new(:us, 'blacksmith')
-    @artisan.should_not be_nil
-  end
-end
-
-describe D3api::Artisan, 'top level hash methods from BaseModel' do
-  subject { @artisan = D3api::Artisan.new(:us, 'blacksmith') }
-  use_vcr_cassette
-
-  it 'returns an array for .training' do
-    subject.training.should be_kind_of(Array)
-  end
-
-  it 'returns a string for .slug' do
-    subject.slug.should be_kind_of(String)
+  after do
+    VCR.eject_cassette
   end
 
-  it 'returns a string for .name' do
-    subject.name.should be_kind_of(String)
+  context '.new' do
+    it { should_not be_nil }
   end
 
-  it 'returns a string for .potrait' do
-    subject.potrait.should be_kind_of(String)
+  context '#set_method' do
+    its(:slug)     { should eql 'blacksmith' }
+    its(:name)     { should eql 'Blacksmith' }
+    its(:portrait) { should eql 'pt_blacksmith' }
+    its(:training) { should be nil }
   end
 end

data/spec/d3api/career_spec.rb

@@ -1,59 +1,34 @@
 require 'spec_helper'
 
-describe D3api::Career, '.new' do
+describe D3api::Career do
   use_vcr_cassette
-
-  it 'returns a response' do
-    @career = D3api::Career.new(:us, 'yojymbu', '1249')
-    @career.should_not be_nil
-  end
-end
-
-describe D3api::Career, 'top level hash methods from BaseModel' do
-  use_vcr_cassette
-  subject { @career = D3api::Career.new(:us, 'yojymbu', '1249') }
-
-  it 'returns an array for .heroes' do
-    subject.heroes.should be_kind_of(Array)
-  end
-
-  it 'returns a hero id for .lastHeroPlayed' do
-    subject.lastHeroPlayed.to_i.should be_kind_of(Integer)
-  end
-
-  it 'returns a string of numbers for .lastUpdated' do
-    subject.lastUpdated.should be_kind_of(Integer)
-  end
-
-  it 'returns an array for .artisans' do
-    subject.artisans.should be_kind_of(Array)
-  end
-
-  it 'returns an array for .hardcoreArtisans' do
-    subject.hardcoreArtisans.should be_kind_of(Array)
-  end
-
-  it 'returns a hash for .kills' do
-    subject.kills.should be_kind_of(Hash)
-  end
-
-  it 'returns a hash for .timePlayed' do
-    subject.timePlayed.should be_kind_of(Hash)
-  end
-
-  it 'returns an array for .fallenHeroes' do
-    subject.fallenHeroes.should be_kind_of(Array)
-  end
-
-  it 'returns a string for .battleTag' do
-    subject.battleTag.should be_kind_of(String)
-  end
-
-  it 'returns an array for .progression' do
-    subject.progression.should be_kind_of(Array)
-  end
-
-  it 'returns an array for .hardcoreProgression' do
-    subject.hardcoreProgression.should be_kind_of(Array)
+  subject { D3api::Career.new(:us, 'yojymbu', '1249') }
+
+  after do
+    VCR.eject_cassette
+  end
+
+  context '.new' do
+    it { should_not be nil }
+  end
+
+  context '#set_method' do
+    its(:last_hero_played)         { should be_kind_of(Integer) }
+    its(:heroes)                   { should be_kind_of(Array) }
+    its(:last_updated)             { should be_kind_of(Time) }
+    its(:artisans)                 { should be_kind_of(Array) }
+    its(:hardcore_artisans)        { should be_kind_of(Array) }
+    its(:monster_kills)            { should be_kind_of(Integer) }
+    its(:elite_kills)              { should be_kind_of(Integer) }
+    its(:hardcore_monster_kills)   { should be_kind_of(Integer) }
+    its(:barbarian_time_played)    { should be_kind_of(Float) }
+    its(:demon_hunter_time_played) { should be_kind_of(Float) }
+    its(:monk_time_played)         { should be_kind_of(Float) }
+    its(:witch_doctor_time_played) { should be_kind_of(Float) }
+    its(:wizard_time_played)       { should be_kind_of(Float) }
+    its(:fallen_heroes)            { should be nil }
+    its(:battle_tag)               { should eql 'Yojymbu#1249' }
+    its(:progression)              { should be nil }
+    its(:hardcore_progression)     { should be nil }
   end
 end

data/spec/d3api/equipped_item_set_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe D3api::EquippedItemSet do
+  subject { D3api::EquippedItemSet.new(
+    {'head' =>
+      {'id' => 'Helm_104',
+      'name' => 'Abyssal Visage',
+      'icon' => 'helm_104_barbarian_male',
+      'displayColor' => 'yellow',
+      'tooltipParams' => 'item/Cj4Ite7E6QkSBwgEFTr1Tl0d0pJdSR0wjxxFHb1b6EgdhgJj6iILCAAVy_4BABgKICAwDTjIA0AASAtQDGD_Axj01PfUC1ACWAA'},
+    'torso'=>
+      {'id' => 'ChestArmor_102',
+      'name' => 'Cleansing Mail',
+      'icon' => 'chestarmor_102_barbarian_male',
+      'displayColor' => 'yellow',
+      'tooltipParams' => 'item/CowBCNvS4ewCEgcIBBXqHRlgHRrEUXQdt8Ji6h2eI7xIHQRFP-IiCwgAFcf-AQAYFCAeMAk43AJAAEgGUAxg_QNqJQoMCAAQ5_mb84CAgIA7EhUIm7'}
+    }
+  )}
+
+  context '#set_method' do
+    its(:item_set) { should be_kind_of(Array) }
+  end
+end

data/spec/d3api/equipped_item_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe D3api::EquippedItem do
+  subject { D3api::EquippedItem.new(
+    [ 'head', {'id' => 'Helm_104',
+      'name' => 'Abyssal Visage',
+      'icon' => 'helm_104_barbarian_male',
+      'displayColor' => 'yellow',
+      'tooltipParams' =>
+        'item/Cj4Ite7E6QkSBwgEFTr1Tl0d0pJdSR0wjxxFHb1b6EgdhgJj6iILCAAVy_4BABgKICAwDTjIA0AASAtQDGD_Axj01PfUC1ACWAA' }
+    ]
+  ) }
+
+  context '#set_method' do
+    its(:location)       { should eql 'head' }
+    its(:id)             { should eql 'Helm_104' }
+    its(:name)           { should eql 'Abyssal Visage' }
+    its(:icon)           { should eql 'helm_104_barbarian_male' }
+    its(:display_color)  { should eql 'yellow' }
+    its(:tooltip_params) { should eql 'item/Cj4Ite7E6QkSBwgEFTr1Tl0d0pJdSR0wjxxFHb1b6EgdhgJj6iILCAAVy_4BABgKICAwDTjIA0AASAtQDGD_Axj01PfUC1ACWAA' }
+  end
+end

data/spec/d3api/follower_spec.rb

@@ -1,10 +1,21 @@
 require 'spec_helper'
 
-describe D3api::Follower, '.new' do
+describe D3api::Follower do
   use_vcr_cassette
+  subject { D3api::Follower.new(:us, 'scoundrel') }
 
-  it 'returns a response' do
-    @follower = D3api::Follower.new
-    @follower.should_not be_nil
+  after do
+    VCR.eject_cassette
+  end
+
+  context '.new' do
+    it { should_not be nil }
+  end
+
+  context '#set_method' do
+    its(:slug)     { should eql 'scoundrel' }
+    its(:name)     { should eql 'Scoundrel' }
+    its(:portrait) { should eql 'scoundrel' }
+    its(:skills)   { should be nil }
   end
 end

data/spec/d3api/hero_follower_set_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe D3api::HeroFollowerSet do
+  subject { D3api::HeroFollowerSet.new(
+    {'templar'=>
+      {'slug' => 'templar',
+        'level' => 8,
+        'items' =>
+          {'mainHand' =>
+            {'id' => 'Spear_001',
+              'name' => 'Javelin',
+              'icon' => 'spear_001_demonhunter_male',
+              'displayColor' => 'white',
+              'tooltipParams' => 'item/ChkI6MLF7A4SBwgEFQsX9vkwCTiqA0AAYKoDGOmjz2A'},
+              'offHand'=>
+            {'id' => 'Shield_001',
+              'name' => 'Buckler',
+              'icon' => 'shield_001_demonhunter_male',
+              'displayColor' => 'white',
+              'tooltipParams' => 'item/ChkIsIumtgkSBwgEFYkDO2wwCTjmBEAAYOYEGJKO2MMN'}},
+          'stats' => {'goldFind' => 0, 'magicFind' => 0, 'experienceBonus' => 0},
+          'skills'=>
+            [{'skill'=>
+              {'slug'=> 'heal',
+                'name' => 'Heal',
+                'icon' => 'templar_heal_110',
+                'level' => 5,
+                'tooltipUrl' => 'skill/templar/heal',
+                'description' => 'Heals you and the Templar for 4651 Life.\r\n\r\nCooldown: 30 seconds',
+                'simpleDescription' => 'Heals you and the Templar.',
+                'skillCalcId' => 'a'}},
+                {},
+                {},
+                {}]}}
+    )
+  }
+
+  context '#set_method' do
+    its(:follower_set) { should be_kind_of(Array) }
+  end
+end

data/spec/d3api/hero_follower_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe D3api::HeroFollower do
+  subject { D3api::HeroFollower.new('templar',
+             {'slug' => 'templar',
+             'level' => 8,
+             'items'=>
+               {'mainHand' =>
+                 {'id' => 'Spear_001',
+                   'name' => 'Javelin',
+                   'icon' => 'spear_001_demonhunter_male',
+                   'displayColor' => 'white',
+                   'tooltipParams' => 'item/ChkI6MLF7A4SBwgEFQsX9vkwCTiqA0AAYKoDGOmjz2A'},
+               'offHand'=>
+                 {'id' => 'Shield_001',
+                   'name' => 'Buckler',
+                   'icon' => 'shield_001_demonhunter_male',
+                   'displayColor' => 'white',
+                   'tooltipParams' => 'item/ChkIsIumtgkSBwgEFYkDO2wwCTjmBEAAYOYEGJKO2MMN'}},
+                   'stats'=>{'goldFind' => 0, 'magicFind' => 0, 'experienceBonus' => 0},
+                'skills'=>
+                  [{'skill'=>
+                    {'slug' => 'heal',
+                      'name' => 'Heal',
+                      'icon' => 'templar_heal_110',
+                      'level' => 5,
+                      'tooltipUrl' => 'skill/templar/heal',
+                      'description' => 'Heals you and the Templar for 4651 Life.\r\n\r\nCooldown: 30 seconds',
+                      'simpleDescription' => 'Heals you and the Templar.',
+                      'skillCalcId' => 'a'}},
+                    {},
+                    {},
+                    {}]}
+    )
+  }
+
+  context '#set_method' do
+    its(:follower_type) { should eql 'templar' }
+    its(:slug) { should eql 'templar'}
+    its(:level) { should eql 8 }
+    its(:items) { should be_kind_of(Array) }
+    its(:skills) { should be nil }
+  end
+end

data/spec/d3api/hero_set_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe D3api::HeroSet do
+  subject { D3api::HeroSet.new(
+    )
+  }
+
+  context '#set_method' do
+
+  end
+end

data/spec/d3api/hero_skills_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe D3api::HeroSkills do
+  subject { D3api::HeroSkills.new('active', [{'skill' =>
+        {'slug' => 'cleave',
+          'name' => 'Cleave',
+          'icon' => 'barbarian_cleave',
+          'level' => 3,
+          'categorySlug' => 'primary',
+          'tooltipUrl' => 'skill/barbarian/cleave',
+          'description' => 'Generate: 5 Fury per attack\r\n\r\nSwing your weapon in a wide arc to deal 140% weapon damage to all enemies caught in the swing.',
+          'simpleDescription' => 'Generate: 5 Fury per attack\r\n\r\nSwing your weapon in an arc and strike multiple enemies.',
+          'skillCalcId' => 'b'},
+        'rune'=>
+          {'slug' => 'cleave-c',
+            'type' => 'c',
+            'name' => 'Scattering Blast',
+            'level' => 30,
+            'description' => 'On Critical Hits, knock enemies back 9 yards and inflict 60% weapon damage to enemies where they land.',
+            'simpleDescription' => 'Critical Hits cause Knockback, and enemies deal additional damage where they land.',
+            'tooltipParams' => 'rune/cleave/c',
+            'skillCalcId' => 'b',
+            'order' => 2}}]
+    )
+  }
+
+  context '#set_method' do
+    its(:skill_set) { should be_kind_of(Array) }
+  end
+end

data/spec/d3api/hero_spec.rb

@@ -1,10 +1,28 @@
 require 'spec_helper'
 
-describe D3api::Hero, '.new' do
+describe D3api::Hero do
   use_vcr_cassette
+  subject { D3api::Hero.new(:us, 'yojymbu', '1249', '30255685') }
 
-  it 'returns a response' do
-    @hero = D3api::Hero.new(:us, 'yojymbu', '1249', '30255685')
-    @hero.should_not be_nil
+  after do
+    VCR.eject_cassette
+  end
+
+  context '.new' do
+    it { should_not be nil }
+  end
+
+  context '#set_method' do
+    its(:id)             { should eql 30255685 }
+    its(:name)           { should eql 'Belgan' }
+    its(:hero_class)     { should eql 'barbarian' }
+    its(:gender)         { should eql 'Male' }
+    its(:level)          { should eql 45 }
+    its(:hardcore)       { should be_kind_of(TrueClass) }
+    its(:last_updated)   { should be_kind_of(Time) }
+    its(:active_skills)  { should be_kind_of(Array) }
+    its(:passive_skills) { should be_kind_of(Array) }
+    its(:items)          { should be_kind_of(Array) }
+    its(:followers)      { should be_kind_of(Array) }
   end
 end

data/spec/d3api/item_spec.rb

@@ -1,10 +1,31 @@
 require 'spec_helper'
 
-describe D3api::Item, '.new' do
+describe D3api::Item do
   use_vcr_cassette
+  subject { D3api::Item.new(:us, 'ChkIsp-JsQsSBwgEFRaK1aUwCTiYBEAAYJgEGNPX06ILUAhYAA') }
 
-  it 'returns a response' do
-    @item = D3api::Item.new(:us, 'ChkIsp-JsQsSBwgEFRaK1aUwCTiYBEAAYJgEGNPX06ILUAhYAA')
-    @item.should_not be_nil
+  after do
+    VCR.eject_cassette
+  end
+
+  context '.new' do
+    it { should_not be nil}
+  end
+
+  context 'set_method' do
+    its(:name)                   { should eql 'Cloth Pants' }
+    its(:icon)                   { should eql 'pants_001_monk_male' }
+    its(:display_color)          { should be_kind_of(String) }
+    its(:tooltip_params)         { should eql 'item/ChkIsp-JsQsSBwgEFRaK1aUwCTiYBEAAYJgEGNPX06ILUAhYAA' }
+    its(:required_level)         { should eql 1 }
+    its(:item_level)             { should eql 2 }
+    its(:bonus_affixes)          { should eql 0 }
+    its(:min_dps)                { should raise_error }
+    its(:max_dps)                { should raise_error }
+    its(:min_attacks_per_second) { should raise_error }
+    its(:max_attacks_per_second) { should raise_error }
+    its(:attributes)             { should be_kind_of(Array) }
+    its(:socket_effects)         { should be nil }
+    its(:salvage)                { should be nil }
   end
 end

data/spec/d3api/skills_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+describe D3api::Skill do
+  subject { D3api::Skill.new('active', {'skill' =>
+        {'slug' => 'cleave',
+          'name' => 'Cleave',
+          'icon' => 'barbarian_cleave',
+          'level' => 3,
+          'categorySlug' => 'primary',
+          'tooltipUrl' => 'skill/barbarian/cleave',
+          'description' => 'Generate: 5 Fury per attack\r\n\r\nSwing your weapon in a wide arc to deal 140% weapon damage to all enemies caught in the swing.',
+          'simpleDescription' => 'Generate: 5 Fury per attack\r\n\r\nSwing your weapon in an arc and strike multiple enemies.',
+          'skillCalcId' => 'b'},
+        'rune'=>
+          {'slug' => 'cleave-c',
+            'type' => 'c',
+            'name' => 'Scattering Blast',
+            'level' => 30,
+            'description' => 'On Critical Hits, knock enemies back 9 yards and inflict 60% weapon damage to enemies where they land.',
+            'simpleDescription' => 'Critical Hits cause Knockback, and enemies deal additional damage where they land.',
+            'tooltipParams' => 'rune/cleave/c',
+            'skillCalcId' => 'b',
+            'order' => 2}}
+    )
+  }
+
+  context '#set_method' do
+    its(:skill_type) { should eql 'active' }
+    its(:skill_slug) { should eql 'cleave' }
+    its(:skill_name) { should eql 'Cleave' }
+    its(:skill_icon) { should eql 'barbarian_cleave' }
+    its(:skill_tooltip_url) { should eql 'skill/barbarian/cleave' }
+    its(:skill_description) { should eql 'Generate: 5 Fury per attack\r\n\r\nSwing your weapon in a wide arc to deal 140% weapon damage to all enemies caught in the swing.' }
+    its(:skill_simple_description) { should eql 'Generate: 5 Fury per attack\r\n\r\nSwing your weapon in an arc and strike multiple enemies.' }
+    its(:rune_slug) { should eql 'cleave-c' }
+    its(:rune_type) { should eql 'c' }
+    its(:rune_name) { should eql 'Scattering Blast' }
+    its(:rune_description) { should eql 'On Critical Hits, knock enemies back 9 yards and inflict 60% weapon damage to enemies where they land.' }
+    its(:rune_simple_description) { should eql 'Critical Hits cause Knockback, and enemies deal additional damage where they land.' }
+    its(:rune_tooltip_params) { should eql 'rune/cleave/c' }
+    its(:rune_order) { should eql 2 }
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,9 @@
 require 'd3api'
 require 'rspec'
 require 'vcr'
+require 'simplecov'
+
+SimpleCov.start
 
 VCR.configure do |config|
   config.cassette_library_dir = 'spec/cassettes'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: d3api
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000 Z
+date: 2013-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -91,6 +91,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: simplecov
+  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: Diablo 3 API ruby wrapper
 email:
 - phereford@gmail.com
@@ -113,23 +145,47 @@ files:
 - lib/d3api/career.rb
 - lib/d3api/configuration.rb
 - lib/d3api/connection.rb
+- lib/d3api/equipped_item.rb
+- lib/d3api/equipped_item_set.rb
 - lib/d3api/follower.rb
 - lib/d3api/hero.rb
+- lib/d3api/hero_follower.rb
+- lib/d3api/hero_follower_set.rb
+- lib/d3api/hero_set.rb
+- lib/d3api/hero_skills.rb
 - lib/d3api/item.rb
 - lib/d3api/request.rb
+- lib/d3api/skill.rb
 - lib/d3api/version.rb
 - spec/.DS_Store
 - spec/cassettes/D3api_Artisan.yml
+- spec/cassettes/D3api_Artisan_new.yml
+- spec/cassettes/D3api_Artisan_top_level_hash_methods_from_BaseModel.yml
 - spec/cassettes/D3api_Career.yml
+- spec/cassettes/D3api_Career_new.yml
+- spec/cassettes/D3api_Career_top_level_hash_methods_from_BaseModel.yml
 - spec/cassettes/D3api_Follower.yml
+- spec/cassettes/D3api_Follower_new.yml
+- spec/cassettes/D3api_Follower_top_level_hash_to_methods.yml
 - spec/cassettes/D3api_Hero.yml
+- spec/cassettes/D3api_Hero_new.yml
+- spec/cassettes/D3api_Hero_top_level_hash_to_methods.yml
 - spec/cassettes/D3api_Item.yml
+- spec/cassettes/D3api_Item_new.yml
+- spec/cassettes/D3api_Item_top_level_hash_to_methods.yml
 - spec/d3api/.DS_Store
 - spec/d3api/artisan_spec.rb
 - spec/d3api/career_spec.rb
+- spec/d3api/equipped_item_set_spec.rb
+- spec/d3api/equipped_item_spec.rb
 - spec/d3api/follower_spec.rb
+- spec/d3api/hero_follower_set_spec.rb
+- spec/d3api/hero_follower_spec.rb
+- spec/d3api/hero_set_spec.rb
+- spec/d3api/hero_skills_spec.rb
 - spec/d3api/hero_spec.rb
 - spec/d3api/item_spec.rb
+- spec/d3api/skills_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/phereford/d3api
 licenses: []
@@ -145,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 796898765737275423
+      hash: -1160581402281800813
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -154,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 796898765737275423
+      hash: -1160581402281800813
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -164,14 +220,31 @@ summary: Blizzard's Diablo 3 API
 test_files:
 - spec/.DS_Store
 - spec/cassettes/D3api_Artisan.yml
+- spec/cassettes/D3api_Artisan_new.yml
+- spec/cassettes/D3api_Artisan_top_level_hash_methods_from_BaseModel.yml
 - spec/cassettes/D3api_Career.yml
+- spec/cassettes/D3api_Career_new.yml
+- spec/cassettes/D3api_Career_top_level_hash_methods_from_BaseModel.yml
 - spec/cassettes/D3api_Follower.yml
+- spec/cassettes/D3api_Follower_new.yml
+- spec/cassettes/D3api_Follower_top_level_hash_to_methods.yml
 - spec/cassettes/D3api_Hero.yml
+- spec/cassettes/D3api_Hero_new.yml
+- spec/cassettes/D3api_Hero_top_level_hash_to_methods.yml
 - spec/cassettes/D3api_Item.yml
+- spec/cassettes/D3api_Item_new.yml
+- spec/cassettes/D3api_Item_top_level_hash_to_methods.yml
 - spec/d3api/.DS_Store
 - spec/d3api/artisan_spec.rb
 - spec/d3api/career_spec.rb
+- spec/d3api/equipped_item_set_spec.rb
+- spec/d3api/equipped_item_spec.rb
 - spec/d3api/follower_spec.rb
+- spec/d3api/hero_follower_set_spec.rb
+- spec/d3api/hero_follower_spec.rb
+- spec/d3api/hero_set_spec.rb
+- spec/d3api/hero_skills_spec.rb
 - spec/d3api/hero_spec.rb
 - spec/d3api/item_spec.rb
+- spec/d3api/skills_spec.rb
 - spec/spec_helper.rb