osl 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa47dc0d996fd2dbf774dd4158a7823b74a852f5
-  data.tar.gz: 55bf9c91650afa603fd95ea6ba772e7c1f88d837
+  metadata.gz: c29e705dce452cc0e71abaf45afed179e0ad93b0
+  data.tar.gz: ac1a16b66e4ee44f37f0c2047e2d2fcf1a6ae454
 SHA512:
-  metadata.gz: 2289f3568d9fb26d0af7eefa928b4e15744594a1890c8a2d287be63ebd6353d06d64679d54e362baa957a8b642de99faafe596a0dc33292858094c89dc3feacb
-  data.tar.gz: 79e86f7e2c5bcdb1d9d409ae6f18de41a8bf79bbf5ccc2950e51ff90350ff5e29818224fe9328f16c5dd13354daf70451616eaac1d518ffb8aeda25aff08591f
+  metadata.gz: 9b4980c6140d971969dc0f192cfadf41ed7f4234800e79e7d2ba1b7ca4657dff8be65d6d4d48f051965337e84736df1697cbe2aaeec69d50b67e501f533fe32f
+  data.tar.gz: c2b231d25d5bcec3ca69218dbfdb7e1997e14e2c2472d8c2795d18f277d1ea6d3b8d54c5679fc37068fc487cd340be96c3d1834876a5d188135c448f35b05b09

data/NEWS.md

@@ -0,0 +1,18 @@
+# NEWS
+
+## 0.0.2: 2013-08-29
+
+Supported Piece class release!
+
+### Changes
+
+  * Improvements
+    * Added SimpleState#pieceAt.
+    * Supported osl::Piece.
+    * Added SimpleState as super-class on NumEffectState.
+    * Improved a check of format.
+    * Use nil for return-value if invalid move-format.
+
+## 0.0.1: 2013-08-20
+
+Initial release!

data/README.md

@@ -30,6 +30,18 @@ Or install it yourself as:
 
 See samples.
 
+## Development
+
+### Prepare
+
+    bundle install
+
+### Testing
+
+    test/run-test.rb
+
+So, you can meet kinotan. :)
+
 ## Contributing
 
 1. Fork it

data/ext/osl/rbosl.cpp

@@ -1,4 +1,5 @@
 #include "ruby.h"
+#include "rbosl_piece.h"
 #include "rbosl_state.h"
 #include "rbosl_move.h"
 
@@ -10,6 +11,7 @@ Init_osl(void)
 {
   static VALUE mOsl;
   mOsl = rb_define_module("Osl");
+  rbosl_piece_init(mOsl);
   rbosl_state_init(mOsl);
   rbosl_move_init(mOsl);
 }

data/ext/osl/rbosl_move.cpp

@@ -1,7 +1,4 @@
-#include "ruby.h"
 #include "rbosl_move.h"
-#include <osl/move.h>
-#include <osl/record/csa.h>
 
 VALUE cMove;
 

data/ext/osl/rbosl_move.h

@@ -2,13 +2,15 @@
 #define RBOSL_MOVE_H
 
 #include "ruby.h"
+#include <osl/move.h>
+#include <osl/record/csa.h>
 
 extern  VALUE cMove;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-extern void rbosl_move_init(VALUE mOsl);
+void rbosl_move_init(VALUE mOsl);
 #ifdef __cplusplus
 } /* extern "C" */
 #endif

data/ext/osl/rbosl_piece.cpp

@@ -0,0 +1,41 @@
+#include "rbosl_piece.h"
+
+VALUE cPiece;
+
+using namespace osl;
+
+void
+rbosl_piece_free(Piece* ptr)
+{
+  ptr->~Piece();
+  ruby_xfree(ptr);
+}
+
+static VALUE
+rbosl_piece_s_new(VALUE self)
+{
+  Piece* ptr = new Piece();
+  return Data_Wrap_Struct(self, NULL, rbosl_piece_free, ptr);
+}
+
+static VALUE
+rbosl_piece_to_csa(VALUE self)
+{
+  Piece* ptr;
+  Data_Get_Struct(self, Piece, ptr);
+  return rb_str_new2(record::csa::show(*ptr).c_str());
+}
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+void
+rbosl_piece_init(VALUE mOsl)
+{
+  cPiece = rb_define_class_under(mOsl, "Piece", rb_cObject);
+  rb_define_singleton_method(cPiece, "new", RUBY_METHOD_FUNC(rbosl_piece_s_new), 0);
+  rb_define_method(cPiece, "to_csa", RUBY_METHOD_FUNC(rbosl_piece_to_csa), 0);
+}
+#ifdef __cplusplus
+} /* extern "C" */
+#endif

data/ext/osl/rbosl_piece.h

@@ -0,0 +1,18 @@
+#ifndef RBOSL_PIECE_H
+#define RBOSL_PIECE_H
+
+#include "ruby.h"
+#include <osl/piece.h>
+#include <osl/record/csa.h>
+
+extern  VALUE cPiece;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+void rbosl_piece_init(VALUE mOsl);
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* RBOSL_PIECE_H */

data/ext/osl/rbosl_state.h

@@ -2,13 +2,22 @@
 #define RBOSL_STATE_H
 
 #include "ruby.h"
+#include <osl/state/simpleState.h>
+#include <osl/state/numEffectState.h>
+#include <osl/handicap.h>
+#include <osl/container/moveVector.h>
+#include <osl/move_generator/legalMoves.h>
+#include <osl/record/csa.h>
+#include <iostream>
+
+extern VALUE cSimpleState;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-extern void rbosl_state_init(VALUE mOsl);
-extern void rbosl_simpleState_init(VALUE mState);
-extern void rbosl_numEffectState_init(VALUE mState);
+void rbosl_state_init(VALUE mOsl);
+void rbosl_simpleState_init(VALUE mState);
+void rbosl_numEffectState_init(VALUE mState);
 #ifdef __cplusplus
 } /* extern "C" */
 #endif

data/ext/osl/rbosl_state_numEffectState.cpp

@@ -1,12 +1,5 @@
-#include "ruby.h"
 #include "rbosl_state.h"
 #include "rbosl_move.h"
-#include <osl/state/numEffectState.h>
-#include <osl/handicap.h>
-#include <osl/container/moveVector.h>
-#include <osl/move_generator/legalMoves.h>
-#include <osl/record/csa.h>
-#include <iostream>
 
 using namespace osl;
 
@@ -26,22 +19,13 @@ rbosl_numEffectState_s_new(VALUE self)
   return Data_Wrap_Struct(self, NULL, NULL, ptr);
 }
 
-static VALUE
-rbosl_numEffectState_show(VALUE self)
-{
-  state::NumEffectState* p;
-  Data_Get_Struct(self, state::NumEffectState, p);
-  std::cout << *p << std::endl;
-  return Qnil;
-}
-
 static VALUE
 rbosl_numEffectState_generate(VALUE self)
 {
-  state::NumEffectState* p;
-  Data_Get_Struct(self, state::NumEffectState, p);
+  state::NumEffectState* ptr;
+  Data_Get_Struct(self, state::NumEffectState, ptr);
   MoveVector moves;
-  LegalMoves::generate(*p, moves);
+  LegalMoves::generate(*ptr, moves);
   VALUE moves_ary = rb_ary_new();
   for (int i = 0; i < (int)moves.size(); i++) {
     // TODO: ruby: munmap_chunk(): invalid pointer
@@ -55,18 +39,18 @@ rbosl_numEffectState_generate(VALUE self)
 static VALUE
 rbosl_numEffectState_makeMove(VALUE self, VALUE rb_move)
 {
-  state::NumEffectState* p;
-  Data_Get_Struct(self, state::NumEffectState, p);
+  state::NumEffectState* ptr;
+  Data_Get_Struct(self, state::NumEffectState, ptr);
 
   Move* c_move;
   if (TYPE(rb_move) == T_STRING) {
-    Move osl_move = record::csa::strToMove(StringValuePtr(rb_move), *p);
+    Move osl_move = record::csa::strToMove(StringValuePtr(rb_move), *ptr);
     c_move = &osl_move;
   } else {
     Data_Get_Struct(rb_move, Move, c_move);
   }
 
-  p->makeMove(*c_move);
+  ptr->makeMove(*c_move);
 
   return Qnil;
 }
@@ -74,22 +58,27 @@ rbosl_numEffectState_makeMove(VALUE self, VALUE rb_move)
 static VALUE
 rbosl_numEffectState_isValidMove(VALUE self, VALUE rb_move)
 {
-  state::NumEffectState* p;
-  Data_Get_Struct(self, state::NumEffectState, p);
+  state::NumEffectState* ptr;
+  Data_Get_Struct(self, state::NumEffectState, ptr);
 
   Move* c_move;
   if (TYPE(rb_move) == T_STRING) {
-    // TODO: format check
-    if (strlen(StringValuePtr(rb_move)) == 0) {
-      return Qfalse;
+    // TODO: Rescue invalid piece. e.g.) +7776XX
+    // TODO: Support except for CSA format.
+    VALUE format_checked = rb_funcall(rb_move,
+                                      rb_intern("match"),
+                                      1,
+                                      rb_str_new2("[+-][0-9]{4}[A-Z]{2}"));
+    if (format_checked == Qnil) {
+      return Qnil;
     }
-    Move osl_move = record::csa::strToMove(StringValuePtr(rb_move), *p);
+    Move osl_move = record::csa::strToMove(StringValuePtr(rb_move), *ptr);
     c_move = &osl_move;
   } else {
     Data_Get_Struct(rb_move, Move, c_move);
   }
 
-  if (p->isValidMove(*c_move)) {
+  if (ptr->isValidMove(*c_move)) {
     return Qtrue;
   } else {
     return Qfalse;
@@ -99,10 +88,10 @@ rbosl_numEffectState_isValidMove(VALUE self, VALUE rb_move)
 static VALUE
 rbosl_numEffectState_inCheck(VALUE self)
 {
-  state::NumEffectState* p;
-  Data_Get_Struct(self, state::NumEffectState, p);
+  state::NumEffectState* ptr;
+  Data_Get_Struct(self, state::NumEffectState, ptr);
 
-  if (p->inCheck(alt(p->turn()))) {
+  if (ptr->inCheck(alt(ptr->turn()))) {
     return Qtrue;
   } else {
     return Qfalse;
@@ -116,9 +105,8 @@ void
 rbosl_numEffectState_init(VALUE mState)
 {
   VALUE cNumEffectState;
-  cNumEffectState = rb_define_class_under(mState, "NumEffectState", rb_cObject);
+  cNumEffectState = rb_define_class_under(mState, "NumEffectState", cSimpleState);
   rb_define_singleton_method(cNumEffectState, "new", RUBY_METHOD_FUNC(rbosl_numEffectState_s_new), 0);
-  rb_define_method(cNumEffectState, "show", RUBY_METHOD_FUNC(rbosl_numEffectState_show), 0);
   rb_define_method(cNumEffectState, "generate", RUBY_METHOD_FUNC(rbosl_numEffectState_generate), 0);
   rb_define_method(cNumEffectState, "makeMove", RUBY_METHOD_FUNC(rbosl_numEffectState_makeMove), 1);
   rb_define_alias(cNumEffectState,  "move", "makeMove");

data/ext/osl/rbosl_state_simpleState.cpp

@@ -1,11 +1,10 @@
-#include "ruby.h"
 #include "rbosl_state.h"
-#include <osl/state/simpleState.h>
-#include <osl/handicap.h>
-#include <iostream>
+#include "rbosl_piece.h"
 
 using namespace osl;
 
+VALUE cSimpleState;
+
 void
 rbosl_simpleState_free(state::SimpleState* ptr)
 {
@@ -29,16 +28,37 @@ rbosl_simpleState_show(VALUE self)
   return Qnil;
 }
 
+static VALUE
+rbosl_simpleState_pieceAt(VALUE self, VALUE rb_square)
+{
+  state::SimpleState* ptr;
+  Data_Get_Struct(self, state::SimpleState, ptr);
+
+  Square* c_square;
+  if (TYPE(rb_square) == T_STRING) {
+    Square tmp_square = record::csa::strToPos(StringValuePtr(rb_square));
+    c_square = &tmp_square;
+  } else {
+    Data_Get_Struct(rb_square, Square, c_square);
+  }
+
+  Piece c_piece = ptr->pieceAt(*c_square);
+  VALUE rb_piece = Data_Wrap_Struct(cPiece, NULL, NULL, &c_piece);
+
+  return rb_piece;
+}
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 void
 rbosl_simpleState_init(VALUE mState)
 {
-  VALUE cSimpleState;
   cSimpleState = rb_define_class_under(mState, "SimpleState", rb_cObject);
   rb_define_singleton_method(cSimpleState, "new", RUBY_METHOD_FUNC(rbosl_simpleState_s_new), 0);
   rb_define_method(cSimpleState, "show", RUBY_METHOD_FUNC(rbosl_simpleState_show), 0);
+  rb_define_method(cSimpleState, "pieceAt", RUBY_METHOD_FUNC(rbosl_simpleState_pieceAt), 1);
+  rb_define_alias(cSimpleState, "at", "pieceAt");
 }
 #ifdef __cplusplus
 } /* extern "C" */

data/lib/osl/version.rb

@@ -1,3 +1,3 @@
 module Osl
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/osl.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Masafumi Yokoyama"]
   spec.email         = ["myokoym@gmail.com"]
   spec.description   = %q{Ruby/OSL is a Ruby binding of OpenShogiLib.}
-  spec.summary       = %q{Ruby/OSL is a Ruby binding of OpenShogiLib.}
+  spec.summary       = %q{Ruby binding of OpenShogiLib}
   spec.homepage      = "https://github.com/myokoym/ruby-osl"
   spec.license       = "MIT"
 
@@ -19,6 +19,9 @@ Gem::Specification.new do |spec|
   spec.extensions    = ["ext/osl/extconf.rb"]
   spec.require_paths = ["lib", "ext/osl"]
 
+  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("rake")
 end

data/test/test-numEffectState.rb

@@ -1,55 +1,63 @@
 require "osl"
 
 class NumEffectStateTest < Test::Unit::TestCase
+  def setup
+    @nstate  = Osl::State::NumEffectState.new
+  end
+
   def test_new
     assert_not_nil(Osl::State::NumEffectState.new)
   end
 
+  def test_super_class
+    assert_true(@nstate.is_a?(Osl::State::SimpleState))
+  end
+
+  def test_show
+    assert_true(@nstate.respond_to?(:show))
+  end
+
   def test_generate
-    nstate = Osl::State::NumEffectState.new
-    moves = nstate.generate
+    moves = @nstate.generate
     assert_not_nil(moves)
     assert_true(moves.is_a?(Array))
     assert_true(moves.first.is_a?(Osl::Move))
   end
 
   def test_makeMove
-    nstate = Osl::State::NumEffectState.new
-    moves = nstate.generate
+    moves = @nstate.generate
     assert_nothing_raised do
-      nstate.makeMove(moves.first)
+      @nstate.makeMove(moves.first)
     end
     assert_nothing_raised do
-      nstate.move(moves.first)  # alias
+      @nstate.move(moves.first)  # alias
     end
   end
 
   def test_makeMove_from_csa
-    nstate = Osl::State::NumEffectState.new
     assert_nothing_raised do
-      nstate.makeMove("+7776FU")
+      @nstate.makeMove("+7776FU")
     end
   end
 
   def test_isValidMove
-    nstate = Osl::State::NumEffectState.new
-    moves = nstate.generate
-    assert_true(nstate.isValidMove(moves.first))
-    assert_true(nstate.valid?(moves.first))  # alias
-    assert_false(nstate.isValidMove(Osl::Move.new))
+    moves = @nstate.generate
+    assert_true(@nstate.isValidMove(moves.first))
+    assert_true(@nstate.valid?(moves.first))  # alias
+    assert_false(@nstate.isValidMove(Osl::Move.new))
   end
 
   def test_isValidMove_from_csa
-    nstate = Osl::State::NumEffectState.new
-    assert_true(nstate.isValidMove("+7776FU"))
-    assert_true(nstate.valid?("+7776FU"))  # alias
-    assert_false(nstate.isValidMove("-7776FU"))
-    assert_false(nstate.isValidMove(""))
+    assert_true(@nstate.isValidMove("+7776FU"))
+    assert_true(@nstate.valid?("+7776FU"))  # alias
+    assert_false(@nstate.isValidMove("-7776FU"))
+    assert_nil(@nstate.isValidMove(""))
+    assert_nil(@nstate.isValidMove("7776FU"))
+    assert_nil(@nstate.isValidMove("-7776"))
   end
 
   def test_inCheck
-    nstate = Osl::State::NumEffectState.new
-    assert_false(nstate.inCheck)
-    assert_false(nstate.in_check?)  # alias
+    assert_false(@nstate.inCheck)
+    assert_false(@nstate.in_check?)  # alias
   end
 end

data/test/test-piece.rb

@@ -0,0 +1,11 @@
+require "osl"
+
+class PieceTest < Test::Unit::TestCase
+  def test_new
+    assert_not_nil(Osl::Piece.new)
+  end
+
+  def test_to_csa
+    assert_true(Osl::Piece.new.to_csa.is_a?(String))
+  end
+end

data/test/test-simpleState.rb

@@ -1,7 +1,26 @@
 require "osl"
+require "stringio"
 
 class SimpleStateTest < Test::Unit::TestCase
+  def setup
+    @sstate = Osl::State::SimpleState.new
+  end
+
   def test_new
     assert_not_nil(Osl::State::SimpleState.new)
   end
+
+  def test_show
+    assert_true(@sstate.respond_to?(:show))
+  end
+
+  def test_pieceAt
+    piece = @sstate.pieceAt("77")
+    assert_true(piece.is_a?(Osl::Piece))
+  end
+
+  def test_at
+    piece = @sstate.at("77")
+    assert_true(piece.is_a?(Osl::Piece))
+  end
 end

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: osl
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2013-08-29 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
@@ -49,12 +91,15 @@ files:
 - .gitignore
 - Gemfile
 - LICENSE
+- NEWS.md
 - README.md
 - Rakefile
 - ext/osl/extconf.rb
 - ext/osl/rbosl.cpp
 - ext/osl/rbosl_move.cpp
 - ext/osl/rbosl_move.h
+- ext/osl/rbosl_piece.cpp
+- ext/osl/rbosl_piece.h
 - ext/osl/rbosl_state.cpp
 - ext/osl/rbosl_state.h
 - ext/osl/rbosl_state_numEffectState.cpp
@@ -67,6 +112,7 @@ files:
 - test/test-move.rb
 - test/test-numEffectState.rb
 - test/test-osl.rb
+- test/test-piece.rb
 - test/test-simpleState.rb
 homepage: https://github.com/myokoym/ruby-osl
 licenses:
@@ -92,11 +138,12 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: Ruby/OSL is a Ruby binding of OpenShogiLib.
+summary: Ruby binding of OpenShogiLib
 test_files:
 - test/run-test.rb
 - test/test-move.rb
 - test/test-numEffectState.rb
 - test/test-osl.rb
+- test/test-piece.rb
 - test/test-simpleState.rb
 has_rdoc: