smite_ruby 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f9a4cc076631a270e034c469e8e3f22ce095373
-  data.tar.gz: 9f9839c006db93cb1df653ac77df88863f8a38dd
+  metadata.gz: 97929724f336dab713e837fff95c08b90ba671cf
+  data.tar.gz: ccd5b5111ce4d5c9f0a6d9f3d1dc497c4165bda8
 SHA512:
-  metadata.gz: 00aa0449f24960adb8bb5f91234e52cfc5b295b684eaed8243ccf01ad9a5e70f6b0538093b63ce55f0423955338028350713719d6681580af9e317fd3d225b45
-  data.tar.gz: 1ed19147cd0c392b5fa8c9baea2dd797c662c113f72fd21b7d941c1d8c35df64153a9310a62578741057bd9caf0433f4b4d9210cb7572ea8335ca1cce9e6d7b4
+  metadata.gz: 52e8a7b71d3cdf517607abea7570c763ba5b226dbcfd93d70d967fd00f23a85b5e05f7a82a04f84aa2dc67c3d9892ae6cd88449c6f9685576e39d8fe0baa06df
+  data.tar.gz: 08d928ae5d9ada988c5a8f469005dfcbac64e22bedbace02dbc80e92924b76623f5abdf405bd56817a3979d0c864ff69da86cdea614d4d25a3cefc076cfea6cd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    smite_ruby (1.4.673)
+    smite_ruby (1.5.0)
       activesupport
       httparty
 

data/lib/smite/god_stats.rb

@@ -49,7 +49,15 @@ module Smite
 
     def with_items(new_items, stacks = @stacks)
       stacks.delete_if { |k,v| v.nil? }
-      GodStats.new(name, @data, { level: level, items: new_items, stacks: stacks })
+      stack_map = new_items.each_with_object({}) do |item, hash|
+        base_stacks = item.stacking? ? 0 : 1
+
+        given_stacks    = stacks[item.name.downcase] || base_stacks
+        actual_stacks   = [given_stacks, base_stacks].max
+        actual_stacks   = [actual_stacks, item.max_stacks ].min.to_i
+        hash[item.name.downcase] = actual_stacks
+      end
+      GodStats.new(name, @data, { level: level, items: new_items, stacks: stack_map })
     end
 
     def bonus_from_items
@@ -146,13 +154,7 @@ module Smite
         item.passive_effects.each do |effect|
           next unless attributes.include?(effect.attribute)
 
-          base_stacks = item.stacking? ? 0 : 1
-          multiplier =  if @stacks.empty? || @stacks[item.name.downcase].nil?
-            base_stacks
-          else
-            [ [@stacks[item.name.downcase], base_stacks].max , item.max_stacks ].min.to_i
-          end
-
+          multiplier =  @stacks[item.name.downcase]
           if effect.percentage?
             @item_bonus[:perc][effect.attribute.to_sym] += multiplier * effect.amount/100.0
           else

data/smite_ruby.gemspec

@@ -1,7 +1,7 @@
 $:.push File.expand_path("../lib", __FILE__)
 Gem::Specification.new do |s|
   s.name          = 'smite_ruby'
-  s.version       = '1.5.0'
+  s.version       = '1.5.1'
   s.date          = '2016-02-22'
   s.summary       = 'Ruby Smite API'
   s.description   = 'Ruby Client for consuming the Smite API'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smite_ruby
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - NcUltimate