lib/surrounded/context/role_builders.rb in surrounded-0.9.1 vs lib/surrounded/context/role_builders.rb in surrounded-0.9.2

@@ -3,11 +3,11 @@
     module RoleBuilders
 
       # Define behaviors for your role players
       def role(name, type=default_role_type, &block)
         if type == :module
-          mod_name = RoleBuilders.mod_name(name)
+          mod_name = RoleName(name)
           mod = Module.new(&block).send(:include, ::Surrounded)
           private_const_set(mod_name, mod)
         else
           meth = method(type)
           meth.call(name, &block)
@@ -18,40 +18,44 @@
       alias_method :role_methods, :role
 
       # Create a named behavior for a role using the standard library SimpleDelegator.
       def wrap(name, &block)
         require 'delegate'
-        wrapper_name = RoleBuilders.mod_name(name)
+        wrapper_name = RoleName(name)
         klass = private_const_set(wrapper_name, Class.new(SimpleDelegator, &block))
         klass.send(:include, Surrounded)
       end
       alias_method :wrapper, :wrap
 
       # Create a named behavior for a role using the standard library DelegateClass.
       # This ties the implementation of the role to a specific class or module API.
       def delegate_class(name, class_name, &block)
         require 'delegate'
-        wrapper_name = RoleBuilders.mod_name(name)
+        wrapper_name = RoleName(name)
         klass = private_const_set(wrapper_name, DelegateClass(Object.const_get(class_name.to_s)))
         klass.class_eval(&block)
         klass.send(:include, Surrounded)
       end
 
       # Create an object which will bind methods to the role player
       def interface(name, &block)
-        interface_name = RoleBuilders.mod_name(name) + 'Interface'
-
+        # AdminInterface
+        interface_name = RoleName(name, 'Interface')
         behavior = private_const_set(interface_name, Module.new(&block))
 
         require 'surrounded/context/negotiator'
         undef_method(name)
+
+        # AdminInterfaceProxy
+        proxy = private_const_set(RoleName(interface_name, 'Proxy'), Negotiator.for_role(behavior))
         define_method(name) do
-          instance_variable_set("@#{name}", Negotiator.new(role_map.assigned_player(name), behavior))
+          instance_variable_set("@#{name}", proxy.new(role_map.assigned_player(name), behavior))
         end
       end
       
-      def self.mod_name(name)
-        name.to_s.gsub(/(?:^|_)([a-z])/){ $1.upcase }
+      private
+      def RoleName(text, suffix=nil)
+        RoleName.new(text, suffix)
       end
 
     end
   end
 end
\ No newline at end of file