shogi-ruby 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d04141b8259822f9f675663b36789155a1cefdd
-  data.tar.gz: 41710950fea3ecf1fe1f8f0a64482bf1a6082874
+  metadata.gz: 129ab7f9ea2e8b0576a5f13e10b62d42d3ce7ed4
+  data.tar.gz: 5c914717d7a5d59858dd430f01cb9af3981b59d5
 SHA512:
-  metadata.gz: b58afe066c75e1aad5879b85b7970e3d1e7ece52c32d762d3e0d05870e920a66a539f0d44289706d5293c86e469431f14d56213138ac398f636629d77867a70d
-  data.tar.gz: dd95ab16a0e4becef1f23cf2d8957d363886156e2280cba54459f80591a46406e7da36b5e84b77bdbae6023faa6d3679554cea720af1e476a5e8ad97edeb655e
+  metadata.gz: be4d6e244dc785666b37505396cf344b5f542b942b075fba215d90e852b145cc0b14194bc4c623303b83e83f1edc4528dad7cd034df0331c1df05f2a99cbae67
+  data.tar.gz: b2dec598efa163be2daf9b803c4d3ca371fa68245018d12199ec8a36ae633ada7f190087d6441f87bdd7aa302d0f673a6e978f0dccd3f0ea7a4552f1520a9c17

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 2.0.0
   - 2.1
   - 2.2
+  - 2.3.1
   - jruby-19mode
   - jruby-head
   - rbx-2
@@ -12,3 +13,5 @@ matrix:
     - rvm: jruby-head
     - rvm: rbx-2
   fast_finish: true
+before_install:
+  - gem update bundler

data/NEWS.md

@@ -1,5 +1,18 @@
 # NEWS
 
+## 0.0.9: 2016-06-24
+
+### Changes
+
+* Improvements
+  * Improved mevement error detection. [Patch by Shigeaki Matsumura]
+  * Implemented Nifu restriction in `move_by_csa`. [Patch by Toru YAGI]
+
+### Thanks
+
+* Shigeaki Matsumura
+* Toru YAGI
+
 ## 0.0.8: 2015-05-31
 
 ### Changes
@@ -7,6 +20,7 @@
   * Improvements
     *  Supported Bundler.require (require "shogi-ruby").
     *  Added Board.register and Cell.register as plugin system.
+    *  Removed a deprecated method `move_from_csa`.
   * Fixes
     *  Fixed error messages.
 

data/README.md

@@ -31,7 +31,6 @@ Ruby用の将棋ライブラリです。
 
 ### まだできないこと
 
-* 二歩チェック
 * 行きどころのない駒のチェック
 * 詰みチェック
 * 手番チェック

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

@@ -126,13 +126,31 @@ module Shogi
             unless after_cell == ""
               raise MoveError, "A piece exists in the cell: #{csa}"
             end
+            if csa[5..6] == "FU"
+              (1..9).each do |y|
+                cell = @table[to_array_y_from_shogi_y(y)][after_x]
+                if cell[1..2] == "FU" && cell[0] == csa[0]
+                  raise_movement_error("Your FU exists in the cell of the same column: #{csa[3]}#{y}")
+                end
+              end
+            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
+            sign = csa[0] == '+' ? 1 : -1
+            movement_x = (after_x - before_x) * sign
+            movement_y = (before_y - after_y) * sign
+
+            if (movement_x == 0 || movement_y == 0 || movement_x.abs == movement_y.abs) &&
+               [movement_x.abs, movement_y.abs].max >= 2
+              xs = (-(movement_x.abs-1)...0).map{|x| sign * (movement_x <=> 0) * x}
+              ys = (-(movement_y.abs-1)...0).map{|x| sign * (movement_y <=> 0) * x}
+              (xs.empty? ? [0] * ys.size : xs).zip(ys)
+                .map{|x, y| [csa[1].to_i + (x || 0), csa[2].to_i + (y || 0)]}
+                .each do |x, y|
+                if (1..9).include?(x) && (1..9).include?(y)
+                  piece = @table[to_array_y_from_shogi_y(y)][to_array_x_from_shogi_x(x)]
+                  raise_movement_error("Can't jump over a piece: #{piece}") if piece && !piece.empty?
+                end
+              end
             end
 
             unless before_piece.move?(movement_x, movement_y)

data/lib/shogi/version.rb

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

data/test/test-board.rb

@@ -138,6 +138,9 @@ lnsgkgsnl/1r5b1/ppppppppp/9/9/9/PPPPPPPPP/1B5R1/LNSGKGSNL
     assert_raise Shogi::MoveError do
       assert_false(@board.move("+2827HI"))
     end
+    assert_raise Shogi::MovementError do
+      assert_false(@board.move("+2826HI"))
+    end
     assert_raise Shogi::MoveError do
       assert_false(@board.move("+2625FU"))
     end
@@ -147,6 +150,12 @@ lnsgkgsnl/1r5b1/ppppppppp/9/9/9/PPPPPPPPP/1B5R1/LNSGKGSNL
     assert_raise Shogi::MoveError do
       assert_false(@board.move("-4131KI"))
     end
+    assert_raise Shogi::MovementError do
+      assert_false(@board.move("+8855KA"))
+    end
+    assert_raise Shogi::MovementError do
+      assert_false(@board.move("-1115KY"))
+    end
 
     assert_nothing_raised do
       @board.move("+7776FU")
@@ -167,6 +176,10 @@ P9+KY+KE+GI+KI+OU+KI+GI+KE+KY
 P+
 P-
     EOT
+
+    assert_raise Shogi::MovementError do
+      assert_false(@board.move("+8833UM").move("-2233KA").move("+0016FU"))
+    end
   end
 
   def test_move_csa_chain

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shogi-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-31 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Shogi Library by Pure Ruby