Added coast parsing, corrected starting state.

v0.4.1

lib/maps/standard.yaml

@@ -343,7 +343,7 @@ Standard:
     - Edi
   Powers:
     Russia:
-      - FStP,AMos,FSev,AWar
+      - FStP(sc),AMos,FSev,AWar
       - Ukr
       - Lvn
       - Fin

lib/parser/state_parser.rb

@@ -43,8 +43,8 @@ def parse_power_state(blob, power)
     end
 
     def parse_unit(blob, power)
-      m = /([AF])(\w{3})/.match(blob)
-      return m[2], AreaState.new(nil, Unit.new( power, unit_type(m[1])))
+      m = /(?'unit_type'[AF])(?'unit_area'\w{3})(?'unit_area_coast'\(.+?\))?/.match(blob)
+      return "#{m['unit_area']}#{m['unit_area_coast']}", AreaState.new(nil, Unit.new( power, unit_type(m['unit_type'])))
     end
 
     def parse_area_state(blob, power)
@@ -73,7 +73,7 @@ def dump_state
           unless powers.has_key? area_state.owner
             powers[area_state.owner] = { units: {}, areas: [] }
           end
-          powers[area_state.owner][:areas] << area
+          powers[area_state.owner][:areas] << strip_coast(area)
         end
       end
       powers.each do |power, state|
@@ -103,5 +103,10 @@ def dump_power(power, state)
     def dump_unit(area, unit)
       "#{unit.type_to_s}#{area}"
     end
+
+    def strip_coast(area)
+      m = /^(?'abbrv'[^(]+)(\((?'coast'.+)\))?$/.match area
+      m['abbrv']
+    end
   end
 end

ruby-adjudicator.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = "ruby-adjudicator"
-  s.version     = "0.4.0"
-  s.date        = "2013-07-07"
+  s.version     = "0.4.1"
+  s.date        = "2013-07-12"
   s.summary     = "Diplomacy adjudicator"
   s.description = "A Diplomacy adjudicator written in ruby."
   s.authors     = ["NamelessOne"]

spec/lib/state_parser_spec.rb

@@ -65,7 +65,17 @@ module Diplomacy
     end
 
     describe "dumping" do
-      # TODO add some tests!
+      it "dumps correctly the French starting position" do
+        gamestate = GameState.new
+        gamestate[:Par] = AreaState.new("France", Unit.new("France", Unit::ARMY))
+        gamestate[:Bre] = AreaState.new("France", Unit.new("France", Unit::FLEET))
+        gamestate[:Mar] = AreaState.new("France", Unit.new("France", Unit::ARMY))
+        gamestate[:Pic] = AreaState.new("France")
+        gamestate[:Bur] = AreaState.new("France")
+        gamestate[:Gas] = AreaState.new("France")
+        sp = StateParser.new gamestate
+        sp.dump_state.should eq("France:APar,FBre,AMar|Par,Bre,Mar,Pic,Bur,Gas")
+      end
     end
   end
 end