shogi-ruby 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e429472baaa224e6e0b2262cde50bfb08c23075b
-  data.tar.gz: 01a6477654158aca9f98345c1e8052c362fa1ffb
+  metadata.gz: 9d04141b8259822f9f675663b36789155a1cefdd
+  data.tar.gz: 41710950fea3ecf1fe1f8f0a64482bf1a6082874
 SHA512:
-  metadata.gz: 45d583c374b2b91803db38971127af6f5781ae4cc924e7a7f2fc35350bf17cd9c1e2e82a66f376b907aa6b6749c3eccdb772fe25420a38b5e4bbdd2d3c256114
-  data.tar.gz: db81567e8cde18b60a646b22e12504ee4918f9b247a5b1363764baefc2a0cb3d64b7d64472722da22a97e2dcf1be6b5d5ce0fa49acb4b3a3e41045bf63a740fc
+  metadata.gz: b58afe066c75e1aad5879b85b7970e3d1e7ece52c32d762d3e0d05870e920a66a539f0d44289706d5293c86e469431f14d56213138ac398f636629d77867a70d
+  data.tar.gz: dd95ab16a0e4becef1f23cf2d8957d363886156e2280cba54459f80591a46406e7da36b5e84b77bdbae6023faa6d3679554cea720af1e476a5e8ad97edeb655e

data/.travis.yml

@@ -1,8 +1,14 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1
+  - 2.2
+  - jruby-19mode
+  - jruby-head
+  - rbx-2
+  - ruby-head
 matrix:
   allow_failures:
-    - rvm: 2.1.0
+    - rvm: jruby-head
+    - rvm: rbx-2
+  fast_finish: true

data/NEWS.md

@@ -1,5 +1,15 @@
 # NEWS
 
+## 0.0.8: 2015-05-31
+
+### Changes
+
+  * Improvements
+    *  Supported Bundler.require (require "shogi-ruby").
+    *  Added Board.register and Cell.register as plugin system.
+  * Fixes
+    *  Fixed error messages.
+
 ## 0.0.7: 2013-10-29
 
 ### Changes

data/README.md

@@ -1,4 +1,4 @@
-# Shogi Library by Pure Ruby [![Build Status](https://secure.travis-ci.org/myokoym/shogi-ruby.png?branch=master)](http://travis-ci.org/myokoym/shogi-ruby)
+# Shogi Library by Pure Ruby [![Build Status](https://secure.travis-ci.org/myokoym/shogi-ruby.png?branch=master)](http://travis-ci.org/myokoym/shogi-ruby) [![Gem Version](https://badge.fury.io/rb/shogi-ruby.png)](http://badge.fury.io/rb/shogi-ruby)
 
 Ruby用の将棋ライブラリです。
 
@@ -11,20 +11,26 @@ Ruby用の将棋ライブラリです。
   * コンピュータ将棋協会が推奨する標準形式です。
 
 ## 用途
+
 ### 向いていること
+
 * 将棋盤の簡単なコンソール表示
 * GUIアプリケーションの内部状態の管理
 
 ### 向いていないこと
+
 * 速度的に、思考エンジンのデータ構造には向きません。
 
 ## 機能
+
 ### できること
+
 * CSA形式で、将棋盤オブジェクトを作成、操作、表示
 * 駒の動きが正しいかどうかのチェック
 * 棋譜の管理
 
 ### まだできないこと
+
 * 二歩チェック
 * 行きどころのない駒のチェック
 * 詰みチェック
@@ -47,7 +53,7 @@ Or install it yourself as:
 
 ## Ruby Version
 
-Ruby 2.0.0 or later. (and 1.9.3)
+Ruby 2.0.0 or later.
 
 ## Usage
 

data/lib/shogi-ruby.rb

@@ -0,0 +1 @@
+require "shogi"

data/lib/shogi/board.rb

@@ -1,121 +1,31 @@
+require "shogi/format/csa/board"
+require "shogi/format/usi/board"
+
 module Shogi
+  class Error               < StandardError; end
+  class CodingError         < Error; end
+  class FormatError         < Error; end
+  class UndefinedPieceError < Error; end
+  class MoveError           < Error; end
+  class MovementError       < Error; end
+
   class Board
-    class Error               < StandardError; end
-    class CodingError         < Error; end
-    class FormatError         < Error; end
-    class UndefinedPieceError < Error; end
-    class MoveError           < Error; end
-    class MovementError       < Error; end
+    def self.register(name)
+      send(:include, Format.const_get(name).const_get("Board"))
+    end
+    self.register("CSA")
+    self.register("USI")
 
     attr_accessor :default_format
     attr_accessor :validate_movement
-    def initialize(default_format=:csa, position=nil)
+    def initialize(default_format=:csa, table=nil)
       @default_format = default_format
-      if position
-        set_from_csa(position)
-      else
-        @position = default_position
-        @captured = []
-      end
+      set_from_csa(table || default_table)
       @validate_movement = true
     end
 
-    def to_csa
-      csa_rows = ""
-
-      @position.each_with_index do |row, i|
-        csa_row = ""
-        row.each do |cell|
-          if cell == ""
-            csa_row << " * "
-          else
-            csa_row << cell
-          end
-        end
-        csa_rows << "P#{i + 1}#{csa_row}\n"
-      end
-
-      sente = "P+"
-      gote = "P-"
-      @captured.each do |piece|
-        if piece[0] == "+"
-          sente << "00#{piece[1..2]}"
-        else
-          gote << "00#{piece[1..2]}"
-        end
-      end
-      csa_rows << "#{sente}\n"
-      csa_rows << "#{gote}\n"
-
-      csa_rows
-    end
-
     def set_from_csa(csa)
-      position = []
-      cell_pattern = '[+-][A-Z]{2}| \* '
-      csa_lines = csa.each_line.to_a
-      csa_lines.slice(0, 9).to_enum.with_index do |row, i|
-        position_row = []
-        row.chomp!
-        unless /\AP#{i + 1}(#{cell_pattern}){9}\z/ =~ row
-          raise FormatError, "Format Error: line P#{i + 1}"
-        end
-        row[2..28].scan(/#{cell_pattern}/) do |cell|
-          if cell == " * "
-            position_row << ""
-          else
-            position_row << cell
-          end
-        end
-        position << position_row
-      end
-      @position = position
-
-      captured = []
-      csa_lines.slice(9, 2).each do |captured_line|
-        captured_line.chomp!
-        unless /\AP[+-](00[A-Z]{2})*\z/ =~ captured_line
-          raise FormatError, "Format Error: captured piece line"
-        end
-        turn = captured_line[1]
-        captured_line[2..-1].scan(/00([A-Z]{2})/) do |cell|
-          captured << turn + cell[0]
-        end
-      end
-      @captured = captured
-    end
-
-    def to_usi
-      @position.map {|row|
-        usi_row = ""
-        space_count = 0
-        row.each do |cell|
-          if cell == ""
-            space_count += 1
-          else
-            if space_count > 0
-              usi_row << space_count.to_s
-              space_count = 0
-            end
-            usi = Piece.const_get(cell[1..2]).new.usi
-            if cell[0] == "-"
-              usi_row << usi.downcase
-            else
-              usi_row << usi
-            end
-          end
-        end
-        if space_count > 0
-          usi_row << space_count.to_s
-          space_count = 0
-        end
-        usi_row
-      }.join("/") << "\n"
-    end
-
-    def move_from_csa(movement)
-      $stderr.puts "warning: Shogi::Board#move_from_csa(movement) is deprecated. Use Shogi::Board#move(movement, :csa)"
-      move(movement, :csa)
+      @table, @captured = parse_from_csa(csa)
     end
 
     def move(movement_lines, format=@default_format)
@@ -129,7 +39,7 @@ module Shogi
     def at(place)
       array_x = to_array_x_from_shogi_x(place[0].to_i)
       array_y = to_array_y_from_shogi_y(place[1].to_i)
-      @position[array_y][array_x]
+      @table[array_y][array_x]
     end
 
     def show(format=@default_format)
@@ -137,118 +47,20 @@ module Shogi
     end
 
     private
-    def default_position
-      [["-KY", "-KE", "-GI", "-KI", "-OU", "-KI", "-GI", "-KE", "-KY"],
-       [   "", "-HI",    "",    "",    "",    "",    "", "-KA",    ""],
-       ["-FU", "-FU", "-FU", "-FU", "-FU", "-FU", "-FU", "-FU", "-FU"],
-       [   "",    "",    "",    "",    "",    "",    "",    "",    ""],
-       [   "",    "",    "",    "",    "",    "",    "",    "",    ""],
-       [   "",    "",    "",    "",    "",    "",    "",    "",    ""],
-       ["+FU", "+FU", "+FU", "+FU", "+FU", "+FU", "+FU", "+FU", "+FU"],
-       [   "", "+KA",    "",    "",    "",    "",    "", "+HI",    ""],
-       ["+KY", "+KE", "+GI", "+KI", "+OU", "+KI", "+GI", "+KE", "+KY"]]
-    end
-
-    def move_by_csa(csa)
-      unless /\A[+-](00|[1-9]{2})[1-9]{2}[A-Z]{2}\z/ =~ csa
-        raise FormatError, "Wrong CSA format: #{csa}"
-      end
-
-      unless Piece.const_defined?(csa[5..6])
-        raise UndefinedPieceError, "Undefined piece: #{csa[5..6]}"
-      end
-
-      if csa[1..2] == "00"
-        before_piece = csa[0] + csa[5..6]
-        unless @captured.include?(before_piece)
-          raise MoveError, "Not captured piece: #{before_piece}"
-        end
-        before_cell = before_piece
-        before_piece = Piece.const_get(before_cell[1..2]).new
-      else
-        before_x = to_array_x_from_shogi_x(csa[1].to_i)
-        before_y = to_array_y_from_shogi_y(csa[2].to_i)
-        before_cell = @position[before_y][before_x]
-        if before_cell == ""
-          raise MoveError, "Before cell is blank"
-        end
-        before_piece = Piece.const_get(before_cell[1..2]).new
-
-        unless csa[0] == before_cell[0]
-          raise MoveError, "Not your piece: #{before_cell}"
-        end
-        unless csa[5..6] == before_cell[1..2]
-          after_piece = Piece.const_get(csa[5..6]).new
-          unless before_piece.promoter == after_piece.class
-          raise MoveError, "Don't promote: #{before_cell[1..2]} -> #{csa[5..6]}"
-          end
-
-          after_y = to_array_y_from_shogi_y(csa[4].to_i)
-          if csa[0] == "+"
-            unless after_y < 3 || before_y < 3
-              raise_movement_error("Don't promote this move: #{csa}")
-            end
-          else
-            unless after_y > 5 || before_y > 5
-              raise_movement_error("Don't promote this move: #{csa}")
-            end
-          end
-        end
-      end
-
-      after_x = to_array_x_from_shogi_x(csa[3].to_i)
-      after_y = to_array_y_from_shogi_y(csa[4].to_i)
-      after_cell = @position[after_y][after_x]
-      if csa[0] == after_cell[0]
-        raise MoveError, "Your piece on after cell: #{csa}"
-      end
-
-      if csa[1..2] == "00"
-        unless after_cell == ""
-          raise MoveError, "Exist piece on after cell"
-        end
-      else
-        if csa[0] == "+"
-          movement_x = after_x - before_x
-          movement_y = before_y - after_y
-        else
-          movement_x = before_x - after_x
-          movement_y = after_y - before_y
-        end
-
-        unless before_piece.move?(movement_x, movement_y)
-          raise_movement_error("Invalid movement: #{csa}")
-        end
-      end
-
-      unless after_cell == ""
-        after_piece = Piece.const_get(after_cell[1..2]).new
-        if after_piece.class.const_defined?(:CHILD)
-          @captured << "#{csa[0]}#{after_piece.class::CHILD}"
-        else
-          @captured << "#{csa[0]}#{after_cell[1..2]}"
-        end
-      end
-      @position[after_y][after_x] = "#{csa[0]}#{csa[5..6]}"
-
-      if csa[1..2] == "00"
-        used = nil
-
-        @captured.each_with_index do |captured_piece, i|
-          if captured_piece == before_cell
-            used = @captured.delete_at(i)
-            break
-          end
-        end
-
-        unless used == before_cell
-          raise CodingError, "[Bug] missing piece in captured"
-        end
-      else
-        @position[before_y][before_x] = ""
-      end
-
-      self
+    def default_table
+      <<-TABLE
+P1-KY-KE-GI-KI-OU-KI-GI-KE-KY
+P2 * -HI *  *  *  *  * -KA * 
+P3-FU-FU-FU-FU-FU-FU-FU-FU-FU
+P4 *  *  *  *  *  *  *  *  * 
+P5 *  *  *  *  *  *  *  *  * 
+P6 *  *  *  *  *  *  *  *  * 
+P7+FU+FU+FU+FU+FU+FU+FU+FU+FU
+P8 * +KA *  *  *  *  * +HI * 
+P9+KY+KE+GI+KI+OU+KI+GI+KE+KY
+P+
+P-
+      TABLE
     end
 
     def raise_movement_error(message)

data/lib/shogi/cell.rb

@@ -1,16 +1,13 @@
+require "shogi/format/csa/cell"
+require "shogi/format/usi/cell"
+
 module Shogi
   class Cell
-    USI_VERTICAL_LABELS = {
-      "1" => "a",
-      "2" => "b",
-      "3" => "c",
-      "4" => "d",
-      "5" => "e",
-      "6" => "f",
-      "7" => "g",
-      "8" => "h",
-      "9" => "i",
-    }
+    def self.register(name)
+      send(:include, Format.const_get(name).const_get("Cell"))
+    end
+    self.register("CSA")
+    self.register("USI")
 
     attr_reader :x, :y
     attr_accessor :piece
@@ -21,33 +18,5 @@ module Shogi
       @piece = piece
       @turn = turn
     end
-
-    def place_csa
-      "#{x}#{y}"
-    end
-
-    def place_usi
-      "#{x}#{USI_VERTICAL_LABELS[y]}"
-    end
-
-    def piece_csa
-      if @piece
-        "#{turn ? "+" : "-"}#{@piece.csa}"
-      else
-        " * "
-      end
-    end
-
-    def piece_usi
-      if @piece
-        if @turn
-          @piece.usi
-        else
-          @piece.usi.downcase
-        end
-      else
-        1
-      end
-    end
   end
 end

data/lib/shogi/format/csa/board.rb

@@ -0,0 +1,175 @@
+module Shogi
+  module Format
+    module CSA
+      module Board
+        def to_csa
+          csa_rows = ""
+
+          @table.each_with_index do |row, i|
+            csa_row = ""
+            row.each do |cell|
+              if cell == ""
+                csa_row << " * "
+              else
+                csa_row << cell
+              end
+            end
+            csa_rows << "P#{i + 1}#{csa_row}\n"
+          end
+
+          sente = "P+"
+          gote = "P-"
+          @captured.each do |piece|
+            if piece[0] == "+"
+              sente << "00#{piece[1..2]}"
+            else
+              gote << "00#{piece[1..2]}"
+            end
+          end
+          csa_rows << "#{sente}\n"
+          csa_rows << "#{gote}\n"
+
+          csa_rows
+        end
+
+        def parse_from_csa(csa)
+          table = []
+          cell_pattern = '[+-][A-Z]{2}| \* '
+          csa_lines = csa.each_line.to_a
+          csa_lines.slice(0, 9).to_enum.with_index do |row, i|
+            table_row = []
+            row.chomp!
+            unless /\AP#{i + 1}(#{cell_pattern}){9}\z/ =~ row
+              raise FormatError, "Format Error: line P#{i + 1}"
+            end
+            row[2..28].scan(/#{cell_pattern}/) do |cell|
+              if cell == " * "
+                table_row << ""
+              else
+                table_row << cell
+              end
+            end
+            table << table_row
+          end
+
+          captured = []
+          csa_lines.slice(9, 2).each do |captured_line|
+            captured_line.chomp!
+            unless /\AP[+-](00[A-Z]{2})*\z/ =~ captured_line
+              raise FormatError, "Invalid format: #{captured_line}"
+            end
+            turn = captured_line[1]
+            captured_line[2..-1].scan(/00([A-Z]{2})/) do |cell|
+              captured << turn + cell[0]
+            end
+          end
+
+          [table, captured]
+        end
+
+        private
+        def move_by_csa(csa)
+          unless /\A[+-](00|[1-9]{2})[1-9]{2}[A-Z]{2}\z/ =~ csa
+            raise FormatError, "Invalid CSA format: #{csa}"
+          end
+
+          unless Piece.const_defined?(csa[5..6])
+            raise UndefinedPieceError, "Undefined piece: #{csa[5..6]}"
+          end
+
+          if csa[1..2] == "00"
+            before_piece = csa[0] + csa[5..6]
+            unless @captured.include?(before_piece)
+              raise MoveError, "Not captured piece: #{before_piece}"
+            end
+            before_cell = before_piece
+            before_piece = Piece.const_get(before_cell[1..2]).new
+          else
+            before_x = to_array_x_from_shogi_x(csa[1].to_i)
+            before_y = to_array_y_from_shogi_y(csa[2].to_i)
+            before_cell = @table[before_y][before_x]
+            if before_cell == ""
+              raise MoveError, "Before cell is blank"
+            end
+            before_piece = Piece.const_get(before_cell[1..2]).new
+
+            unless csa[0] == before_cell[0]
+              raise MoveError, "Not your piece: #{before_cell}"
+            end
+            unless csa[5..6] == before_cell[1..2]
+              after_piece = Piece.const_get(csa[5..6]).new
+              unless before_piece.promoter == after_piece.class
+                raise MoveError, "Can't promote: #{before_cell[1..2]} -> #{csa[5..6]}"
+              end
+
+              after_y = to_array_y_from_shogi_y(csa[4].to_i)
+              if csa[0] == "+"
+                unless after_y < 3 || before_y < 3
+                  raise_movement_error("Can't promote: #{csa}")
+                end
+              else
+                unless after_y > 5 || before_y > 5
+                  raise_movement_error("Can't promote: #{csa}")
+                end
+              end
+            end
+          end
+
+          after_x = to_array_x_from_shogi_x(csa[3].to_i)
+          after_y = to_array_y_from_shogi_y(csa[4].to_i)
+          after_cell = @table[after_y][after_x]
+          if csa[0] == after_cell[0]
+            raise MoveError, "Your piece exists in the cell: #{csa}"
+          end
+
+          if csa[1..2] == "00"
+            unless after_cell == ""
+              raise MoveError, "A piece exists in the cell: #{csa}"
+            end
+          else
+            if csa[0] == "+"
+              movement_x = after_x - before_x
+              movement_y = before_y - after_y
+            else
+              movement_x = before_x - after_x
+              movement_y = after_y - before_y
+            end
+
+            unless before_piece.move?(movement_x, movement_y)
+              raise_movement_error("Invalid movement: #{csa}")
+            end
+          end
+
+          unless after_cell == ""
+            after_piece = Piece.const_get(after_cell[1..2]).new
+            if after_piece.class.const_defined?(:CHILD)
+              @captured << "#{csa[0]}#{after_piece.class::CHILD}"
+            else
+              @captured << "#{csa[0]}#{after_cell[1..2]}"
+            end
+          end
+          @table[after_y][after_x] = "#{csa[0]}#{csa[5..6]}"
+
+          if csa[1..2] == "00"
+            used = nil
+
+            @captured.each_with_index do |captured_piece, i|
+              if captured_piece == before_cell
+                used = @captured.delete_at(i)
+                break
+              end
+            end
+
+            unless used == before_cell
+              raise CodingError, "[Bug] missing piece in captured"
+            end
+          else
+            @table[before_y][before_x] = ""
+          end
+
+          self
+        end
+      end
+    end
+  end
+end

data/lib/shogi/format/csa/cell.rb

@@ -0,0 +1,19 @@
+module Shogi
+  module Format
+    module CSA
+      module Cell
+        def place_csa
+          "#{x}#{y}"
+        end
+
+        def piece_csa
+          if @piece
+            "#{turn ? "+" : "-"}#{@piece.csa}"
+          else
+            " * "
+          end
+        end
+      end
+    end
+  end
+end

data/lib/shogi/format/usi/board.rb

@@ -0,0 +1,35 @@
+module Shogi
+  module Format
+    module USI
+      module Board
+        def to_usi
+          @table.map {|row|
+            usi_row = ""
+            space_count = 0
+            row.each do |cell|
+              if cell == ""
+                space_count += 1
+              else
+                if space_count > 0
+                  usi_row << space_count.to_s
+                  space_count = 0
+                end
+                usi = Piece.const_get(cell[1..2]).new.usi
+                if cell[0] == "-"
+                  usi_row << usi.downcase
+                else
+                  usi_row << usi
+                end
+              end
+            end
+            if space_count > 0
+              usi_row << space_count.to_s
+              space_count = 0
+            end
+            usi_row
+          }.join("/") << "\n"
+        end
+      end
+    end
+  end
+end

data/lib/shogi/format/usi/cell.rb

@@ -0,0 +1,35 @@
+module Shogi
+  module Format
+    module USI
+      module Cell
+        USI_VERTICAL_LABELS = {
+          "1" => "a",
+          "2" => "b",
+          "3" => "c",
+          "4" => "d",
+          "5" => "e",
+          "6" => "f",
+          "7" => "g",
+          "8" => "h",
+          "9" => "i",
+        }
+
+        def place_usi
+          "#{x}#{USI_VERTICAL_LABELS[y]}"
+        end
+
+        def piece_usi
+          if @piece
+            if @turn
+              @piece.usi
+            else
+              @piece.usi.downcase
+            end
+          else
+            1
+          end
+        end
+      end
+    end
+  end
+end

data/lib/shogi/version.rb

@@ -1,3 +1,3 @@
 module Shogi
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/shogi-ruby.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency("test-unit")
   spec.add_development_dependency("test-unit-notify")
   spec.add_development_dependency("test-unit-rr")
-  spec.add_development_dependency("bundler", "~> 1.3")
+  spec.add_development_dependency("bundler")
   spec.add_development_dependency("rake")
 end

data/test/test-board.rb

@@ -7,13 +7,13 @@ class BoardTest < Test::Unit::TestCase
   end
 
   def test_initialize
-    rows = @board.instance_variable_get(:@position)
+    rows = @board.instance_variable_get(:@table)
     assert_equal(9, rows.size)
     assert_true(rows.all? {|row| row.size == 9 })
   end
 
   def test_initialize_csa
-    position = <<-EOT
+    table = <<-EOT
 P1 *  *  *  * +HI *  * -KE * 
 P2 *  *  *  *  * +KA-OU * -KY
 P3 *  *  *  *  *  * -FU-FU-FU
@@ -26,8 +26,8 @@ P9 *  *  *  *  *  *  *  *  *
 P+00HI00GI00KE
 P-
     EOT
-    @board = Shogi::Board.new(:csa, position)
-    assert_equal(position, @board.to_csa)
+    @board = Shogi::Board.new(:csa, table)
+    assert_equal(table, @board.to_csa)
     assert_nothing_raised do
       @board.move("+0031HI")
     end
@@ -47,7 +47,7 @@ P-
   end
 
   def test_to_csa
-    before_state = @board.instance_variable_get(:@position).dup
+    before_state = @board.instance_variable_get(:@table).dup
     assert_equal(<<-EOT, @board.to_csa)
 P1-KY-KE-GI-KI-OU-KI-GI-KE-KY
 P2 * -HI *  *  *  *  * -KA * 
@@ -61,11 +61,11 @@ P9+KY+KE+GI+KI+OU+KI+GI+KE+KY
 P+
 P-
     EOT
-    assert_equal(before_state, @board.instance_variable_get(:@position))
+    assert_equal(before_state, @board.instance_variable_get(:@table))
   end
 
   def test_show
-    before_state = @board.instance_variable_get(:@position).dup
+    before_state = @board.instance_variable_get(:@table).dup
     s = ""
     io = StringIO.new(s)
     $stdout = io
@@ -87,7 +87,7 @@ P9+KY+KE+GI+KI+OU+KI+GI+KE+KY
 P+
 P-
     EOT
-    assert_equal(before_state, @board.instance_variable_get(:@position))
+    assert_equal(before_state, @board.instance_variable_get(:@table))
   end
 
   def test_set_from_csa
@@ -112,11 +112,11 @@ P-
   end
 
   def test_to_usi
-    before_state = @board.instance_variable_get(:@position).dup
+    before_state = @board.instance_variable_get(:@table).dup
     assert_equal(<<-EOT, @board.to_usi)
 lnsgkgsnl/1r5b1/ppppppppp/9/9/9/PPPPPPPPP/1B5R1/LNSGKGSNL
     EOT
-    assert_equal(before_state, @board.instance_variable_get(:@position))
+    assert_equal(before_state, @board.instance_variable_get(:@table))
   end
 
   def test_at
@@ -126,25 +126,25 @@ lnsgkgsnl/1r5b1/ppppppppp/9/9/9/PPPPPPPPP/1B5R1/LNSGKGSNL
   def test_move_csa
     @board.default_format = :csa
 
-    assert_raise Shogi::Board::FormatError do
+    assert_raise Shogi::FormatError do
       @board.move("+27FU")
     end
-    assert_raise Shogi::Board::UndefinedPieceError do
+    assert_raise Shogi::UndefinedPieceError do
       @board.move("+2726AA")
     end
-    assert_raise Shogi::Board::MoveError do
+    assert_raise Shogi::MoveError do
       assert_false(@board.move("+2726HI"))
     end
-    assert_raise Shogi::Board::MoveError do
+    assert_raise Shogi::MoveError do
       assert_false(@board.move("+2827HI"))
     end
-    assert_raise Shogi::Board::MoveError do
+    assert_raise Shogi::MoveError do
       assert_false(@board.move("+2625FU"))
     end
-    assert_raise Shogi::Board::MovementError do
+    assert_raise Shogi::MovementError do
       assert_false(@board.move("+2725FU"))
     end
-    assert_raise Shogi::Board::MoveError do
+    assert_raise Shogi::MoveError do
       assert_false(@board.move("-4131KI"))
     end
 
@@ -229,7 +229,7 @@ P-00KA
   def test_move_csa_promote
     @board.move("+7776FU", :csa)
     @board.move("-3334FU", :csa)
-    assert_raise Shogi::Board::MovementError do
+    assert_raise Shogi::MovementError do
       assert_false(@board.move("+2726TO", :csa))
     end
     assert_nothing_raised do
@@ -321,7 +321,7 @@ P-00KA
   end
 
   def test_move_csa_promote_to_7
-    position = <<-EOT
+    table = <<-EOT
 P1 *  *  *  *  *  *  *  *  * 
 P2 *  *  *  *  *  *  *  *  * 
 P3 *  *  *  *  *  *  *  *  * 
@@ -334,14 +334,14 @@ P9 *  *  *  *  *  *  *  *  *
 P+
 P-
     EOT
-    @board = Shogi::Board.new(:csa, position)
+    @board = Shogi::Board.new(:csa, table)
     assert_nothing_raised do
       @board.move("-5657TO", :csa)
     end
   end
 
   def test_move_csa_promote_from_7
-    position = <<-EOT
+    table = <<-EOT
 P1 *  *  *  *  *  *  *  *  * 
 P2 *  *  *  *  *  *  *  *  * 
 P3 *  *  *  *  *  *  *  *  * 
@@ -354,7 +354,7 @@ P9 *  *  *  *  *  *  *  *  *
 P+
 P-
     EOT
-    @board = Shogi::Board.new(:csa, position)
+    @board = Shogi::Board.new(:csa, table)
     assert_nothing_raised do
       @board.move("-5746NG", :csa)
     end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: shogi-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2015-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit-notify
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit-rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A Shogi library by pure Ruby. It supports CSA format.
@@ -87,17 +87,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - NEWS.ja.md
 - NEWS.md
 - README.md
 - Rakefile
+- lib/shogi-ruby.rb
 - lib/shogi.rb
 - lib/shogi/board.rb
 - lib/shogi/cell.rb
+- lib/shogi/format/csa/board.rb
+- lib/shogi/format/csa/cell.rb
+- lib/shogi/format/usi/board.rb
+- lib/shogi/format/usi/cell.rb
 - lib/shogi/game.rb
 - lib/shogi/piece.rb
 - lib/shogi/piece/base.rb
@@ -119,17 +124,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Shogi Library by Pure Ruby