d3api 1.1.1 → 1.1.2

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
+  - 2.0.0
   - 1.9.3
   - 1.9.2
   - jruby-19mode

data/lib/d3api/artisan.rb

@@ -1,13 +1,14 @@
 module D3api
   class Artisan < BaseModel
-    attr_accessor :slug, :name, :portrait, :training
-
     ARTISAN_MAPPING = {
       :slug => 'slug',
       :name => 'name',
       :portrait => 'portrait',
       :training => nil
     }
+
+    attr_accessor :slug, :name, :portrait, :training
+
     def initialize(region=:us, artisan_type)
       json_response = find(region, artisan_type)
 

data/lib/d3api/follower.rb

@@ -6,6 +6,7 @@ module D3api
       :portrait => 'portrait',
       :active_skills => nil
     }
+
     attr_accessor :slug, :name, :portrait, :active_skills
 
     def initialize(region, follower_type)

data/lib/d3api/hero.rb

@@ -5,12 +5,12 @@ module D3api
       :name => 'name',
       :hero_class => 'class',
       :level => 'level',
-      :hardcore => 'hardcore'
+      :hardcore => 'hardcore',
+      :paragon_level => 'paragonLevel'
     }
 
-    include D3api::Request
     attr_accessor :id, :name, :hero_class, :gender,
-                  :level, :hardcore, :last_updated,
+                  :level, :hardcore, :paragon_level, :last_updated,
                   :items, :active_skills, :passive_skills,
                   :followers, :stats
 

data/lib/d3api/hero/stats.rb

@@ -31,13 +31,15 @@ module D3api
       :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,
-                  :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
+                  :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
 
     def initialize(stat_values)
       set_method(stat_values, STAT_MAPPINGS)

data/lib/d3api/item.rb

@@ -10,6 +10,7 @@ module D3api
       :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,

data/lib/d3api/version.rb

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

data/spec/d3api/hero_spec.rb

@@ -18,10 +18,11 @@ describe D3api::Hero do
     its(:hero_class)     { should eql 'barbarian' }
     its(:gender)         { should eql 'Male' }
     its(:level)          { should eql 45 }
-    its(:hardcore)       { should be_kind_of(TrueClass) }
+    its(:hardcore)       { should eql true }
     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(:paragon_level)  { should eql 0 }
     its(:items)          { should be_kind_of(Array) }
     its(:followers)      { should be_kind_of(Array) }
   end

data/spec/d3api/item_spec.rb

@@ -12,7 +12,7 @@ describe D3api::Item do
     it { should_not be nil}
   end
 
-  context 'set_method' do
+  context 'set_method', 'non-weapon' do
     its(:name)                   { should eql 'Cloth Pants' }
     its(:icon)                   { should eql 'pants_001_monk_male' }
     its(:display_color)          { should be_kind_of(String) }
@@ -28,4 +28,13 @@ describe D3api::Item do
     its(:socket_effects)         { should be nil }
     its(:salvage)                { should be nil }
   end
+
+  context 'set_method', 'weapon' do
+    subject { D3api::Item.new(:us, 'COGHsoAIEgcIBBXIGEoRHYQRdRUdnWyzFB2qXu51MA04kwNAAFAKYJMD') }
+
+    its(:min_dps)                { should eql 206.69999241828918 }
+    its(:max_dps)                { should eql 206.69999241828918 }
+    its(:min_attacks_per_second) { should eql 1.2999999523162842 }
+    its(:max_attacks_per_second) { should eql 1.2999999523162842 }
+  end
 end

metadata

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