paladins 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: a1459a4fe6fcf781c004bb9842aab968dc537ed38a74cca643ef78d40ab7cb82
-  data.tar.gz: 53a2c401373e5ecf077a3d9942deb66768050d7af8a7733120f6957c07d23155
+SHA1:
+  metadata.gz: 8fce42ac5f9e2ee6cd3df1ba4c818d86167645e6
+  data.tar.gz: 732786fc042df2f8e53481c40f614cc87675c9d9
 SHA512:
-  metadata.gz: c740c94a9317523bdf299fff8f9d1c462b3737c5408dbbc743b1269c4d1b32700b217cb605f3955f36f5663cbccd7af0dd92c371e71a476ff1348f8c8cc1bc2a
-  data.tar.gz: ef16c78222bb039fa977cbb3afebadab36165a53d2fec49a6df8ffc00505a69b3c22eb5f137ef86cba04725d9e9a55e6137d3fd5be87e8eb4df7c0187e3e087f
+  metadata.gz: af44a0d2cc566e9ea760d4a67b6c21c951e761f43d8ae1dc2b683549a743cd3c7849f41d02eba432720eb0b4e5ed9e8f9e825b74ab95ba4368b4baea4bda3561
+  data.tar.gz: 5e67c65fa2bbc56abf887ee9f6a7394f01a7e4b246c3262fe191ee66ffd1803349daad09a54931ec29a2c177f7bb777ec3de67493823e0d9cf0c88d4c084cbe9

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.1.3 (alpha)
+
+- added support for method Paladins.getplayer(player_name)
+- clients now check for expired or nil sessions and create new session after 15 minutes
+- gem is now thread safe (tests missing, so I'm not really sure about it :)
+
 ## 0.1.2 (alpha)
 
 - added support for method Paladins.ping

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    paladins (0.1.1)
+    paladins (0.1.2)
       faraday
       json
 

data/lib/paladins.rb

@@ -23,16 +23,25 @@ module Paladins
 
   def self.gethirezserverstatus
     client = Paladins::Client.new(configuration)
+    client.extend(MonitorMixin)
     client.get_hirez_server_status
   end
 
   def self.ping
     client = Paladins::Client.new(configuration)
+    client.extend(MonitorMixin)
     client.ping
   end
 
   def self.getchampionranks(player_name)
     client = Paladins::Client.new(configuration)
+    client.extend(MonitorMixin)
     client.get_champion_ranks(player_name)
   end
+
+  def self.getplayer(player_name)
+    client = Paladins::Client.new(configuration)
+    client.extend(MonitorMixin)
+    client.get_player(player_name)
+  end
 end

data/lib/paladins/client.rb

@@ -1,10 +1,13 @@
 require 'faraday'
 require 'json'
 require 'digest'
+require 'monitor'
 
 module Paladins
   class Client
-    @@session_id = nil
+    # include MonitorMixin
+
+    @@session = { id: nil, updated_at: nil }
 
     attr_accessor :api_url, :dev_id, :auth_key, :response_format
 
@@ -23,25 +26,30 @@ module Paladins
     def create_session
       # /createsession[ResponseFormat]/{developerId}/{signature}/{timestamp}
       response = Faraday.get(url(method: 'createsession', session: false))
-      @@session_id = JSON.parse(response.body).dig('session_id')
-
-      @@session_id
+      @@session[:updated_at] = Time.now
+      @@session[:id] = JSON.parse(response.body).dig('session_id')
     end
 
     def test_session
       # /testsession[ResponseFormat]/{developerId}/{signature}/{session}/{timestamp}
       time_now = Paladins::Utils.time_now
-      response = Faraday.get("#{@api_url}/testsessionJson/#{@dev_id}/#{get_signature('testsession', time_now)}/#{@@session_id}/#{time_now}")
+      response = Faraday.get("#{@api_url}/testsessionJson/#{@dev_id}/#{get_signature('testsession', time_now)}/#{@@session[:id]}/#{time_now}")
       attributes = JSON.parse(response.body)
     end
 
     def session_expired?
-      true
-      ## TODO: return TRUE only when #test_session returns something saying session is expired
+      self.synchronize do
+        if Time.now - @@session[:updated_at] > 60*12
+          @@session[:updated_at] = Time.now
+          true
+        else
+          false
+        end
+      end
     end
 
     def get_or_create_session
-      create_session if ( @@session_id.nil? || session_expired? )
+      ( @@session[:id].nil? || session_expired? ) ? create_session : @@session[:id]
     end
 
     def ping
@@ -62,6 +70,12 @@ module Paladins
       attributes = JSON.parse(response.body)
     end
 
+    def get_player(player_name)
+      # /getplayer[ResponseFormat]/{developerId}/{signature}/{session}/{timestamp}/{player}
+      response = Faraday.get(url(method: 'getplayer', session: true) + "/#{player_name}")
+      attributes = JSON.parse(response.body)
+    end
+
     def url(method:, session: false)
       time_now = Paladins::Utils.time_now
       url = "#{@api_url}/#{method}#{@response_format}/#{@dev_id}/#{get_signature(method, time_now)}"

data/lib/paladins/version.rb

@@ -1,3 +1,3 @@
 module Paladins
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paladins
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Davide Ghezzi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-30 00:00:00.000000000 Z
+date: 2018-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for Paladins API.