surrounded 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6cd923340dae45ac571dd98abf41be26d111f4569c59d98c27cd4e71f6204d1
-  data.tar.gz: a5d11c76eccb01b30fdec8aaced90571449d96c21fe4eced13e55dc1603241da
+  metadata.gz: aa24dd1e23a33e7949fe503496f6ef64d86cccc0ac3abd70e149acc9cc24ac44
+  data.tar.gz: d282d6bdf295c8a0d9a08a0e43b679902a355f9a556dd9a2504261fbbecfa430
 SHA512:
-  metadata.gz: 90659aa84b6565797f5b45fb4b637d0dfa21190dfed5366c20b586c4351ca1d0f02fdc5f8d6c45620ac6c9b36dccac28a842ce74b93a2d0a9258297db3d9e0e4
-  data.tar.gz: 4831ec1fe6a7dda8a9578776ecb0b2e2030ff37490d15f7e7f35351253bfe7f2c52c9ae1aa8fb7172cb471236b3d5c639f7eae8ef8c5510668a56542ba0fe014
+  metadata.gz: ea3dcc682bc3c6b3e5bc0c1be6e68fc4c2e920a0a25d5e8d12ee91ecd726ac2c812a3539576e2db1838d59fb65a9fdb18c9b65f5dd7dffeeeac1bf2f1c646a18
+  data.tar.gz: 3251756a4d7bd37979a8b8af55867b47d1cffdfabb1503ab641f1c756f22b8867c9e08f997e4a3a0582ff96d0b288a1dee1cb91e479f467d212925893ca838ac

data/Changelog.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.1.2] - 2026-06-24
+
+### Fixed
+
+- Roles applied through a wrapper, such as an interface, can reach the other roles in their context. (c1d41a6)
+
 ## [1.1.1] - 2025-10-17
 
 ### Changed

data/lib/surrounded/context/role_builders.rb

@@ -46,11 +46,8 @@ module Surrounded
       # Create an object which will bind methods to the role player.
       #
       # This object will behave differently that a wrapper or delegate_class.
-      # The interface object should only be used for objects whose methods
-      # _will not_ call to the other objects in the context.
-      # Because the interface methods are applied individually to an object,
-      # that object is unaware of the other objects in the context and cannot
-      # access them from any of its methods.
+      # Interface methods run as the wrapped object itself, so they can access
+      # the other objects in the context only if that object includes Surrounded.
       def interface(name, &block)
         # AdminInterface
         interface_name = RoleName(name, "Interface")

data/lib/surrounded/context/role_map.rb

@@ -32,17 +32,41 @@ module Surrounded
         keys.include?(role)
       end
 
-      # Check if an object is playing a role in this map
+      # Record the behaviored player applied to a role for the duration of a
+      # trigger. The assigned domain object stays in the container; the player
+      # (a wrapper, or the same object for cast roles) is tracked here.
+      def apply(role, player)
+        applied[role] = player
+      end
+
+      # The player a role currently presents: the applied player while a trigger
+      # is running, otherwise the assigned domain object.
+      def current_player(role)
+        applied.fetch(role) { assigned_player(role) }
+      end
+
+      # Forget all applied players, e.g. after a trigger removes behaviors.
+      def reset_applied
+        applied.clear
+      end
+
+      # Check if an object is playing a role in this map, by identity — whether
+      # it is the assigned domain object or the applied player wrapping it.
       def role_player?(object)
-        !values(object).empty?
-      rescue container.class::ItemNotPresent
-        false
+        values.any? { |player| player.equal?(object) } ||
+          applied.values.any? { |player| player.equal?(object) }
       end
 
-      # Get the object playing the given role
+      # Get the domain object assigned to the given role
       def assigned_player(role)
         values(role).first
       end
+
+      private
+
+      def applied
+        @applied ||= {}
+      end
     end
   end
 end

data/lib/surrounded/context/seclusion.rb

@@ -10,10 +10,16 @@ module Surrounded
         const
       end
 
-      # Create attr_reader for the named methods and make them private
+      # Create readers for the named methods and make them private. Role names
+      # resolve to the current player (original object, or its applied wrapper
+      # during a trigger); any other name reads its instance variable.
       def private_attr_reader(*method_names)
-        attr_reader(*method_names)
-        private(*method_names)
+        method_names.each do |name|
+          define_method(name) do
+            role_map.role?(name) ? role_map.current_player(name) : instance_variable_get(:"@#{name}")
+          end
+          private(name)
+        end
       end
     end
   end

data/lib/surrounded/context.rb

@@ -96,7 +96,7 @@ module Surrounded
       def role?(name, &block)
         return false unless role_map.role?(name)
         accessor = block.binding.eval("self")
-        role_map.role_player?(accessor) && role_map.assigned_player(name)
+        role_map.role_player?(accessor) && role_map.current_player(name)
       end
 
       # Check if a given object is a role player in the context.
@@ -153,7 +153,6 @@ module Surrounded
       end
 
       def map_role(role, mod_name, object)
-        instance_variable_set("@#{role}", object)
         role_map.update(role, role_module_basename(mod_name), object)
       end
 
@@ -168,7 +167,6 @@ module Surrounded
           end
 
           role_player = applicator.call(role_const(behavior), object)
-          map_role(role, behavior, role_player)
         end
         role_player || object
       end
@@ -206,6 +204,7 @@ module Surrounded
       def apply_behaviors
         role_map.each do |role, mod_name, object|
           player = apply_behavior(role, mod_name, object)
+          role_map.apply(role, player)
           if player.respond_to?(:store_context, true)
             player.__send__(:store_context) {}
           end
@@ -213,12 +212,14 @@ module Surrounded
       end
 
       def remove_behaviors
-        role_map.each do |role, mod_name, player|
+        role_map.each do |role, mod_name, object|
+          player = role_map.current_player(role)
           if player.respond_to?(:remove_context, true)
             player.__send__(:remove_context) {}
           end
           remove_behavior(role, mod_name, player)
         end
+        role_map.reset_applied
       end
 
       # List of possible methods to use to add behavior to an object from a module.
@@ -284,8 +285,8 @@ module Surrounded
           .to_s
           .split("_")
           .map { |part|
-          part.capitalize
-        }
+            part.capitalize
+          }
           .join
           .sub(/_\d+/, "") + suffix.to_s
       end

data/lib/surrounded/version.rb

@@ -1,5 +1,5 @@
 module Surrounded
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 
   def self.version
     VERSION

data/test/role_identity_test.rb

@@ -0,0 +1,39 @@
+require "test_helper"
+
+# Refuses value-equality so resolution must use object identity.
+class IdentityResistant
+  include Surrounded
+
+  def initialize(name)
+    @name = name
+  end
+  attr_reader :name
+
+  def ==(other) = false
+  def eql?(other) = false
+  def hash = object_id
+end
+
+class SpeakerContext
+  extend Surrounded::Context
+
+  initialize :speaker, :listener
+
+  interface :speaker do
+    def greet
+      listener.name
+    end
+  end
+
+  trigger :speak do
+    speaker.greet
+  end
+end
+
+describe "role identity independent of equality" do
+  it "resolves a sibling role by object identity, not ==" do
+    a = IdentityResistant.new("A")
+    b = IdentityResistant.new("B")
+    expect(SpeakerContext.new(speaker: a, listener: b).speak).must_equal "B"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: surrounded
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - "'Jim Gay'"
@@ -80,6 +80,7 @@ files:
 - test/non_surrounded_role_player_test.rb
 - test/override_methods_test.rb
 - test/role_context_method_test.rb
+- test/role_identity_test.rb
 - test/surrounded_context_test.rb
 - test/surrounded_test.rb
 - test/test_helper.rb
@@ -102,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Create encapsulated environments for your objects.
 test_files: []