csstats 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6872b7c03f06e7dd770c35a07cd90aaed879ecd
-  data.tar.gz: 3834dbf6a0af008ce011d01f182e72c8249fe1a5
+  metadata.gz: 2313cf63067bbd162abce2c0a4c5fe00c87a6379
+  data.tar.gz: 60a0b3c72b821d3c194588282dbbbf256079e59e
 SHA512:
-  metadata.gz: d2ef9f0ac0f3cfbd024eb17f3ae4bad43ca8cf81a715a39c8114744aea8f244a671a5896c231f83895fb42fe3b3c1829f4a8daa5215303f6b3192504c357d87b
-  data.tar.gz: 593d29515df36cef84ea29e4e3141b659982b24b6b90a513fb92cccf5254b5a620415a0156a5d1ec31ad17420cfaa15f9d19527581c644b74ba1e4e149046093
+  metadata.gz: 516528ff7124ea2285562e66a627cbd883ba6f83cdc49471ba2193dbd07f8cf3c58315ac81c9c3faecc397c457bfaa08e8a31d1d818e3ddd47c37cefb488d2e9
+  data.tar.gz: 390927f04cbdcf054e255af541f83010f15b2156998a5be80d203af25778512d6a284915bc16a5ec14b66bdd05d81a0ff4db508a602c4dd78e9ff1d6ca84f145

data/.travis.yml

@@ -1,7 +1,19 @@
+bundler_args: --without development
+
 language: ruby
+
 rvm:
-  - jruby-19mode
-  - rbx-19mode
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
+  - ruby-head
+  - jruby-19mode
+  - jruby-head
+  - rbx
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+    - rvm: rbx

data/Gemfile

@@ -3,9 +3,9 @@ source 'https://rubygems.org'
 gem 'rake'
 
 group :test do
-  gem 'coveralls', require: false
-  gem 'rspec', '>= 2.13'
-  gem 'simplecov', require: false
+  gem 'coveralls', '~> 0.7.0', require: false
+  gem 'rspec',     '~> 2.14.1'
+  gem 'simplecov', '~> 0.7.1', require: false
 end
 
 gemspec

data/README.md

@@ -1,6 +1,6 @@
 # CSstats
 
-Gem which handle csstats.dat file generated by CSX module
+Gem which handle `csstats.dat` file generated by CSX module
 in AMX Mod X ([http://www.amxmodx.org/][amxx])
 
 [![Gem Version](https://badge.fury.io/rb/csstats.png)][rubygems]
@@ -40,7 +40,7 @@ stats.players_count
  # => 15
 ```
 
-You can find player by specified name.
+You can get player information by specified name.
 
 ```ruby
 stats = CSstats.new(path: 'csstats.dat')
@@ -57,6 +57,7 @@ implementations:
 * Ruby 1.9.2
 * Ruby 1.9.3
 * Ruby 2.0.0
+* Ruby 2.1.0
 
 ## Copyright
 Copyright (c) 2013 Justas Palumickas.

data/csstats.gemspec

@@ -5,20 +5,19 @@ require 'csstats/version'
 
 Gem::Specification.new do |gem|
   gem.name = "csstats"
+  gem.version = CSstats::VERSION
   gem.authors = ["Justas Palumickas"]
   gem.email = ["justas@elish.lt"]
-  gem.description = %q{ Gem which handle csstats.dat file generated by CSX module in AMX Mod X (http://www.amxmodx.org/) }
-  gem.summary = gem.description
   gem.homepage = "https://github.com/jpalumickas/csstats/"
-  gem.licenses = ['MIT']
+  gem.summary = gem.description
+  gem.description = %q{ Gem which handle csstats.dat file generated by CSX module in AMX Mod X (http://www.amxmodx.org/) }
+  gem.license = 'MIT'
 
   gem.files = `git ls-files`.split($/)
   gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency 'bundler', '~> 1.0'
   gem.add_dependency 'hashie', '~> 2.0'
-
-  gem.version = CSstats::VERSION
+  gem.add_development_dependency 'bundler', '~> 1.0'
 end

data/lib/csstats/handler.rb

@@ -34,6 +34,57 @@ module CSstats
       end
     end
 
+    # Public: Get the player information of specified id.
+    #
+    # id - The Integer of player id.
+    #
+    # Returns the Mash of player information.
+    def player(id)
+      unless @players[id - 1].nil?
+        @players[id - 1]
+      end
+    end
+
+    # Public: Get total players count.
+    #
+    # Returns the Integer of player count.
+    def players_count
+      @players.count
+    end
+
+    # Public: Get player by specified name.
+    #
+    # name - The String of player name.
+    #
+    # Returns the Mash of player information.
+    def search_by_name(name)
+      @players.each do |player|
+        return player if name == player.nick
+      end
+    end
+
+    private
+
+    # Internal: Count player efficiency.
+    #
+    # kills  - The Integer of player kills in game.
+    # deaths - The Integer of player deaths in game.
+    #
+    # Returns The Float of player efficiency.
+    def count_efficiency(kills, deaths)
+      (kills.to_f / (kills.to_f + deaths.to_f) * 100).round(2)
+    end
+
+    # Internal: Count player accuracy.
+    #
+    # hits  - The Integer of player hits in game.
+    # shots - The Integer of player shots in game.
+    #
+    # Returns The Float of player accuracy.
+    def count_accuracy(hits, shots)
+      (hits.to_f / shots.to_f * 100).round(2)
+    end
+
     # Internal: Read player information from file.
     #
     # handle - The File which was opened for reading data.
@@ -50,33 +101,17 @@ module CSstats
       length = read_short_data(handle)
       mash.uniq = read_string_data(handle, length)
 
-      mash.teamkill = read_int_data(handle)
-      mash.damage = read_int_data(handle)
-      mash.deaths = read_int_data(handle)
-      mash.kills = read_int_data(handle)
-      mash.shots = read_int_data(handle)
-      mash.hits = read_int_data(handle)
-      mash.headshots = read_int_data(handle)
-
-      mash.defusions = read_int_data(handle)
-      mash.defused = read_int_data(handle)
-      mash.plants = read_int_data(handle)
-      mash.explosions = read_int_data(handle)
+      read_data = %w(teamkill damage deaths kills shots hits headshots
+                     defusions defused plants explosions - head chest stomach
+                     leftarm rightarm leftleg rightleg -)
 
-      read_int_data(handle) # 0x00000000
+      read_data.each { |data| mash[data] = read_int_data(handle) }
 
-      mash.head = read_int_data(handle)
-      mash.chest = read_int_data(handle)
-      mash.stomach = read_int_data(handle)
-      mash.leftarm = read_int_data(handle)
-      mash.rightarm = read_int_data(handle)
-      mash.leftleg = read_int_data(handle)
-      mash.rightleg = read_int_data(handle)
+      # Remove all 0x00000000
+      mash.tap { |x| x.delete('-') }
 
-      mash.acc = mash.hits.to_f / mash.shots.to_f * 100
-      mash.eff = mash.kills.to_f / (mash.kills.to_f + mash.deaths.to_f) * 100
-
-      read_int_data(handle) # 0x00000000
+      mash.acc = count_accuracy(mash.hits, mash.shots)
+      mash.eff = count_efficiency(mash.kills, mash.deaths)
 
       mash
     end
@@ -115,34 +150,5 @@ module CSstats
       data = data.strip
       data
     end
-
-    # Internal: Get the player information of specified id.
-    #
-    # id - The Integer of player id.
-    #
-    # Returns the Mash of player information.
-    def player(id)
-      unless @players[id - 1].nil?
-        @players[id - 1]
-      end
-    end
-
-    # Get total players count.
-    #
-    # Returns the Integer of player count.
-    def players_count
-      @players.count
-    end
-
-    # Get player by specified name.
-    #
-    # name - The String of player name.
-    #
-    # Returns the Mash of player information.
-    def search_by_name(name)
-      @players.each do |player|
-        return player if name == player.nick
-      end
-    end
   end
 end

data/lib/csstats/version.rb

@@ -1,3 +1,3 @@
 module CSstats
-  VERSION = '1.0.2' unless defined?(CSstats::VERSION)
+  VERSION = '1.0.3' unless defined?(CSstats::VERSION)
 end

data/spec/csstats/handler_spec.rb

@@ -14,9 +14,99 @@ describe CSstats::Handler do
     expect(@handler.player(2).nick).to eq 'CHMARSON'
   end
 
-  it 'should return searched player' do
-    player = @handler.search_by_name('CHMARSON')
-    expect(player.nick).to eq 'CHMARSON'
-  end
+  describe 'player with specified name' do
+
+    before do
+      @player = @handler.search_by_name('CHMARSON')
+    end
+
+    it 'should return searched player' do
+      expect(@player.nick).to eq 'CHMARSON'
+    end
+
+    it 'should return correct player rank' do
+      expect(@player.rank).to eq 2
+    end
+
+    it 'should return correct player teamkill' do
+      expect(@player.teamkill).to eq 7
+    end
+
+    it 'should return correct player damage' do
+      expect(@player.damage).to eq 101543
+    end
+
+    it 'should return correct player deaths' do
+      expect(@player.deaths).to eq 511
+    end
+
+    it 'should return correct player kills' do
+      expect(@player.kills).to eq 759
+    end
+
+    it 'should return correct player shots' do
+      expect(@player.shots).to eq 9421
+    end
+
+    it 'should return correct player hits' do
+      expect(@player.hits).to eq 2885
+    end
+
+    it 'should return correct player headshots' do
+      expect(@player.headshots).to eq 225
+    end
+
+    it 'should return correct player defusions' do
+      expect(@player.defusions).to eq 15
+    end
+
+    it 'should return correct player defused' do
+      expect(@player.defused).to eq 9
+    end
 
+    it 'should return correct player plants' do
+      expect(@player.plants).to eq 33
+    end
+
+    it 'should return correct player explosions' do
+      expect(@player.explosions).to eq 7
+    end
+
+    it 'should return correct player head' do
+      expect(@player.head).to eq 275
+    end
+
+    it 'should return correct player chest' do
+      expect(@player.chest).to eq 407
+    end
+
+    it 'should return correct player stomach' do
+      expect(@player.stomach).to eq 376
+    end
+
+    it 'should return correct player leftarm' do
+      expect(@player.leftarm).to eq 1126
+    end
+
+    it 'should return correct player rightarm' do
+      expect(@player.rightarm).to eq 283
+    end
+
+    it 'should return correct player leftleg' do
+      expect(@player.leftleg).to eq 202
+    end
+
+    it 'should return correct player rightleg' do
+      expect(@player.rightleg).to eq 214
+    end
+
+    it 'should return correct player accuracy' do
+      expect(@player.acc).to eq 30.62
+    end
+
+    it 'should return correct player efficiency' do
+      expect(@player.eff).to eq 59.76
+    end
+
+  end
 end

metadata

@@ -1,54 +1,54 @@
 --- !ruby/object:Gem::Specification
 name: csstats
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Justas Palumickas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-11 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
+        version: '2.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
+        version: '1.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-description: ' Gem which handle csstats.dat file generated by CSX module in AMX Mod
-  X (http://www.amxmodx.org/) '
+        version: '1.0'
+description: " Gem which handle csstats.dat file generated by CSX module in AMX Mod
+  X (http://www.amxmodx.org/) "
 email:
 - justas@elish.lt
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.md
@@ -73,20 +73,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
-summary: Gem which handle csstats.dat file generated by CSX module in AMX Mod X (http://www.amxmodx.org/)
+summary: ''
 test_files:
 - spec/csstats/handler_spec.rb
 - spec/csstats_spec.rb