drsi 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94aae14ff4de08a20726540d5b43141bbbdc8d24
-  data.tar.gz: b63c09ef0f0299d85f3a65fd0cb4bf1c6de39c87
+  metadata.gz: f34d6bd83bc21f9c63c83c31c552e1f48dc42acf
+  data.tar.gz: 28785a5247013c7ddf5d0da3bae4d01f60308c42
 SHA512:
-  metadata.gz: b1399b95a5dc17b649cd11da703f255278b54ecd6b1088be0a06be14b6666b0a0e5856ce3a89332631ed0daf65aaa3eab388e3679d49cef406ab195dcd2a78eb
-  data.tar.gz: be8217e6295ed0731fc35e93cec412ffb15200627eab2afcb32a73f6cefd4c2e6f36b1c0e59f7769b639d7878bdf2caf34167a32a455f33e6427c7f20f0f9ffc
+  metadata.gz: 9b422c3925e5055ddf1053684ec51220d7580a0c67cb0c0f2788d42864f5937a44d80f7f74421330b19a4bc304ca1b0f25a96633692962c786b6a237c72d08de
+  data.tar.gz: a099dbfa5b9de7ded07c1aed28487ef3242d9eaf9374229ad11a48b53140833ef512cbb5a477f643db089670c2c78ec17c6335e2b58c36b5b4b727933213f50e

data/lib/drsi/dci/context.rb

@@ -97,8 +97,12 @@ module DCI
           class_eval do
             method_object = instance_method(methodname)
             define_method(methodname) do |*args, &block|
-              players_play_role!
-              method_object.bind(self).call(*args, &block).tap {players_unplay_role!}
+              # puts "Context: #{self} - in method #{methodname} - #{do_play_unplay_p} assigning_roles"
+              extending_ticker = players_play_role!
+              method_object.bind(self).call(*args, &block).tap do
+                # puts "Context: #{self} - in method #{methodname} - #{do_play_unplay_p} un-assigning_roles"
+                players_unplay_role!(extending_ticker)
+              end
             end
           end
         end
@@ -141,11 +145,19 @@ module DCI
         (roles.keys - players.keys)
       end
 
+      def player_already_playing_role_in_this_context?(player, rolekey)
+        context = player.send(:context)
+        return false unless player.send(:rolekey) == rolekey
+        context == self or context.class == self.class
+      end
+
       # Associates every role to the intended player.
       def players_play_role!
+        extending_ticker = {}
         roles.keys.each do |rolekey|
-          assign_role_to_player!(rolekey, @_players[rolekey])
+          assign_role_to_player!(rolekey, @_players[rolekey], extending_ticker: extending_ticker)
         end
+        extending_ticker
       end
 
       # Associates a role to an intended player:
@@ -153,16 +165,27 @@ module DCI
       #   - The player get access to the context it is playing.
       #   - The player get access to the rest of players in its context through instance methods named after their role keys.
       #   - This context instance get access to this new role player through an instance method named after the role key.
-      def assign_role_to_player!(rolekey, player)
+      def assign_role_to_player!(rolekey, player, extending_ticker:{})
         role_mod = roles[rolekey]
-        ::DCI::Multiplayer(player).each {|roleplayer| roleplayer.__play_role!(role_mod, self)}
+        # puts "  Context: #{self} - assigning role #{rolekey} to #{player}"
+        ::DCI::Multiplayer(player).each do |roleplayer|
+          if player_already_playing_role_in_this_context?(roleplayer, rolekey)
+            extending_ticker.merge!("#{roleplayer.object_id}_#{rolekey}" => false)
+          else
+            extending_ticker.merge!("#{roleplayer.object_id}_#{rolekey}" => true)
+            roleplayer.__play_role!(rolekey, role_mod, self)
+          end
+        end
         instance_variable_set(:"@#{rolekey}", player)
       end
 
       # Disassociates every role from the playing object.
-      def players_unplay_role!
+      def players_unplay_role!(extending_ticker)
         roles.keys.each do |rolekey|
-          ::DCI::Multiplayer(@_players[rolekey]).each {|roleplayer| roleplayer.__unplay_last_role!}
+          ::DCI::Multiplayer(@_players[rolekey]).each do |roleplayer|
+            # puts "  Context: #{self} - un-assigning role #{rolekey} to #{roleplayer}"
+            roleplayer.__unplay_last_role! if extending_ticker["#{roleplayer.object_id}_#{rolekey}"]
+          end
           # 'instance_variable_set(:"@#{rolekey}", nil)
         end
       end

data/lib/drsi/rolable.rb

@@ -12,11 +12,12 @@ module Rolable
   #  - Get or extend a new empty role module,
   #  - Copy role_mod instance_methods into it,
   #  - Inject context and settings methods.
-  def __play_role!(role_mod, a_context)
+  def __play_role!(a_rolekey, role_mod, a_context)
     new_role = __next_empty_role
     new_role.__copy_instance_methods_from(role_mod)
-    new_role.class_exec(a_context) do |the_context|
+    new_role.class_exec(a_context, a_rolekey) do |the_context, the_rolekey|
       private
+      define_method(:rolekey) {the_rolekey}
       define_method(:context) {the_context}
       define_method(:settings) {|*keys| context.send(:settings, *keys)}
     end
@@ -61,8 +62,13 @@ module Rolable
       __roles << role
     end
 
-    # The context a role is played within. This method must be overidden in every __role definition module.
-    # def context
-    #   nil
-    # end
+    # The context within this object is playing its last role. This method must be overidden in every __role definition module.
+    def context
+      nil
+    end
+
+    # The rolekey this object is playing its last role. This method must be overidden in every __role definition module.
+    def rolekey
+      nil
+    end
 end

data/lib/drsi/version.rb

@@ -1,3 +1,3 @@
 module Drsi
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/multiplayers_spec.rb

@@ -1,11 +1,10 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'ostruct'
 
 describe 'Role MultiPlayers' do
 
   context "A role can be played by many objects in the same context at the same time" do
     before(:all) do
-      class TestingRoleplayersContext < DCI::Context
+      class TestingMultiplayersContext < DCI::Context
         role :role1 do
           def role1method1; :role1method1_executed end
           def role1self; self end
@@ -71,14 +70,15 @@ describe 'Role MultiPlayers' do
 
       end
 
-      @player1, @player2, @player22 = OpenStruct.new(:name => 'player1'), OpenStruct.new(:name => 'player2'), OpenStruct.new(:name => 'player22')
+      Player = Struct.new(:name)
+      @player1, @player2, @player22 = Player.new('player1'), Player.new('player2'), Player.new('player22')
       @multiplayer = DCI::Multiplayer[@player2, @player22]
       #puts @multiplayer.instance_variable_get(:@players)
-      @testing_roleplayers_context  = TestingRoleplayersContext.new(:role1    => @player1,
-                                                                    :role2    => @multiplayer,
-                                                                    :setting1 => :one,
-                                                                    :setting2 => :two,
-                                                                    :setting3 => :three)
+      @testing_roleplayers_context  = TestingMultiplayersContext.new(:role1    => @player1,
+                                                                     :role2    => @multiplayer,
+                                                                     :setting1 => :one,
+                                                                     :setting2 => :two,
+                                                                     :setting3 => :three)
     end
 
     it("For it to work, the developer has to give a rolekey the value of a DCI::Multiplayer instance when instantiating the context...") do
@@ -112,14 +112,12 @@ describe 'Role MultiPlayers' do
       @player22.private_methods.map(&:to_s).should_not include(:private_role2method2)
       @player2.name.should eq('player2')
       @player22.name.should eq('player22')
-      @player2.should_not  respond_to(:role1)
-      @player22.should_not respond_to(:role1)
-      @player2.should_not  respond_to(:context)
-      @player22.should_not respond_to(:context)
-      @player2.should_not  respond_to(:settings)
-      @player22.should_not respond_to(:settings)
-      (@player2.private_methods.map(&:to_s) &  ['role1', 'context', 'settings']).should be_empty
-      (@player22.private_methods.map(&:to_s) & ['role1', 'context', 'settings']).should be_empty
+      expect{@player2.send(:role1)}.to  raise_error
+      expect{@player22.send(:role1)}.to raise_error
+      @player2.send(:context).should  be_nil
+      @player22.send(:context).should be_nil
+      expect{@player2.send(:settings)}.to  raise_error
+      expect{@player22.send(:settings)}.to raise_error
     end
 
   end

data/spec/roleplayers_spec.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'ostruct'
 
 describe 'RolePlayers' do
 
@@ -39,7 +38,7 @@ describe 'RolePlayers' do
           role1.name
         end
 
-        def check_role1_context_access
+        def check_role1_private_context_access
           [!role1.respond_to?(:context), role1.private_methods.map(&:to_s).include?('context'), role1.send(:context) == self].uniq == [true]
         end
 
@@ -49,7 +48,8 @@ describe 'RolePlayers' do
         end
       end
 
-      @player1, @player2 = OpenStruct.new(:name => 'player1'), OpenStruct.new(:name => 'player2')
+      Player = Struct.new(:name)
+      @player1, @player2 = Player.new('player1'), Player.new('player2')
       @testing_roleplayers_context = TestingRoleplayersContext.new(:role1    => @player1,
                                                                    :role2    => @player2,
                                                                    :setting1 => :one,
@@ -74,8 +74,8 @@ describe 'RolePlayers' do
     it("Inside the context, roleplayers have private access to other roleplayers through methods named after their keys.") do
       @testing_roleplayers_context.check_role_interaccess.should be_true
     end
-    it("...and offer a public_method to access the context.") do
-      @testing_roleplayers_context.check_role1_context_access.should be_true
+    it("...as well as private access to the context.") do
+      @testing_roleplayers_context.check_role1_private_context_access.should be_true
     end
 
     it("They also have private access to extra args received in the instantiation of its context...") do
@@ -95,14 +95,11 @@ describe 'RolePlayers' do
       @player1.should_not respond_to(:role1method1)
       @player2.private_methods.map(&:to_s).should_not include(:private_role2method2)
       @player1.name.should eq('player1')
-      @player2.should_not respond_to(:role1)
-      @player2.should_not respond_to(:context)
-      @player2.should_not respond_to(:settings)
-      (@player2.private_methods.map(&:to_s) & ['role1', 'context', 'settings']).should be_empty
+      @player2.send(:context).should be_nil
+      expect {@player2.send(:settings)}.to raise_error
+      expect {@player2.send(:role1)}.to raise_error
     end
 
-
-
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drsi
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Lorenzo Tello
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec