Parse package repository correctly

Author: dfreeman

addon/components/api/x-import-path/component.js

@@ -2,10 +2,10 @@ import Component from '@ember/component';
 import layout from './template';
 import config from 'dummy/config/environment';
 
-const packageJson = config['ember-cli-addon-docs'].packageJson;
+const projectName = config['ember-cli-addon-docs'].projectName;
 
 export default Component.extend({
   layout,
   classNames: ['import-path'],
-  projectName: packageJson.name
+  projectName
 });

addon/components/docs-header/component.js

@@ -7,7 +7,7 @@ import { addonLogo } from 'ember-cli-addon-docs/utils/computed';
 import { inject as service } from '@ember/service';
 import { reads } from '@ember/object/computed';
 
-const packageJson = config['ember-cli-addon-docs'].packageJson;
+const { projectName, projectHref } = config['ember-cli-addon-docs'];
 
 /**
   Render a header showing a link to your documentation, your project logo, a
@@ -33,18 +33,19 @@ export default Component.extend({
   layout,
   tagName: '',
 
-  packageJson: packageJson,
   projectVersion: service(),
 
+  projectHref,
+
   didInsertElement() {
     this._super(...arguments);
     this.get('projectVersion').loadAvailableVersions();
   },
 
-  logo: addonLogo(packageJson),
+  logo: addonLogo(projectName),
 
   name: computed(function() {
-    let name = packageJson.name;
+    let name = projectName;
     name = name.replace('ember-data-', '');
     name = name.replace('ember-cli-', '');
     name = name.replace('ember-', '');

addon/components/docs-header/template.hbs

@@ -39,8 +39,8 @@
         </span>
       {{/docs-header/link}}
 
-      {{#if packageJson.repository}}
-        {{#docs-header/link href=packageJson.repository}}
+      {{#if projectHref}}
+        {{#docs-header/link href=projectHref}}
           <span class='flex'>
             {{svg-jar 'github' width=24 height=24}}
           </span>

addon/components/docs-viewer/x-main/component.js

@@ -7,7 +7,7 @@ import addonFiles from 'ember-cli-addon-docs/addon-files';
 import config from 'dummy/config/environment';
 import { getOwner } from '@ember/application';
 
-const packageJson = config['ember-cli-addon-docs'].packageJson;
+const projectHref = config['ember-cli-addon-docs'].projectHref;
 
 export default Component.extend({
   layout,
@@ -34,14 +34,14 @@ export default Component.extend({
       let file = addonFiles.find(f => f.match(path));
 
       if (file) {
-        return `${packageJson.repository}/edit/master/addon/${file}`;
+        return `${projectHref}/edit/master/addon/${file}`;
       }
     } else {
       let file = appFiles
         .filter(file => file.match(/template.(hbs|md)/))
         .find(file => file.match(path));
 
-      return `${packageJson.repository}/edit/master/tests/dummy/app/${file}`;
+      return `${projectHref}/edit/master/tests/dummy/app/${file}`;
     }
   })
 

addon/components/docs-viewer/x-nav/component.js

@@ -6,7 +6,7 @@ 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;
+const projectName = config['ember-cli-addon-docs'].projectName;
 
 export default Component.extend({
   layout,
@@ -15,17 +15,16 @@ export default Component.extend({
   root: 'docs',
 
   store: service(),
-  packageJson,
 
-  addonLogo: addonLogo(packageJson),
+  addonLogo: addonLogo(projectName),
 
   addonTitle: computed('addonLogo', function() {
     let logo = this.get('addonLogo');
 
-    return classify(packageJson.name.replace(`${logo}-`, ''));
+    return classify(projectName.replace(`${logo}-`, ''));
   }),
 
   project: computed(function() {
-    return this.get('store').peekRecord('project', packageJson.name);
+    return this.get('store').peekRecord('project', projectName);
   })
 });

addon/routes/docs.js

@@ -1,12 +1,12 @@
 import Route from '@ember/routing/route';
 import config from 'dummy/config/environment';
 
-const packageJson = config['ember-cli-addon-docs'].packageJson;
+const projectName = config['ember-cli-addon-docs'].projectName;
 
 export default Route.extend({
 
   model() {
-    return this.store.findRecord('project', packageJson.name);
+    return this.store.findRecord('project', projectName);
   }
 
 });

addon/services/project-version.js

@@ -11,7 +11,7 @@ export default Service.extend({
   _loadAvailableVersions: task(function*() {
     let config = getOwner(this).resolveRegistration('config:environment');
     let rootURL = config.rootURL;
-    let tag = config['ember-cli-addon-docs'].packageJson.version;
+    let tag = config['ember-cli-addon-docs'].projectTag;
     let slash = rootURL.indexOf('/', 1);
 
     // TODO deal with apps deployed to custom domains, so their pathnames don't have a leading

addon/utils/computed.js

@@ -119,9 +119,8 @@ export function hasMemberType(...memberKeys) {
 /**
   @hide
 */
-export function addonLogo(packageJson) {
+export function addonLogo(name) {
   return computed(function() {
-    let name = packageJson.name;
     let logo;
     if (name.match(/ember-cli/)) {
       logo = 'ember-cli';

index.js

@@ -48,12 +48,17 @@ module.exports = {
   },
 
   config(env, baseConfig) {
+    let repo = this.parent.pkg.repository;
+    let info = require('hosted-git-info').fromUrl(repo.url || repo);
+
     let config = {
       'ember-component-css': {
         namespacing: false
       },
       'ember-cli-addon-docs': {
-        packageJson: this.parent.pkg
+        projectName: this.parent.pkg.name,
+        projectTag: this.parent.pkg.version,
+        projectHref: info && info.browse()
       }
     };
 

tests/dummy/mirage/config.js

@@ -1,12 +1,12 @@
 import config from 'dummy/config/environment';
-const packageJson = config['ember-cli-addon-docs'].packageJson;
+const projectTag = config['ember-cli-addon-docs'].projectTag;
 
 export default function() {
   this.get('/versions.json', () => {
     return {
       "latest": {
         "sha": "53b73465d31925f26fd1f77881aefcaccce2915a",
-        "tag": packageJson.version,
+        "tag": projectTag,
         "path": "latest",
         "name": "latest"
       },