game_machine 0.0.10 → 0.0.11

data/lib/game_machine/handlers/request.rb

@@ -61,6 +61,10 @@ module GameMachine
         ).set_client_connection(message.client_connection)
         entity.set_player(message.player)
         ClientManager.find.tell(entity)
+
+        ## Just for now, need to do this correctly by registering with the client manager
+        chat_destroy = MessageLib::ChatDestroy.new.set_player_id(message.player.id)
+        GameSystems::ChatManager.find.tell(chat_destroy)
       end
 
       def game_handler

data/lib/game_machine/model.rb

@@ -18,6 +18,14 @@ module GameMachine
 
       end
 
+      def delete(id)
+        commands.datastore.delete(id)
+      end
+
+      def delete!(id)
+        commands.datastore.delete!(id)
+      end
+
       def find!(id)
         scoped_id = scope_for(id)
         if entity = Commands::Base.commands.datastore.get!(scoped_id)
@@ -44,14 +52,7 @@ module GameMachine
           json = entity.json_entity.json
         end
 
-        attributes = JSON.parse(json)
-        if klass = attributes.delete('klass')
-          model = klass.constantize.new(attributes)
-          model.id = model.unscoped_id
-          model
-        else
-          raise "Unable to find klass attribute in #{attributes.inspect}"
-        end
+        self.from_hash(JSON.parse(json))
       end
 
       def scope_for(id)
@@ -69,6 +70,48 @@ module GameMachine
       def id_scope
         @id_scope
       end
+
+      def from_hash(attributes)
+        if klass = attributes.delete('klass')
+          attributes = attributes.each_with_object({}) do |(k, v), h|
+            if v.kind_of?(Hash)
+              h[k] = from_hash(v)
+            elsif v.kind_of?(Array)
+              h[k] = v.collect do |e|
+                e.kind_of?(Hash) ? from_hash(e) : e
+              end
+            else
+              h[k] = v
+            end
+          end
+          model = klass.constantize.new(attributes)
+          model.id = model.unscoped_id
+          model
+        else
+          OpenStruct.new(attributes)
+        end
+      end
+    end
+
+
+    def as_json
+      attributes['id'] = scoped_id
+      attributes.merge!(:klass => self.class.name)
+      attributes.each_with_object({}) do |(k, v), h|
+        if v.kind_of?(OpenStruct) 
+          h[k] = v.as_json
+        elsif v.is_a?(Array)
+          h[k] = v.collect do |e|
+            e.kind_of?(OpenStruct) ? e.as_json : e
+          end
+        else
+          h[k] = v
+        end
+      end
+    end
+
+    def to_json
+      JSON.generate(as_json)
     end
 
     def attributes
@@ -91,11 +134,6 @@ module GameMachine
       end
     end
 
-    def to_json
-      attributes['id'] = scoped_id
-      JSON.dump(attributes.merge(:klass => self.class.name))
-    end
-
     def to_entity
       MessageLib::Entity.new.set_id(scoped_id).set_json_entity(to_json_entity)
     end
@@ -120,6 +158,14 @@ module GameMachine
       commands.datastore.put!(to_storage_entity)
     end
 
+    def destroy
+      commands.datastore.delete(scoped_id)
+    end
+
+    def destroy!
+      commands.datastore.delete!(scoped_id)
+    end
+
   end
 end
 

data/lib/game_machine/models.rb

@@ -1,3 +1,20 @@
 
 require_relative 'models/region'
 require_relative 'models/player_status_update'
+require_relative 'models/create_team'
+require_relative 'models/destroy_team'
+require_relative 'models/join_team'
+require_relative 'models/team_accept_invite'
+require_relative 'models/team_invite'
+require_relative 'models/teams'
+require_relative 'models/team'
+require_relative 'models/teams_request'
+require_relative 'models/team_joined'
+require_relative 'models/leave_team'
+require_relative 'models/player_team'
+require_relative 'models/team_left'
+require_relative 'models/echo_test'
+require_relative 'models/find_match'
+require_relative 'models/match'
+require_relative 'models/start_match'
+require_relative 'models/end_match'

data/lib/game_machine/models/create_team.rb

@@ -0,0 +1,9 @@
+module GameMachine
+  module Models
+    class CreateTeam < Model
+      attribute :name, String
+      attribute :owner, String
+      attribute :access, String
+    end
+  end
+end

data/lib/game_machine/models/destroy_team.rb

@@ -0,0 +1,8 @@
+module GameMachine
+  module Models
+    class DestroyTeam < Model
+      attribute :name, String
+      attribute :owner, String
+    end
+  end
+end

data/lib/game_machine/models/echo_test.rb

@@ -0,0 +1,6 @@
+module GameMachine
+  module Models
+    class EchoTest < Model
+    end
+  end
+end

data/lib/game_machine/models/end_match.rb

@@ -0,0 +1,7 @@
+module GameMachine
+  module Models
+    class EndMatch < Model
+      attribute :match_id, Array
+    end
+  end
+end

data/lib/game_machine/models/find_match.rb

@@ -0,0 +1,7 @@
+module GameMachine
+  module Models
+    class FindMatch < Model
+      attribute :team_name, String
+    end
+  end
+end

data/lib/game_machine/models/join_team.rb

@@ -0,0 +1,7 @@
+module GameMachine
+  module Models
+    class JoinTeam < Model
+      attribute :name, String
+    end
+  end
+end

data/lib/game_machine/models/leave_team.rb

@@ -0,0 +1,7 @@
+module GameMachine
+  module Models
+    class LeaveTeam < Model
+      attribute :name, String
+    end
+  end
+end

data/lib/game_machine/models/match.rb

@@ -0,0 +1,9 @@
+module GameMachine
+  module Models
+    class Match < Model
+      attribute :teams, String
+      attribute :server, String
+      attribute :game_handler, String
+    end
+  end
+end

data/lib/game_machine/models/player_team.rb

@@ -0,0 +1,9 @@
+module GameMachine
+  module Models
+    class PlayerTeam < Model
+      attribute :id, String
+      attribute :name, String
+      attribute :match_id, String
+    end
+  end
+end

data/lib/game_machine/models/start_match.rb

@@ -0,0 +1,8 @@
+module GameMachine
+  module Models
+    class StartMatch < Model
+      attribute :team_names, Array
+      attribute :game_handler, String
+    end
+  end
+end

data/lib/game_machine/models/team.rb

@@ -0,0 +1,11 @@
+module GameMachine
+  module Models
+    class Team < Model
+      attribute :name, String
+      attribute :owner, String
+      attribute :access, String
+      attribute :members, Array
+      attribute :invite_id, String
+    end
+  end
+end

data/lib/game_machine/models/team_accept_invite.rb

@@ -0,0 +1,9 @@
+module GameMachine
+  module Models
+    class TeamAcceptInvite < Model
+      attribute :name, String
+      attribute :invite_id, String
+      attribute :invitee, String
+    end
+  end
+end

data/lib/game_machine/models/team_invite.rb

@@ -0,0 +1,8 @@
+module GameMachine
+  module Models
+    class TeamInvite < Model
+      attribute :name, String
+      attribute :invite_id, String
+    end
+  end
+end

data/lib/game_machine/models/team_joined.rb

@@ -0,0 +1,7 @@
+module GameMachine
+  module Models
+    class TeamJoined < Model
+      attribute :name, String
+    end
+  end
+end

data/lib/game_machine/models/team_left.rb

@@ -0,0 +1,7 @@
+module GameMachine
+  module Models
+    class TeamLeft < Model
+      attribute :name, String
+    end
+  end
+end

data/lib/game_machine/models/teams.rb

@@ -0,0 +1,7 @@
+module GameMachine
+  module Models
+    class Teams < Model
+      attribute :teams, Array
+    end
+  end
+end

data/lib/game_machine/models/teams_request.rb

@@ -0,0 +1,6 @@
+module GameMachine
+  module Models
+    class TeamsRequest < Model
+    end
+  end
+end

data/lib/game_machine/object_db.rb

@@ -3,7 +3,11 @@ module GameMachine
 
     class << self
       def dbprocs
-        @dbprocs ||= java.util.concurrent.ConcurrentHashMap.new
+        if @dbprocs
+          @dbprocs
+        else
+          @dbprocs = java.util.concurrent.ConcurrentHashMap.new
+        end
       end
     end
 
@@ -31,9 +35,7 @@ module GameMachine
     def get_entity(entity_id)
       entity = entities.fetch(entity_id,nil)
       if entity.nil?
-        if bytes = store.get(entity_id)
-          entity = MessageLib::Entity.parse_from(bytes)
-        end
+        entity = store.get(entity_id)
       end
       entity
     end
@@ -43,14 +45,18 @@ module GameMachine
         procname = message.get_update_method.to_sym
         current_entity_id = message.get_current_entity_id
         update_entity = message.get_update_entity
-        unless current_entity = get_entity(current_entity_id)
-          current_entity = MessageLib::Entity.new.set_id(current_entity_id)
+        current_entity = get_entity(current_entity_id)
+        if self.class.dbprocs.has_key?(procname)
+          dbproc = self.class.dbprocs[procname]
+          returned_entity = dbproc.call(
+            current_entity_id,current_entity,update_entity
+          )
+          set_entity(returned_entity)
+          sender.tell(returned_entity || false)
+        else
+          GameMachine.logger.warn("Unable to find dbproc #{procname}")
         end
-        returned_entity = self.class.dbprocs[procname].call(
-          current_entity,update_entity
-        )
-        set_entity(returned_entity)
-        sender.tell(returned_entity || false)
+
       elsif message.is_a?(MessageLib::ObjectdbPut)
         set_entity(message.get_entity)
         sender.tell(true)

data/lib/game_machine/version.rb

@@ -1,3 +1,3 @@
 module GameMachine
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

data/lib/game_machine/write_behind_cache.rb

@@ -137,7 +137,7 @@ module GameMachine
         enqueue(message.id)
       else
         message = swap_if_queued_exists(message)
-        @store.set(message.id, message.to_byte_array)
+        @store.set(message.id, message)
         @last_write = current_time
         set_updated_at(message)
       end

data/spec/actor/actor_spec.rb

@@ -27,13 +27,13 @@ module GameMachine
 
         it "registeres the class in the system manager" do
           Actor::Base.aspect(aspect)
-          expect(Application.registered.include?(Actor::Base)).to be_true
+          expect(Application.registered.include?(Actor::Base)).to be_truthy
         end
       end
 
       describe "#sender" do
         it "returns an actor ref" do
-          subject.sender.should be_kind_of(Actor::Ref)
+          expect(subject.sender).to be_kind_of(Actor::Ref)
         end
       end
 
@@ -49,21 +49,21 @@ module GameMachine
       describe "#find_remote" do
         it "should return ref with correctly formatted path" do
           actor_ref = GameSystems::LocalEcho.find_remote('default','test')
-          actor_ref.path.match(/akka.tcp:\/\/cluster@localhost:2551\/user\/test/).should be_true
+          expect(actor_ref.path.match(/akka.tcp:\/\/cluster@localhost:2551\/user\/test/)).to be_truthy
         end
       end
 
       describe "#find" do
         it "should return ref with correctly formatted path" do
           actor_ref = GameSystems::LocalEcho.find('test')
-          actor_ref.path.match(/\/user\/test/).should be_true
+          expect(actor_ref.path.match(/\/user\/test/)).to be_truthy
         end
       end
 
       describe "#add_hashring" do
         it "adds the hashring and returns it" do
           expect(Actor::Base.add_hashring('test','ring')).to eq(Actor::Base.hashring('test'))
-          Actor::Base.hashring('test').should == 'ring'
+          expect(Actor::Base.hashring('test')).to eq('ring')
         end
       end
 

data/spec/actor/ref_spec.rb

@@ -14,26 +14,26 @@ module GameMachine
 
     describe "#initialize" do
       it "sets the path" do
-        Actor::Ref.new('test').path.should == 'test'
+        expect(Actor::Ref.new('test').path).to eq('test')
       end
     end
 
     describe "#ask" do
       it "should accept an actor ref" do
         ref = Actor::Ref.new(local_echo.get_self)
-        ref.ask('test',1000).should == 'test'
+        expect(ref.ask('test',1000)).to eq('test')
       end
 
       it "should accept a path" do
         Actor::Builder.new(GameSystems::LocalEcho).with_name('echotest3').start
         ref = GameSystems::LocalEcho.find('echotest3')
-        ref.ask('test',1000).should == 'test'
+        expect(ref.ask('test',1000)).to eq('test')
       end
     end
 
     describe "#tell" do
       it 'sender argument is optional' do
-        subject.tell('test').should be_true
+        expect(subject.tell('test')).to be_truthy
       end
 
       it "should accept a path" do
@@ -49,34 +49,34 @@ module GameMachine
     describe "#send_message" do
 
       it "default should call tell with message and nil sender" do
-        subject.should_receive(:tell).with('test',nil)
+        expect(subject).to receive(:tell).with('test',nil)
         subject.send_message('test')
       end
 
       it "blocking=true should call ask with message and default timeout" do
-        subject.should_receive(:ask).with('test',100)
+        expect(subject).to receive(:ask).with('test',100)
         subject.send_message('test', :blocking => true)
       end
 
       it "sender option should be passed to tell" do
-        subject.should_receive(:tell).with('test','sender')
+        expect(subject).to receive(:tell).with('test','sender')
         subject.send_message('test',:sender => 'sender')
       end
 
       it "timeout option should be passed to ask" do
-        subject.should_receive(:ask).with('test',2)
+        expect(subject).to receive(:ask).with('test',2)
         subject.send_message('test', :timeout => 2, :blocking => true)
       end
 
       it "should get returned message" do
         Actor::Builder.new(GameSystems::LocalEcho).with_name('echotest2').start
         ref = GameSystems::LocalEcho.find('echotest2')
-        ref.send_message('hi', :blocking => true, :timeout => 1000).should == 'hi'
+        expect(ref.send_message('hi', :blocking => true, :timeout => 1000)).to eq('hi')
       end
 
       it "should return false on timeout" do
         ref = GameSystems::LocalEcho.find('blah')
-        ref.send_message('hi', :blocking => true, :timeout => 1).should be_false
+        expect(ref.send_message('hi', :blocking => true, :timeout => 1)).to be_falsey
       end
     end
   end