refactor: octane dummy app files

README.md

@@ -88,26 +88,26 @@ In the following examples, assume the models look like this:
 
 ```javascript
   // standard models
-  User = DS.Model.extend({
-    name:     DS.attr('string'),
-    style:    DS.attr('string'),
-    projects: DS.hasMany('project'),
-    hats:     DS.hasMany('hat', {polymorphic: true})
-  });
+  class User extends Model {
+    @attr('string')     name
+    @attr('string')     style
+    @hasMany('project') projects
+    @hasMany('hat', {polymorphic: true})  hats
+  }
 
-  Project = DS.Model.extend({
-    title:  DS.attr('string'),
-    user:   DS.belongsTo('user')
-  });
+  class Project extends Model {
+    @attr('string')     title
+    @belongsTo('user')  user
+  }
 
   // polymorphic models
-  Hat = DS.Model.extend({
-    type: DS.attr('string'),
-    user: DS.belongsTo('user')
-  });
+  class Hat extends Model {
+    @attr('string')     type
+    @belongsTo('user')  user
+  }
 
-  BigHat = Hat.extend();
-  SmallHat = Hat.extend();
+  class BigHat extends Hat {};
+  class SmallHat extends Hat {};
 ```
 
 ### Defining Factories
@@ -561,10 +561,10 @@ Let's say you have a model and a factory like this:
   import Model from 'ember-data/model';
   import attr from 'ember-data/attr';
 
-  export default Model.extend({
-    dogNumber: attr('string'),
-    sound: attr('string')
-  });
+  export default class Dog extends Model{
+    @attr('string') dogNumber
+    @attr('string') sound
+  }
 
   // tests/factories/dog.js
   import FactoryGuy from 'ember-data-factory-guy';
@@ -1071,23 +1071,23 @@ For example, say we have the following `Employee` model which makes use of the `
 
 ```javascript
 // Employee model
-export default Model.extend({
-  name: fragment('name'),
-  phoneNumbers: fragmentArray('phone-number')
-})
+export default class Employee extends Model {
+  @fragment('name') name
+  @fragmentArray('phone-number') phoneNumbers
+}
 
 // Name fragment
-export default Fragment.extend({
-  titles: array('string'),
-  firstName: attr('string'),
-  lastName: attr('string')
-});
+export default class Name extends Fragment {
+  @array('string')  titles
+  @attr('string')   firstName
+  @attr('string')    lastName
+}
 
 // Phone Number fragment
-export default Fragment.extend({
-  number: attr('string')
-  type: attr('string')
-});
+export default class PhoneNumber extends Fragment {
+  @attr('string') number
+  @attr('string') type
+}
 ```
 
 A factory for this model and its fragments would look like so:
@@ -2086,18 +2086,18 @@ describe('Admin View', function() {
 ```javascript
 
   // app/serializers/person.js
-  export default DS.RESTSerializer.extend({
+  export default class PersonSerializer extends RESTSerializer {
 
     // let's say you're modifying all names to be Japanese honorific style
-    serialize: function(snapshot, options) {
+    serialize(snapshot, options) {
       var json = this._super(snapshot, options);
 
       let honorificName = [snapshot.record.get('name'), 'san'].join('-');
       json.name = honorificName;
 
       return json;
     }
-  });
+  }
 
   // somewhere in your tests
   let person = make('person', {name: "Daniel"});

addon/factory-guy.js

@@ -68,10 +68,10 @@ class FactoryGuy {
   /**
    ```javascript
 
-   Person = DS.Model.extend({
-     type: DS.attr('string'),
-     name: DS.attr('string')
-   })
+   class Person extends Model {
+     @attr('string') type
+     @attr('string') name
+   }
 
    FactoryGuy.define('person', {
      sequences: {

tests/dummy/app/adapters/application.js

@@ -3,4 +3,4 @@
 import AdapterFetch from 'ember-fetch/mixins/adapter-fetch';
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
 
-export default JSONAPIAdapter.extend(AdapterFetch);
+export default class extends JSONAPIAdapter.extend(AdapterFetch) {}

tests/dummy/app/controllers/profiles.js

@@ -1,2 +1,2 @@
 import Controller from '@ember/controller';
-export default Controller.extend();
+export default class extends Controller {}

tests/dummy/app/controllers/search/results.js

@@ -0,0 +1,11 @@
+import Controller from '@ember/controller';
+
+export default class extends Controller {
+  get previousPage() {
+    return this.model.meta?.previous;
+  }
+
+  get nextPage() {
+    return this.model.meta?.next;
+  }
+}

tests/dummy/app/controllers/users.js

@@ -1,9 +1,9 @@
 import Controller from '@ember/controller';
+import { action } from '@ember/object';
 
-export default Controller.extend({
-  actions: {
-    deleteUser(user) {
-      return user.destroyRecord();
-    },
-  },
-});
+export default class extends Controller {
+  @action
+  deleteUser(user) {
+    return user.destroyRecord();
+  }
+}

tests/dummy/app/models/big-group.js

@@ -1,6 +1,6 @@
 import Group from './group';
 import { attr } from '@ember-data/model';
 
-export default Group.extend({
-  type: attr('string', { defaultValue: 'BigGroup' }),
-});
+export default class extends Group {
+  @attr('string', { defaultValue: 'BigGroup' }) type;
+}

tests/dummy/app/models/big-hat.js

@@ -1,6 +1,6 @@
 import Hat from './hat';
 import { hasMany } from '@ember-data/model';
 
-export default Hat.extend({
-  materials: hasMany('soft-material', { async: false }),
-});
+export default class extends Hat {
+  @hasMany('soft-material', { async: false }) materials;
+}

tests/dummy/app/models/billing-address.js

@@ -1,6 +1,6 @@
 import { attr } from '@ember-data/model';
 import Address from 'dummy/models/nested-fragment/address';
 
-export default Address.extend({
-  billingAddressProperty: attr('number'),
-});
+export default class extends Address {
+  @attr('number') billingAddressProperty;
+}

tests/dummy/app/models/cat.js

@@ -1,7 +1,7 @@
 import Model, { attr } from '@ember-data/model';
 
-export default Model.extend({
-  type: attr('string'),
-  name: attr('string'),
-  friend: attr('string'),
-});
+export default class extends Model {
+  @attr('string') type;
+  @attr('string') name;
+  @attr('string') friend;
+}

tests/dummy/app/models/comic-book.js

@@ -1,8 +1,8 @@
 import Model, { attr, hasMany, belongsTo } from '@ember-data/model';
 
-export default Model.extend({
-  name: attr('string'),
-  company: belongsTo('company'),
-  characters: hasMany('person', { polymorphic: true }),
-  includedVillains: hasMany('villain'),
-});
+export default class extends Model {
+  @attr('string') name;
+  @belongsTo('company') company;
+  @hasMany('person', { polymorphic: true }) characters;
+  @hasMany('villain') includedVillains;
+}

tests/dummy/app/models/company.js

@@ -1,9 +1,9 @@
 import Model, { attr, hasMany, belongsTo } from '@ember-data/model';
 
-export default Model.extend({
-  type: attr('string', { defaultValue: 'Company' }),
-  name: attr('string'),
-  profile: belongsTo('profile', { async: false }),
-  users: hasMany('user', { async: true, inverse: 'company' }),
-  projects: hasMany('project', { async: true }),
-});
+export default class extends Model {
+  @attr('string', { defaultValue: 'Company' }) type;
+  @attr('string') name;
+  @belongsTo('profile', { async: false }) profile;
+  @hasMany('user', { async: true, inverse: 'company' }) users;
+  @hasMany('project', { async: true }) projects;
+}

tests/dummy/app/models/cool-stoner.js

@@ -1,3 +1,3 @@
 import Stoner from './stoner';
 
-export default Stoner.extend();
+export default class extends Stoner {}

tests/dummy/app/models/department-employment.js

@@ -2,8 +2,8 @@ import { attr } from '@ember-data/model';
 import Fragment from 'ember-data-model-fragments/fragment';
 import { fragment } from 'ember-data-model-fragments/attributes';
 
-export default Fragment.extend({
-  startDate: attr('date'),
-  endDate: attr('date'),
-  department: fragment('department'),
-});
+export default class extends Fragment {
+  @attr('date') startDate;
+  @attr('date') endDate;
+  @fragment('department') department;
+}

tests/dummy/app/models/department.js

@@ -2,10 +2,11 @@ import { attr } from '@ember-data/model';
 import Fragment from 'ember-data-model-fragments/fragment';
 import { fragmentArray } from 'ember-data-model-fragments/attributes';
 
-export default Fragment.extend({
-  name: attr('string'),
-  addresses: fragmentArray('nested-fragment/address', {
+export default class extends Fragment {
+  @attr('string') name;
+  @fragmentArray('nested-fragment/address', {
     polymorphic: true,
     typeKey: '$type',
-  }),
-});
+  })
+  addresses;
+}

tests/dummy/app/models/dog.js

@@ -1,8 +1,8 @@
 import Model, { attr, belongsTo } from '@ember-data/model';
 
-export default Model.extend({
-  owner: belongsTo('person'),
-  dogNumber: attr('string'),
-  sound: attr('string'),
-  tag: attr(), // hash
-});
+export default class extends Model {
+  @belongsTo('person') owner;
+  @attr('string') dogNumber;
+  @attr('string') sound;
+  @attr() tag; // hash
+}

tests/dummy/app/models/employee.js

@@ -5,12 +5,12 @@ import {
   fragmentArray,
 } from 'ember-data-model-fragments/attributes';
 
-export default Model.extend({
-  designation: fragment('name'),
-  name: fragment('name'),
-  titles: array('string'),
-  gender: attr('string'),
-  birthDate: attr('date'),
-  position: attr(),
-  departmentEmployments: fragmentArray('department-employment'),
-});
+export default class extends Model {
+  @fragment('name') designation;
+  @fragment('name') name;
+  @array('string') titles;
+  @attr('string') gender;
+  @attr('date') birthDate;
+  @attr() position;
+  @fragmentArray('department-employment') departmentEmployments;
+}

tests/dummy/app/models/entry-type.js

@@ -1,6 +1,6 @@
 import Model, { attr, hasMany } from '@ember-data/model';
 
-export default Model.extend({
-  name: attr('string'),
-  entries: hasMany('entry'),
-});
+export default class extends Model {
+  @attr('string') name;
+  @hasMany('entry') entries;
+}

tests/dummy/app/models/entry.js

@@ -1,6 +1,6 @@
 import Model, { attr, belongsTo } from '@ember-data/model';
 
-export default Model.extend({
-  name: attr('string'),
-  entryType: belongsTo('entry-type'),
-});
+export default class extends Model {
+  @attr('string') name;
+  @belongsTo('entry-type') entryType;
+}

tests/dummy/app/models/fluffy-material.js

@@ -1,10 +1,11 @@
 import Material from './material';
 import { belongsTo } from '@ember-data/model';
 
-export default Material.extend({
-  hat: belongsTo('hat', {
+export default class extends Material {
+  @belongsTo('hat', {
     async: false,
     inverse: 'fluffyMaterials',
     polymorphic: true,
-  }),
-});
+  })
+  hat;
+}

tests/dummy/app/models/group.js

@@ -1,17 +1,19 @@
 import Model, { attr, hasMany, belongsTo } from '@ember-data/model';
 
-export default Model.extend({
-  type: attr('string', { defaultValue: 'Group' }),
-  name: attr('string'),
-  profiles: hasMany('profile', { async: false, inverse: 'group' }),
-  versions: hasMany('group', {
+export default class extends Model {
+  @attr('string', { defaultValue: 'Group' }) type;
+  @attr('string') name;
+  @hasMany('profile', { async: false, inverse: 'group' }) profiles;
+  @hasMany('group', {
     async: false,
     polymorphic: true,
     inverse: 'group',
-  }),
-  group: belongsTo('group', {
+  })
+  versions;
+  @belongsTo('group', {
     async: false,
     polymorphic: true,
     inverse: 'versions',
-  }),
-});
+  })
+  group;
+}