tassadar 0.0.2 → 0.1.0

data/CHANGELOG.md

@@ -1,9 +1,13 @@
 # CHANGELOG
 
+## 0.1.0
+
+* Updates serialization strategy for SC2 1.5 compliance
+
 ## 0.0.2
 
 * Converts serialized strings ASCII-8BIT => UTF-8. This was the source of serious encoding problems in replay parsing.
 
 ## 0.0.1
 
-* Initial release
+* Initial release

data/lib/tassadar/mpq.rb

@@ -7,17 +7,16 @@ require 'tassadar/mpq/file_data'
 require 'tassadar/mpq/block_table'
 require 'tassadar/mpq/hash_table'
 require 'tassadar/mpq/block_encryptor'
-
 module Tassadar
   module MPQ
     class MPQ < BinData::Record
       endian :little
 
-      string :magic, :length => 3, :check_value => "MPQ"
-      int8   :magic_4, :check_value => 27
-      int32  :user_data_size
-      int32  :archive_header_offset
-      string :user_data, :read_length => :user_data_size
+      string :user_magic, :length => 4
+      uint32 :user_data_max_length
+      uint32 :archive_header_offset
+      uint32 :user_data_length
+      string :user_data, :length => :user_data_length
 
       archive_header :archive_header, :adjust_offset => lambda { archive_header_offset }
       encrypted_block_table :block_table, :entries => lambda { archive_header.block_table_entries },
@@ -28,7 +27,6 @@ module Tassadar
       file_data_array :file_data,         :blocks => lambda { block_table.blocks },
                                           :sector_size_shift => lambda { archive_header.sector_size_shift },
                                           :archive_header_offset => :archive_header_offset
-
       def files
         @files ||= read_file('(listfile)').split
       end

data/lib/tassadar/mpq/archive_header.rb

@@ -3,16 +3,12 @@ module Tassadar
     class ArchiveHeader < BinData::Record
       endian :little
 
-      string :magic, :length => 3, :check_value => "MPQ"
-      uint8   :magic_4, :check_value => 26
-
-      uint32  :header_size, :check_value => 44
-
-      # archive_size actually here, but not used and is computed from later data
-      skip    :length => 4
+      string :magic, :length => 4
+      uint32  :header_size
+      uint32 :archive_size
 
       uint16  :format_version
-      uint8   :sector_size_shift, :check_value => 3
+      uint8   :sector_size_shift
       skip    :length => 1
       uint32  :hash_table_offset
       uint32  :block_table_offset
@@ -22,10 +18,6 @@ module Tassadar
       uint16  :hash_table_offset_high
       uint16  :block_table_offset_high
 
-      archive_size :archive_size, :hash_table_offset => :hash_table_offset,
-                                  :hash_table_entries => :hash_table_entries,
-                                  :block_table_offset => :block_table_offset,
-                                  :block_table_entries => :block_table_entries
     end
   end
 end

data/lib/tassadar/sc2/serialized_data.rb

@@ -5,16 +5,21 @@ module Tassadar
         key = io.readbytes(1).unpack("C").first
 
         case key
+        when 0
+          read_array(io)
         when 2
           read_byte_string(io)
+        when 3
+          flag = io.readbytes(1)
+          read_and_return_value(io)
         when 4
-          read_array(io)
+          read_flag(io)
         when 5
           read_kvo(io)
         when 6
           read_small_int(io)
         when 7
-          read_big_int(io)
+          io.readbytes(4)
         when 9
           read_vlf_int(io)
         else
@@ -55,17 +60,25 @@ module Tassadar
         (value & 1) == 1 ? -(value >> 1) : (value >> 1)
       end
 
-      def read_array(io)
-        result = []
-        2.times { io.readbytes(1).unpack("C").first }
+      def read_flag(io)
+        switch = io.readbytes(1).unpack("C").first
 
-        num_elements = io.readbytes(1).unpack("C").first >> 1
+        if switch == 1
+          read_and_return_value(io)
+        else
+          return 0
+        end
+      end
 
-        num_elements.times do
-          result << read_and_return_value(io)
+      def read_array(io)
+        entries = read_vlf_int(io)
+        results = []
+        
+        entries.times do
+          results << read_and_return_value(io)
         end
 
-        result
+        results
       end
 
       def read_kvo(io)

data/lib/tassadar/version.rb

@@ -1,3 +1,3 @@
 module Tassadar
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/spec/mpq/archive_header_spec.rb

@@ -15,14 +15,6 @@ describe Tassadar::MPQ::ArchiveHeader do
     end
   end
 
-  it "should read the magic header" do
-    @archive_header.magic.should == "MPQ"
-  end
-
-  it "should read magic 4" do
-    @archive_header.magic_4.should == 26
-  end
-
   it "should read the header size" do
     @archive_header.header_size.should == 44
   end

data/spec/mpq_spec.rb

@@ -2,15 +2,11 @@ require 'spec_helper'
 
 describe Tassadar::MPQ::MPQ do
   before(:each) do
-    @mpq = Tassadar::MPQ::MPQ.read(File.read("spec/replays/Delta\ Quadrant.SC2Replay"))
-  end
-
-  it "should have a valid magic string" do
-    @mpq.magic.should == "MPQ"
+    @mpq = Tassadar::MPQ::MPQ.read(File.read("spec/replays/patch150.SC2Replay"))
   end
 
   it "should read the user data size" do
-    @mpq.user_data_size.should == 512
+    @mpq.user_data_length.should == 60
   end
 
   it "should have block_table entries" do

data/spec/sc2/game_spec.rb

@@ -2,19 +2,19 @@ require 'spec_helper'
 
 describe Tassadar::SC2::Game do
   before(:each) do
-    @replay = Tassadar::SC2::Replay.new("spec/replays/Delta\ Quadrant.SC2Replay")
+    @replay = Tassadar::SC2::Replay.new("spec/replays/patch150.SC2Replay")
   end
 
   it "should set the winner" do
-    @replay.game.winner.name.should == "redgar"
+    @replay.game.winner.name.should == "Ratbaxter"
   end
 
   it "should set the map" do
-    @replay.game.map.should == "Delta Quadrant"
+    @replay.game.map.should == "Scorched Haven"
   end
 
   it "should set the time" do
-    @replay.game.time.should == Time.new(2011, 07, 05, 17, 01, 8, "-05:00")
+    @replay.game.time.should == Time.new(2012, 8, 2, 11, 00, 33, "-05:00")
   end
 
   it "should set the speed" do
@@ -22,7 +22,7 @@ describe Tassadar::SC2::Game do
   end
 
   it "should set the game type" do
-    @replay.game.type.should == "1v1"
+    @replay.game.type.should == "2v2"
   end
 
   it "should set the category" do

data/spec/sc2/player_spec.rb

@@ -4,16 +4,16 @@ require 'spec_helper'
 describe Tassadar::SC2::Player do
   context 'NA Sc2 Replay' do
     before(:each) do
-      @replay = Tassadar::SC2::Replay.new("spec/replays/Delta\ Quadrant.SC2Replay")
-      @player = @replay.players.first
+      @replay = Tassadar::SC2::Replay.new("spec/replays/OhanaLE.SC2Replay")
+      @player = @replay.players.last
     end
 
     it "should set the name" do
-      @player.name.should == "guitsaru"
+      @player.name.should == "MLGLogan"
     end
 
     it "should set the id" do
-      @player.id.should == 1918894
+      @player.id.should == 1485031
     end
 
     it "should tell if the player won" do
@@ -21,20 +21,15 @@ describe Tassadar::SC2::Player do
     end
 
     it "should have a color" do
-      @player.color.should == {:alpha => 255, :red => 180, :green => 20, :blue => 30}
-    end
-
-    it "should have a chosen race" do
-      @player.chosen_race.should == "Terran"
+      @player.color.should == {:alpha => 255, :red => 0, :green => 66, :blue => 255}
     end
 
     it "should have random as the chosen race if random" do
-      replay = Tassadar::SC2::Replay.new("spec/replays/random.sc2replay")
-      replay.players.last.chosen_race.should == "Random"
+      @player.chosen_race.should == "Random"
     end
 
     it "should have an actual race" do
-      @player.actual_race.should == "Terran"
+      @player.actual_race.should == "Protoss"
     end
 
     it "should have a handicap" do

data/tassadar.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency("bindata")
   s.add_dependency("bzip2-ruby")
+  s.add_development_dependency("pry")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tassadar
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000Z
+date: 2012-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
-  requirement: &70239924932500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70239924932500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bzip2-ruby
-  requirement: &70239924854920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +38,28 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70239924854920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Pure ruby MPQ and SC2 Replay parser
 email:
 - mpruitt@agoragames.com
@@ -72,7 +98,9 @@ files:
 - spec/mpq/block_table_spec.rb
 - spec/mpq_spec.rb
 - spec/replays/Delta Quadrant.SC2Replay
+- spec/replays/OhanaLE.SC2Replay
 - spec/replays/eu_replay.SC2Replay
+- spec/replays/patch150.sc2replay
 - spec/replays/random.sc2replay
 - spec/sc2/game_spec.rb
 - spec/sc2/player_spec.rb
@@ -93,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1060130835485239362
+      hash: -1764239395588821646
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -102,10 +130,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1060130835485239362
+      hash: -1764239395588821646
 requirements: []
 rubyforge_project: tassadar
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Pure ruby MPQ and SC2 Replay parser
@@ -114,7 +142,9 @@ test_files:
 - spec/mpq/block_table_spec.rb
 - spec/mpq_spec.rb
 - spec/replays/Delta Quadrant.SC2Replay
+- spec/replays/OhanaLE.SC2Replay
 - spec/replays/eu_replay.SC2Replay
+- spec/replays/patch150.sc2replay
 - spec/replays/random.sc2replay
 - spec/sc2/game_spec.rb
 - spec/sc2/player_spec.rb