Skip to content

Commit

Permalink
#16 Remove normalizeModel task references from jsdocs and examples
Browse files Browse the repository at this point in the history
  • Loading branch information
tormozz48 committed Feb 10, 2016
1 parent 8b677c5 commit bf74002
Show file tree
Hide file tree
Showing 14 changed files with 14 additions and 27 deletions.
16 changes: 8 additions & 8 deletions examples/gulp-full.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
var gulp = require('gulp'),
gorshochek = require('../index'),
token = '54fa292690dc4b5410bb' + '57d08170f11d32691633';
const gulp = require('gulp');
const gorshochek = require('../index');

var model = gorshochek.createModel(),
tasks = gorshochek.tasks;
const token = process.env.TOKEN;

const model = gorshochek.createModel();
const tasks = gorshochek.tasks;

gulp.task('merge-model', tasks.core.mergeModels(model, {modelPath: './examples/model.ru.json'}));
gulp.task('normalize-model', ['merge-model'], tasks.core.normalizeModel(model));
gulp.task('process-model', ['normalize-model']);
gulp.task('process-model', ['merge-model']);

gulp.task('load-from-github', ['process-model'], tasks.docs.loadSourceFromGithub(model, {token: token}));
gulp.task('load-from-github', ['process-model'], tasks.docs.loadSourceFromGithub(model, {token}));
gulp.task('load-from-file', ['process-model'], tasks.docs.loadSourceFromLocal(model));
gulp.task('transform-md-html', ['load-from-github', 'load-from-file'], tasks.docs.transformMdToHtml(model));
gulp.task('process-docs', ['transform-md-html']);
Expand Down
13 changes: 6 additions & 7 deletions examples/native-full.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
var Q = require('q'),
gorshochek = require('../index'),
token = process.env.TOKEN;
const Q = require('q');
const gorshochek = require('../index');
const token = process.env.TOKEN;

var model = gorshochek.createModel(),
tasks = gorshochek.tasks;
const model = gorshochek.createModel();
const tasks = gorshochek.tasks;

// TODO: run everything possible in parallel

Q()
.then(tasks.core.mergeModels(model, {modelPath: './examples/model.ru.json'}))
.then(tasks.core.normalizeModel(model))
.then(tasks.meta.generateTagPages(model))
.then(tasks.docs.loadSourceFromGithub(model, {token: token}))
.then(tasks.docs.loadSourceFromGithub(model, {token}))
.then(tasks.docs.loadSourceFromLocal(model))
.then(tasks.docs.transformMdToHtml(model))
.then(tasks.page.createHeaderTitle(model))
Expand Down
1 change: 0 additions & 1 deletion src/tasks/core/rsync.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ const debug = require('debug')('rsync');
* var model = gorshochek.createModel();
* Q()
* .then(tasks.core.mergeModels(model, {modelPath: './examples/model.ru.json'}))
* .then(tasks.core.normalizeModel(model))
* .then(tasks.core.saveModel(model))
* .then(tasks.core.rsync(model, {
* dest: './data',
Expand Down
1 change: 0 additions & 1 deletion src/tasks/core/save-model.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import * as baseUtil from '../../util';
* var model = gorshochek.createModel();
* Q()
* .then(tasks.core.mergeModels(model, {modelPath: './examples/model.ru.json'}))
* .then(tasks.core.normalizeModel(model))
* .then(tasks.core.saveModel(model))
* .then(tasks.core.rsync(model, {
* dest: './data',
Expand Down
1 change: 0 additions & 1 deletion src/tasks/docs/load-from-file.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const debug = require('debug')('docs file load');
* var model = gorshochek.createModel();
* Q()
* .then(tasks.core.mergeModels(model, {modelPath: './examples/model.ru.json'}))
* .then(tasks.core.normalizeModel(model))
* .then(tasks.docs.loadSourcesFromLocal(model))
* .then(tasks.core.saveModel(model))
* .then(tasks.core.rsync(model, {
Expand Down
1 change: 0 additions & 1 deletion src/tasks/docs/load-from-github.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ const debug = require('debug')('docs github load');
* var model = gorshochek.createModel();
* Q()
* .then(tasks.core.mergeModels(model, {modelPath: './examples/model.ru.json'}))
* .then(tasks.core.normalizeModel(model))
* .then(tasks.docs.loadSourcesFromGithub(model, {
* token: 'your github token',
* updateDate: true,
Expand Down
1 change: 0 additions & 1 deletion src/tasks/docs/transform-md-html.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import * as baseUtil from '../../util';
* var model = gorshochek.createModel();
* Q()
* .then(tasks.core.mergeModels(model, {modelPath: './examples/model.ru.json'}))
* .then(tasks.core.normalizeModel(model))
* .then(tasks.docs.loadSourcesFromLocal(model))
* .then(tasks.docs.transformMdToHtml(model))
* .then(tasks.core.saveModel(model))
Expand Down
1 change: 0 additions & 1 deletion src/tasks/meta/tags.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ const debug = require('debug')('meta-tags');
* var model = gorshochek.createModel();
* Q()
* .then(tasks.core.mergeModels(model, {modelPath: './examples/model.ru.json'}))
* .then(tasks.core.normalizeModel(model))
* .then(tasks.meta.createTagPages(model, {baseUrl: '/tags', baseTitle: 'Tags'}))
* .then(tasks.core.saveModel(model))
* .then(tasks.core.rsync(model, {
Expand Down
1 change: 0 additions & 1 deletion src/tasks/override/override-docs.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ const debug = require('debug')('override-docs');
* var model = gorshochek.createModel();
* Q()
* .then(tasks.core.mergeModels(model, {modelPath: './examples/model.ru.json'}))
* .then(tasks.core.normalizeModel(model))
* .then(tasks.docs.loadSourcesFromLocal(model))
* .then(tasks.docs.transformMdToHtml(model))
* .then(tasks.override.overrideDocLinks(model))
Expand Down
1 change: 0 additions & 1 deletion src/tasks/page/breadcrumbs.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import * as util from './util';
* var model = gorshochek.createModel();
* Q()
* .then(tasks.core.mergeModels(model, {modelPath: './examples/model.ru.json'}))
* .then(tasks.core.normalizeModel(model))
* .then(tasks.page.createBreadcrumbs(model))
* .then(tasks.core.saveModel(model))
* .then(tasks.core.rsync(model, {
Expand Down
1 change: 0 additions & 1 deletion src/tasks/page/header-meta.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import Q from 'q';
* var model = gorshochek.createModel();
* Q()
* .then(tasks.core.mergeModels(model, {modelPath: './examples/model.ru.json'}))
* .then(tasks.core.normalizeModel(model))
* .then(tasks.page.createHeaderMeta(model))
* .then(tasks.core.saveModel(model))
* .then(tasks.core.rsync(model, {
Expand Down
1 change: 0 additions & 1 deletion src/tasks/page/header-title.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import * as util from './util';
* var model = gorshochek.createModel();
* Q()
* .then(tasks.core.mergeModels(model, {modelPath: './examples/model.ru.json'}))
* .then(tasks.core.normalizeModel(model))
* .then(tasks.page.createHeaderTitle(model, {delimiter: '/'}))
* .then(tasks.core.saveModel(model))
* .then(tasks.core.rsync(model, {
Expand Down
1 change: 0 additions & 1 deletion src/tasks/page/search-meta.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import * as util from './util';
* var model = gorshochek.createModel();
* Q()
* .then(tasks.core.mergeModels(model, {modelPath: './examples/model.ru.json'}))
* .then(tasks.core.normalizeModel(model))
* .then(tasks.page.createSearchMeta(model))
* .then(tasks.core.saveModel(model))
* .then(tasks.core.rsync(model, {
Expand Down
1 change: 0 additions & 1 deletion src/tasks/sitemap/sitemap-xml.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ const debug = require('debug')('sitemap-xml');
* var model = gorshochek.createModel();
* Q()
* .then(tasks.core.mergeModels(model, {modelPath: './examples/model.ru.json'}))
* .then(tasks.core.normalizeModel(model))
* .then(tasks.sitemap.createSitemapXML(model, {host: 'https://ru.bem.info'}))
* .then(tasks.core.saveModel(model))
* .then(tasks.core.rsync(model, {
Expand Down

0 comments on commit bf74002

Please sign in to comment.