lib/surrounded/context/role_map.rb in surrounded-1.0.0 vs lib/surrounded/context/role_map.rb in surrounded-1.1.0

@@ -4,38 +4,47 @@
   module Context
     class RoleMap
       extend Forwardable
 
       class << self
+        # Get the role map container and provide an alternative if desired
+        # Ex: RoleMap.from_base(SomeCustomContainer)
         def from_base(klass=::Triad)
-          role_mapper = Class.new(self)
-          Surrounded::Exceptions.define(role_mapper, exceptions: :ItemNotPresent, namespace: klass)
-          role_mapper.container_class=(klass)
-          role_mapper.def_delegators :container, :update, :each, :values, :keys
-          role_mapper
+          unless const_defined?(:Container)
+            role_mapper = Class.new(self)
+            role_mapper.container_class=(klass)
+            Surrounded::Exceptions.define(role_mapper, exceptions: :ItemNotPresent, namespace: klass)
+            const_set(:Container, role_mapper)
+          end
+          const_get(:Container)
         end
 
         def container_class=(klass)
           @container_class = klass
         end
       end
 
+      def_delegators :container, :update, :each, :values, :keys
+
       def container
         @container ||= self.class.instance_variable_get(:@container_class).new
       end
 
+      # Check if a role exists in the map
       def role?(role)
         keys.include?(role)
       end
 
+      # Check if an object is playing a role in this map
       def role_player?(object)
         !values(object).empty?
-      rescue ::StandardError
+      rescue self.container.class::ItemNotPresent
         false
       end
 
+      # Get the object playing the given role
       def assigned_player(role)
         values(role).first
       end
     end
   end
-end
\ No newline at end of file
+end