gorgerb 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92bdd09b3212ee3b0310996d9f87481f1a23607b2bd53a32e27531631d648608
-  data.tar.gz: 85905d90026e1001a90ae77a498856c63f31e998717d5761725a797ac5410de2
+  metadata.gz: 7ac26d65b69948cdf64ed0d232df076bc17f0788c4c4cebda0032c67ec1ec71a
+  data.tar.gz: 4c9a92e1e186b6c3abbaafa6f764ab8ed022fff61f6ad6cacb68064ebf3396ed
 SHA512:
-  metadata.gz: 1c4750bef2d3559fe07a03892a2304f45769d8ec07ef50ddeee686dec0ba6858e9a5724ba909ea12aa541fb01b62bb0ed91d1516a3d543ae08b8cf77de30ed86
-  data.tar.gz: bc10db0b6a28231f9d03b7712b24ea9ae91a015080396418607f38209b16a9071fbfcd7f20580314fbc4e1c929991729cea428f6fae8e6a49c7bb90003c8cab4
+  metadata.gz: cbc505a11b49dce7caa14f997961621786d4838da7ecabd9dd017f837c085b39f9efaa3307d7c7dc1a1ced80c7734c818d60d38f7626d2cb872c83bb9c984cf9
+  data.tar.gz: '03395f8f62d8cfd75cdc359abc8ee6569e8476c796703ebcf08cc4fefb9f1b5710965ae095b61baf41904ecf520e033f236d9a125ac91ec7cbbbf0b47b4a63bf'

data/.gitignore

@@ -1 +1,2 @@
 spec/examples.txt
+Gemfile.lock

data/CHANGELOG.md

@@ -19,6 +19,13 @@ glance - what to expact from upgrading to a new version.
 ### Removed
 
 
+## [0.2.0] - 2019-03-17
+
+### Added
+
+- Add support for new output format of Gorge.
+
+
 ## [0.1.0] - 2018-04-03
 
 ### Added

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in sunscout.gemspec
+# Specify your gem's dependencies in gorgerb.gemspec
 gemspec

data/gorgerb.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'gorgerb'
-  spec.version       = '0.1.0'
+  spec.version       = '0.2.0'
   spec.authors       = ['Michael Senn']
   spec.email         = ['michael@morrolan.ch']
 
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'typhoeus', '~> 1.3'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler', '~> 2'
   spec.add_development_dependency 'rspec', '~> 3.7'
   spec.add_development_dependency 'pry', '~> 0.11'
 end

data/lib/gorgerb/client.rb

@@ -13,8 +13,15 @@ module Gorgerb
       Typhoeus::Config.user_agent = user_agent
     end
 
-    def player_statistics(steam_id)
-      response = request("players/#{ steam_id }/statistics")
+    def player_statistics(steam_id, statistics_classes:)
+      statistics_classes = [statistics_classes] unless statistics_classes.is_a? Array
+
+      response = request(
+        "players/#{ steam_id }/statistics",
+        params: {
+          statistics_classes: statistics_classes
+        }
+      )
 
       PlayerStatistics.from_hsh(response)
     rescue KeyError => e
@@ -22,8 +29,8 @@ module Gorgerb
     end
 
     private
-    def request(path, method: :get)
-      request = build_request(path, method: :get)
+    def request(path, method: :get, params: {})
+      request = build_request(path, method: :get, params: params)
       request.run
 
       response = request.response
@@ -42,10 +49,12 @@ module Gorgerb
       raise APIError, 'Invalid JSON received from API'
     end
 
-    def build_request(path, method: :get)
+    def build_request(path, method: :get, params:)
       opts = {
         connecttimeout: @connect_timeout,
-        timeout: @timeout
+        timeout: @timeout,
+        params: params,
+        params_encoding: :rack
       }
       opts[:userpwd] = "#{ @http_user }:#{ @http_password }" if @http_user && @http_password
 

data/lib/gorgerb/player_statistics.rb

@@ -2,38 +2,66 @@ require 'json'
 
 module Gorgerb
   class PlayerStatistics
-    KDR = Struct.new(:total, :alien, :marine)
-    Accuracy = Struct.new(:total, :alien, :marine)
+    KDR = Struct.new(:alien, :marine)
+    Accuracy = Struct.new(:alien, :marine)
     MarineAccuracy = Struct.new(:total, :no_onos)
+    Meta = Struct.new(:sample_size)
+    StatisticsPoint = Struct.new(:meta, :kdr, :accuracy)
 
-    attr_reader :steam_id, :kdr, :accuracy
+    attr_reader :steam_id
 
     def self.from_hsh(data)
-      kdr_data = data.fetch('kdr')
-      accuracy_data = data.fetch('accuracy')
-
-      steam_id = data.fetch 'steam_id'
-      kdr = KDR.new(
-        kdr_data.fetch('total'),
-        kdr_data.fetch('alien'),
-        kdr_data.fetch('marine')
-      )
-      accuracy = Accuracy.new(
-        accuracy_data.fetch('total'),
-        accuracy_data.fetch('alien'),
-        MarineAccuracy.new(
-          accuracy_data.fetch('marine').fetch('total'),
-          accuracy_data.fetch('marine').fetch('no_onos'),
+      stats_points = {}
+
+      steam_id = data.fetch('_').fetch('steam_id')
+      # Prevent it being treated as a stats point further below.
+      data.delete('_')
+
+      data.each do |stats_class, class_data|
+        kdr_data = class_data.fetch('kdr')
+        accuracy_data = class_data.fetch('accuracy')
+        meta_data = class_data.fetch('_')
+
+        kdr = KDR.new(
+          kdr_data.fetch('alien'),
+          kdr_data.fetch('marine')
+        )
+
+        accuracy = Accuracy.new(
+          accuracy_data.fetch('alien'),
+          MarineAccuracy.new(
+            accuracy_data.fetch('marine').fetch('total'),
+            accuracy_data.fetch('marine').fetch('no_onos'),
+          )
+        )
+
+        meta = Meta.new(
+          meta_data.fetch('sample_size')
+        )
+
+        stats_points[stats_class] = StatisticsPoint.new(
+          meta,
+          kdr,
+          accuracy
         )
-      )
+      end
 
-      PlayerStatistics.new(steam_id, kdr, accuracy)
+      PlayerStatistics.new(steam_id, stats_points)
     end
 
-    def initialize(steam_id, kdr, accuracy)
+    def initialize(steam_id, statistics_points)
       @steam_id = steam_id
-      @kdr = kdr
-      @accuracy = accuracy
+      @statistics_points = statistics_points
+    end
+
+    def method_missing(m, *args, &block)
+      stats_class = m.to_s
+
+      if @statistics_points.key? stats_class
+        @statistics_points[stats_class]
+      else
+        super(m, *args, &block)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gorgerb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Senn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-03 00:00:00.000000000 Z
+date: 2019-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -77,7 +77,6 @@ files:
 - ".rspec"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -105,8 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Ruby binding to Gorge, the NS2+/Wonitor stats aggregator.

data/Gemfile.lock

@@ -1,45 +0,0 @@
-PATH
-  remote: .
-  specs:
-    gorgerb (0.1.0)
-      typhoeus
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    coderay (1.1.2)
-    diff-lcs (1.3)
-    ethon (0.11.0)
-      ffi (>= 1.3.0)
-    ffi (1.9.23)
-    method_source (0.9.0)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    typhoeus (1.3.0)
-      ethon (>= 0.9.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.16)
-  gorgerb!
-  pry
-  rspec
-
-BUNDLED WITH
-   1.16.1