Links to inherited entries made more straightforward

coffeedoc · Nov 10, 2013 · d02f59e · d02f59e
1 parent 2703b80
commit d02f59e
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 15 deletions.
diff --git a/lib/entities/class.coffee b/lib/entities/class.coffee
@@ -163,10 +163,23 @@ 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 = @effectiveMethods().map (method) =>
+      {
+        entity: method
+        owner: @
+      }
+
+    resolvers =
+      includes: 'effectiveInclusionMethods'
+      extends: 'effectiveExtensionMethods'
+      concerns: 'effectiveConcernMethods'
+
+    for storage, resolver of resolvers
+      for mixin in @[storage]
+        for method in mixin[resolver]()
+          methods.push
+            entity: method
+            owner: mixin
 
     methods
 
@@ -177,19 +190,31 @@ module.exports = class Entities.Class extends require('../entity')
     entries = getter()
 
     entries.filter (entry) ->
-      found[entry.name] = true unless found[entry.name]
+      found[entry.entity.name] = true unless found[entry.entity.name]
 
   inheritedMethods: ->
     @_inheritedMethods ||= @inherited =>
-      @parent.allMethods().concat(@parent.inheritedMethods())
+      @parent.allMethods().concat @parent.inheritedMethods()
 
   inheritedVariables: ->
     @_inheritedVariables ||= @inherited =>
-      @parent.variables.concat(@parent.inheritedVariables())
+      variables = @parent.variables.map (variable) =>
+        {
+          entity: variable
+          owner: @parent
+        }
+
+      variables.concat @parent.inheritedVariables()
 
   inheritedProperties: ->
     @_inheritedProperties ||= @inherited =>
-      @parent.properties.concat(@parent.inheritedProperties())
+      properties = @parent.properties.map (property) =>
+        {
+          entity: property
+          owner: @parent
+        }
+
+      properties.concat @parent.inheritedProperties()
 
   inspect: ->
     {

diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
       "name": "Boris Staal"
     }
   ],
-  "version": "2.0.0-rc.3",
+  "version": "2.0.0-rc.4",
   "licenses": [
     {
       "type": "MIT",

diff --git a/spec/lib/entities/class_spec.coffee b/spec/lib/entities/class_spec.coffee
@@ -14,19 +14,22 @@ describe 'Class', ->
   it 'lists inherited methods', ->
 
     environment = Environment.read('spec/_templates/complicateds/methods.coffee')
-    methods     = environment.entities[12].inheritedMethods().map (x) -> x.inspect()
+    methods     = environment.entities[12].inheritedMethods().map (x) -> x.entity.inspect()
 
     expect(methods).toEqual(
       [
         { name: 'x', kind: 'dynamic', bound: false, parameters: [  ] },
-        { name: 'z', kind: 'dynamic', bound: false, parameters: [  ] }
+        { name: 'z', kind: 'dynamic', bound: false, parameters: [  ] },
+        { name: 'm', kind: 'dynamic', bound: false, parameters: [  ] },
+        { name: 'cs', kind: 'static', bound: false, parameters: [  ] },
+        { name: 'cd', kind: 'dynamic', bound: false, parameters: [  ] }
       ]
     )
 
   it 'lists inherited variables', ->
 
     environment = Environment.read('spec/_templates/complicateds/variables.coffee')
-    variables   = environment.entities[5].inheritedVariables().map (x) -> x.inspect()
+    variables   = environment.entities[5].inheritedVariables().map (x) -> x.entity.inspect()
 
     expect(variables).toEqual(
       [

diff --git a/themes/default/lib/theme.coffee b/themes/default/lib/theme.coffee
@@ -60,6 +60,7 @@ module.exports = class Theme.Theme
       kind = 'extra'  if entity instanceof Codo.Entities.Extra
       kind = 'method' if entity.entity instanceof Codo.Meta.Method
       kind = 'variable' if entity.entity instanceof Codo.Entities.Variable
+      kind = 'property' if entity.entity instanceof Codo.Entities.Property
 
     switch kind
       when 'file', 'extra'

diff --git a/themes/default/templates/class.hamlc b/themes/default/templates/class.hamlc
@@ -102,7 +102,7 @@
             %a{href: @pathFor('class', @entity.parent, @path)}= @entity.parent.name
           %p.inherited
             - for property in @entity.inheritedProperties()
-              %a{href: "#{@pathFor('class', @entity.parent, @path)}##{@anchorFor(property)}"}= property.name
+              %a{href: @pathFor(property, undefined, @path)}= property.entity.name
 
 
       - if @entity.variables.length > 0 || @entity.inheritedVariables().length > 0
@@ -115,7 +115,7 @@
             %a{href: @pathFor('class', @entity.parent, @path)}= @entity.parent.name
           %p.inherited
             - for variable in @entity.inheritedVariables()
-              %a{href: "#{@pathFor('class', @entity.parent, @path)}##{@anchorFor(variable)}"}= variable.name
+              %a{href: @pathFor(variable, undefined, @path)}= variable.entity.name
 
 
       - staticMethods  = @entity.effectiveMethods().filter (m) -> m.kind == 'static'
@@ -139,7 +139,7 @@
             %a{href: @pathFor('class', @entity.parent, @path)}= @entity.parent.name
           %p.inherited
             - for method in @entity.inheritedMethods()
-              %a{href: "#{@pathFor 'class', @entity.parent, @path}##{@anchorFor(method)}"}= method.shortSignature()
+              %a{href: @pathFor(method, undefined, @path)}= method.entity.shortSignature()
 
       - if @entity.extends.length > 0
         %h2