Skip to content

Commit ce71c78

Browse files
committed
Switching to importing inflections from ember-inflector
1 parent f98c4e9 commit ce71c78

File tree

5 files changed

+11
-22
lines changed

5 files changed

+11
-22
lines changed

app/adapters/application.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
import { inject as service } from '@ember/service';
22
import DS from 'ember-data';
3-
import Ember from 'ember';
43
import fetch from 'fetch';
54
import ENV from 'ember-api-docs/config/environment';
6-
7-
const {
8-
Inflector: { inflector }
9-
} = Ember;
5+
import { pluralize } from 'ember-inflector';
106

117
const { JSONAPIAdapter } = DS;
128

@@ -29,11 +25,11 @@ export default JSONAPIAdapter.extend({
2925
if (['namespace', 'class', 'module'].includes(modelName)) {
3026
let [version] = id.replace(`${projectName}-`, '').split('-');
3127
let revId = this.get('metaStore').getRevId(projectName, version, modelName, id);
32-
url = `json-docs/${projectName}/${version}/${inflector.pluralize(modelName)}/${revId}`;
28+
url = `json-docs/${projectName}/${version}/${pluralize(modelName)}/${revId}`;
3329
} else if (modelName === 'missing') {
3430
let version = this.get('projectService.version');
3531
let revId = this.get('metaStore').getRevId(projectName, version, modelName, id);
36-
url = `json-docs/${projectName}/${version}/${inflector.pluralize(modelName)}/${revId}`;
32+
url = `json-docs/${projectName}/${version}/${pluralize(modelName)}/${revId}`;
3733
} else if (modelName === 'project') {
3834
this.set('currentProject', id);
3935
url = `rev-index/${id}`;

app/routes/class.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import { hash, resolve } from 'rsvp';
22
import Route from '@ember/routing/route';
3-
import Ember from 'ember';
43
import getLastVersion from 'ember-api-docs/utils/get-last-version';
5-
6-
const { Inflector: { inflector }} = Ember;
4+
import { pluralize } from 'ember-inflector';
75

86
export default Route.extend({
97

@@ -44,7 +42,7 @@ export default Route.extend({
4442
},
4543

4644
redirect(model) {
47-
return this.transitionTo(`project-version.${inflector.pluralize(model.classData.type)}.${model.classData.type}`,
45+
return this.transitionTo(`project-version.${pluralize(model.classData.type)}.${model.classData.type}`,
4846
model.project.id,
4947
model.version,
5048
model.classData.data.get('name'));

app/routes/data-class.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import { hash, resolve } from 'rsvp';
22
import Route from '@ember/routing/route';
3-
import Ember from 'ember';
43
import getLastVersion from 'ember-api-docs/utils/get-last-version';
5-
6-
const { Inflector: { inflector }} = Ember;
4+
import { pluralize } from 'ember-inflector';
75

86
export default Route.extend({
97

@@ -40,7 +38,7 @@ export default Route.extend({
4038
},
4139

4240
redirect(model) {
43-
return this.transitionTo(`project-version.${inflector.pluralize(model.classData.type)}.${model.classData.type}`,
41+
return this.transitionTo(`project-version.${pluralize(model.classData.type)}.${model.classData.type}`,
4442
model.project.id,
4543
model.version,
4644
model.classData.data.get('name'));

app/routes/data-module.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import { hash, resolve } from 'rsvp';
22
import Route from '@ember/routing/route';
3-
import Ember from 'ember';
43
import getLastVersion from 'ember-api-docs/utils/get-last-version';
5-
6-
const { Inflector: { inflector }} = Ember;
4+
import { pluralize } from 'ember-inflector';
75

86
export default Route.extend({
97

@@ -32,7 +30,7 @@ export default Route.extend({
3230
},
3331

3432
redirect(model) {
35-
return this.transitionTo(`project-version.${inflector.pluralize(model.classData.type)}.${model.classData.type}`,
33+
return this.transitionTo(`project-version.${pluralize(model.classData.type)}.${model.classData.type}`,
3634
model.project.id,
3735
model.version,
3836
model.classData.data.get('name'));

app/routes/module.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import { hash, resolve } from 'rsvp';
22
import Route from '@ember/routing/route';
3-
import Ember from 'ember';
43
import getLastVersion from 'ember-api-docs/utils/get-last-version';
54

6-
const { Inflector: { inflector }} = Ember;
5+
import { pluralize } from 'ember-inflector';
76

87
export default Route.extend({
98

@@ -29,7 +28,7 @@ export default Route.extend({
2928
},
3029

3130
redirect(model) {
32-
return this.transitionTo(`project-version.${inflector.pluralize(model.classData.type)}.${model.classData.type}`,
31+
return this.transitionTo(`project-version.${pluralize(model.classData.type)}.${model.classData.type}`,
3332
model.project.id,
3433
model.version,
3534
model.classData.data.get('name'));

0 commit comments

Comments
 (0)