@@ -8,11 +8,10 @@ class ScalaChessProject(info: ProjectInfo) extends DefaultWebProject(info) { val geronimoServlet = "org.apache.geronimo.specs" % "geronimo-servlet_2.5_spec" % "1.2" % "compile->default" val gae = "com.google.appengine" % "appengine-api-1.0-sdk" % "1.2.1" % "compile->default" - val specs = "org.scala-tools.testing" % "specs" % "1.4.4" % "test->default" + val specs = "org.scala-tools.testing" % "specs" % "1.5.0" % "test->default" val scalacheck = "org.scala-tools.testing" % "scalacheck" % "1.5" % "test->default" val mockito = "org.mockito" % "mockito-core" % "1.7" % "test->default" val junit = "junit" % "junit" % "4.4" % "test->default" val jetty = "org.mortbay.jetty" % "jetty" % "6.1.14" % "test->default" -// val jspapi = "org.mortbay.jetty" % "jsp-api-2.1" % "7.0.0pre2" % "test->default" val jasper = "org.apache.tomcat" % "jasper" % "6.0.18" % "test->default" } project/build/src/ScalaChessProject.scala @@ -24,28 +24,90 @@ <attribute name="method" value="1" /> <attribute name="URI" value="/WEB-INF/classes" /> </containerElement> - </packaging> - </configuration> - </facet> - <facet type="web" name="Web2"> - <configuration> - <descriptors> - <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/target/webapp/WEB-INF/web.xml" optional="false" version="2.5" /> - </descriptors> - <webroots> - <root url="file://$MODULE_DIR$/target/webapp" relative="/" /> - </webroots> - <building> - <setting name="EXPLODED_URL" value="file://" /> - <setting name="EXPLODED_ENABLED" value="false" /> - <setting name="JAR_URL" value="file://" /> - <setting name="JAR_ENABLED" value="false" /> - <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" /> - </building> - <packaging> - <containerElement type="module" name="scala-chess"> + <containerElement type="library" level="module"> <attribute name="method" value="1" /> - <attribute name="URI" value="/WEB-INF/classes" /> + <attribute name="URI" value="/WEB-INF/lib" /> + <url>jar://$MODULE_DIR$/lib_managed/compile/appengine-api-1.0-sdk-1.2.1.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib" /> + <url>jar://$MODULE_DIR$/lib/commons-1.0.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib" /> + <url>jar://$MODULE_DIR$/lib_managed/test/specs-1.4.4.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib" /> + <url>jar://$MODULE_DIR$/lib_managed/test/junit-4.4.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib" /> + <url>jar://$MODULE_DIR$/lib_managed/test/jetty-util-6.1.14.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib" /> + <url>jar://$MODULE_DIR$/lib_managed/test/mockito-core-1.7.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib" /> + <url>jar://$MODULE_DIR$/lib_managed/test/juli-6.0.18.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib" /> + <url>jar://$MODULE_DIR$/lib_managed/test/hamcrest-core-1.1.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib" /> + <url>jar://$MODULE_DIR$/lib_managed/test/jetty-6.1.14.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib" /> + <url>jar://$MODULE_DIR$/lib_managed/test/jasper-6.0.18.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib" /> + <url>jar://$MODULE_DIR$/lib_managed/test/catalina-6.0.18.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib" /> + <url>jar://$MODULE_DIR$/lib_managed/test/jasper-jdt-6.0.18.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib" /> + <url>jar://$MODULE_DIR$/lib_managed/test/objenesis-1.0.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib" /> + <url>jar://$MODULE_DIR$/lib_managed/test/annotations-api-6.0.18.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib" /> + <url>jar://$MODULE_DIR$/lib_managed/test/el-api-6.0.18.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib" /> + <url>jar://$MODULE_DIR$/lib_managed/test/jasper-el-6.0.18.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib" /> + <url>jar://$MODULE_DIR$/lib_managed/test/scalacheck-1.5.jar!/</url> </containerElement> </packaging> </configuration> @@ -81,7 +143,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib_managed/default/servlet-api-2.5-6.1.14.jar!/" /> + <root url="jar://$APPLICATION_HOME_DIR$/lib/javaee.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -90,7 +152,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib_managed/default/catalina-6.0.18.jar!/" /> + <root url="jar://$MODULE_DIR$/project/boot/scala-2.7.4/sbt-0.4.5/ivy-2.0.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -99,7 +161,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib_managed/default/juli-6.0.18.jar!/" /> + <root url="jar://$MODULE_DIR$/project/boot/scala-2.7.4/sbt-0.4.5/sbt_2.7.4-0.4.5.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -108,7 +170,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib_managed/default/jsp-api-6.0.18.jar!/" /> + <root url="jar://$MODULE_DIR$/lib_managed/compile/appengine-api-1.0-sdk-1.2.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -117,7 +179,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib_managed/default/el-api-6.0.18.jar!/" /> + <root url="jar://$MODULE_DIR$/lib_managed/compile/geronimo-servlet_2.5_spec-1.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -126,7 +188,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib_managed/default/junit-4.4.jar!/" /> + <root url="jar://$MODULE_DIR$/lib/commons-1.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -135,7 +197,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib_managed/default/objenesis-1.0.jar!/" /> + <root url="jar://$MODULE_DIR$/lib_managed/test/specs-1.4.4.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -144,7 +206,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib_managed/default/jasper-el-6.0.18.jar!/" /> + <root url="jar://$MODULE_DIR$/lib_managed/test/junit-4.4.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -153,7 +215,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib_managed/default/geronimo-servlet_2.5_spec-1.2.jar!/" /> + <root url="jar://$MODULE_DIR$/lib_managed/test/jetty-util-6.1.14.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -162,7 +224,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib_managed/default/hamcrest-core-1.1.jar!/" /> + <root url="jar://$MODULE_DIR$/lib_managed/test/mockito-core-1.7.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -171,7 +233,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib_managed/default/jasper-6.0.18.jar!/" /> + <root url="jar://$MODULE_DIR$/lib_managed/test/juli-6.0.18.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -180,7 +242,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib_managed/default/jasper-jdt-6.0.18.jar!/" /> + <root url="jar://$MODULE_DIR$/lib_managed/test/hamcrest-core-1.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -189,7 +251,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib_managed/default/specs-1.4.4.jar!/" /> + <root url="jar://$MODULE_DIR$/lib_managed/test/jetty-6.1.14.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -198,7 +260,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib_managed/default/mockito-core-1.7.jar!/" /> + <root url="jar://$MODULE_DIR$/lib_managed/test/jasper-6.0.18.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -207,7 +269,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib_managed/default/jetty-6.1.14.jar!/" /> + <root url="jar://$MODULE_DIR$/lib_managed/test/catalina-6.0.18.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -216,7 +278,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib_managed/default/annotations-api-6.0.18.jar!/" /> + <root url="jar://$MODULE_DIR$/lib_managed/test/jasper-jdt-6.0.18.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -225,7 +287,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib_managed/default/scalacheck-1.5.jar!/" /> + <root url="jar://$MODULE_DIR$/lib_managed/test/servlet-api-2.5-6.1.14.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -234,7 +296,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib_managed/default/appengine-api-1.0-sdk-1.2.0.jar!/" /> + <root url="jar://$MODULE_DIR$/lib_managed/test/servlet-api-6.0.18.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -243,7 +305,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib_managed/default/servlet-api-6.0.18.jar!/" /> + <root url="jar://$MODULE_DIR$/lib_managed/test/objenesis-1.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -252,7 +314,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib_managed/default/jetty-util-6.1.14.jar!/" /> + <root url="jar://$MODULE_DIR$/lib_managed/test/annotations-api-6.0.18.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -261,7 +323,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$APPLICATION_HOME_DIR$/lib/javaee.jar!/" /> + <root url="jar://$MODULE_DIR$/lib_managed/test/jsp-api-6.0.18.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -270,7 +332,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/project/boot/scala-2.7.4/sbt-0.4.5/ivy-2.0.0.jar!/" /> + <root url="jar://$MODULE_DIR$/lib_managed/test/el-api-6.0.18.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -279,7 +341,16 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/project/boot/scala-2.7.4/sbt-0.4.5/sbt_2.7.4-0.4.5.jar!/" /> + <root url="jar://$MODULE_DIR$/lib_managed/test/jasper-el-6.0.18.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/lib_managed/test/scalacheck-1.5.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> scala-chess.iml @@ -44,6 +44,19 @@ <option name="MAXIMUM_HEAP_SIZE" value="128" /> </component> <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" /> + <component name="FacetAutodetectingManager"> + <autodetection-disabled> + <facet-type id="web"> + <modules> + <module name="scala-chess"> + <files> + <file url="file://$PROJECT_DIR$/target/webapp/WEB-INF/web.xml" /> + </files> + </module> + </modules> + </facet-type> + </autodetection-disabled> + </component> <component name="IdProvider" IDEtalkID="10181603A04ECEAF537878239FF83C85" /> <component name="InspectionProjectProfileManager"> <option name="PROJECT_PROFILE" value="Project Default" /> scala-chess.ipr @@ -2,20 +2,159 @@ package au.com.loftinspace.scalachess import _root_.com.google.appengine.api.users._ import game.Board - class LoginSnippet(getUserService: UserService) { + def this() = this { + UserServiceFactory.getUserService + } - def this() = this { - UserServiceFactory.getUserService - } + def render(request: _root_.javax.servlet.http.HttpServletRequest) = { + val userService = getUserService + val user = userService.getCurrentUser + user match { + case null => <html><head><title>Just tooling around for now...</title></head> + <body><h1>Just a test</h1><p>Hello!<a href={userService.createLoginURL(request.getRequestURI())}>Sign in</a>just for kicks.</p> </body></html> + case _ => <html><head> + <title>scratch</title> + <link rel="stylesheet" type="text/css" media="screen" href="style.css"/> + <script type="text/javascript" src="mootools-1.2.3-core.js"></script> + <script type="text/javascript" src="mootools-1.2.3.1-more.js"></script> + <script type="text/javascript" src="demo.js"></script> +</head> +<body> +<a href={userService.createLogoutURL(request.getRequestURI)}>sign out</a> +<div id="board"> + <div class="row"> + <div class="dark square" id="a8"></div> + <div class="light square" id="b8"></div> + <div class="dark square" id="c8"></div> + <div class="light square" id="d8"></div> + <div class="dark square" id="e8"></div> + <div class="light square" id="f8"></div> + <div class="dark square" id="g8"></div> + <div class="light square" id="h8"></div> + <div class="end"/> + </div> + <div class="row"> + <div class="light square" id="a7"></div> + <div class="dark square" id="b7"></div> + <div class="light square" id="c7"></div> + <div class="dark square" id="d7"></div> + <div class="light square" id="e7"></div> + <div class="dark square" id="f7"></div> + <div class="light square" id="g7"></div> + <div class="dark square" id="h7"></div> + <div class="end"/> + </div> + <div class="row"> + <div class="dark square" id="a6"></div> + <div class="light square" id="b6"></div> + <div class="dark square" id="c6"></div> + <div class="light square" id="d6"></div> + <div class="dark square" id="e6"></div> + <div class="light square" id="f6"></div> + <div class="dark square" id="g6"></div> + <div class="light square" id="h6"></div> + <div class="end"/> + </div> + <div class="row"> + <div class="light square" id="a5"></div> + <div class="dark square" id="b5"></div> + <div class="light square" id="c5"></div> + <div class="dark square" id="d5"></div> + <div class="light square" id="e5"></div> + <div class="dark square" id="f5"></div> + <div class="light square" id="g5"></div> + <div class="dark square" id="h5"></div> + <div class="end"/> + </div> + <div class="row"> + <div class="dark square" id="a4"></div> + <div class="light square" id="b4"></div> + <div class="dark square" id="c4"></div> + <div class="light square" id="d4"></div> + <div class="dark square" id="e4"></div> + <div class="light square" id="f4"></div> + <div class="dark square" id="g4"></div> + <div class="light square" id="h4"></div> + <div class="end"/> + </div> + <div class="row"> + <div class="light square" id="a3"></div> + <div class="dark square" id="b3"></div> + <div class="light square" id="c3"></div> + <div class="dark square" id="d3"></div> + <div class="light square" id="e3"></div> + <div class="dark square" id="f3"></div> + <div class="light square" id="g3"></div> + <div class="dark square" id="h3"></div> + <div class="end"/> + </div> + <div class="row"> + <div class="dark square" id="a2"></div> + <div class="light square" id="b2"></div> + <div class="dark square" id="c2"></div> + <div class="light square" id="d2"></div> + <div class="dark square" id="e2"></div> + <div class="light square" id="f2"></div> + <div class="dark square" id="g2"></div> + <div class="light square" id="h2"></div> + <div class="end"/> + </div> + <div class="row"> + <div class="light square" id="a1"></div> + <div class="dark square" id="b1"></div> + <div class="light square" id="c1"></div> + <div class="dark square" id="d1"></div> + <div class="light square" id="e1"></div> + <div class="dark square" id="f1"></div> + <div class="light square" id="g1"></div> + <div class="dark square" id="h1"></div> + <div class="end"/> + </div> +</div> + +<div class="clear"></div> +<div id="pieces"> + <div class="piece" id="black_knight_1"><img src="img/img_fantasy_shad/bn.png" alt="black pawn" height="60"/></div> + <div class="piece" id="black_knight_2"><img src="img/img_fantasy_shad/bn.png" alt="black pawn" height="60"/></div> + <div class="piece" id="black_queen_1"><img src="img/img_fantasy_shad/bq.png" alt="black pawn" height="60"/></div> + <div class="piece" id="black_king_1"><img src="img/img_fantasy_shad/bk.png" alt="black pawn" height="60"/></div> + <div class="piece" id="black_bishop_1"><img src="img/img_fantasy_shad/bb.png" alt="black pawn" height="60"/></div> + <div class="piece" id="black_bishop_2"><img src="img/img_fantasy_shad/bb.png" alt="black pawn" height="60"/></div> + <div class="piece" id="black_rook_1"><img src="img/img_fantasy_shad/br.png" alt="black pawn" height="60"/></div> + <div class="piece" id="black_rook_2"><img src="img/img_fantasy_shad/br.png" alt="black pawn" height="60"/></div> + <div class="piece" id="black_pawn_1"><img src="img/img_fantasy_shad/bp.png" alt="black pawn" height="60"/></div> + <div class="piece" id="black_pawn_2"><img src="img/img_fantasy_shad/bp.png" alt="black pawn" height="60"/></div> + <div class="piece" id="black_pawn_3"><img src="img/img_fantasy_shad/bp.png" alt="black pawn" height="60"/></div> + <div class="piece" id="black_pawn_4"><img src="img/img_fantasy_shad/bp.png" alt="black pawn" height="60"/></div> + <div class="piece" id="black_pawn_5"><img src="img/img_fantasy_shad/bp.png" alt="black pawn" height="60"/></div> + <div class="piece" id="black_pawn_6"><img src="img/img_fantasy_shad/bp.png" alt="black pawn" height="60"/></div> + <div class="piece" id="black_pawn_7"><img src="img/img_fantasy_shad/bp.png" alt="black pawn" height="60"/></div> + <div class="piece" id="black_pawn_8"><img src="img/img_fantasy_shad/bp.png" alt="black pawn" height="60"/></div> + <div class="piece" id="white_knight_1"><img src="img/img_fantasy_shad/wn.png" alt="white pawn" height="60"/></div> + <div class="piece" id="white_knight_2"><img src="img/img_fantasy_shad/wn.png" alt="white pawn" height="60"/></div> + <div class="piece" id="white_queen_1"><img src="img/img_fantasy_shad/wq.png" alt="white pawn" height="60"/></div> + <div class="piece" id="white_king_1"><img src="img/img_fantasy_shad/wk.png" alt="white pawn" height="60"/></div> + <div class="piece" id="white_bishop_1"><img src="img/img_fantasy_shad/wb.png" alt="white pawn" height="60"/></div> + <div class="piece" id="white_bishop_2"><img src="img/img_fantasy_shad/wb.png" alt="white pawn" height="60"/></div> + <div class="piece" id="white_pawn_1"><img src="img/img_fantasy_shad/wp.png" alt="white pawn" height="60"/></div> + <div class="piece" id="white_pawn_2"><img src="img/img_fantasy_shad/wp.png" alt="white pawn" height="60"/></div> + <div class="piece" id="white_pawn_3"><img src="img/img_fantasy_shad/wp.png" alt="white pawn" height="60"/></div> + <div class="piece" id="white_pawn_4"><img src="img/img_fantasy_shad/wp.png" alt="white pawn" height="60"/></div> + <div class="piece" id="white_pawn_5"><img src="img/img_fantasy_shad/wp.png" alt="white pawn" height="60"/></div> + <div class="piece" id="white_pawn_6"><img src="img/img_fantasy_shad/wp.png" alt="white pawn" height="60"/></div> + <div class="piece" id="white_pawn_7"><img src="img/img_fantasy_shad/wp.png" alt="white pawn" height="60"/></div> + <div class="piece" id="white_pawn_8"><img src="img/img_fantasy_shad/wp.png" alt="white pawn" height="60"/></div> + <div class="piece" id="white_rook_1"><img src="img/img_fantasy_shad/wr.png" alt="black pawn" height="60"/></div> + <div class="piece" id="white_rook_2"><img src="img/img_fantasy_shad/wr.png" alt="black pawn" height="60"/></div> +</div> +</body> +</html> - def render(request: _root_.javax.servlet.http.HttpServletRequest) = { - val userService = getUserService - val user = userService.getCurrentUser - user match { - case null => <p>Hello! <a href={userService.createLoginURL(request.getRequestURI())}>Sign in</a> just for kicks.</p> - case _ => <p>Hello, {user.getNickname}! Now you can <a href={userService.createLogoutURL(request.getRequestURI)}>sign out</a> again.</p> - <table><tr><td><pre>New board is created with {new Board().reset.pieces.size} pieces</pre></td></tr></table> - } + /* +<p>Hello, {user.getNickname}! Now you can <a href={userService.createLogoutURL(request.getRequestURI)}>sign out</a> again.</p> + <table><tr><td><pre>New board is created with {new Board().reset.pieces.size} pieces</pre></td></tr></table> + */ } + } } src/main/scala/au/com/loftinspace/scalachess/LoginSnippet.scala @@ -1,5 +1,6 @@ package au.com.loftinspace.scalachess.game +import _root_.com.twitter.service.Json import Positioning._ case class Board(pieces: Map[Position, Piece], taken: List[Piece]) { @@ -151,4 +152,9 @@ case class Board(pieces: Map[Position, Piece], taken: List[Piece]) { case _ => new Board(pieces - history.move.from + {history.move.to -> pieces(history.move.from)}, taken) } } + + /** + * Provide a JSON representation of the current state + */ + def toJson = Json.build(Map('pieces.name -> pieces, 'taken.name -> taken)).toString } \ No newline at end of file src/main/scala/au/com/loftinspace/scalachess/game/Board.scala @@ -1,126 +1,176 @@ package au.com.loftinspace.scalachess.game +import _root_.com.twitter.service.Json +import reflect.BeanProperty import scala.collection.immutable._ import scala.util.matching.Regex import Positioning._ -case class Game(board: Board, history: List[History], players: Map[Colour, String], nextMove: Colour) { - def this() = this(new Board().reset, Nil, Map.empty, White) - - def moves: Map[Position, Set[Position]] = Map.empty +case class Game(@BeanProperty board: Board, history: List[History], players: Map[Colour, String], nextMove: Colour) { + def this() = this (new Board().reset, Nil, Map.empty, White) + + /** + * Find all possible moves on the board during the next turn of play + */ + def moves: Map[Position, Set[Position]] = { + val default: Map[Position, Set[Position]] = Map.empty + board.pieces.foldLeft(default) { (moves, boardElement) => + val (position, piece) = boardElement + if (nextMove.equals(piece.colour)) { + val viableMoves = movesFrom(position) + if (viableMoves.isEmpty) { + moves + } else { + moves(position) = viableMoves + } + } else { + moves + } + } + } -/* - { - for ((position, piece) <- board.pieces; if (nextMove.equals(piece.colour))) yield (position, piece.movesFrom(position)) + /** + * Find all possible moves on the board during the next turn of play - in JSON format + */ + def movesAsJson = { + Json.build(moves).toString } -*/ - - def movesFrom(p: Position): Set[Position] = Set() - -/* - private val CoordinatePattern = new Regex("^[a-h][1-8]$") - private val LineUp = Rook :: Knight :: Bishop :: Queen :: King :: Bishop :: Knight :: Rook :: Nil - - private var pieces: Map[Position, Option[Piece]] = new HashMap[Position, Option[Piece]] - private var piecesCaptured: List[Piece] = Nil - private var movesMade: List[Move] = Nil - - reset - - def piecesMap = pieces - def capturedPieces = piecesCaptured - def moves = movesMade - - def move(s: Symbol) = new Movement(pieceAt(s)) - case class Movement(p: Option[Piece]) { - val piece = p.getOrElse(throw new IllegalMoveException("Cannot move a piece from an empty position")) - def to(s: Symbol): Option[Piece] = { - Game.this check piece canMoveTo s - val from = piece.position.get - piece.hasMoved = true - var taken = Game.this place piece at s - if (taken.isEmpty && (movesMade.lastOption.map(move => move.isPawnLaunch && move.traversed(s))).getOrElse(false)) { - taken = Some(movesMade.last.piece) - taken.get.captured = true - piecesCaptured = taken.get :: piecesCaptured + + /** + * Find all valid moves on the board from the given position for the next turn of play + */ + def movesFrom(pos: Position): Set[Position] = { + type BoardQuery = (Board, Position, List[History]) => IterationControl + + def follow(vector: List[Position], query: BoardQuery): Set[Position] = { + def next(positions: Set[Position], tail: List[Position]): Set[Position] = { + if (tail.isEmpty) return positions + query(board, tail(0), history) match { + case Continue => next(positions + tail(0), tail.tail) + case IncludeAndStop => positions + tail(0) + case Stop => positions + } + } + next(Set(), vector) + } + board.pieces.get(pos) match { + case None => Set() + case Some(piece) => if (piece.colour.equals(nextMove)) { + piece.movesFrom(pos).foldLeft(Set(): Set[Position]) { + (positions, vectorAndQuery) => + val (vector, (query, implication)) = vectorAndQuery + positions ++ follow(vector, query) + } + } else { + Set() } - movesMade = movesMade ::: List(Move(piece, from, position(s), taken)) - taken } } - def check(p: Piece) = new PieceAssertion(p) - case class PieceAssertion(p: Piece) { - def canMoveTo(s: Symbol) = { - val target = position(s) - val validMoves = Game.this findMovesFor p - if (!validMoves.contains(target)) - throw new IllegalMoveException(p + " cannot move from " + p.position + " to " + target) + /* + private val CoordinatePattern = new Regex("^[a-h][1-8]$") + private val LineUp = Rook :: Knight :: Bishop :: Queen :: King :: Bishop :: Knight :: Rook :: Nil + + private var pieces: Map[Position, Option[Piece]] = new HashMap[Position, Option[Piece]] + private var piecesCaptured: List[Piece] = Nil + private var movesMade: List[Move] = Nil + + reset + + def piecesMap = pieces + def capturedPieces = piecesCaptured + def moves = movesMade + + def move(s: Symbol) = new Movement(pieceAt(s)) + case class Movement(p: Option[Piece]) { + val piece = p.getOrElse(throw new IllegalMoveException("Cannot move a piece from an empty position")) + def to(s: Symbol): Option[Piece] = { + Game.this check piece canMoveTo s + val from = piece.position.get + piece.hasMoved = true + var taken = Game.this place piece at s + if (taken.isEmpty && (movesMade.lastOption.map(move => move.isPawnLaunch && move.traversed(s))).getOrElse(false)) { + taken = Some(movesMade.last.piece) + taken.get.captured = true + piecesCaptured = taken.get :: piecesCaptured + } + movesMade = movesMade ::: List(Move(piece, from, position(s), taken)) + taken + } } - } - def place(p: Piece) = new Placement(p) - case class Placement(p: Piece) { - def at(s: Symbol): Option[Piece] = at(position(s)) - def at(destination: Position): Option[Piece] = { - val captured: Option[Piece] = pieces(destination) - captured.foreach{(cap: Piece) => - cap.captured = true - piecesCaptured = cap :: piecesCaptured + def check(p: Piece) = new PieceAssertion(p) + case class PieceAssertion(p: Piece) { + def canMoveTo(s: Symbol) = { + val target = position(s) + val validMoves = Game.this findMovesFor p + if (!validMoves.contains(target)) + throw new IllegalMoveException(p + " cannot move from " + p.position + " to " + target) } - p.position.foreach{(origin: Position) => pieces = pieces.update(origin, None)} - p.position = Some(destination) - pieces = pieces.update(destination, Some(p)) - captured } - } - def findMovesFor(p: Piece): Set[Position] = p.movesWithinContext(this, moves.lastOption) - def findMovesFor(s: Symbol): Set[Position] = pieceAt(s).map(findMovesFor(_)).getOrElse(Set()) - - def pieceAt(p: Position) = pieces(p) - def pieceAt(s: Symbol): Option[Piece] = pieceAt(position(s)) - def pieceAt(rank: Int, file: Int): Option[Piece] = pieceAt(Position(rank, file)) - def piecesAt(positions: List[Position]): List[Option[Piece]] = positions.map(pieceAt(_)) - - def presents(scenario: Map[Symbol, Option[Piece]]) = - scenario.foldLeft(true) { (res, entry) => res && pieces(position(entry._1)).equals(entry._2) } - - def positionsOf(p: Piece) = pieces.filter(_._2.equals(Some(p))).keySet.toSeq - - def reset = { - for (file <- 'a' to 'h'; rank <- 1 to 8) { - val coord = position(Symbol(file.toString + rank)) - pieces = pieces.update(coord, None) - rank match { - case 1 => place(Piece(White, LineUp(file - 'a'))) at coord - case 2 => place(Piece(White, Pawn)) at coord - case 7 => place(Piece(Black, Pawn)) at coord - case 8 => place(Piece(Black, LineUp(file - 'a'))) at coord - case _ => + def place(p: Piece) = new Placement(p) + case class Placement(p: Piece) { + def at(s: Symbol): Option[Piece] = at(position(s)) + def at(destination: Position): Option[Piece] = { + val captured: Option[Piece] = pieces(destination) + captured.foreach{(cap: Piece) => + cap.captured = true + piecesCaptured = cap :: piecesCaptured + } + p.position.foreach{(origin: Position) => pieces = pieces.update(origin, None)} + p.position = Some(destination) + pieces = pieces.update(destination, Some(p)) + captured } } - } - def arrange(layout: Map[Symbol, Piece]) = { - for (rank <- 1 to 8; file <- 'a' to 'h') { - val symbol = Symbol(file.toString + rank) - val pos = position(symbol) - val pieceOpt = layout.get(symbol) - pieces = pieces.update(pos, pieceOpt) - pieceOpt.foreach(_.position = Some(pos)) + def findMovesFor(p: Piece): Set[Position] = p.movesWithinContext(this, moves.lastOption) + def findMovesFor(s: Symbol): Set[Position] = pieceAt(s).map(findMovesFor(_)).getOrElse(Set()) + + def pieceAt(p: Position) = pieces(p) + def pieceAt(s: Symbol): Option[Piece] = pieceAt(position(s)) + def pieceAt(rank: Int, file: Int): Option[Piece] = pieceAt(Position(rank, file)) + def piecesAt(positions: List[Position]): List[Option[Piece]] = positions.map(pieceAt(_)) + + def presents(scenario: Map[Symbol, Option[Piece]]) = + scenario.foldLeft(true) { (res, entry) => res && pieces(position(entry._1)).equals(entry._2) } + + def positionsOf(p: Piece) = pieces.filter(_._2.equals(Some(p))).keySet.toSeq + + def reset = { + for (file <- 'a' to 'h'; rank <- 1 to 8) { + val coord = position(Symbol(file.toString + rank)) + pieces = pieces.update(coord, None) + rank match { + case 1 => place(Piece(White, LineUp(file - 'a'))) at coord + case 2 => place(Piece(White, Pawn)) at coord + case 7 => place(Piece(Black, Pawn)) at coord + case 8 => place(Piece(Black, LineUp(file - 'a'))) at coord + case _ => + } + } } - } - def printout = { - for (rank <- 8 to 1 by -1) { - for (file <- 'a' to 'h') { - print(pieceAt(Symbol(file.toString + rank))) - print(' ') + def arrange(layout: Map[Symbol, Piece]) = { + for (rank <- 1 to 8; file <- 'a' to 'h') { + val symbol = Symbol(file.toString + rank) + val pos = position(symbol) + val pieceOpt = layout.get(symbol) + pieces = pieces.update(pos, pieceOpt) + pieceOpt.foreach(_.position = Some(pos)) } - println } - } -*/ + + def printout = { + for (rank <- 8 to 1 by -1) { + for (file <- 'a' to 'h') { + print(pieceAt(Symbol(file.toString + rank))) + print(' ') + } + println + } + } + */ } src/main/scala/au/com/loftinspace/scalachess/game/Game.scala @@ -115,6 +115,8 @@ case class Piece(colour: Colour, role: Role) { case _ => resultSeed } } + + override def toString = (colour + "_" + role).toLowerCase } trait IterationControl src/main/scala/au/com/loftinspace/scalachess/game/Piece.scala @@ -1,12 +1,4 @@ <%@ page contentType="text/html;charset=UTF-8" language="java" %> <%@ page import="au.com.loftinspace.scalachess.LoginSnippet" %> -<html> - <head> - <title>Just tooling around for now ...</title> - </head> - <body> - <h1>Just a test</h1> - <%= new LoginSnippet().render(request) %> - </body> -</html> +<%= new LoginSnippet().render(request) %> src/main/webapp/index.jsp @@ -4,13 +4,12 @@ import Positioning._ import org.specs.Specification object BoardSpecs extends GameSpecification { - val board = new Board "a board" should { - "have no pieces by default" in { board.pieces must beEmpty } - "have nothing taken by default" in { board.taken must beEmpty } + "have no pieces by default" in {board.pieces must beEmpty} + "have nothing taken by default" in {board.taken must beEmpty} "allow a piece to be placed" in { val updatedBoard = board place Piece(White, Rook) at 'e3 @@ -119,7 +118,7 @@ object BoardSpecs extends GameSpecification { position('f8) -> Piece(Black, Bishop), position('g8) -> Piece(Black, Knight), position('h8) -> Piece(Black, Rook) - ) + ) } "be able to be rewound to a prior state" in { @@ -308,4 +307,12 @@ object BoardSpecs extends GameSpecification { (newBoard threatsTo Black at 'b4) must beEmpty } + "generate the correct JSON when empty" in { + new Board().toJson must_== "{\"pieces\":{},\"taken\":[]}" + } + + "generate the correct JSON with one piece" in { + new Board().place(Piece(Black, Queen)).at(Position(3, 5)).toJson must_== "{\"pieces\":{\"e3\":\"black_queen\"},\"taken\":[]}" + } + } \ No newline at end of file src/test/scala/au/com/loftinspace/scalachess/game/BoardSpecs.scala @@ -27,7 +27,7 @@ object GameSpecs extends GameSpecification { position('g2) -> Set(position('g3), position('g4)), position('h2) -> Set(position('h3), position('h4)), position('b1) -> Set(position('a3), position('c3)), - position('g2) -> Set(position('f3), position('h3)) + position('g1) -> Set(position('f3), position('h3)) ) } @@ -35,7 +35,6 @@ object GameSpecs extends GameSpecification { game.movesFrom(position('a2)) must_== Set(position('a3), position('a4)) } - /* "report what piece is at any coordinate".withA(game) { game => val pawn = Piece(Black, Pawn) src/test/scala/au/com/loftinspace/scalachess/game/GameSpecs.scala 23c16b630bb65d224fa63e7865b79463f57d3f02 Jeremy Mawson jem.mawson@gmail.com http://github.com/Synesso/scala-chess/commit/1cd19158b09b11c8701e70d85405e1d26d874936 1cd19158b09b11c8701e70d85405e1d26d874936 2009-07-28T04:56:58-07:00 2009-07-28T04:56:58-07:00 Server-side JSON creation 1daf0d670789ba643fb058d0d7a43036ab7e3391 Jeremy Mawson jem.mawson@gmail.com