csstats 1.1.0 → 1.2.0

data/spec/csstats_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe CSstats do
   describe '.new' do
-    it 'is a CSstats::Handler' do
-      expect(CSstats.new(path: csstats_file)).to be_a CSstats::Handler
+    it 'is a CSstats::Client' do
+      expect(CSstats.new(path: csstats_file)).to be_a(CSstats::Client)
     end
 
     it 'is a CSstats::FileNotFound if file path empty' do

data/spec/spec_helper.rb

@@ -1,11 +1,7 @@
 require 'simplecov'
-require 'coveralls'
-require 'codeclimate-test-reporter'
 
 SimpleCov.formatters = [
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter,
-  CodeClimate::TestReporter::Formatter
+  SimpleCov::Formatter::HTMLFormatter
 ]
 
 SimpleCov.start
@@ -24,11 +20,11 @@ def csstats_file
 end
 
 def fixture_file(filename)
-  fixtures = File.expand_path('../fixtures', __FILE__)
+  fixtures = File.expand_path('fixtures', __dir__)
   File.join(fixtures, filename)
 end
 
 def tmp_file(filename)
-  tmps = File.expand_path('../tmp', __FILE__)
+  tmps = File.expand_path('tmp', __dir__)
   File.join(tmps, filename)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csstats
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Justas Palumickas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.16'
 description: Gem which handle csstats.dat file generated by CSX module in AMX Mod
   X (http://www.amxmodx.org/)
 email: jpalumickas@gmail.com
@@ -59,21 +59,27 @@ files:
 - bin/console
 - csstats.gemspec
 - lib/csstats.rb
+- lib/csstats/client.rb
+- lib/csstats/columns.rb
 - lib/csstats/error.rb
-- lib/csstats/handler.rb
 - lib/csstats/parser.rb
-- lib/csstats/parser/file_reader.rb
-- lib/csstats/parser/file_reader/handler.rb
-- lib/csstats/parser/player.rb
-- lib/csstats/parser/players.rb
+- lib/csstats/parser/reader.rb
+- lib/csstats/parser/reader/file_reader.rb
+- lib/csstats/parser/reader/file_streamer.rb
+- lib/csstats/parser/reader/player.rb
+- lib/csstats/parser/reader/players.rb
+- lib/csstats/parser/writer.rb
+- lib/csstats/parser/writer/file_streamer.rb
+- lib/csstats/parser/writer/player.rb
+- lib/csstats/parser/writer/players.rb
+- lib/csstats/player.rb
+- lib/csstats/players.rb
 - lib/csstats/version.rb
-- lib/csstats/writer.rb
-- lib/csstats/writer/file_writer/handler.rb
-- lib/csstats/writer/player.rb
-- lib/csstats/writer/players.rb
-- spec/csstats/handler_spec.rb
-- spec/csstats/parser/player_spec.rb
-- spec/csstats/writer/players_spec.rb
+- spec/csstats/client_spec.rb
+- spec/csstats/parser/reader/player_spec.rb
+- spec/csstats/parser/writer/players_spec.rb
+- spec/csstats/player_spec.rb
+- spec/csstats/players_spec.rb
 - spec/csstats_spec.rb
 - spec/fixtures/csstats.dat
 - spec/spec_helper.rb
@@ -90,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -98,14 +104,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: ''
 test_files:
-- spec/csstats/handler_spec.rb
-- spec/csstats/parser/player_spec.rb
-- spec/csstats/writer/players_spec.rb
+- spec/csstats/client_spec.rb
+- spec/csstats/parser/reader/player_spec.rb
+- spec/csstats/parser/writer/players_spec.rb
+- spec/csstats/player_spec.rb
+- spec/csstats/players_spec.rb
 - spec/csstats_spec.rb
 - spec/fixtures/csstats.dat
 - spec/spec_helper.rb

data/lib/csstats/handler.rb

@@ -1,50 +0,0 @@
-module CSstats
-  class Handler
-    attr_reader :file_path, :max_players
-
-    # Public: Initialize file.
-    #
-    # options - The Hash options:
-    #   :path       - The String of csstats.dat file path (required).
-    #   :maxplayers - The Integer of how many players to return (optional).
-    #
-    # Returns nothing.
-    def initialize(options = {})
-      @file_path = options[:path]
-      @max_players = options[:maxplayers] || 0
-
-      raise CSstats::FileNotExist unless File.exist?(file_path.to_s)
-    end
-
-    # Public: Get the player information of specified id.
-    #
-    # id - The Integer of player id.
-    #
-    # Returns the Mash of player information.
-    def player(id)
-      players[id - 1]
-    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.find { |player| player.nick == name }
-    end
-
-    def players
-      @players ||= CSstats::Parser::Players.new(
-        file_path, max_players: max_players
-      ).parse
-    end
-  end
-end

data/lib/csstats/parser/file_reader.rb

@@ -1,39 +0,0 @@
-require_relative 'file_reader/handler'
-
-module CSstats
-  module Parser
-    class FileReader
-      attr_reader :file_path, :limit
-
-      def initialize(file_path, options = {})
-        @file_path = file_path
-        @limit = options[:limit] || 0
-
-        raise CSstats::FileNotExist unless File.exist?(file_path.to_s)
-      end
-
-      def read(&block)
-        return unless block_given?
-
-        file = File.new(file_path, 'r')
-
-        # Need to read first data, which means file version.
-        _file_version = Handler.new(file).read_short_data
-
-        read_data(file, &block)
-
-        file.close
-      end
-
-      private
-
-      def read_data(file, &_block)
-        index = 0
-        while !file.eof? && (limit.zero? || index < limit)
-          yield(Handler.new(file), index)
-          index += 1
-        end
-      end
-    end
-  end
-end

data/lib/csstats/parser/player.rb

@@ -1,82 +0,0 @@
-require 'hashie/mash'
-
-module CSstats
-  module Parser
-    class Player
-      DATA_COLUMNS = %w(
-        teamkill damage deaths kills shots hits headshots defusions defused
-        plants explosions - head chest stomach leftarm rightarm leftleg
-        rightleg -
-      ).freeze
-
-      # Internal: Parse player information from file.
-      #
-      # handler - The File which was opened for reading data.
-      #
-      # Returns The Mash of player information.
-      def parse(handler)
-        length = handler.read_short_data
-        return if length.zero?
-
-        player_data = Hashie::Mash.new
-        player_data.nick = handler.read_string_data(length)
-
-        add_data(player_data, handler)
-
-        player_data
-      end
-
-      private
-
-      def add_data(player_data, handler)
-        add_uniq(player_data, handler)
-        add_general_data(player_data, handler)
-        add_calculations(player_data)
-      end
-
-      def add_uniq(player_data, handler)
-        length = handler.read_short_data
-        player_data.uniq = handler.read_string_data(length)
-      end
-
-      def add_general_data(player_data, handler)
-        DATA_COLUMNS.each { |type| player_data[type] = handler.read_int_data }
-
-        # Remove all 0x00000000
-        player_data.tap { |x| x.delete('-') }
-      end
-
-      def add_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: 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_and_deaths = kills.to_f + deaths.to_f
-        return 0.0 if kills_and_deaths.zero?
-
-        (kills.to_f / kills_and_deaths * 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)
-        return 0.0 if shots.to_f.zero?
-
-        (hits.to_f / shots.to_f * 100).round(2)
-      end
-    end
-  end
-end

data/lib/csstats/parser/players.rb

@@ -1,42 +0,0 @@
-module CSstats
-  module Parser
-    class Players
-      attr_reader :file_path, :max_players
-
-      def initialize(file_path, options = {})
-        @file_path = file_path
-        @max_players = options[:max_players] || 0
-      end
-
-      def parse
-        players = []
-
-        file_reader.read do |handler, index|
-          parse_player(handler, index, players)
-        end
-
-        players
-      end
-
-      private
-
-      def parse_player(handler, index, players)
-        player = player_parser.parse(handler)
-        return unless player
-
-        player['rank'] = index + 1
-        players[index] = player
-      end
-
-      def player_parser
-        @player_parser ||= CSstats::Parser::Player.new
-      end
-
-      def file_reader
-        @file_reader ||= CSstats::Parser::FileReader.new(
-          file_path, limit: max_players
-        )
-      end
-    end
-  end
-end

data/lib/csstats/writer/player.rb

@@ -1,39 +0,0 @@
-module CSstats
-  module Writer
-    class Player
-      attr_reader :player
-
-      def initialize(player)
-        @player = player
-      end
-
-      def write(handler)
-        write_nick(handler)
-        write_uniq(handler)
-        write_general_data(handler)
-      end
-
-      private
-
-      def write_nick(handler)
-        handler.write_short_data(player.nick.length + 1)
-        handler.write_string_data(player.nick)
-      end
-
-      def write_uniq(handler)
-        handler.write_short_data(player.uniq.length + 1)
-        handler.write_string_data(player.uniq)
-      end
-
-      def write_general_data(handler)
-        CSstats::Parser::Player::DATA_COLUMNS.each do |type|
-          if type == '-'
-            handler.write_int_data(0)
-          else
-            handler.write_int_data(player[type])
-          end
-        end
-      end
-    end
-  end
-end

data/lib/csstats/writer/players.rb

@@ -1,24 +0,0 @@
-module CSstats
-  module Writer
-    class Players
-      attr_reader :players
-
-      def initialize(players)
-        @players = players
-      end
-
-      def write(file_path)
-        file = File.new(file_path, 'w')
-        handler = CSstats::Writer::FileWriter::Handler.new(file)
-
-        handler.write_short_data(11) # File version
-
-        players.each do |player|
-          CSstats::Writer::Player.new(player).write(handler)
-        end
-
-        file.close
-      end
-    end
-  end
-end

data/spec/csstats/handler_spec.rb

@@ -1,113 +0,0 @@
-require 'spec_helper'
-
-describe CSstats::Handler do
-  before do
-    @handler = CSstats::Handler.new(path: csstats_file, maxplayers: 15)
-  end
-
-  it 'should return corrent players count' do
-    expect(@handler.players_count).to eq 15
-  end
-
-  it 'should return correct player data' do
-    expect(@handler.player(2).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 101_543
-    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
-
-    it 'should not return empty data' do
-      expect(@player['-']).to eq nil
-    end
-  end
-end