Skip to content

Replace moment.js with date-fns #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 24, 2017
Merged

Replace moment.js with date-fns #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
"typings": "./dist/index.d.ts",
"dependencies": {
"@types/qs": "^6.5.0",
"date-fns": "^1.28.5",
"lodash-es": "^4.17.4",
"moment": "^2.15.2",
"qs": "^6.5.0"
},
"peerDependencies": {
Expand Down
7 changes: 4 additions & 3 deletions src/decorators/attribute.decorator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
import * as moment from 'moment';
import * as dateFormat from 'date-fns/format';
import * as dateParse from 'date-fns/parse';

export function Attribute(config: any = {}) {
return function (target: any, propertyName: string) {

let converter = function(dataType: any, value: any, forSerialisation = false): any {
if (!forSerialisation) {
if (dataType === Date) {
return moment(value).toDate();
return dateParse(value);
}
} else {
if (dataType === Date) {
return moment(value).format(moment.defaultFormatUtc);
return dateFormat(value, 'YYYY-MM-DDTHH:mm:ss[Z]');
}
}

Expand Down
32 changes: 16 additions & 16 deletions src/models/json-api.model.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { TestBed } from '@angular/core/testing';
import * as dateParse from 'date-fns/parse';
import { Author } from '../../test/models/author.model';
import {
AUTHOR_ID, AUTHOR_NAME, AUTHOR_BIRTH, AUTHOR_DEATH,
Expand All @@ -9,7 +10,6 @@ import { Http, BaseRequestOptions, ConnectionBackend } from '@angular/http';
import { MockBackend } from '@angular/http/testing';
import { Datastore } from '../../test/datastore.service';
import { Chapter } from '../../test/models/chapter.model';
import * as moment from 'moment';

let datastore: Datastore;

Expand Down Expand Up @@ -48,7 +48,7 @@ describe('JsonApiModel', () => {
expect(author).toBeDefined();
expect(author.id).toBe('1');
expect(author.name).toBe('Daniele');
expect(author.date_of_birth.getTime()).toBe(moment('1987-05-25').toDate().getTime());
expect(author.date_of_birth.getTime()).toBe(dateParse('1987-05-25').getTime());
});

it('should be instantiated without attributes', () => {
Expand All @@ -69,10 +69,10 @@ describe('JsonApiModel', () => {
expect(author).toBeDefined();
expect(author.id).toBe(AUTHOR_ID);
expect(author.name).toBe(AUTHOR_NAME);
expect(author.date_of_birth.valueOf()).toBe(moment(AUTHOR_BIRTH, 'YYYY-MM-DD').valueOf());
expect(author.date_of_death.valueOf()).toBe(moment(AUTHOR_DEATH, 'YYYY-MM-DD').valueOf());
expect(author.created_at.valueOf()).toBe(moment(AUTHOR_CREATED).valueOf());
expect(author.updated_at.valueOf()).toBe(moment(AUTHOR_UPDATED).valueOf());
expect(author.date_of_birth.valueOf()).toBe(dateParse(AUTHOR_BIRTH).valueOf());
expect(author.date_of_death.valueOf()).toBe(dateParse(AUTHOR_DEATH).valueOf());
expect(author.created_at.valueOf()).toBe(dateParse(AUTHOR_CREATED).valueOf());
expect(author.updated_at.valueOf()).toBe(dateParse(AUTHOR_UPDATED).valueOf());
expect(author.books).toBeUndefined();
});

Expand All @@ -86,17 +86,17 @@ describe('JsonApiModel', () => {
expect(author).toBeDefined();
expect(author.id).toBe(AUTHOR_ID);
expect(author.name).toBe(AUTHOR_NAME);
expect(author.date_of_birth.valueOf()).toBe(moment(AUTHOR_BIRTH, 'YYYY-MM-DD').valueOf());
expect(author.date_of_death.valueOf()).toBe(moment(AUTHOR_DEATH, 'YYYY-MM-DD').valueOf());
expect(author.created_at.valueOf()).toBe(moment(AUTHOR_CREATED).valueOf());
expect(author.updated_at.valueOf()).toBe(moment(AUTHOR_UPDATED).valueOf());
expect(author.date_of_birth.valueOf()).toBe(dateParse(AUTHOR_BIRTH).valueOf());
expect(author.date_of_death.valueOf()).toBe(dateParse(AUTHOR_DEATH).valueOf());
expect(author.created_at.valueOf()).toBe(dateParse(AUTHOR_CREATED).valueOf());
expect(author.updated_at.valueOf()).toBe(dateParse(AUTHOR_UPDATED).valueOf());
expect(author.books).toBeDefined();
expect(author.books.length).toBe(BOOK_NUMBER);
author.books.forEach((book: Book, index: number) => {
expect(book instanceof Book).toBeTruthy();
expect(+book.id).toBe(index + 1);
expect(book.title).toBe(BOOK_TITLE);
expect(book.date_published.valueOf()).toBe(moment(BOOK_PUBLISHED, 'YYYY-MM-DD').valueOf());
expect(book.date_published.valueOf()).toBe(dateParse(BOOK_PUBLISHED).valueOf());
});
});

Expand Down Expand Up @@ -125,17 +125,17 @@ describe('JsonApiModel', () => {
expect(author).toBeDefined();
expect(author.id).toBe(AUTHOR_ID);
expect(author.name).toBe(AUTHOR_NAME);
expect(author.date_of_birth.valueOf()).toBe(moment(AUTHOR_BIRTH, 'YYYY-MM-DD').valueOf());
expect(author.date_of_death.valueOf()).toBe(moment(AUTHOR_DEATH, 'YYYY-MM-DD').valueOf());
expect(author.created_at.valueOf()).toBe(moment(AUTHOR_CREATED).valueOf());
expect(author.updated_at.valueOf()).toBe(moment(AUTHOR_UPDATED).valueOf());
expect(author.date_of_birth.valueOf()).toBe(dateParse(AUTHOR_BIRTH).valueOf());
expect(author.date_of_death.valueOf()).toBe(dateParse(AUTHOR_DEATH).valueOf());
expect(author.created_at.valueOf()).toBe(dateParse(AUTHOR_CREATED).valueOf());
expect(author.updated_at.valueOf()).toBe(dateParse(AUTHOR_UPDATED).valueOf());
expect(author.books).toBeDefined();
expect(author.books.length).toBe(BOOK_NUMBER);
author.books.forEach((book: Book, index: number) => {
expect(book instanceof Book).toBeTruthy();
expect(+book.id).toBe(index + 1);
expect(book.title).toBe(BOOK_TITLE);
expect(book.date_published.valueOf()).toBe(moment(BOOK_PUBLISHED, 'YYYY-MM-DD').valueOf());
expect(book.date_published.valueOf()).toBe(dateParse(BOOK_PUBLISHED).valueOf());
expect(book.chapters).toBeDefined();
expect(book.chapters.length).toBe(CHAPTERS_NUMBER);
book.chapters.forEach((chapter: Chapter, cindex: number) => {
Expand Down
4 changes: 2 additions & 2 deletions src/services/json-api-datastore.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {TestBed} from '@angular/core/testing';
import * as dateParse from 'date-fns/parse';
import {Author} from '../../test/models/author.model';
import {AUTHOR_BIRTH, AUTHOR_ID, AUTHOR_NAME, BOOK_TITLE, getAuthorData} from '../../test/fixtures/author.fixture';
import {
Expand All @@ -13,7 +14,6 @@ import {
import {MockBackend, MockConnection} from '@angular/http/testing';
import {BASE_URL, Datastore} from '../../test/datastore.service';
import {ErrorResponse} from '../models/error-response.model';
import * as moment from 'moment';
import {getSampleBook} from '../../test/fixtures/book.fixture';
import {Book} from '../../test/models/book.model';

Expand Down Expand Up @@ -244,7 +244,7 @@ describe('JsonApiDatastore', () => {
datastore.findRecord(Author, '1').subscribe((author) => {
expect(author).toBeDefined();
expect(author.id).toBe(AUTHOR_ID);
expect(author.date_of_birth).toEqual(moment(AUTHOR_BIRTH, 'YYYY-MM-DD').toDate());
expect(author.date_of_birth).toEqual(dateParse(AUTHOR_BIRTH));
});
});

Expand Down