fonte 0.0.1 → 0.1.0

data/README.md

@@ -7,7 +7,7 @@ More info can be found at [HL Engine Log Standard documentation](https://develop
 
 ## Examples
 
-Fonte comes with a bunch of parsers that can be used individually. Also, there is the `LogParser` which will then includes all the other `_*Parser_` to parse a full log file.
+Fonte comes with a bunch of parsers that can be used individually. Also, there is the `LogParser` which will then includes all the other `*Parser` to parse a full log file.
 
 For example, if you wish to parse only a player informaton, you could use the PlayerParser:
 
@@ -20,20 +20,21 @@ player.steam_id.account_number.value    # => 24968171
 player.team.value                       # => "Red"
 ```
 
-Or you could parse a rcon authentication individually or within a log:
+Another case is parsing a rcon authentication individually and within a log:
 
 ```ruby
-rcon_authentication = Fonte::Parsers::PlayerParser.new.parse('Rcon: "rcon challenge "super secret" command" from "192.168.10.1:17015"')
+rcon_parser = Fonte::Parsers::RconParser.new
+rcon_authentication = rcon_parser.parse('Rcon: "rcon challenge "super secret" command" from "192.168.10.1:17015"')
 rcon_authentication.password.value      # => "super secret"
-```
-
-```ruby
-log = Fonte::Parsers::LogParser.new.parse('L 12/26/2011 - 02:14:33: Rcon: "rcon challenge "super secret" command" from "192.168.10.1:17015"')
 
+log_parser = Fonte::Parsers::LogParser.new
+log = log_parser.parse('L 12/26/2011 - 02:14:33: Rcon: "rcon challenge "super secret" command" from "192.168.10.1:17015"')
 log.command.password.value              # => "super secret"
 log.date_time.day                       # => 26
 ```
 
-## Disclaimer
+## Games it supports
+In the current version it can parse all TF2, CSS and DOD files. Left4Dead is not supported yet due LOTS of "custom" events.
 
-This is a very early approach and can be a considered a proof of concept in the current version. Lots of things should (and will) be changed. For instance, I am not quite happy with the forced _".value"_ API, but for now, it was the easiest way to implement. Also, it doesn't support real games log yet, so, there should be a way to easily "plug" specific game "log commands".
+## Disclaimer
+This is a very early approach and can be a considered a proof of concept. Lots of things should (and will) be changed. For instance, I am not quite happy with the forced _".value"_ API, but for now, it was the easiest way to implement. Also, it doesn't support real games log yet, so, there should be a way to easily "plug" specific game "log commands".

data/fonte.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "rspec"
-  s.add_runtime_dependency "treetop"
+  s.add_development_dependency "rspec", "~> 2.8.0"
+  s.add_runtime_dependency "treetop", "~> 1.4.8"
 end

data/lib/fonte/parsers.rb

@@ -1,6 +1,6 @@
 module Fonte
   module Parsers
-    %w(number word temporal address rcon steam_id player log).each do |parser|
+    %w(number word temporal address rcon steam_id property player action log).each do |parser|
       Treetop.load File.join(File.dirname(__FILE__), "parsers", parser)
     end
   end

data/lib/fonte/parsers/action.treetop

@@ -0,0 +1,342 @@
+module Fonte
+  module Parsers
+    grammar Action
+      include Word
+      include Player
+      include Address
+      include Property
+
+      rule action
+          log_started_action
+        / log_ended_action
+        / cvar_start_action
+        / cvar_end_action
+        / cvar_set_action
+        / map_loading_action
+        / map_started_action
+        / server_name_action
+        / connection_action
+        / validation_action
+        / enter_game_action
+        / disconnection_action
+        / kick_action
+        / kick_and_ban_action
+        / suicide_action
+        / join_team_action
+        / role_selection_action
+        / name_change_action
+        / kill_action
+        / injure_action
+        / triggered_player_action_against_player
+        / triggered_player_action
+        / triggered_team_action
+        / triggered_world_action
+        / chat_action
+        / team_chat_action
+        / private_chat_action
+        / server_chat_action
+        / team_alliance_action
+        / score_report
+        / weapon_selection_action
+        / weapon_pickup_action
+      end
+
+      rule log_started_action
+        "Log file started" properties:action_properties? {
+          def value
+            "log start"
+          end
+        }
+      end
+
+      rule log_ended_action
+        "Log file closed" {
+          def value
+            "log end"
+          end
+        }
+      end
+
+      rule cvar_start_action
+        [Ss] "erver cvars start" {
+          def value
+            "cvar start"
+          end
+        }
+      end
+
+      rule cvar_end_action
+        [Ss] "erver cvars end" {
+          def value
+            "cvar end"
+          end
+        }
+      end
+
+      rule cvar_set_action
+        ([Ss] "erver cvar" SPACE)? key:quoted_word SPACE "=" SPACE val:quoted_word {
+          def value
+            "cvar set"
+          end
+
+          def to_hash
+            { key.value => val.value }
+          end
+        }
+      end
+
+      rule map_loading_action
+        "Loading map" SPACE name:map_name {
+          def value
+            "map load"
+          end
+        }
+      end
+
+      rule map_started_action
+        "Started map" SPACE name:map_name SPACE "(" crc:map_crc ")" {
+          def value
+            "map start"
+          end
+        }
+      end
+
+      rule map_name
+        quoted_word
+      end
+
+      rule map_crc
+        "CRC" SPACE quoted_word <Fonte::Nodes::SingleWordNode>
+      end
+
+      rule server_name_action
+        "Server name is" SPACE name:quoted_word {
+          def value
+            "server name"
+          end
+        }
+      end
+
+      rule server_chat_action
+        "Server say" SPACE message:quoted_word {
+          def value
+            "server chat"
+          end
+        }
+      end
+
+      rule connection_action
+        QUOTE player QUOTE SPACE "connected, address" SPACE QUOTE ip QUOTE {
+          def value
+            "connection"
+          end
+        }
+      end
+
+      rule validation_action
+        QUOTE player QUOTE SPACE "STEAM USERID validated" {
+          def value
+            "validation"
+          end
+        }
+      end
+
+      rule enter_game_action
+        QUOTE player QUOTE SPACE "entered the game" {
+          def value
+            "enter"
+          end
+        }
+      end
+
+      rule disconnection_action
+        QUOTE player QUOTE SPACE "disconnected" properties:action_properties? {
+          def value
+            "disconnection"
+          end
+        }
+      end
+
+      rule kick_action
+        QUOTE player QUOTE SPACE "was kicked by" SPACE '"Console"' properties:action_properties? {
+          def value
+            "kick"
+          end
+        }
+      end
+
+      rule kick_and_ban_action
+        QUOTE player QUOTE SPACE "was kicked and banned by" SPACE '"Console"' properties:action_properties? {
+          def value
+            "kickban"
+          end
+        }
+      end
+
+      rule suicide_action
+        QUOTE player QUOTE SPACE "committed suicide with" SPACE QUOTE weapon QUOTE properties:action_properties? {
+          def value
+            "suicide"
+          end
+        }
+      end
+
+      rule join_team_action
+        QUOTE player QUOTE SPACE "joined team" SPACE QUOTE team QUOTE {
+          def value
+            "join"
+          end
+        }
+      end
+
+      rule role_selection_action
+        QUOTE player QUOTE SPACE "changed role to" SPACE QUOTE role QUOTE {
+          def value
+            "role selection"
+          end
+        }
+      end
+
+      rule name_change_action
+        QUOTE player QUOTE SPACE "changed name to" SPACE new_name:quoted_word {
+          def value
+            "name change"
+          end
+        }
+      end
+
+      rule kill_action
+        QUOTE attacker:player QUOTE SPACE "killed" SPACE QUOTE victim:player QUOTE SPACE "with" SPACE QUOTE weapon QUOTE properties:action_properties? {
+          def value
+            "kill"
+          end
+        }
+      end
+
+      rule injure_action
+        QUOTE attacker:player QUOTE SPACE "attacked" SPACE QUOTE victim:player QUOTE SPACE "with" SPACE QUOTE weapon QUOTE properties:action_properties? {
+          def value
+            "injure"
+          end
+        }
+      end
+
+      rule triggered_player_action_against_player
+        QUOTE attacker:player QUOTE SPACE "triggered" SPACE action:quoted_word SPACE "against" SPACE QUOTE victim:player QUOTE (SPACE "with" SPACE QUOTE weapon QUOTE)? properties:action_properties? {
+          def value
+            action.value
+          end
+        }
+      end
+
+      rule triggered_player_action
+        QUOTE player QUOTE SPACE "triggered" SPACE action:quoted_word properties:action_properties? {
+          def value
+            action.value
+          end
+        }
+      end
+
+      rule triggered_team_action
+        "Team" SPACE QUOTE team QUOTE SPACE "triggered" SPACE action:quoted_word properties:action_properties? {
+          def value
+            action.value
+          end
+        }
+      end
+
+      rule triggered_world_action
+        "World triggered" SPACE action:quoted_word properties:action_properties? {
+          def value
+            action.value
+          end
+        }
+      end
+
+      rule chat_action
+        QUOTE player QUOTE SPACE "say" SPACE message:quoted_word {
+          def value
+            "chat"
+          end
+        }
+      end
+
+      rule team_chat_action
+        QUOTE player QUOTE SPACE "say_team" SPACE message:quoted_word {
+          def value
+            "team chat"
+          end
+        }
+      end
+
+      rule private_chat_action
+        QUOTE player QUOTE SPACE "tell" SPACE QUOTE target:player QUOTE SPACE "message" SPACE message:quoted_word {
+          def value
+            "private chat"
+          end
+        }
+      end
+
+      rule team_alliance_action
+        "Team" SPACE QUOTE team QUOTE SPACE "formed alliance with team" SPACE QUOTE allied_team:team QUOTE {
+          def value
+            "alliance"
+          end
+        }
+      end
+
+      rule score_report
+        "Team" SPACE QUOTE team QUOTE SPACE score_type SPACE QUOTE points:integer QUOTE SPACE "with" SPACE QUOTE players_count:integer QUOTE SPACE "players" {
+          def value
+            score_type.value
+          end
+        }
+      end
+
+      rule score_type
+        ("current score" / "final score" / "scored") {
+          def value
+            case text_value
+              when "scored"
+                "team score"
+              else
+                text_value
+            end
+          end
+        }
+      end
+
+      rule weapon_selection_action
+        QUOTE player QUOTE SPACE "selected weapon" SPACE QUOTE weapon QUOTE {
+          def value
+            "weapon selection"
+          end
+        }
+      end
+
+      rule weapon_pickup_action
+        QUOTE player QUOTE SPACE "acquired weapon" SPACE QUOTE weapon QUOTE {
+          def value
+            "weapon pickup"
+          end
+        }
+      end
+
+      rule role
+        word
+      end
+
+      rule weapon
+        word
+      end
+
+      rule action_properties
+        SPACE properties {
+          def value
+            properties.value
+          end
+        }
+      end
+    end
+  end
+end

data/lib/fonte/parsers/log.treetop

@@ -4,86 +4,14 @@ module Fonte
       include Word
       include Temporal
       include Rcon
+      include Action
 
       rule entry
-        "L" SPACE date_time ":" SPACE command
+        "L" SPACE date_time ":" SPACE command "\n"?
       end
 
       rule command
-          log_started
-        / log_ended
-        / cvar_start
-        / cvar_end
-        / cvar_set
-        / map_loading
-        / map_started
-        / server_name
-        / server_say
-        / rcon_command
-      end
-
-      rule log_ended
-        "Log file closed"
-      end
-
-      rule log_started
-        "Log file started" SPACE log_filename SPACE log_game_path SPACE log_game_version
-      end
-
-      rule log_filename
-        "(file" SPACE quoted_word ")" <Fonte::Nodes::SingleWordNode>
-      end
-
-      rule log_game_path
-        "(game" SPACE quoted_word ")" <Fonte::Nodes::SingleWordNode>
-      end
-
-      rule log_game_version
-        "(version" SPACE quoted_word ")" <Fonte::Nodes::SingleWordNode>
-      end
-
-      rule cvar_start
-        [Ss] "erver cvars start"
-      end
-
-      rule cvar_end
-        [Ss] "erver cvars end"
-      end
-
-      rule cvar_set
-        ([Ss] "erver cvar" SPACE)? key:quoted_word SPACE "=" SPACE val:quoted_word {
-          def name
-            key.value
-          end
-
-          def value
-            val.value
-          end
-        }
-      end
-
-      rule map_loading
-        "Loading map" SPACE map_name
-      end
-
-      rule map_started
-        "Started map" SPACE map_name SPACE "(" map_crc ")"
-      end
-
-      rule map_name
-        quoted_word
-      end
-
-      rule map_crc
-        "CRC" SPACE quoted_word <Fonte::Nodes::SingleWordNode>
-      end
-
-      rule server_name
-        "Server name is" SPACE server_name:quoted_word <Fonte::Nodes::SingleWordNode>
-      end
-
-      rule server_say
-        "Server say" SPACE server_say:quoted_word <Fonte::Nodes::SingleWordNode>
+        action / rcon_command
       end
     end
   end

data/lib/fonte/parsers/player.treetop

@@ -6,7 +6,11 @@ module Fonte
       include SteamID
 
       rule player
-        nickname "<" uid ">" "<" steam_id ">" "<" team ">"
+        nickname "<" uid ">" "<" steam_id ">" "<" team ">" {
+          def value
+            text_value
+          end
+        }
       end
 
       rule nickname
@@ -22,7 +26,7 @@ module Fonte
       end
 
       rule team
-        (![<>] .)* {
+        (![<>] character)* {
           def value
             text_value == "Unassigned" || text_value == "Console" || text_value == "" ? nil : text_value
           end

data/lib/fonte/parsers/property.treetop

@@ -0,0 +1,47 @@
+module Fonte
+  module Parsers
+    grammar Property
+      include Word
+
+      rule properties
+        property+ {
+          def value
+            elements.inject({}) { |properties, property| properties.merge property.value }
+          end
+        }
+      end
+
+      rule property
+        key_only_property / key_value_property
+      end
+
+      rule key_only_property
+        "(" property_key ")" SPACE? {
+          def value
+            { property_key.value => true }
+          end
+        }
+      end
+
+      rule key_value_property
+        "(" property_key SPACE property_value ")" SPACE? {
+          def value
+            { property_key.value => property_value.value }
+          end
+        }
+      end
+
+      rule property_key
+        (!SPACE ![()] character)+ {
+          def value
+            text_value
+          end
+        }
+      end
+
+      rule property_value
+        quoted_word
+      end
+    end
+  end
+end

data/lib/fonte/parsers/word.treetop

@@ -10,13 +10,17 @@ module Fonte
       end
 
       rule word
-        (ESCAPED_QUOTE / !QUOTE .)* {
+        character* {
           def value
             text_value
           end
         }
       end
 
+      rule character
+        (ESCAPED_QUOTE / !QUOTE .)
+      end
+
       rule SPACE
         " "+
       end

data/lib/fonte/version.rb

@@ -1,3 +1,3 @@
 module Fonte
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/spec/parsers/action_parser_spec.rb

@@ -0,0 +1,322 @@
+require "spec_helper"
+
+module Fonte
+  module Parsers
+    describe ActionParser do
+      let(:parser) { described_class.new }
+
+      subject { parser.parse(action) }
+
+      describe "log start" do
+        let(:action) { "Log file started" }
+        its(:value) { should == "log start" }
+
+        context "with properties" do
+          let(:action) { 'Log file started (file "logs/L0109005.log") (game "/home/ubuntu/srcds/orangebox/tf") (version "4785")' }
+          it_should_behave_like "a action with properties", "file", "game", "version"
+        end
+      end
+
+      describe "log end" do
+        let(:action) { "Log file closed" }
+        its(:value) { should == "log end" }
+      end
+
+      describe "cvar start" do
+        let(:action) { 'Server cvars start' }
+        its(:value) { should == "cvar start" }
+
+        context "when it starts with an downcase 'S'" do
+          let(:action) { 'server cvars start' }
+          its(:value) { should == "cvar start" }
+        end
+      end
+
+      describe "cvar end" do
+        let(:action) { 'Server cvars end' }
+        its(:value) { should == "cvar end" }
+
+        context "when it starts with an downcase 'S'" do
+          let(:action) { 'server cvars end' }
+          its(:value) { should == "cvar end" }
+        end
+      end
+
+      describe "cvar set" do
+        context "when it starts with 'Server'" do
+          let(:action) { 'Server cvar "key" = "value"' }
+          its(:value) { should == "cvar set" }
+          its(:"to_hash") { should == { "key" => "value"} }
+        end
+
+        context "when it starts with 'server'" do
+          let(:action) { 'server cvar "key" = "value"' }
+          its(:value) { should == "cvar set" }
+          its(:"to_hash") { should == { "key" => "value"} }
+        end
+
+        context "without the 'Server' entry" do
+          let(:action) { '"key" = "value"' }
+          its(:value) { should == "cvar set" }
+          its(:"to_hash") { should == { "key" => "value"} }
+        end
+      end
+
+      describe "sever name" do
+        let(:action) { 'Server name is "Manapot Server"' }
+        its(:value) { should == "server name" }
+        its(:"name.value") { should == "Manapot Server" }
+      end
+
+      describe "connection" do
+        let(:action) { '"Reu<2><STEAM_1:1:24968171><>" connected, address "187.123.17.180:27005"' }
+        its(:value) { should == "connection" }
+        its(:"player.value") { should == "Reu<2><STEAM_1:1:24968171><>" }
+      end
+
+      describe "validation" do
+        let(:action) { '"Reu<2><STEAM_1:1:24968171><>" STEAM USERID validated' }
+        its(:value) { should == "validation" }
+        its(:"player.value") { should == "Reu<2><STEAM_1:1:24968171><>" }
+      end
+
+      describe "enter game" do
+        let(:action) { '"Reu<2><STEAM_1:1:24968171><>" entered the game' }
+        its(:value) { should == "enter" }
+        its(:"player.value") { should == "Reu<2><STEAM_1:1:24968171><>" }
+      end
+
+      describe "map load" do
+        let(:action) { 'Loading map "c4m2_sugarmill_a"' }
+        its(:value) { should == "map load" }
+        its(:"name.value") { should == "c4m2_sugarmill_a" }
+      end
+
+      describe "map start" do
+        let(:action) { 'Started map "c4m2_sugarmill_a" (CRC "-431283537")' }
+        its(:value) { should == "map start" }
+        its(:"name.value") { should == "c4m2_sugarmill_a" }
+        its(:"crc.value") { should == "-431283537" }
+      end
+
+      describe "disconnection" do
+        let(:action) { '"Reu<2><STEAM_1:1:24968171><>" disconnected' }
+        its(:value) { should == "disconnection" }
+        its(:"player.value") { should == "Reu<2><STEAM_1:1:24968171><>" }
+
+        context "with properties" do
+          let(:action) { '"Reu<2><STEAM_1:1:24968171><>" disconnected (reason "Disconnect by user.")' }
+          it_should_behave_like "a action with properties", "reason"
+        end
+      end
+
+      describe "kick" do
+        let(:action) { '"Reu<2><STEAM_1:1:24968171><>" was kicked by "Console"' }
+        its(:value) { should == "kick" }
+        its(:"player.value") { should == "Reu<2><STEAM_1:1:24968171><>" }
+
+        context "with properties" do
+          let(:action) { '"Reu<2><STEAM_1:1:24968171><>" was kicked by "Console" (reason "Disconnect by user.")' }
+          it_should_behave_like "a action with properties", "reason"
+        end
+      end
+
+      describe "kick and ban" do
+        let(:action) { '"Reu<2><STEAM_1:1:24968171><>" was kicked and banned by "Console"' }
+        its(:value) { should == "kickban" }
+        its(:"player.value") { should == "Reu<2><STEAM_1:1:24968171><>" }
+
+        context "with properties" do
+          let(:action) { '"Reu<2><STEAM_1:1:24968171><>" was kicked and banned by "Console" (reason "Disconnect by user.")' }
+          it_should_behave_like "a action with properties", "reason"
+        end
+      end
+
+      describe "suicide" do
+        let(:action) { '"Reu<2><STEAM_1:1:24968171><>" committed suicide with "weapon"' }
+        its(:value) { should == "suicide" }
+        its(:"player.value") { should == "Reu<2><STEAM_1:1:24968171><>" }
+        its(:"weapon.value") { should == "weapon" }
+
+        context "with properties" do
+          let(:action) { '"Reu<2><STEAM_1:1:24968171><>" committed suicide with "weapon" (attacker_position "-3361 1361 -864")' }
+          it_should_behave_like "a action with properties", "attacker_position"
+        end
+      end
+
+      describe "join team" do
+        let(:action) { '"Reu<2><STEAM_1:1:24968171><>" joined team "Spectator"' }
+        its(:value) { should == "join" }
+        its(:"player.value") { should == "Reu<2><STEAM_1:1:24968171><>" }
+        its(:"team.value") { should == "Spectator" }
+      end
+
+      describe "role selection" do
+        let(:action) { '"Reu<2><STEAM_1:1:24968171><Blue>" changed role to "spy"' }
+        its(:value) { should == "role selection" }
+        its(:"player.value") { should == "Reu<2><STEAM_1:1:24968171><Blue>" }
+        its(:"role.value") { should == "spy" }
+      end
+
+      describe "name change" do
+        let(:action) { '"Reu<2><STEAM_1:1:24968171><Blue>" changed name to "Navarro"' }
+        its(:value) { should == "name change" }
+        its(:"player.value") { should == "Reu<2><STEAM_1:1:24968171><Blue>" }
+        its(:"new_name.value") { should == "Navarro" }
+      end
+
+      describe "kill" do
+        let(:action) { '"Reu<2><STEAM_1:1:24968171><Blue>" killed "guimello<13><STEAM_1:1:34492580><Red>" with "minigun"' }
+        its(:value) { should == "kill" }
+        its(:"attacker.value") { should == "Reu<2><STEAM_1:1:24968171><Blue>" }
+        its(:"victim.value") { should == "guimello<13><STEAM_1:1:34492580><Red>" }
+
+        context "with properties" do
+          let(:action) { '"Reu<2><STEAM_1:1:24968171><Blue>" killed "guimello<13><STEAM_1:1:34492580><Red>" with "minigun" (attacker_position "3354 -2485 -187") (victim_position "3410 -2518 -149")' }
+          it_should_behave_like "a action with properties", "attacker_position", "victim_position"
+        end
+      end
+
+      describe "injure" do
+        let(:action) { '"Reu<2><STEAM_1:1:24968171><Blue>" attacked "guimello<13><STEAM_1:1:34492580><Red>" with "minigun"' }
+        its(:value) { should == "injure" }
+        its(:"attacker.value") { should == "Reu<2><STEAM_1:1:24968171><Blue>" }
+        its(:"victim.value") { should == "guimello<13><STEAM_1:1:34492580><Red>" }
+
+        context "with properties" do
+          let(:action) { '"Reu<2><STEAM_1:1:24968171><Blue>" attacked "guimello<13><STEAM_1:1:34492580><Red>" with "minigun" (attacker_position "3354 -2485 -187") (victim_position "3410 -2518 -149")' }
+          it_should_behave_like "a action with properties", "attacker_position", "victim_position"
+        end
+      end
+
+      describe "action trigger against player" do
+        let(:action) { '"Reu<2><STEAM_1:1:24968171><Blue>" triggered "player_extinguished" against "guimello<13><STEAM_1:1:34492580><Red>"' }
+        its(:value) { should == "player_extinguished" }
+        its(:"attacker.value") { should == "Reu<2><STEAM_1:1:24968171><Blue>" }
+        its(:"victim.value") { should == "guimello<13><STEAM_1:1:34492580><Red>" }
+
+        context "with extra arguments" do
+          let(:action) { '"Reu<2><STEAM_1:1:24968171><Blue>" triggered "player_extinguished" against "guimello<13><STEAM_1:1:34492580><Red>"' }
+          its(:value) { should == "player_extinguished" }
+          its(:"attacker.value") { should == "Reu<2><STEAM_1:1:24968171><Blue>" }
+          its(:"victim.value") { should == "guimello<13><STEAM_1:1:34492580><Red>" }
+        end
+
+        context "with properties" do
+          let(:action) { '"Reu<2><STEAM_1:1:24968171><Blue>" triggered "player_extinguished" against "guimello<13><STEAM_1:1:34492580><Red>" (attacker_position "3354 -2485 -187") (victim_position "3410 -2518 -149")' }
+          it_should_behave_like "a action with properties", "attacker_position", "victim_position"
+          its(:value) { should == "player_extinguished" }
+          its(:"attacker.value") { should == "Reu<2><STEAM_1:1:24968171><Blue>" }
+          its(:"victim.value") { should == "guimello<13><STEAM_1:1:34492580><Red>" }
+        end
+
+        context "with properties and extra arguments" do
+          let(:action) { '"Reu<2><STEAM_1:1:24968171><Blue>" triggered "player_extinguished" against "guimello<13><STEAM_1:1:34492580><Red>" with "tf_weapon_medigun" (attacker_position "3354 -2485 -187") (victim_position "3410 -2518 -149")' }
+          it_should_behave_like "a action with properties", "attacker_position", "victim_position"
+          its(:value) { should == "player_extinguished" }
+          its(:"attacker.value") { should == "Reu<2><STEAM_1:1:24968171><Blue>" }
+          its(:"victim.value") { should == "guimello<13><STEAM_1:1:34492580><Red>" }
+        end
+      end
+
+      describe "player action" do
+        let(:action) { '"Reu<2><STEAM_1:1:24968171><Blue>" triggered "builtobject"' }
+        its(:value) { should == "builtobject" }
+        its(:"player.value") { should == "Reu<2><STEAM_1:1:24968171><Blue>" }
+
+        context "with properties" do
+          let(:action) { '"Reu<2><STEAM_1:1:24968171><Blue>" triggered "builtobject" (attacker_position "3354 -2485 -187") (victim_position "3410 -2518 -149")' }
+          it_should_behave_like "a action with properties", "attacker_position", "victim_position"
+        end
+      end
+
+      describe "team action" do
+        let(:action) { 'Team "Red" triggered "capture"' }
+        its(:value) { should == "capture" }
+        its(:"team.value") { should == "Red" }
+
+        context "with properties" do
+          let(:action) { 'Team "Red" triggered "pointcaptured" (cp "3") (cpname "#Badwater_cap_4") (numcappers "1") (player1 "Reu<2><STEAM_1:1:24968171><Blue>") (position1 "-2902 1411 617")' }
+          it_should_behave_like "a action with properties", "cp", "cpname", "numcappers", "player1", "position1"
+        end
+      end
+
+      describe "world action" do
+        let(:action) { 'World triggered "Round_Start"' }
+        its(:value) { should == "Round_Start" }
+
+        context "with properties" do
+          let(:action) { 'World triggered "Mini_Round_Selected" (round "Round_A")' }
+          it_should_behave_like "a action with properties", "round"
+        end
+      end
+
+      describe "chat" do
+        let(:action) { '"Reu<2><STEAM_1:1:24968171><Blue>" say "hai"' }
+        its(:value) { should == "chat" }
+        its(:"message.value") { should == "hai" }
+        its(:"player.value") { should == "Reu<2><STEAM_1:1:24968171><Blue>" }
+      end
+
+      describe "team chat" do
+        let(:action) { '"Reu<2><STEAM_1:1:24968171><Blue>" say_team "hai"' }
+        its(:value) { should == "team chat" }
+        its(:"message.value") { should == "hai" }
+        its(:"player.value") { should == "Reu<2><STEAM_1:1:24968171><Blue>" }
+      end
+
+      describe "private chat" do
+        let(:action) { '"Reu<2><STEAM_1:1:24968171><Blue>" tell "guimello<13><STEAM_1:1:34492580><Blue>" message "gogogo"' }
+        its(:value) { should == "private chat" }
+        its(:"message.value") { should == "gogogo" }
+        its(:"player.value") { should == "Reu<2><STEAM_1:1:24968171><Blue>" }
+        its(:"target.value") { should == "guimello<13><STEAM_1:1:34492580><Blue>" }
+      end
+
+      describe "sever chat" do
+        let(:action) { 'Server say "Hai"' }
+        its(:value) { should == "server chat" }
+        its(:"message.value") { should == "Hai" }
+      end
+
+      describe "team alliance" do
+        let(:action) { 'Team "Red" formed alliance with team "Blue"' }
+        its(:value) { should == "alliance" }
+        its(:"team.value") { should == "Red" }
+        its(:"allied_team.value") { should == "Blue" }
+      end
+
+      describe "score report" do
+        let(:action) { 'Team "Red" scored "3" with "12" players' }
+        its(:value) { should == "team score" }
+        its(:"team.value") { should == "Red" }
+        its(:"points.value") { should == 3 }
+        its(:"players_count.value") { should == 12 }
+
+        context "final score" do
+          let(:action) { 'Team "Red" final score "3" with "12" players' }
+          its(:value) { should == "final score" }
+        end
+
+        context "current score" do
+          let(:action) { 'Team "Red" current score "3" with "12" players' }
+          its(:value) { should == "current score" }
+        end
+      end
+
+      describe "weapon selection" do
+        let(:action) { '"Reu<2><STEAM_1:1:24968171><Blue>" selected weapon "AWP"' }
+        its(:value) { should == "weapon selection" }
+        its(:"player.value") { should == "Reu<2><STEAM_1:1:24968171><Blue>" }
+        its(:"weapon.value") { should == "AWP" }
+      end
+
+      describe "weapon pickup" do
+        let(:action) { '"Reu<2><STEAM_1:1:24968171><Blue>" acquired weapon "Shotgun"' }
+        its(:value) { should == "weapon pickup" }
+        its(:"player.value") { should == "Reu<2><STEAM_1:1:24968171><Blue>" }
+        its(:"weapon.value") { should == "Shotgun" }
+      end
+    end
+  end
+end

data/spec/parsers/log_parser_spec.rb

@@ -23,166 +23,6 @@ module Fonte
       end
 
       describe "commands" do
-        describe "log started command" do
-          let(:text) { 'L 12/26/2011 - 02:14:29: Log file started (file "logs/L127_000_001_001_27015_201112260214_000.log") (game "/home/ubuntu/srcds/left4dead2/left4dead2") (version "4777")' }
-          it { should be }
-
-          let(:command) { parser.parse(text).command }
-
-          describe "log filename" do
-            subject { command.log_filename.value }
-            it { should == "logs/L127_000_001_001_27015_201112260214_000.log" }
-          end
-
-          describe "game path" do
-            subject { command.log_game_path.value }
-            it { should == "/home/ubuntu/srcds/left4dead2/left4dead2" }
-          end
-
-          describe "game version" do
-            subject { command.log_game_version.value }
-            it { should == "4777" }
-          end
-        end
-
-        describe "cvar start command" do
-          let(:command) { parser.parse(text).command }
-
-          context "when server starts with an upcase 'S'" do
-            let(:text) { 'L 12/26/2011 - 02:14:29: Server cvars start' }
-            it { should be }
-          end
-
-          context "when server starts with an downcase 'S'" do
-            let(:text) { 'L 12/26/2011 - 02:14:29: server cvars start' }
-            it { should be }
-          end
-        end
-
-        describe "cvar end command" do
-          let(:command) { parser.parse(text).command }
-
-          context "when server starts with an upcase 'S'" do
-            let(:text) { 'L 12/26/2011 - 02:14:29: Server cvars end' }
-            it { should be }
-          end
-
-          context "when server starts with an downcase 'S'" do
-            let(:text) { 'L 12/26/2011 - 02:14:29: server cvars end' }
-            it { should be }
-          end
-        end
-
-        describe "cvar set command" do
-          let(:command) { parser.parse(text).command }
-
-          context "when server starts with an upcase 'S'" do
-            let(:text) { 'L 12/26/2011 - 02:14:29: Server cvar "var" = "value"' }
-            it { should be }
-
-            describe "the variable" do
-              subject { command }
-
-              its(:value) { should == "value" }
-              its(:name)  { should == "var" }
-            end
-          end
-
-          context "when server starts with an downcase 'S'" do
-            let(:text) { 'L 12/26/2011 - 02:14:29: server cvar "var" = "value"' }
-            it { should be }
-
-            describe "the variable" do
-              subject { command }
-
-              its(:value) { should == "value" }
-              its(:name)  { should == "var" }
-            end
-          end
-
-          context "when server starts without the Server cvar entry " do
-            let(:text) { 'L 12/26/2011 - 02:14:29: "var" = "value"' }
-            it { should be }
-
-            describe "the variable" do
-              subject { command }
-
-              its(:value) { should == "value" }
-              its(:name)  { should == "var" }
-            end
-          end
-        end
-
-        describe "map loading command" do
-          let(:text) { 'L 12/26/2011 - 02:14:29: Loading map "c4m2_sugarmill_a"' }
-          it { should be }
-
-          let(:command) { parser.parse(text).command }
-
-          describe "map name" do
-            subject { command.map_name.value }
-            it { should == "c4m2_sugarmill_a" }
-          end
-        end
-
-        describe "map started command" do
-          let(:text) { 'L 12/26/2011 - 02:14:33: Started map "c4m2_sugarmill_a" (CRC "-431283537")' }
-          it { should be }
-
-          let(:command) { parser.parse(text).command }
-
-          describe "map name" do
-            subject { command.map_name.value }
-            it { should == "c4m2_sugarmill_a" }
-          end
-
-          describe "map CRC" do
-            subject { command.map_crc.value }
-            it { should == "-431283537" }
-          end
-        end
-
-        describe "map started command" do
-          let(:text) { 'L 12/26/2011 - 02:14:33: Started map "c4m2_sugarmill_a" (CRC "-431283537")' }
-          it { should be }
-
-          let(:command) { parser.parse(text).command }
-
-          describe "map name" do
-            subject { command.map_name.value }
-            it { should == "c4m2_sugarmill_a" }
-          end
-
-          describe "map CRC" do
-            subject { command.map_crc.value }
-            it { should == "-431283537" }
-          end
-        end
-
-        describe "sever name command" do
-          let(:text) { 'L 12/26/2011 - 02:14:33: Server name is "Manapot Server"' }
-          it { should be }
-
-          let(:command) { parser.parse(text).command }
-
-          describe "server name" do
-            subject { command.server_name.value }
-            it { should == "Manapot Server" }
-          end
-        end
-
-        describe "sever say command" do
-          let(:text) { 'L 12/26/2011 - 02:14:33: Server say "Hai"' }
-          it { should be }
-
-          let(:command) { parser.parse(text).command }
-
-          describe "server say" do
-            subject { command.server_say.value }
-            it { should == "Hai" }
-          end
-        end
-
         describe "rcon command" do
           let(:text) { 'L 12/26/2011 - 02:14:33: Rcon: "rcon challenge "password" command" from "192.168.10.1:17015"' }
           subject { parser.parse(text).command }

data/spec/parsers/player_parser_spec.rb

@@ -8,6 +8,8 @@ module Fonte
 
       subject { parser.parse(player) }
 
+      its(:value) { should == "Reu<2><STEAM_1:1:24968171><Red>" }
+
       its(:"nickname.value") { should == "Reu" }
       its(:"uid.value")      { should == 2 }
       its(:"steam_id.value") { should == "STEAM_1:1:24968171" }

data/spec/parsers/property_parser_spec.rb

@@ -0,0 +1,29 @@
+require "spec_helper"
+
+module Fonte
+  module Parsers
+    describe PropertyParser do
+      let(:parser) { described_class.new }
+
+      subject { parser.parse(properties) }
+
+      context "with one property" do
+        let(:properties) { '(key "value")' }
+        it { should be }
+        its(:value) { should == { "key" => "value" } }
+      end
+
+      context "with multiple properties" do
+        let(:properties) { '(key1 "value1") (key2 "value2")' }
+        it { should be }
+        its(:value) { should == { "key1" => "value1", "key2" => "value2" } }
+      end
+
+      context "with properties without values" do
+        let(:properties) { '(headshot)' }
+        it { should be }
+        its(:value) { should == { "headshot" => true } }
+      end
+    end
+  end
+end

data/spec/support/shared_examples/properties.rb

@@ -0,0 +1,10 @@
+shared_examples "a action with properties" do |*properties|
+  its(:"properties.value") { should respond_to :keys }
+  its(:"properties.value") { should respond_to :values }
+
+  if properties
+    properties.each do |property|
+      its(:"properties.value.keys") { should include property }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fonte
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,30 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-14 00:00:00.000000000Z
+date: 2012-01-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160380860 !ruby/object:Gem::Requirement
+  requirement: &2151839440 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2160380860
+  version_requirements: *2151839440
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &2160380280 !ruby/object:Gem::Requirement
+  requirement: &2151837980 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.8
   type: :runtime
   prerelease: false
-  version_requirements: *2160380280
+  version_requirements: *2151837980
 description: 
 email:
 - rnavarro1@gmail.com
@@ -56,24 +56,29 @@ files:
 - lib/fonte/nodes/steam_id_node.rb
 - lib/fonte/nodes/steam_id_universe_node.rb
 - lib/fonte/parsers.rb
+- lib/fonte/parsers/action.treetop
 - lib/fonte/parsers/address.treetop
 - lib/fonte/parsers/log.treetop
 - lib/fonte/parsers/number.treetop
 - lib/fonte/parsers/player.treetop
+- lib/fonte/parsers/property.treetop
 - lib/fonte/parsers/rcon.treetop
 - lib/fonte/parsers/steam_id.treetop
 - lib/fonte/parsers/temporal.treetop
 - lib/fonte/parsers/word.treetop
 - lib/fonte/version.rb
+- spec/parsers/action_parser_spec.rb
 - spec/parsers/address_parser_spec.rb
 - spec/parsers/log_parser_spec.rb
 - spec/parsers/number_parser_spec.rb
 - spec/parsers/player_parser_spec.rb
+- spec/parsers/property_parser_spec.rb
 - spec/parsers/rcon_parser_spec.rb
 - spec/parsers/steam_id_parser_spec.rb
 - spec/parsers/temporal_parser_spec.rb
 - spec/parsers/word_parser_spec.rb
 - spec/spec_helper.rb
+- spec/support/shared_examples/properties.rb
 - spec/support/shared_examples/rcon_command.rb
 homepage: https://github.com/reu/fonte
 licenses: []
@@ -89,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3476406977491015761
+      hash: 3614551501371426417
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -98,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3476406977491015761
+      hash: 3614551501371426417
 requirements: []
 rubyforge_project: fonte
 rubygems_version: 1.8.10
@@ -106,13 +111,16 @@ signing_key:
 specification_version: 3
 summary: Valve Source Engine log parser
 test_files:
+- spec/parsers/action_parser_spec.rb
 - spec/parsers/address_parser_spec.rb
 - spec/parsers/log_parser_spec.rb
 - spec/parsers/number_parser_spec.rb
 - spec/parsers/player_parser_spec.rb
+- spec/parsers/property_parser_spec.rb
 - spec/parsers/rcon_parser_spec.rb
 - spec/parsers/steam_id_parser_spec.rb
 - spec/parsers/temporal_parser_spec.rb
 - spec/parsers/word_parser_spec.rb
 - spec/spec_helper.rb
+- spec/support/shared_examples/properties.rb
 - spec/support/shared_examples/rcon_command.rb