From 56042980f462992107b1b2ab1795a1aefa8b48d5 Mon Sep 17 00:00:00 2001
From: Alex LaFroscia <alafroscia@netflix.com>
Date: Mon, 26 Mar 2018 16:46:36 -0700
Subject: [PATCH 1/3] Unify `addonLogo` implementation

---
 addon/components/docs-header/component.js      | 16 ++--------------
 .../components/docs-viewer/x-nav/component.js  | 15 ++-------------
 addon/utils/computed.js                        | 18 ++++++++++++++++++
 3 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/addon/components/docs-header/component.js b/addon/components/docs-header/component.js
index 3b1ba0b47..ab15c10c2 100644
--- a/addon/components/docs-header/component.js
+++ b/addon/components/docs-header/component.js
@@ -3,6 +3,7 @@ import layout from './template';
 import config from 'dummy/config/environment';
 import { computed } from '@ember/object';
 import { classify } from '@ember/string';
+import { addonLogo } from 'ember-cli-addon-docs/utils/computed';
 
 const packageJson = config['ember-cli-addon-docs'].packageJson;
 
@@ -32,20 +33,7 @@ export default Component.extend({
 
   packageJson: packageJson,
 
-  addonLogo: computed(function() {
-    let name = packageJson.name;
-    let logo;
-
-    if (name.match('ember-cli-')) {
-      logo = 'ember-cli';
-    } else if (name.match('ember-data-')) {
-      logo = 'ember-data';
-    } else if (name.match('ember-data-')) {
-      logo = 'ember';
-    }
-
-    return logo;
-  }),
+  addonLogo: addonLogo(packageJson),
 
   addonName: computed(function() {
     let name = packageJson.name;
diff --git a/addon/components/docs-viewer/x-nav/component.js b/addon/components/docs-viewer/x-nav/component.js
index e44ff1b9f..9fc5c62bc 100644
--- a/addon/components/docs-viewer/x-nav/component.js
+++ b/addon/components/docs-viewer/x-nav/component.js
@@ -4,6 +4,7 @@ import Component from '@ember/component';
 import layout from './template';
 import config from 'dummy/config/environment';
 import { classify } from '@ember/string';
+import { addonLogo } from 'ember-cli-addon-docs/utils/computed';
 
 const packageJson = config['ember-cli-addon-docs'].packageJson;
 
@@ -17,19 +18,7 @@ export default Component.extend({
   store: service(),
   packageJson,
 
-  addonLogo: computed(function() {
-    let name = packageJson.name;
-    let logo;
-    if (name.match(/ember-cli/)) {
-      logo = 'ember-cli';
-    } else if (name.match(/ember-data/)) {
-      logo = 'ember-data';
-    } else {
-      logo = 'ember';
-    }
-
-    return logo;
-  }),
+  addonLogo: addonLogo(packageJson),
 
   addonTitle: computed('addonLogo', function() {
     let logo = this.get('addonLogo');
diff --git a/addon/utils/computed.js b/addon/utils/computed.js
index 91bc639c1..c45dc8090 100644
--- a/addon/utils/computed.js
+++ b/addon/utils/computed.js
@@ -111,3 +111,21 @@ export function hasMemberType(...memberKeys) {
   });
 }
 
+/**
+  @hide
+*/
+export function addonLogo(packageJson) {
+  return computed(function() {
+    let name = packageJson.name;
+    let logo;
+    if (name.match(/ember-cli/)) {
+      logo = 'ember-cli';
+    } else if (name.match(/ember-data/)) {
+      logo = 'ember-data';
+    } else {
+      logo = 'ember';
+    }
+
+    return logo;
+  });
+}

From 19e60761630370a910f24f794a44f2a5698d53a2 Mon Sep 17 00:00:00 2001
From: Alex LaFroscia <alafroscia@netflix.com>
Date: Mon, 26 Mar 2018 16:49:26 -0700
Subject: [PATCH 2/3] Make `logo` setting API of docs-header more consistent

---
 addon/components/docs-header/component.js | 2 +-
 addon/components/docs-header/template.hbs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/components/docs-header/component.js b/addon/components/docs-header/component.js
index ab15c10c2..75da2026f 100644
--- a/addon/components/docs-header/component.js
+++ b/addon/components/docs-header/component.js
@@ -33,7 +33,7 @@ export default Component.extend({
 
   packageJson: packageJson,
 
-  addonLogo: addonLogo(packageJson),
+  logo: addonLogo(packageJson),
 
   addonName: computed(function() {
     let name = packageJson.name;
diff --git a/addon/components/docs-header/template.hbs b/addon/components/docs-header/template.hbs
index 58fa12278..2ee94179e 100644
--- a/addon/components/docs-header/template.hbs
+++ b/addon/components/docs-header/template.hbs
@@ -4,7 +4,7 @@
       <div class="text-center text-xs">
         {{#if logo}}
           <div class='h-4 pb-1'>
-            {{docs-logo logo=addonLogo}}
+            {{docs-logo logo=logo}}
           </div>
         {{/if}}
         <span class='font-medium normal-case block -mt-2px'>{{addonName}}</span>

From 8233707d5b9bfe74e15a96b867d7520b975a46ea Mon Sep 17 00:00:00 2001
From: Alex LaFroscia <alafroscia@netflix.com>
Date: Mon, 26 Mar 2018 17:04:52 -0700
Subject: [PATCH 3/3] Switch `addonName` to `name`

This also updates the implementation to match the documentation
---
 addon/components/docs-header/component.js | 2 +-
 addon/components/docs-header/template.hbs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/components/docs-header/component.js b/addon/components/docs-header/component.js
index 75da2026f..6fc6f0468 100644
--- a/addon/components/docs-header/component.js
+++ b/addon/components/docs-header/component.js
@@ -35,7 +35,7 @@ export default Component.extend({
 
   logo: addonLogo(packageJson),
 
-  addonName: computed(function() {
+  name: computed(function() {
     let name = packageJson.name;
     name = name.replace('ember-data-', '');
     name = name.replace('ember-cli-', '');
diff --git a/addon/components/docs-header/template.hbs b/addon/components/docs-header/template.hbs
index 2ee94179e..f5e2ed3ef 100644
--- a/addon/components/docs-header/template.hbs
+++ b/addon/components/docs-header/template.hbs
@@ -7,7 +7,7 @@
             {{docs-logo logo=logo}}
           </div>
         {{/if}}
-        <span class='font-medium normal-case block -mt-2px'>{{addonName}}</span>
+        <span class='font-medium normal-case block -mt-2px'>{{name}}</span>
       </div>
     {{/docs-header/link}}