Mixins included into inheritance chain

coffeedoc · Nov 10, 2013 · 2703b80 · 2703b80
1 parent 3ded1a8
commit 2703b80
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/lib/entities/class.coffee b/lib/entities/class.coffee
@@ -162,6 +162,14 @@ module.exports = class Entities.Class extends require('../entity')
 
     @_effectiveMethods
 
+  allMethods: ->
+    methods = @effectiveMethods()
+    methods = methods.concat mixin.effectiveInclusionMethods() for mixin in @includes
+    methods = methods.concat mixin.effectiveExtensionMethods() for mixin in @extends
+    methods = methods.concat mixin.effectiveConcernMethods() for mixin in @concerns
+
+    methods
+
   inherited: (getter) ->
     return [] if !@parent || !@parent.name?
 
@@ -173,7 +181,7 @@ module.exports = class Entities.Class extends require('../entity')
 
   inheritedMethods: ->
     @_inheritedMethods ||= @inherited =>
-      @parent.effectiveMethods().concat(@parent.inheritedMethods())
+      @parent.allMethods().concat(@parent.inheritedMethods())
 
   inheritedVariables: ->
     @_inheritedVariables ||= @inherited =>