d3api 1.1.0 → 1.1.1

data/lib/d3api/artisan.rb

@@ -2,24 +2,23 @@ module D3api
   class Artisan < BaseModel
     attr_accessor :slug, :name, :portrait, :training
 
+    ARTISAN_MAPPING = {
+      :slug => 'slug',
+      :name => 'name',
+      :portrait => 'portrait',
+      :training => nil
+    }
     def initialize(region=:us, artisan_type)
       json_response = find(region, artisan_type)
 
       values = super json_response
 
-      set_method(values)
+      set_method(values, ARTISAN_MAPPING)
     end
 
     private
     def find(region, 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

@@ -5,5 +5,12 @@ module D3api
     def initialize(values)
       JSON.parse(values)
     end
+
+    private
+    def set_method(values, static_array)
+      static_array.each do |key, value|
+        self.send("#{key}=", values[value])
+      end
+    end
   end
 end

data/lib/d3api/follower.rb

@@ -1,5 +1,11 @@
 module D3api
   class Follower < BaseModel
+    FOLLOWER_MAPPINGS = {
+      :slug => 'slug',
+      :name => 'name',
+      :portrait => 'portrait',
+      :active_skills => nil
+    }
     attr_accessor :slug, :name, :portrait, :active_skills
 
     def initialize(region, follower_type)
@@ -7,19 +13,12 @@ module D3api
 
       values = super json_response
 
-      set_method(values)
+      set_method(values, FOLLOWER_MAPPINGS)
     end
 
     private
     def find(region, 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.active_skills = nil
-    end
   end
 end

data/lib/d3api/hero.rb

@@ -1,5 +1,13 @@
 module D3api
   class Hero < BaseModel
+    HERO_MAPPINGS = {
+      :id => 'id',
+      :name => 'name',
+      :hero_class => 'class',
+      :level => 'level',
+      :hardcore => 'hardcore'
+    }
+
     include D3api::Request
     attr_accessor :id, :name, :hero_class, :gender,
                   :level, :hardcore, :last_updated,
@@ -11,7 +19,8 @@ module D3api
 
       values = super json_response
 
-      set_method(values)
+      set_method(values, HERO_MAPPINGS)
+      set_hero(values)
     end
 
     # stats class
@@ -21,13 +30,8 @@ module D3api
       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']
+    def set_hero(values)
       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'])
@@ -41,7 +45,6 @@ module D3api
       self.followers ||= D3api::HeroFollowerSet
         .new(values['followers'])
         .follower_set
-
       self.stats ||= D3api::HeroStats
         .new(values['stats'])
     end

data/lib/d3api/hero/stats.rb

@@ -1,5 +1,36 @@
 module D3api
-  class HeroStats
+  class HeroStats < BaseModel
+    STAT_MAPPINGS = {
+      :life => 'life',
+      :damage => 'damage',
+      :attack_speed => 'attackSpeed',
+      :armor => 'armor',
+      :strength => 'strength',
+      :dexterity => 'dexterity',
+      :vitality => 'vitality',
+      :intelligence => 'intelligence',
+      :physical_resist => 'physicalResist',
+      :fire_resist => 'fireResist',
+      :cold_resist => 'coldResist',
+      :lightning_resist => 'lightningResist',
+      :poison_resist => 'poisonResist',
+      :arcane_resist => 'arcaneResist',
+      :crit_damage => 'critDamage',
+      :block_chance => 'blockChance',
+      :block_amount_min => 'blockAmountMin',
+      :block_amount_max => 'blockAmountMax',
+      :damage_increase => 'damageIncrease',
+      :crit_chance => 'critChance',
+      :damage_reduction => 'damageReduction',
+      :thorns => 'thorns',
+      :life_steal => 'lifeSteal',
+      :life_per_kill => 'lifePerKill',
+      :gold_find => 'goldFind',
+      :magic_find => 'magicFind',
+      :life_on_hit => 'lifeOnHit',
+      :primary_resource => 'primaryResource',
+      :secondary_resource => 'secondaryResource'
+    }
     attr_accessor :life, :damage, :attack_speed, :armor, :strength,
                   :dexterity, :vitality, :intelligence, :physical_resist,
                   :fire_resist, :cold_resist, :lightning_resist, :poison_resist,
@@ -9,40 +40,7 @@ module D3api
                   :life_on_hit, :primary_resource, :secondary_resource
 
     def initialize(stat_values)
-      set_method(stat_values)
-    end
-
-    private
-    def set_method(values)
-      self.life = values['life']
-      self.damage = values['damage']
-      self.attack_speed = values['attackSpeed']
-      self.armor = values['armor']
-      self.strength = values['strength']
-      self.dexterity = values['dexterity']
-      self.vitality = values['vitality']
-      self.intelligence = values['intelligence']
-      self.physical_resist = values['physicalResist']
-      self.fire_resist = values['fireResist']
-      self.cold_resist = values['coldResist']
-      self.lightning_resist = values['lightningResist']
-      self.poison_resist = values['poisonResist']
-      self.arcane_resist = values['arcaneResist']
-      self.crit_damage = values['critDamage']
-      self.block_chance = values['blockChance']
-      self.block_amount_min = values['blockAmountMin']
-      self.block_amount_max = values['blockAmountMax']
-      self.damage_increase = values['damageIncrease']
-      self.crit_chance = values['critChance']
-      self.damage_reduction = values['damageReduction']
-      self.thorns = values['thorns']
-      self.life_steal = values['lifeSteal']
-      self.life_per_kill = values['lifePerKill']
-      self.gold_find = values['goldFind']
-      self.magic_find = values['magicFind']
-      self.life_on_hit = values['lifeOnHit']
-      self.primary_resource = values['primaryResource']
-      self.secondary_resource = values['secondaryResource']
+      set_method(stat_values, STAT_MAPPINGS)
     end
   end
 end

data/lib/d3api/item.rb

@@ -1,5 +1,15 @@
 module D3api
   class Item < BaseModel
+    ITEM_MAPPINGS = {
+      :name => 'name',
+      :icon => 'icon',
+      :tooltip_params => 'tooltipParams',
+      :display_color => 'displayColor',
+      :required_level => 'requiredLevel',
+      :item_level => 'itemLevel',
+      :bonus_affixes => 'bonusAffixes',
+      :attributes => 'attributes'
+    }
     attr_accessor :name, :icon, :tooltip_params, :display_color,
                   :required_level, :item_level, :bonus_affixes,
                   :attributes, :min_dps, :max_dps, :min_attacks_per_second,
@@ -10,7 +20,8 @@ module D3api
 
       values = super json_response
 
-      set_method(values)
+      set_method(values, ITEM_MAPPINGS)
+      set_item(values)
     end
 
     private
@@ -18,16 +29,7 @@ module D3api
       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']
-
+    def set_item(values)
       unless weapon(values)
         self.min_dps = values['dps']['min']
         self.max_dps = values['dps']['max']

data/lib/d3api/item/equipped_item.rb

@@ -1,5 +1,13 @@
 module D3api
-  class EquippedItem
+  class EquippedItem < BaseModel
+    EQUIPPED_ITEM_MAPPINGS = {
+      :id => 'id',
+      :name => 'name',
+      :icon => 'icon',
+      :display_color => 'displayColor',
+      :tooltip_params => 'tooltipParams'
+    }
+
     attr_accessor :location, :name, :icon, :display_color,
                   :tooltip_params, :id
 
@@ -7,17 +15,8 @@ module D3api
       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']
+      set_method(attributes, EQUIPPED_ITEM_MAPPINGS)
     end
   end
 end

data/lib/d3api/version.rb

@@ -1,3 +1,3 @@
 module D3api
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: d3api
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-13 00:00:00.000000000 Z
+date: 2013-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -191,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2997824699744414621
+      hash: 1878087509152130220
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2997824699744414621
+      hash: 1878087509152130220
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24