tf2_line_parser 0.0.2 → 0.0.3

data/.travis.yml

@@ -2,4 +2,5 @@ language: ruby
 rvm:
   - 1.9.3
   - rbx-19mode
+  - jruby-19mode
 script: ./script/ci

data/Gemfile.lock

@@ -2,12 +2,17 @@ PATH
   remote: .
   specs:
     tf2_line_parser (0.0.2)
+      activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (3.2.12)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
     coderay (1.0.8)
     diff-lcs (1.1.3)
+    i18n (0.6.1)
     method_source (0.8.1)
     multi_json (1.6.1)
     pry (0.9.12)

data/lib/tf2_line_parser/events/capture_block.rb

@@ -11,8 +11,6 @@ module TF2LineParser
         @attributes ||= [:time, :player_nick, :player_steamid, :player_team, :cp_number, :cp_name]
       end
 
-      attr_accessor :time, :player, :cap_number, :cap_name
-
       def initialize(time, player_name, player_steam_id, player_team, cap_number, cap_name)
         @time = parse_time(time)
         @player = Player.new(player_name, player_steam_id, player_team)

data/lib/tf2_line_parser/events/charge_deployed.rb

@@ -11,8 +11,6 @@ module TF2LineParser
         @attributes ||= [:time, :player_nick, :player_steamid, :player_team]
       end
 
-      attr_accessor :time, :player
-
       def initialize(time, name, steam_id, team)
         @time = parse_time(time)
         @player = Player.new(name, steam_id, team)

data/lib/tf2_line_parser/events/chat.rb

@@ -4,8 +4,6 @@ module TF2LineParser
 
     class Chat < Event
 
-      attr_accessor :time, :player, :message
-
       def initialize(time, player_name, player_steam_id, player_team, message)
         @time = parse_time(time)
         @player = Player.new(player_name, player_steam_id, player_team)

data/lib/tf2_line_parser/events/console_say.rb

@@ -11,8 +11,6 @@ module TF2LineParser
         @attributes ||= [:time, :message]
       end
 
-      attr_accessor :time, :message
-
       def initialize(time, message)
         @time = parse_time(time)
         @message = message

data/lib/tf2_line_parser/events/damage.rb

@@ -11,8 +11,6 @@ module TF2LineParser
         @attributes ||= [:time, :player_nick, :player_steamid, :player_team, :value]
       end
 
-      attr_accessor :time, :player, :value
-
       def initialize(time, player_name, player_steam_id, player_team, value)
         @time = parse_time(time)
         @player = Player.new(player_name, player_steam_id, player_team)

data/lib/tf2_line_parser/events/event.rb

@@ -4,6 +4,11 @@ module TF2LineParser
 
     class Event
 
+      attr_accessor :time, :type, :cap_number, :cap_name, :message, :unknown
+      attr_accessor :team, :score, :value, :item, :role, :length, :method
+      attr_accessor :player, :target
+
+
       def self.time_format
         @time_format ||= '%m/%d/%Y - %T'
       end
@@ -57,8 +62,6 @@ module TF2LineParser
         @attributes ||= [:time, :player_nick, :player_steamid, :player_team, :target_nick, :target_steamid, :target_team]
       end
 
-      attr_accessor :time, :player, :target
-
       def initialize(time, player_name, player_steam_id, player_team, target_name, target_steam_id, target_team)
         @time = parse_time(time)
         @player = Player.new(player_name, player_steam_id, player_team)

data/lib/tf2_line_parser/events/heal.rb

@@ -11,8 +11,6 @@ module TF2LineParser
         @attributes ||= [:time, :player_nick, :player_steamid, :player_team, :target_nick, :target_steamid, :target_team, :value]
       end
 
-      attr_accessor :time, :player, :target, :value
-
       def initialize(time, player_name, player_steam_id, player_team, target_name, target_steam_id, target_team, value)
         @time = parse_time(time)
         @player = Player.new(player_name, player_steam_id, player_team)

data/lib/tf2_line_parser/events/match_end.rb

@@ -11,8 +11,6 @@ module TF2LineParser
         @attributes ||= [:time, :reason]
       end
 
-      attr_accessor :time, :reason
-
       def initialize(time, reason)
         @time = parse_time(time)
         @reason = reason

data/lib/tf2_line_parser/events/pickup_item.rb

@@ -15,8 +15,6 @@ module TF2LineParser
         @attributes ||= [:time, :player_nick, :player_steamid, :player_team, :item]
       end
 
-      attr_accessor :time, :player, :item
-
       def initialize(time, player_name, player_steam_id, player_team, item)
         @time = parse_time(time)
         @player = Player.new(player_name, player_steam_id, player_team)

data/lib/tf2_line_parser/events/point_capture.rb

@@ -11,8 +11,6 @@ module TF2LineParser
         @attributes ||= [:time, :team, :cp_number, :cp_name]
       end
 
-      attr_accessor :time, :team, :cap_number, :cap_name
-
       def initialize(time, team, cap_number, cap_name)
         @time = parse_time(time)
         @team = team

data/lib/tf2_line_parser/events/role_change.rb

@@ -15,8 +15,6 @@ module TF2LineParser
         @attributes ||= [:time, :player_nick, :player_steamid, :player_team, :role]
       end
 
-      attr_accessor :time, :player, :role
-
       def initialize(time, player_name, player_steam_id, player_team, role)
         @time = parse_time(time)
         @player = Player.new(player_name, player_steam_id, player_team)

data/lib/tf2_line_parser/events/round_length.rb

@@ -11,8 +11,6 @@ module TF2LineParser
         @attributes ||= [:time, :length]
       end
 
-      attr_accessor :time, :length
-
       def initialize(time, length)
         @time = parse_time(time)
         @length = length

data/lib/tf2_line_parser/events/round_stalemate.rb

@@ -11,8 +11,6 @@ module TF2LineParser
         @attributes ||= [:time]
       end
 
-      attr_accessor :time
-
       def initialize(time)
         @time = parse_time(time)
       end

data/lib/tf2_line_parser/events/round_start.rb

@@ -11,8 +11,6 @@ module TF2LineParser
         @attributes ||= [:time]
       end
 
-      attr_accessor :time
-
       def initialize(time)
         @time = parse_time(time)
       end

data/lib/tf2_line_parser/events/round_win.rb

@@ -11,8 +11,6 @@ module TF2LineParser
         @attributes ||= [:time, :team]
       end
 
-      attr_accessor :time, :team
-
       def initialize(time, team)
         @time = parse_time(time)
         @team = team

data/lib/tf2_line_parser/events/score.rb

@@ -15,8 +15,6 @@ module TF2LineParser
         @attributes ||= [:time, :team, :score]
       end
 
-      attr_accessor :time, :team, :score
-
       def initialize(time, team, score)
         @time = parse_time(time)
         @team = team

data/lib/tf2_line_parser/events/suicide.rb

@@ -15,8 +15,6 @@ module TF2LineParser
         @attributes ||= [:time, :player_nick, :player_steamid, :player_team, :method]
       end
 
-      attr_accessor :time, :player, :method
-
       def initialize(time, player_name, player_steam_id, player_team, method)
         @time = parse_time(time)
         @player = Player.new(player_name, player_steam_id, player_team)

data/lib/tf2_line_parser/events/unknown.rb

@@ -15,8 +15,6 @@ module TF2LineParser
         @attributes ||= [:time, :unknown]
       end
 
-      attr_accessor :time, :unknown
-
       def initialize(time, unknown)
         @time = parse_time(time)
         @unknown = unknown

data/lib/tf2_line_parser/line.rb

@@ -1,4 +1,5 @@
 require 'time'
+require 'active_support/multibyte/chars'
 
 module TF2LineParser
 
@@ -7,12 +8,18 @@ module TF2LineParser
     attr_accessor :line
 
     def initialize(line)
-      @line = line.force_encoding('UTF-8').encode('UTF-16LE', :invalid => :replace, :replace => '').encode('UTF-8')
+      @line = line
     end
 
     def parse
       Events::Event.types.each do |type|
-        if match = line.match(type.regex)
+        begin
+          match = line.match(type.regex)
+        rescue ArgumentError
+          tidied_line = ActiveSupport::Multibyte::Chars.new(line).tidy_bytes
+          match = tidied_line.match(type.regex)
+        end
+        if match
           @match ||= type.new(*type.regex_results(match))
           break
         end

data/lib/tf2_line_parser/version.rb

@@ -1,3 +1,3 @@
 module TF2LogLineParser
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/tf2_line_parser.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.homepage      = 'http://github.com/Arie/tf2_line_parser'
 
+  gem.add_dependency "activesupport"
   gem.add_development_dependency "pry-nav",        "~> 0.2.3"
   gem.add_development_dependency "rspec",          "~> 2.12.0"
   gem.add_development_dependency "spec_coverage",  "~> 0.0.5"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tf2_line_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,6 +11,22 @@ bindir: bin
 cert_chain: []
 date: 2013-02-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement