drsi 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f34d6bd83bc21f9c63c83c31c552e1f48dc42acf
-  data.tar.gz: 28785a5247013c7ddf5d0da3bae4d01f60308c42
+  metadata.gz: bfba058e060a1aeff1bbd634bf58b5c75d2c6f96
+  data.tar.gz: be2b11f836e7e14ebdfedce0445132c154bb6ef7
 SHA512:
-  metadata.gz: 9b422c3925e5055ddf1053684ec51220d7580a0c67cb0c0f2788d42864f5937a44d80f7f74421330b19a4bc304ca1b0f25a96633692962c786b6a237c72d08de
-  data.tar.gz: a099dbfa5b9de7ded07c1aed28487ef3242d9eaf9374229ad11a48b53140833ef512cbb5a477f643db089670c2c78ec17c6335e2b58c36b5b4b727933213f50e
+  metadata.gz: adbad678c9cf9ae41f91cee89d62a34f4b5fa4783cd7faa161eb1c5afd8727a7c74917202c46f58b35f9409f23d96111465bc3f7169c3a3a7c6c04f4c943d8ef
+  data.tar.gz: 3fb6063db4e72a8163e83c04209148d965a80b71ca9484f4a0d01c243dc8d2d0678b9a337eca096f7b822c56a8c994959a9bfd0bd18101a6964688105dc6d2d3

data/lib/drsi/dci/context.rb

@@ -146,8 +146,8 @@ module DCI
       end
 
       def player_already_playing_role_in_this_context?(player, rolekey)
-        context = player.send(:context)
-        return false unless player.send(:rolekey) == rolekey
+        context = player.send(:__context)
+        return false unless player.send(:__rolekey) == rolekey
         context == self or context.class == self.class
       end
 

data/lib/drsi/dci/role.rb

@@ -10,7 +10,7 @@ module DCI
       # Defines a new private reader instance method for a context mate role, delegating it to the context object.
       def add_role_reader_for!(rolekey)
         return if private_method_defined?(rolekey)
-        define_method(rolekey) {context.send(rolekey)}
+        define_method(rolekey) {__context.send(rolekey)}
         private rolekey
       end
 

data/lib/drsi/module.rb

@@ -7,6 +7,7 @@ class Module
       type    = methods_type.to_s.split('_').first.to_sym
       __add_instance_methods(methods, type)
     end
+    self
   end
 
 
@@ -16,11 +17,7 @@ class Module
     # Also, set their visibility from 'type' (:public, :protected, :private).
     def __add_instance_methods(methods, type)
       module_exec(methods, type) do |methods, type|
-        methods.each do |method|
-          define_method(method.name) do |*args, &block|
-            method.bind(self).call(*args, &block)
-          end
-        end
+        methods.each {|method| define_method(method.name, method)}
         send(type, *methods.map(&:name))
       end
     end

data/lib/drsi/rolable.rb

@@ -8,18 +8,17 @@ require 'drsi/module'
 # reusing the empty ones or adding and extending new ones when it is needed.
 module Rolable
 
-  # Make an object play (in the given 'context') the role defined as a module in 'role_mod':
+  # Make an object play (in the given 'a_context') the role defined as a module in 'role_mod':
   #  - Get or extend a new empty role module,
   #  - Copy role_mod instance_methods into it,
-  #  - Inject context and settings methods.
+  #  - Inject __context and settings methods.
   def __play_role!(a_rolekey, role_mod, a_context)
-    new_role = __next_empty_role
-    new_role.__copy_instance_methods_from(role_mod)
+    new_role = __next_role_for(role_mod)
     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)}
+      define_method(:__rolekey) {the_rolekey}
+      define_method(:__context) {the_context}
+      define_method(:settings) {|*keys| __context.send(:settings, *keys)}
     end
   end
 
@@ -49,26 +48,27 @@ module Rolable
 
     # Returns the highest role module free of methods. If none, creates a new empty module ready to be filled with
     # role instance methods.
-    def __next_empty_role
+    def __next_role_for(mod)
       @__last_role_index = __last_role_index + 1
-      __add_empty_role! unless __last_role
-      __last_role
+      new_role = __last_role
+      new_role ? new_role.__copy_instance_methods_from(mod) : __add_role_for(mod)
     end
 
     # Creates and extends a new module ready to be filled with role instance methods.
-    def __add_empty_role!
-      role = Module.new
+    def __add_role_for(mod)
+      role = mod.dup
       extend(role)
       __roles << role
+      role
     end
 
     # The context within this object is playing its last role. This method must be overidden in every __role definition module.
-    def context
+    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
+    def __rolekey
       nil
     end
 end

data/lib/drsi/version.rb

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

data/spec/multiplayers_spec.rb

@@ -54,7 +54,8 @@ describe 'Role MultiPlayers' do
 
         def roles2_have_context_private_access?
           role2[0..-1].all? do |roleplayer|
-            [!roleplayer.respond_to?(:context), roleplayer.private_methods.map(&:to_s).include?('context'), roleplayer.send(:context) == self].uniq == [true]
+            [!roleplayer.respond_to?(:__context), roleplayer.private_methods.map(&:to_s).include?('__context'), roleplayer.send(:__context) == self,
+             !roleplayer.respond_to?(:__rolekey), roleplayer.private_methods.map(&:to_s).include?('__rolekey'), roleplayer.send(:__rolekey) == :role2].uniq == [true]
           end
         end
 
@@ -97,7 +98,7 @@ describe 'Role MultiPlayers' do
       @testing_roleplayers_context.roles2_external_interfaces_accessible?(@player2.name, @player22.name).should be_true
     end
 
-    it("They have private access to the context.") do
+    it("They have private access to the context via #__context.") do
       @testing_roleplayers_context.roles2_have_context_private_access?.should be_true
     end
 
@@ -114,8 +115,8 @@ describe 'Role MultiPlayers' do
       @player22.name.should eq('player22')
       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
+      @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

data/spec/roleplayers_spec.rb

@@ -39,7 +39,8 @@ describe 'RolePlayers' do
         end
 
         def check_role1_private_context_access
-          [!role1.respond_to?(:context), role1.private_methods.map(&:to_s).include?('context'), role1.send(:context) == self].uniq == [true]
+          [!role1.respond_to?(:__context), role1.private_methods.map(&:to_s).include?('__context'), role1.send(:__context) == self,
+           !role1.respond_to?(:__rolekey), role1.private_methods.map(&:to_s).include?('__rolekey'), role1.send(:__rolekey) == :role1].uniq == [true]
         end
 
         def check_role1_settings_access
@@ -95,7 +96,7 @@ 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.send(:context).should be_nil
+      @player2.send(:__context).should be_nil
       expect {@player2.send(:settings)}.to raise_error
       expect {@player2.send(:role1)}.to raise_error
     end

metadata

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