demo-reader 0.2.6 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.3.0

data/demo-reader.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{demo-reader}
-  s.version = "0.2.6"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["aekym"]
-  s.date = %q{2010-12-19}
+  s.date = %q{2011-03-09}
   s.description = %q{A library to read warsow demo files (.wd8, .wd9, .wd10, .wd11 files) and q3 demo files (*.dm68)}
   s.email = %q{me@aekym.com}
   s.extensions = ["ext/dm68/extconf.rb"]
@@ -66,13 +66,18 @@ Gem::Specification.new do |s|
      "test/fixtures/warsow/wd11/race_st1_07.848.wd11",
      "test/fixtures/warsow/wd11/race_wdm16_unfinished.wd11",
      "test/fixtures/warsow/wd11/race_wrc03-3_28.684.wd11",
+     "test/fixtures/warsow/wd12/freestyle_wctf1.wd12",
+     "test/fixtures/warsow/wd12/race_bardok-egypt_10.690.wd12",
+     "test/fixtures/warsow/wd12/race_bardok-w3sp_18.000.wd12",
+     "test/fixtures/warsow/wd12/race_cjscomp008.wd12",
      "test/helper.rb",
      "test/unit/demo_reader_defrag_dm_68_cpm_test.rb",
      "test/unit/demo_reader_defrag_dm_68_vq3_test.rb",
      "test/unit/demo_reader_test.rb",
      "test/unit/demo_reader_warsow_wd10_race_test.rb",
      "test/unit/demo_reader_warsow_wd11_freestyle_test.rb",
-     "test/unit/demo_reader_warsow_wd11_race_test.rb"
+     "test/unit/demo_reader_warsow_wd11_race_test.rb",
+     "test/unit/demo_reader_warsow_wd12_race_test.rb"
   ]
   s.homepage = %q{http://github.com/aekym/demo-reader}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -86,7 +91,8 @@ Gem::Specification.new do |s|
      "test/unit/demo_reader_test.rb",
      "test/unit/demo_reader_warsow_wd10_race_test.rb",
      "test/unit/demo_reader_warsow_wd11_freestyle_test.rb",
-     "test/unit/demo_reader_warsow_wd11_race_test.rb"
+     "test/unit/demo_reader_warsow_wd11_race_test.rb",
+     "test/unit/demo_reader_warsow_wd12_race_test.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/demo_reader_warsow.rb

@@ -30,13 +30,13 @@ class DemoReaderWarsow
     @version = detect_version(file)
 
     # just support some wd* file versions
-    return unless [8, 9, 10, 11].include? @version
+    return unless [8, 9, 10, 11, 12].include? @version
 
     # skip 4 bytes "svs.spawncount"
     file.pos += 4
 
     # skip 2 bytes "cl.snapFrameTime"
-    file.pos += 2 if [10, 11].include? @version
+    file.pos += 2 if [10, 11, 12].include? @version
 
     # skip 4 bytes "cl.baseServerTime"
     file.pos += 4 if @version == 10
@@ -80,8 +80,8 @@ class DemoReaderWarsow
 
     # detect game mode
 
-    if @version == 11
-      @gamemode = gamemode_wd11(content)
+    if @version >= 11
+      @gamemode = gamemode_wd1x(content)
     else
       regex = /&([^ ]+) /
 
@@ -177,7 +177,7 @@ class DemoReaderWarsow
 
 
   def detect_version(file)
-    # try to detect version 8, 9 or 10
+    # try to detect version 8, 9, 11, 12
     #
     file.pos = 0
 
@@ -188,7 +188,7 @@ class DemoReaderWarsow
     # reads 4 bytes and decodes the little-endian format
     version = file.read(4).unpack('V')[0]
 
-    return version if [8, 9, 10].include? version
+    return version if [8, 9, 10].include?(version)
 
 
     # try to detect version 11
@@ -209,7 +209,7 @@ class DemoReaderWarsow
     # reads 4 bytes and decodes the little-endian format
     version = file.read(4).unpack('V')[0]
 
-    return version if version == 11
+    return version if [11, 12].include?(version)
 
     nil # could not detect any known version
   end
@@ -226,7 +226,7 @@ class DemoReaderWarsow
   end
 
 
-  def gamemode_wd11(file_content)
+  def gamemode_wd1x(file_content)
     if file_content =~ /cs 12 "(.*?)"/
       $1
     end

data/test/unit/demo_reader_warsow_wd12_race_test.rb

@@ -0,0 +1,33 @@
+$LOAD_PATH << File.dirname(__FILE__) + '/..'
+require "helper"
+
+class DemoReaderWarsowWd12RaceTest < Test::Unit::TestCase
+
+  game = "Warsow"
+  gamemode = "race"
+  version = 12
+
+  [
+    %w(freestyle_wctf1 wctf1),
+    %w(race_bardok-w3sp_18.000 bardok-w3sp 00:18.000),
+    %w(race_bardok-egypt_10.690 bardok-egypt 00:10.690),
+    %w(race_cjscomp008 cjscomp008 00:17.932),
+  ].each do |entry|
+
+    file, map, time = entry
+
+    define_method "test_warsow_wd#{version}_demo_#{file.gsub(/[^a-z_0-9]/, "_")}" do
+      demo = DemoReader.parse("test/fixtures/warsow/wd#{version}/#{file}.wd#{version}")
+
+      assert demo.valid
+      assert_equal version, demo.version
+      assert_equal game, demo.game
+      assert_equal gamemode, demo.gamemode
+      assert_equal map, demo.mapname
+      assert_equal time, demo.time if time
+    end
+
+  end
+
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: demo-reader
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 6
-  version: 0.2.6
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - aekym
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-19 00:00:00 +01:00
+date: 2011-03-09 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -77,6 +77,10 @@ files:
 - test/fixtures/warsow/wd11/race_st1_07.848.wd11
 - test/fixtures/warsow/wd11/race_wdm16_unfinished.wd11
 - test/fixtures/warsow/wd11/race_wrc03-3_28.684.wd11
+- test/fixtures/warsow/wd12/freestyle_wctf1.wd12
+- test/fixtures/warsow/wd12/race_bardok-egypt_10.690.wd12
+- test/fixtures/warsow/wd12/race_bardok-w3sp_18.000.wd12
+- test/fixtures/warsow/wd12/race_cjscomp008.wd12
 - test/helper.rb
 - test/unit/demo_reader_defrag_dm_68_cpm_test.rb
 - test/unit/demo_reader_defrag_dm_68_vq3_test.rb
@@ -84,6 +88,7 @@ files:
 - test/unit/demo_reader_warsow_wd10_race_test.rb
 - test/unit/demo_reader_warsow_wd11_freestyle_test.rb
 - test/unit/demo_reader_warsow_wd11_race_test.rb
+- test/unit/demo_reader_warsow_wd12_race_test.rb
 has_rdoc: true
 homepage: http://github.com/aekym/demo-reader
 licenses: []
@@ -126,3 +131,4 @@ test_files:
 - test/unit/demo_reader_warsow_wd10_race_test.rb
 - test/unit/demo_reader_warsow_wd11_freestyle_test.rb
 - test/unit/demo_reader_warsow_wd11_race_test.rb
+- test/unit/demo_reader_warsow_wd12_race_test.rb