csstats 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7af1111cba3fbcebf12a2a0578fb3985b96c498
-  data.tar.gz: ed56d30db6ae2f8fa927ffc9ab73fd174e61f004
+  metadata.gz: 62ca403d7af2f0c4e360b2aad4b7aa8b4c0d1adb
+  data.tar.gz: a105d30eabbae88b37c8e78b4517bf52da96dd0a
 SHA512:
-  metadata.gz: 5d1cc0ad34d13a77635636e1b2f42696a309db66d91e239020fcd9833a2f811010b8a25561db404a3f34322b98e13c3243d7f20ecb7d06cddc5f4a42c08124ce
-  data.tar.gz: 058600f16b155ddfc7d9b91dce6d7fefd46dd5697e852186cc5fd798854c78c66d57476132b00ea9bb88f6088f7caaefda7e6c40a347c1ddbed6c369e1af9d0f
+  metadata.gz: 64915feabd7078daea341085c861ea05ef04d0324ec0ffbece9586975fa85d1ef529a28ce9b69e26edea59614e198701c1357c85cb348b13eb9f2688fcc42e5b
+  data.tar.gz: adfe45bb877909a1d9aa7bc27a65fac035485b1be9fc9d5393d143e1cd2894a07565a9ddbeb822553f2c0bdbc77957218a793600ec86852cdb629b77dd02e829

data/.rubocop.yml

@@ -0,0 +1,2 @@
+Style/Documentation:
+  Enabled: false

data/.travis.yml

@@ -7,6 +7,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.0
   - ruby-head
   - jruby-19mode
   - jruby-head

data/Gemfile

@@ -3,9 +3,9 @@ source 'https://rubygems.org'
 gem 'rake'
 
 group :test do
-  gem 'coveralls', '~> 0.7.1', require: false
-  gem 'rspec',     '~> 3.1.0'
-  gem 'simplecov', '~> 0.9.0', require: false
+  gem 'coveralls', '~> 0.8.1', require: false
+  gem 'rspec',     '~> 3.2.0'
+  gem 'simplecov', '~> 0.10.0', require: false
 end
 
 gemspec

data/README.md

@@ -1,10 +1,10 @@
 # CSstats
 
-[![Gem Version](http://img.shields.io/gem/v/csstats.svg?style=flat)][rubygems]
-[![Build Status](http://img.shields.io/travis/jpalumickas/csstats/master.svg?style=flat)][travis]
-[![Dependency Status](http://img.shields.io/gemnasium/jpalumickas/csstats.svg?style=flat)][gemnasium]
-[![Coverage Status](https://img.shields.io/coveralls/jpalumickas/csstats.svg?branch=master&style=flat)][coveralls]
-[![Code Climate](https://img.shields.io/codeclimate/github/jpalumickas/csstats.svg?style=flat)][codeclimate]
+[![Gem Version](http://img.shields.io/gem/v/csstats.svg?style=flat-square)][rubygems]
+[![Build Status](http://img.shields.io/travis/jpalumickas/csstats/master.svg?style=flat-square)][travis]
+[![Dependency Status](http://img.shields.io/gemnasium/jpalumickas/csstats.svg?style=flat-square)][gemnasium]
+[![Coverage Status](https://img.shields.io/coveralls/jpalumickas/csstats.svg?branch=master&style=flat-square)][coveralls]
+[![Code Climate](https://img.shields.io/codeclimate/github/jpalumickas/csstats.svg?style=flat-square)][codeclimate]
 
 Gem which handle `csstats.dat` file generated by CSX module
 in AMX Mod X ([http://www.amxmodx.org/][amxx])
@@ -58,6 +58,7 @@ implementations:
 * Ruby 1.9.3
 * Ruby 2.0.0
 * Ruby 2.1.0
+* Ruby 2.2.0
 
 ## Copyright
 Copyright (c) 2013 Justas Palumickas.

data/csstats.gemspec

@@ -10,16 +10,17 @@ Gem::Specification.new do |gem|
   gem.email = 'jpalumickas@gmail.com'
   gem.homepage = 'https://github.com/jpalumickas/csstats/'
   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.description = 'Gem which handle csstats.dat file generated by CSX' \
+                    ' module in AMX Mod X (http://www.amxmodx.org/)'
 
+  gem.license = 'MIT'
   gem.required_ruby_version = '>= 1.9.2'
 
-  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.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  gem.executables = gem.files.grep(/^bin\//).map { |f| File.basename(f) }
+  gem.test_files = gem.files.grep(/^(test|spec|features)\//)
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'hashie', '~> 3.3'
-  gem.add_development_dependency 'bundler', '~> 1.5'
+  gem.add_dependency 'hashie', '~> 3.4'
+  gem.add_development_dependency 'bundler', '~> 1.6'
 end

data/lib/csstats/error.rb

@@ -1,3 +1,4 @@
 module CSstats
   class Error < StandardError; end
+  class FileNotExist < StandardError; end
 end

data/lib/csstats/handler.rb

@@ -2,7 +2,7 @@ require 'hashie/mash'
 
 module CSstats
   class Handler
-    attr_reader :path, :players
+    attr_reader :path, :players, :maxplayers
 
     # Public: Initialize file.
     #
@@ -13,25 +13,15 @@ module CSstats
     # Returns nothing.
     def initialize(options = {})
       @path = options[:path]
-      @players = []
-      return if path.nil?
-
-      maxplayers = options[:maxplayers] || 0
+      @maxplayers = options[:maxplayers] || 0
 
-      file = File.new(path, 'r')
-      file_version = read_short_data(file)
+      @players = []
+      fail CSstats::FileNotExist unless File.exist?(path.to_s)
 
-      i = 0
-      while !file.eof? && (maxplayers == 0 || i < maxplayers)
-        player = read_player(file)
+      @file = File.new(path, 'r')
+      _file_version = read_short_data(@file)
 
-        if player
-          player['rank'] = i + 1
-          players[i] = player
-        end
-
-        i += 1
-      end
+      read_players!
     end
 
     # Public: Get the player information of specified id.
@@ -61,6 +51,20 @@ module CSstats
 
     private
 
+    def read_players!
+      i = 0
+      while !@file.eof? && (maxplayers == 0 || i < maxplayers)
+        player = read_player(@file)
+
+        if player
+          player['rank'] = i + 1
+          players[i] = player
+        end
+
+        i += 1
+      end
+    end
+
     # Internal: Count player efficiency.
     #
     # kills  - The Integer of player kills in game.
@@ -88,27 +92,38 @@ module CSstats
     # Returns The Mash of player information.
     def read_player(handle)
       length = read_short_data(handle)
-      return nil if length == 0
+      return if length == 0
 
-      mash = Hashie::Mash.new
+      player_data = Hashie::Mash.new
 
-      mash.nick = read_string_data(handle, length)
+      player_data.nick = read_string_data(handle, length)
+
+      add_player_uniq(player_data, handle)
+      add_player_general_data(player_data, handle)
+      add_player_calculations(player_data)
+
+      player_data
+    end
+
+    def add_player_uniq(player_data, handle)
       length = read_short_data(handle)
-      mash.uniq = read_string_data(handle, length)
+      player_data.uniq = read_string_data(handle, length)
+    end
 
-      read_data = %w(teamkill damage deaths kills shots hits headshots
-                     defusions defused plants explosions - head chest stomach
-                     leftarm rightarm leftleg rightleg -)
+    def add_player_general_data(player_data, handle)
+      data_types = %w(teamkill damage deaths kills shots hits headshots
+                      defusions defused plants explosions - head chest stomach
+                      leftarm rightarm leftleg rightleg -)
 
-      read_data.each { |data| mash[data] = read_int_data(handle) }
+      data_types.each { |type| player_data[type] = read_int_data(handle) }
 
       # Remove all 0x00000000
-      mash.tap { |x| x.delete('-') }
-
-      mash.acc = count_accuracy(mash.hits, mash.shots)
-      mash.eff = count_efficiency(mash.kills, mash.deaths)
+      player_data.tap { |x| x.delete('-') }
+    end
 
-      mash
+    def add_player_calculations(player_data)
+      player_data.acc = count_accuracy(player_data.hits, player_data.shots)
+      player_data.eff = count_efficiency(player_data.kills, player_data.deaths)
     end
 
     # Internal: Get the 32bit integer from file.
@@ -118,7 +133,7 @@ module CSstats
     # Returns the Integer.
     def read_int_data(handle)
       data = handle.read(4)
-      raise CSstats::Error, 'Cannot read int data.' unless data
+      fail CSstats::Error, 'Cannot read int data.' unless data
 
       data.unpack('V').first
     end
@@ -130,7 +145,7 @@ module CSstats
     # Returns the Integer.
     def read_short_data(handle)
       data = handle.read(2)
-      raise CSstats::Error, 'Cannot read short data.' unless data
+      fail CSstats::Error, 'Cannot read short data.' unless data
 
       data.unpack('v').first
     end
@@ -143,7 +158,7 @@ module CSstats
     # Returns the String.
     def read_string_data(handle, length)
       data = handle.read(length)
-      raise CSstats::Error, 'Cannot read string data.' unless data
+      fail CSstats::Error, 'Cannot read string data.' unless data
 
       data.strip
     end

data/lib/csstats/version.rb

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

data/spec/csstats/handler_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe CSstats::Handler do
-
   before do
     @handler = CSstats::Handler.new(path: csstats_file, maxplayers: 15)
   end
@@ -15,7 +14,6 @@ describe CSstats::Handler do
   end
 
   describe 'player with specified name' do
-
     before do
       @player = @handler.search_by_name('CHMARSON')
     end
@@ -33,7 +31,7 @@ describe CSstats::Handler do
     end
 
     it 'should return correct player damage' do
-      expect(@player.damage).to eq 101543
+      expect(@player.damage).to eq 101_543
     end
 
     it 'should return correct player deaths' do
@@ -108,5 +106,8 @@ describe CSstats::Handler do
       expect(@player.eff).to eq 59.76
     end
 
+    it 'should not return empty data' do
+      expect(@player['-']).to eq nil
+    end
   end
 end

data/spec/csstats_spec.rb

@@ -1,11 +1,13 @@
 require 'spec_helper'
 
 describe CSstats do
-
   describe '.new' do
     it 'is a CSstats::Handler' do
-      expect(CSstats.new).to be_a CSstats::Handler
+      expect(CSstats.new(path: csstats_file)).to be_a CSstats::Handler
     end
-  end
 
+    it 'is a CSstats::FileNotFound if file path empty' do
+      expect { CSstats.new }.to raise_error(CSstats::FileNotExist)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csstats
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Justas Palumickas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -16,30 +16,30 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-description: " Gem which handle csstats.dat file generated by CSX module in AMX Mod
-  X (http://www.amxmodx.org/) "
+        version: '1.6'
+description: Gem which handle csstats.dat file generated by CSX module in AMX Mod
+  X (http://www.amxmodx.org/)
 email: jpalumickas@gmail.com
 executables: []
 extensions: []
@@ -47,6 +47,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
@@ -82,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: ''