Safer include and prepend with block.

lib/sus/include_context.rb

@@ -6,9 +6,47 @@
 require_relative 'context'
 
 module Sus
+	module IncludeContext
+		module Helpers
+			def prepend(*arguments, &block)
+				arguments.each do |argument|
+					if argument.class == Module
+						super(argument)
+					else
+						argument.prepended(self)
+					end
+				end
+
+				if block_given?
+					wrapper = Module.new
+					wrapper.instance_exec(&block)
+					super(wrapper)
+				end
+			end
+
+			def include(*arguments, &block)
+				arguments.each do |argument|
+					if argument.class == Module
+						super(argument)
+					else
+						argument.included(self)
+					end
+				end
+
+				if block_given?
+					wrapper = Module.new
+					wrapper.module_exec(&block)
+					super(wrapper)
+				end
+			end
+		end
+	end
+
 	module Context
-		def include_context(shared, *arguments, **options)
-			self.class_exec(*arguments, **options, &shared.block)
+		include IncludeContext::Helpers
+
+		def include_context(shared, ...)
+			shared.included(self, ...)
 		end
 	end
 end

lib/sus/it_behaves_like.rb

@@ -18,12 +18,12 @@ def self.build(parent, shared, arguments = nil, unique: false, &block)
 			base.description = shared.name
 			base.identity = Identity.nested(parent.identity, base.description, unique: unique)
 			base.set_temporary_name("#{self}[#{base.description}]")
-
+			
 			# User provided block is evaluated first, so that it can provide default behaviour for the shared context:
 			if block_given?
 				base.class_exec(*arguments, &block)
 			end
-
+			
 			base.class_exec(*arguments, &shared.block)
 			return base
 		end

lib/sus/shared.rb

@@ -18,6 +18,10 @@ def self.build(name, block)
 
 			return base
 		end
+
+		def included(base, *arguments, **options)
+			base.class_exec(*arguments, **options, &self.block)
+		end
 	end
 
 	def self.Shared(name, &block)

test/sus/include_context.rb

@@ -5,15 +5,31 @@
 
 AThing = Sus::Shared("a thing") do |key, value: 42|
 	let(:a_thing) {{key => value}}
+
+	include do
+		def before
+			super
+
+			events << :shared_before
+		end
+	end
 end
 
 describe Sus::Context do
 	with '.include_context' do
 		with "a shared context with an option" do
+			let(:events) {Array.new}
 			include_context AThing, :key, value: 42
 
+			def before
+				super
+
+				events << :example_before
+			end
+
 			it "can include a shared context" do
 				expect(a_thing).to be == {:key => 42}
+				expect(events).to be == [:shared_before, :example_before]
 			end
 		end
 	end