game_machine 0.0.10 → 0.0.11

data/spec/grid_spec.rb

@@ -2,6 +2,10 @@ require 'spec_helper'
 module GameMachine
   describe Grid do
 
+    let(:test_grid_config) do
+      {:grid_size => 10, :cell_size => 10, :update_frequency => 1}
+    end
+
     subject {Grid}
 
     before(:each) do 
@@ -18,11 +22,17 @@ module GameMachine
     describe "#load_from_config" do
       it "should create grids from config" do
         Grid.load_from_config
-        expect(Grid.config.has_key?('default')).to be_true
+        expect(Grid.config.has_key?('default')).to be_truthy
       end
     end
 
     describe "#find_or_create" do
+
+      before(:each) do
+        expect(subject.config).to receive(:fetch).with('test').
+          and_return(test_grid_config)
+      end
+
       it "creates a grid if none exists for the given name" do
         grid = subject.find_or_create('test')
         expect(grid).to be_instance_of(JavaLib::Grid)

data/spec/handlers/authentication_spec.rb

@@ -17,18 +17,9 @@ module GameMachine
 
         context "player is authenticated" do
           it "authenticates player with valid authtoken" do
-            expect(subject.authenticate!(player)).to be_true
+            expect(subject.authenticate!(player)).to be_truthy
           end
         end
-
-        context "player is not authenticated" do
-          it "does not authenticate player with invalid authtoken" do
-            player.set_authtoken('badtoken')
-            expect(subject.authenticate!(player)).to be_false
-          end
-        end
-
-
       end
 
     end

data/spec/handlers/game_spec.rb

@@ -25,8 +25,8 @@ module GameMachine
 
         it "dispatches entities to correct system" do
           client_message = MessageLib::ClientMessage.new.add_entity(leave_chat)
-          GameSystems::ChatManager.stub(:find).and_return(actor_ref)
-          actor_ref.should_receive(:tell)
+          allow(GameSystems::ChatManager).to receive(:find).and_return(actor_ref)
+          expect(actor_ref).to receive(:tell)
           Game.should_receive_message(client_message,'dispatch_test') do
             Game.find('dispatch_test').tell(client_message)
           end

data/spec/handlers/request_spec.rb

@@ -25,36 +25,25 @@ module GameMachine
 
       let(:actor_ref) {double('Actor::Ref', :tell => true)}
 
-      describe "#on_receive" do
+      subject do
+        ref = Actor::Builder.new(Request).with_name('request_test').test_ref
+        ref.underlying_actor
+      end
 
-        before(:each) do
-          Actor::Builder.new(Request).with_name('test_request_handler').start
-        end
+      describe "#on_receive" do
 
         it "sets player on entities" do
+          allow(Authentication).to receive(:authenticated?).and_return(true)
           message = client_message
           entity = message.get_entity_list.first
-          entity.should_receive(:set_player).with(message.player)
-          Request.should_receive_message(message,'test_request_handler') do
-            Request.find('test_request_handler').tell(message)
-          end
+          expect(entity).to receive(:set_player).with(message.player)
+          subject.on_receive(message)
         end
 
 
         it "calls unhandled if not a client message" do
-          Request.any_instance.should_receive(:unhandled).with('test')
-          Request.should_receive_message('test','test_request_handler') do
-            Request.find('test_request_handler').tell('test')
-          end
-        end
-
-        it "calls unhandled if player is not set" do
-          message = client_message
-          message.set_player(nil)
-          Request.any_instance.should_receive(:unhandled).with(message)
-          Request.should_receive_message(message,'test_request_handler') do
-            Request.find('test_request_handler').tell(message)
-          end
+          expect(subject).to receive(:unhandled).with('test')
+          subject.on_receive('test')
         end
 
       end

data/spec/hashring_spec.rb

@@ -12,47 +12,47 @@ module GameMachine
 
     describe "#nodes" do
       it "nodes should equal buckets" do
-        subject.nodes.sort.should == buckets.sort
+        expect(subject.nodes.sort).to eq(buckets.sort)
       end
     end
 
     describe "#points" do
       it "should be number of points equal to REPLICAS * buckets.size " do
-        subject.points.size.should == subject.buckets.size * Hashring::REPLICAS
+        expect(subject.points.size).to eq(subject.buckets.size * Hashring::REPLICAS)
       end
     end
 
     describe "#bucket_for" do
       it "returns bucket for value" do
-        buckets.include?(subject.bucket_for('test')).should be_true
+        expect(buckets.include?(subject.bucket_for('test'))).to be_truthy
       end
     end
 
     describe "#remove_bucket" do
       it "removes the bucket from buckets array" do
         subject.remove_bucket('server1')
-        subject.buckets.size.should == 1
-        subject.buckets.first.should == 'server2'
+        expect(subject.buckets.size).to eq(1)
+        expect(subject.buckets.first).to eq('server2')
       end
 
       it "removes node from ring" do
         subject.remove_bucket('server1')
-        subject.nodes.size.should == 1
-        subject.buckets.first.should == 'server2'
+        expect(subject.nodes.size).to eq(1)
+        expect(subject.buckets.first).to eq('server2')
       end
     end
 
     describe "#add_bucket" do
       it "adds new bucket to buckets array" do
         subject.add_bucket('blah')
-        subject.buckets.size.should == 3
-        subject.buckets.sort.first.should == 'blah'
+        expect(subject.buckets.size).to eq(3)
+        expect(subject.buckets.sort.first).to eq('blah')
       end
 
       it "adds node to ring" do
         subject.add_bucket('blah')
-        subject.nodes.size.should == 3
-        subject.nodes.sort.first.should == 'blah'
+        expect(subject.nodes.size).to eq(3)
+        expect(subject.nodes.sort.first).to eq('blah')
       end
     end
   end

data/spec/java_grid_spec.rb

@@ -9,7 +9,7 @@ module GameMachine
 
     describe "#set" do
       it "returns true when value is set" do
-        expect(subject.set('blah',0,0,0,'player')).to be_true
+        expect(subject.set('blah',0,0,0,'player')).to be_truthy
       end
 
       it "creates a grid point in correct cell" do

data/spec/misc_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'jruby/core_ext'
 module GameMachine
+
   describe "misc" do 
     let(:entity) do 
       entity = MessageLib::Entity.new
@@ -12,10 +13,9 @@ module GameMachine
       entity
     end
 
-    it "singleton manager" do
+    xit "singleton manager" do
       ref = Akka.instance.actor_system.actor_selection('/user/region_manager_proxy')
       ref.tell('HELLO',nil)
-      sleep 1
     end
 
     xit "vector3" do

data/spec/model_spec.rb

@@ -5,21 +5,25 @@ require 'benchmark'
 module GameMachine
   describe "model" do
 
-    class ScopedModel < GameMachine::Model
+
+    class TestModel < GameMachine::Model
       attribute :health, Integer
       attribute :name, String
       attribute :defense_skill, Integer
       attribute :attack_skill, Integer
-      set_id_scope :tm
     end
 
-    class TestModel < GameMachine::Model
+    class ScopedModel < GameMachine::Model
       attribute :health, Integer
       attribute :name, String
       attribute :defense_skill, Integer
       attribute :attack_skill, Integer
+      attribute :test_models, Array
+      attribute :test_model, TestModel
+      set_id_scope :tm
     end
 
+
     let(:scoped_model) do
       model = ScopedModel.new(:health => 100, :id => 'myid')
     end
@@ -33,6 +37,19 @@ module GameMachine
     end
 
 
+
+    # Unfinished but leaving here for now
+    describe "nesting" do
+      it "should parse correctly" do
+          scoped_model.test_models = []
+          scoped_model.test_models << test_model
+          scoped_model.test_models << test_model
+          scoped_model.test_model = test_model
+          hash = JSON.parse(scoped_model.to_json)
+          ScopedModel.from_hash(hash)
+      end
+    end
+
     context :scoped_model do
 
       describe "#unscoped_id" do
@@ -60,19 +77,14 @@ module GameMachine
     describe "#save" do
 
       it "should return true on success" do
-        expect(test_model.save).to be_true
-      end
-
-      it "should return false if id is nil" do
-        test_model.id = nil
-        expect(test_model.save).to be_false
+        expect(test_model.save).to be_truthy
       end
     end
 
     describe "#save!" do
-      it "should raise an exception if id is nil" do
-        test_model.id = nil
-        expect {test_model.save!}.to raise_error
+      it "should call datastore.put!" do
+        expect_any_instance_of(GameMachine::Commands::DatastoreCommands).to receive(:put!)
+        test_model.save!
       end
 
       it "should not raise an exception if id is not nil" do
@@ -83,13 +95,13 @@ module GameMachine
     describe "#to_json" do
       it "should set klass" do
         model_hash = JSON.parse(test_model.to_json)
-        expect(model_hash.has_key?('klass')).to be_true
+        expect(model_hash.has_key?('klass')).to be_truthy
       end
     end
 
     describe "#to_entity" do
       it "should return an entity with json entity" do
-        expect(test_model.to_entity.has_json_entity).to be_true
+        expect(test_model.to_entity.has_json_entity).to be_truthy
       end
     end
 

data/spec/write_behind_cache_spec.rb

@@ -15,8 +15,8 @@ module GameMachine
       ref = Actor::Builder.new(WriteBehindCache).test_ref
       #props = JavaLib::Props.new(WriteBehindCache);
       #ref = JavaLib::TestActorRef.create(Akka.instance.actor_system, props, WriteBehindCache.name);
-      ref.underlying_actor.stub(:schedule_queue_run)
-      ref.underlying_actor.stub(:schedule_queue_stats)
+      allow(ref.underlying_actor).to receive(:schedule_queue_run)
+      allow(ref.underlying_actor).to receive(:schedule_queue_stats)
       ref.underlying_actor.post_init
       ref.underlying_actor
     end
@@ -24,19 +24,19 @@ module GameMachine
     describe "#on_receive" do
 
       before(:each) do
-        DataStore.stub(:instance).and_return(data_store)
+        allow(DataStore).to receive(:instance).and_return(data_store)
         subject.write_interval = 10
         subject.max_writes_per_second = 100
       end
 
       context "receives a string message" do
         it "check_queue message should call check_queue" do
-          subject.should_receive(:check_queue)
+          expect(subject).to receive(:check_queue)
           subject.on_receive('check_queue')
         end
 
         it "takes one message id from queue and writes it" do
-          data_store.should_receive(:set).exactly(2).times
+          expect(data_store).to receive(:set).exactly(2).times
           3.times do |i|
             subject.on_receive(entity.clone.set_id(i.to_s))
           end
@@ -45,7 +45,7 @@ module GameMachine
         end
 
         it "queue_stats message should call queue_stats" do
-          subject.should_receive(:queue_stats)
+          expect(subject).to receive(:queue_stats)
           subject.on_receive('queue_stats')
         end
       end
@@ -54,28 +54,28 @@ module GameMachine
 
         it "new message should be written to cache" do
           subject.on_receive(entity)
-          subject.cache.fetch(entity.id).should == entity
+          expect(subject.cache.fetch(entity.id)).to eq(entity)
         end
 
         it "message not eligible for write should be enqueued" do
           subject.on_receive(entity)
           subject.on_receive(entity)
-          subject.queue.size.should == 1
+          expect(subject.queue.size).to eq(1)
         end
 
         it "saves to store with entity id and entity" do
-          data_store.should_receive(:set).with(entity.id,kind_of(java.lang.Object))
+          expect(data_store).to receive(:set).with(entity.id,kind_of(java.lang.Object))
           subject.on_receive(entity)
         end
 
         it "does not save if write on same id happens before write_interval has passed" do
-          data_store.should_receive(:set).with(entity.id,kind_of(java.lang.Object)).once
+          expect(data_store).to receive(:set).with(entity.id,kind_of(java.lang.Object)).once
           subject.on_receive(entity)
           subject.on_receive(entity)
         end
 
         it "sequential writes of different id's should get saved" do
-          data_store.should_receive(:set).exactly(4).times
+          expect(data_store).to receive(:set).exactly(4).times
           4.times do |i|
             subject.on_receive(entity.clone.set_id(i.to_s))
             sleep 0.150
@@ -85,8 +85,8 @@ module GameMachine
         it "sequential writes that exceed max writes per second should be enqueued" do
           subject.write_interval = -1
           subject.max_writes_per_second = 1
-          data_store.should_receive(:set).exactly(1).times
-          subject.should_receive(:enqueue).exactly(2).times
+          expect(data_store).to receive(:set).exactly(1).times
+          expect(subject).to receive(:enqueue).exactly(2).times
           3.times do |i|
             subject.on_receive(entity.clone.set_id(i.to_s))
           end
@@ -95,8 +95,8 @@ module GameMachine
         it "sequential writes of existing messages that exceed write_interval should be enqueued" do
           subject.write_interval = 100000
           subject.max_writes_per_second = -1
-          data_store.should_receive(:set).exactly(1).times
-          subject.should_receive(:enqueue).exactly(3).times
+          expect(data_store).to receive(:set).exactly(1).times
+          expect(subject).to receive(:enqueue).exactly(3).times
           4.times do |i|
             subject.on_receive(entity.set_id('11'))
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: game_machine
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Chris Ochs
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-06-28 00:00:00.000000000 Z
+date: 2014-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -260,6 +260,12 @@ files:
 - games/example/lib/player_register.rb
 - games/example/lib/tracking_handler.rb
 - games/example/lib/zone_manager.rb
+- games/models.rb
+- games/models/clan_member.rb
+- games/models/clan_profile.rb
+- games/models/player.rb
+- games/plugins.rb
+- games/plugins/team_handler.rb
 - games/preload.rb
 - integration_tests/basic_spec.rb
 - integration_tests/bot_spec.rb
@@ -314,8 +320,6 @@ files:
 - lib/game_machine/application.rb
 - lib/game_machine/auth_handlers/base.rb
 - lib/game_machine/auth_handlers/public.rb
-- lib/game_machine/bot/chat.rb
-- lib/game_machine/bot/client.rb
 - lib/game_machine/client_manager.rb
 - lib/game_machine/clients.rb
 - lib/game_machine/clients/client.rb
@@ -359,6 +363,7 @@ files:
 - lib/game_machine/game_systems/devnull.rb
 - lib/game_machine/game_systems/entity_loader.rb
 - lib/game_machine/game_systems/entity_tracking.rb
+- lib/game_machine/game_systems/json_model_persistence.rb
 - lib/game_machine/game_systems/local_echo.rb
 - lib/game_machine/game_systems/objectdb_proxy.rb
 - lib/game_machine/game_systems/private_chat.rb
@@ -367,6 +372,7 @@ files:
 - lib/game_machine/game_systems/region_settings.rb
 - lib/game_machine/game_systems/remote_echo.rb
 - lib/game_machine/game_systems/stress_test.rb
+- lib/game_machine/game_systems/team_manager.rb
 - lib/game_machine/grid.rb
 - lib/game_machine/grid_replicator.rb
 - lib/game_machine/handlers/authentication.rb
@@ -381,8 +387,25 @@ files:
 - lib/game_machine/message_queue.rb
 - lib/game_machine/model.rb
 - lib/game_machine/models.rb
+- lib/game_machine/models/create_team.rb
+- lib/game_machine/models/destroy_team.rb
+- lib/game_machine/models/echo_test.rb
+- lib/game_machine/models/end_match.rb
+- lib/game_machine/models/find_match.rb
+- lib/game_machine/models/join_team.rb
+- lib/game_machine/models/leave_team.rb
+- lib/game_machine/models/match.rb
 - lib/game_machine/models/player_status_update.rb
+- lib/game_machine/models/player_team.rb
 - lib/game_machine/models/region.rb
+- lib/game_machine/models/start_match.rb
+- lib/game_machine/models/team.rb
+- lib/game_machine/models/team_accept_invite.rb
+- lib/game_machine/models/team_invite.rb
+- lib/game_machine/models/team_joined.rb
+- lib/game_machine/models/team_left.rb
+- lib/game_machine/models/teams.rb
+- lib/game_machine/models/teams_request.rb
 - lib/game_machine/mono_server.rb
 - lib/game_machine/navigation.rb
 - lib/game_machine/navigation/detour.rb
@@ -453,8 +476,6 @@ files:
 - spec/commands/navigation_commands_spec.rb
 - spec/commands/player_commands_spec.rb
 - spec/commands_spec.rb
-- spec/data_stores/mapdb_spec.rb
-- spec/data_stores/redis_spec.rb
 - spec/game_systems/agents/controller_spec.rb
 - spec/game_systems/agents/test_agent.rb
 - spec/game_systems/agents/test_agent_config.rb
@@ -462,6 +483,7 @@ files:
 - spec/game_systems/chat_spec.rb
 - spec/game_systems/entity_tracking_spec.rb
 - spec/game_systems/region_manager_spec.rb
+- spec/game_systems/team_manager_spec.rb
 - spec/grid_spec.rb
 - spec/handlers/authentication_spec.rb
 - spec/handlers/game_spec.rb
@@ -546,8 +568,6 @@ test_files:
 - spec/commands/navigation_commands_spec.rb
 - spec/commands/player_commands_spec.rb
 - spec/commands_spec.rb
-- spec/data_stores/mapdb_spec.rb
-- spec/data_stores/redis_spec.rb
 - spec/game_systems/agents/controller_spec.rb
 - spec/game_systems/agents/test_agent.rb
 - spec/game_systems/agents/test_agent_config.rb
@@ -555,6 +575,7 @@ test_files:
 - spec/game_systems/chat_spec.rb
 - spec/game_systems/entity_tracking_spec.rb
 - spec/game_systems/region_manager_spec.rb
+- spec/game_systems/team_manager_spec.rb
 - spec/grid_spec.rb
 - spec/handlers/authentication_spec.rb
 - spec/handlers/game_spec.rb