Fix multiple problems with uses and extends

app/helpers/project-name-from-class-name.js

@@ -0,0 +1,16 @@
+import { helper } from '@ember/component/helper';
+
+export function projectNameFromClassName([className, fallback]) {
+    className = className || "";
+    if (className.indexOf('Ember') > -1) {
+      return 'ember';
+    }
+
+    if (className.indexOf('DS.') > -1) {
+      return 'ember-data';
+    }
+
+    return fallback;
+}
+
+export default helper(projectNameFromClassName);

app/helpers/remove-ember-prefix.js

@@ -0,0 +1,15 @@
+import { helper } from '@ember/component/helper';
+
+export function removeEmberPrefix(params/*, hash*/) {
+  let ext = params[0]; 
+  // Ember doesn't use the Ember prefix on all Classes
+  if(ext.indexOf('.')>=0 && ext.substring(0,5) === 'Ember'){
+    // return ext.replace('.','');
+    return ext.slice(6);
+  }
+  else{
+    return ext;
+  }
+}
+
+export default helper(removeEmberPrefix);

app/models/class.js

@@ -5,11 +5,11 @@ const {attr, belongsTo} = DS;
 const projectNameFromClassName = key => {
   return computed(key, function() {
     const value = this.get(key) || "";
-    if (value.indexOf('Ember.') > -1) {
+    if (value.indexOf('Ember') > -1) {
       return 'ember';
     }
 
-    if (value.indexOf('DS.') > 1) {
+    if (value.indexOf('DS.') > -1) {
       return 'ember-data';
     }
 
@@ -51,7 +51,6 @@ export default DS.Model.extend({
 
   extendedClassProjectName: projectNameFromClassName('extends'),
   extendedClassVersion: guessVersionFor('extends'),
-  usedClassProjectName: projectNameFromClassName('uses'),
   usedClassVersion: guessVersionFor('uses')
 
 });

app/templates/project-version/classes/class.hbs

@@ -9,7 +9,7 @@
     {{#if model.extends}}
       <div class="attribute">
         <span class="attribute-label">Extends:</span>
-        <span class="attribute-value">{{#link-to 'project-version.classes.class' model.extendedClassProjectName model.projectVersion.compactVersion model.extends}}{{model.extends}}{{/link-to}}</span>
+        <span class="attribute-value">{{#link-to 'project-version.classes.class' model.extendedClassProjectName model.projectVersion.compactVersion (remove-ember-prefix model.extends)}}{{model.extends}}{{/link-to}}</span>
       </div>
     {{/if}}
     {{#if model.uses}}
@@ -18,7 +18,7 @@
         <span class="attribute-value">
           {{#each model.uses as |parentClass idx|}}
             {{#if (not-eq idx 0)}}<span class="comma">,</span>{{/if}}
-            {{#link-to 'project-version.classes.class' model.usedClassProjectName model.projectVersion.compactVersion parentClass}}{{parentClass}}{{/link-to}}
+              {{#link-to 'project-version.classes.class' (project-name-from-class-name parentClass model.project.id) model.projectVersion.compactVersion (remove-ember-prefix parentClass)}}{{parentClass}}{{/link-to}}
           {{/each}}
         </span>
       </div>

tests/integration/helpers/remove-ember-prefix-test.js

@@ -0,0 +1,31 @@
+import { moduleForComponent, test } from 'ember-qunit';
+import hbs from 'htmlbars-inline-precompile';
+
+moduleForComponent('remove-ember-prefix', 'helper:remove-ember-prefix', {
+  integration: true
+});
+
+
+test('it doesn\'t remove DS prefix', function(assert) {
+  this.set('inputValue', 'DS.Error');
+
+  this.render(hbs`{{remove-ember-prefix inputValue}}`);
+
+  assert.equal(this.$().text().trim(), 'DS.Error');
+});
+
+test('it does remove `Ember.` prefix ', function(assert) {
+  this.set('inputValue', 'Ember.ArrayProxy');
+
+  this.render(hbs`{{remove-ember-prefix inputValue}}`);
+
+  assert.equal(this.$().text().trim(), 'ArrayProxy');
+});
+
+test('it doesn\'t remove `Ember` prefix', function(assert) {
+  this.set('inputValue', 'EmberArray');
+
+  this.render(hbs`{{remove-ember-prefix inputValue}}`);
+
+  assert.equal(this.$().text().trim(), 'EmberArray');
+});

tests/unit/helpers/project-name-from-class-name-test.js

@@ -0,0 +1,19 @@
+import { projectNameFromClassName } from 'ember-api-docs/helpers/project-name-from-class-name';
+import { module, test } from 'qunit';
+
+module('Unit | Helper | project name from class name');
+
+test('it should find ember project name', function(assert) {
+  const result = projectNameFromClassName(['Ember.SomeClass', 'fallback']);
+  assert.equal(result, 'ember');
+});
+
+test('it should find ember-data project name', function(assert) {
+  const result = projectNameFromClassName(['DS.SomeClass', 'fallback']);
+  assert.equal(result, 'ember-data');
+});
+
+test('it should find fallback project name', function(assert) {
+  const result = projectNameFromClassName(['Other.SomeClass', 'fallback']);
+  assert.equal(result, 'fallback');
+});