smite_ruby 1.4.9 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fcad5bd4774d5cf3f1c76a330ea0e8f791093ab
-  data.tar.gz: 85a1e44fb48a152dae28a493c8582184d55c965d
+  metadata.gz: 9f9a4cc076631a270e034c469e8e3f22ce095373
+  data.tar.gz: 9f9839c006db93cb1df653ac77df88863f8a38dd
 SHA512:
-  metadata.gz: be93cc0b126c2a2073a8385c73695127b5d21ffe98b99317ec9eba583e63a1c26f72bba065bc58e683e1642493e7d8588633e928e7e0a292190762f2ab35fc82
-  data.tar.gz: 3aa1b5acac28193f68a3cc30db75e4cf1599d575a724457fe5e4a3b2f03e052032548051b100e834f4c16ce6237bfb8b77a052ddf4e0c07131fec198fbf2638f
+  metadata.gz: 00aa0449f24960adb8bb5f91234e52cfc5b295b684eaed8243ccf01ad9a5e70f6b0538093b63ce55f0423955338028350713719d6681580af9e317fd3d225b45
+  data.tar.gz: 1ed19147cd0c392b5fa8c9baea2dd797c662c113f72fd21b7d941c1d8c35df64153a9310a62578741057bd9caf0433f4b4d9210cb7572ea8335ca1cce9e6d7b4

data/lib/smite/client.rb

@@ -8,7 +8,7 @@ module Smite
       @dev_id     = dev_id
       @auth_key   = auth_key
       @lang       = [1,2,3,7,9,10,11,12,13].include?(lang) ? lang : 1
-      @created    = Time.now - 20 * 60
+      @created    = Time.new(0)
       create_session
     end
 
@@ -108,14 +108,23 @@ module Smite
       return @session_id if valid_session?
 
       response      = api_call('createsession', [], false)
+      unless response && response['ret_msg'] == 'Approved'
+        return @session_id = nil
+      end
+
       @session_id   = response['session_id']
       @created      = Time.now
+      @session_id
     end
 
     def valid_session?
       (created + (15 * 60)) > Time.now
     end
 
+    def ping
+      self.class.get('/pingjson')
+    end
+
     private
 
     def api_call(method, params = [], session = true)

data/lib/smite/game.rb

@@ -9,7 +9,8 @@ module Smite
       end
 
       def device(name_or_id)
-        idx = device_hash[name_or_id.to_s.downcase]
+        key = name_or_id.to_s.downcase.gsub(/[^\w]/,'')
+        idx = device_hash[key]
         idx.nil? ? nil : devices[idx]
       end
       alias_method :item, :device
@@ -17,7 +18,8 @@ module Smite
       alias_method :active, :device
 
       def god(name_or_id)
-        idx = god_hash[name_or_id.to_s.downcase]
+        key = name_or_id.to_s.downcase.gsub(/[^\w]/,'')
+        idx = god_hash[key]
         idx.nil? ? nil : gods[idx]
       end
 
@@ -93,15 +95,18 @@ module Smite
 
       def device_hash
         @device_hash ||= (0...devices.count).each_with_object({}) do |idx, hash|
-          hash[devices[idx].item_id.to_s]          = idx
-          hash[devices[idx].device_name.downcase]  = idx
+          name_key = devices[idx].name.downcase.gsub(/[^\w]/,'')
+
+          hash[devices[idx].item_id.to_s] = idx
+          hash[name_key]                  = idx
         end
       end
 
       def god_hash
         @god_hash ||= (0...gods.count).each_with_object({}) do |idx, hash|
-          hash[gods[idx].id.to_s]        = idx
-          hash[gods[idx].name.downcase]  = idx
+          name_key = gods[idx].name.downcase.gsub(/[^\w]/,'')
+          hash[gods[idx].id.to_s] = idx
+          hash[name_key]          = idx
         end
       end
     end

data/lib/smite/god_stats.rb

@@ -4,26 +4,43 @@ module Smite
     
     def initialize(god_name, data, params = { level: 0 })
       super(data)
-      @name = god_name
+      @name   = god_name
+      @items  = params[:items] || []
+
+      # make sure level is between 0 and 20 (0 for base stats)
+      @level  = [[params[:level].to_i, 20].min, 0].max
+      @stacks = params[:stacks] || {}
+    end
+
+    def items
+      return @filtered_items unless @filtered_items.nil?
+
+      # only allow items
+      @items.select!(&:item?)
 
       # make sure ratatoskr only has 1 acorn and items are unique
-      @items  = (params[:items] || []).uniq do |a|
+      @items  = @items.uniq do |a|
         a.name =~ /acorn/i ? 'acorn' : a.name
       end
 
-      # make sure only 6 items total
+      # make sure there are only 6 items total
       @items = @items[0..5]
 
       # make sure ratatoskr has at least 1 acorn
-      if god_name.downcase == 'ratatoskr'
+      if @name.downcase == 'ratatoskr'
         if !@items.any? { |i| i.name =~ /acorn/i }
           @items[0] = Smite::Game.item('magic acorn')
         end
+      else
+        # and that everyone else has none
+        @items.reject! { |item| item.name =~ /acorn/i }
       end
 
-      # make sure level is between 0 and 20 (0 for base stats)
-      @level  = [[params[:level].to_i, 20].min, 0].max
-      @stacks = params[:stacks] || {}
+      # only accept physical items for physical gods and vice versa
+      physical        = Smite::Game.god(@name).physical?
+      @filtered_items = @items.select do |item|
+        physical ? item.physical? : item.magic?
+      end
     end
 
     def at_level(new_level)
@@ -41,12 +58,6 @@ module Smite
       @item_bonus = {}
       @item_bonus[:flat] = default_bonus.dup
       @item_bonus[:perc] = default_bonus.dup
-
-      # only accept physical items for physical gods and vice versa
-      physical  = Smite::Game.god(@name).physical?
-      @items    = @items.select do |item|
-        physical ? item.physical? : item.magic?
-      end
       return @item_bonus if items.empty?
 
       bonus_from_active_item_effects
@@ -167,11 +178,11 @@ module Smite
         case name
         when 'Scylla'
           case level
-          when 0..7   then 0
-          when 8..12  then 20
-          when 13..16 then 40
-          when 17..18 then 60
-          when 19     then 80
+          when 0..8   then 0
+          when 9..13  then 20
+          when 14..17 then 40
+          when 18..19 then 60
+          when 20     then 80
           end
         when 'Ares'
           30 * items.count(&:aura?)

data/lib/smite/item.rb

@@ -12,7 +12,7 @@ module Smite
     end
 
     def self.physical_item_trees
-      [7573, 7827, 7922, 8268, 9624, 9812, 9825, 9830, 9833, 10190, 10662, 11468, 12667, 12671]
+      [7573, 7827, 7922, 8268, 9624, 9812, 9825, 9830, 9833, 10190, 10662, 11122, 11468, 12667, 12671]
     end
 
     def self.magical_item_trees

data/lib/smite/item_effect.rb

@@ -17,7 +17,7 @@ module Smite
       value       = data.delete('Value')
       @percentage = value[/%/]
 
-      value   = value.tr('+', '').to_i
+      value   = value.tr('+', '').to_f
       @amount = value
     end
 

data/smite_ruby.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smite_ruby
 version: !ruby/object:Gem::Version
-  version: 1.4.9
+  version: 1.5.0
 platform: ruby
 authors:
 - NcUltimate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty