berlin-ai 0.0.5 → 0.0.6

data/berlin-ai.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
   s.summary      = "Berlin Artificial Intelligence"
   s.description  = "Berlin Artificial Intelligence"
   
-  s.add_dependency 'sinatra'
-  s.add_dependency 'yajl-ruby'
+  s.add_dependency 'sinatra', '>=1.2.6'
+  s.add_dependency 'yajl-ruby', '>=0.8.2'
   
   s.files = [
     'LICENSE',

data/lib/ai/game.rb

@@ -1,13 +1,15 @@
 module Berlin
   module AI
+    # Game keeps track of current games played by the server, indexing them on their uniq id.
     class Game
       attr_reader :id
       
+      # Keep track of all current games
       @@games = {}
       
       def self.create_or_update action, infos, map, state
         # Check for params and quit on errors
-        return nil if action.nil? || infos.nil? || map.nil? || state.nil?
+        return if action.nil? || infos.nil? || map.nil? || state.nil?
         
         # First, we parse the received request
         infos  = JSON.parse( infos )
@@ -21,7 +23,7 @@ module Berlin
 
         if action == "game_over"
           # Release the game to avoid memory leaks
-          @@games[game_id] = nil
+          @@games.delete game_id
         elsif state
           # Now, we want to update the current state of the game with the new content
           game.update state
@@ -30,19 +32,17 @@ module Berlin
         game
       end
       
-      # @id = Uniq game ID (params[:game])
-      # @map = Current state of the game (params[:json])
       def initialize id, map, infos
-        @id         = id
-        @map        = Berlin::AI::Map.new map, infos
+        @id  = id
+        @map = Berlin::AI::Map.new map, infos
       end
 
-      # Let's update the map with the latest state
       def update state
         @map.update state
       end
       
-      # Must be overwritten
+      # This method must be overritten with yours. The return value of this method will be returned
+      # in a json format to Berlin and be interpreted as the moves you'd like to do.
       def turn_moves
         raise "Please... overwrite me!"
       end

data/lib/ai/map.rb

@@ -1,6 +1,6 @@
 module Berlin
   module AI
-    # Map will keep track of all the useful information needed to play, such as
+    # Map keeps track of all the useful information needed to play, such as
     # nodes, points, soldiers, etc. Game will then be able to pick any information
     # it wants from map to decide what are the best moves to do.
     class Map

data/lib/ai/node.rb

@@ -13,22 +13,22 @@ module Berlin
         @links              = []
       end
 
-      # Register a given node as an adjacent one.
+      # Registers a given node as an adjacent one.
       def link_to other_node
         @links << other_node
       end
 
-      # Is other_node adjacents to current node?
+      # Returns true if other_node is adjacent to self
       def adjacent? other_node
         @links.include? other_node
       end
       
-      # Is there anybody out there?
+      # Returns true if self has more than zero soldier
       def occupied?
         @number_of_soldiers > 0
       end
 
-      # What are current node's neighbors?
+      # Returns a list of all adjacent nodes
       def adjacent_nodes
         @links.dup
       end

data/lib/berlin-ai.rb

@@ -1,9 +1,16 @@
+require 'sinatra'
+require 'yajl/json_gem'
+
 %w(game map node).each do |file|
   require File.expand_path( File.dirname( __FILE__ ) ) + "/ai/#{file}"
 end
 
+# Tell Sinatra to use ai file as root file
+set :app_file, $0
+
 post '/' do
   begin
+    # Check if it's one of the four Berlin keywords
     if ['ping', 'turn', 'game_start', 'game_over'].include? params[:action]
       game = Berlin::AI::Game.create_or_update params[:action], params[:infos], params[:map], params[:state]
 

data/lib/version.rb

@@ -2,7 +2,7 @@ module Berlin
   module AI
     MAJOR = 0
     MINOR = 0
-    BUILD = 5
+    BUILD = 6
 
     VERSION = "#{MAJOR}.#{MINOR}.#{BUILD}"
   end

data/test/test_ai.rb

@@ -1,20 +1,14 @@
 require 'rubygems'
-require 'sinatra'
-require 'yajl/json_gem'
 require 'berlin-ai'
 
-module Berlin
-  module AI
-    class Game
-      def turn_moves
-        @map.controlled_nodes.map do |node|
-          {
-            :from => node.id,
-            :to => node.adjacent_nodes.sample.id,
-            :number_of_soldiers => rand(node.number_of_soldiers + 1)
-          }
-        end
-      end
+class Berlin::AI::Game
+  def turn_moves
+    @map.controlled_nodes.map do |node|
+      {
+        :from => node.id,
+        :to => node.adjacent_nodes.sample.id,
+        :number_of_soldiers => rand(node.number_of_soldiers + 1)
+      }
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: berlin-ai
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Christian Blais
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-19 00:00:00 -04:00
+date: 2011-05-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,10 +28,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 19
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 2
+        - 6
+        version: 1.2.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,10 +44,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 59
         segments: 
         - 0
-        version: "0"
+        - 8
+        - 2
+        version: 0.8.2
   type: :runtime
   version_requirements: *id002
 description: Berlin Artificial Intelligence