1
0
mirror of https://github.com/JuanCanham/HackMyResume.git synced 2024-11-05 09:56:22 +00:00

Merge branch 'dev' into docs-2.0

This commit is contained in:
hacksalot 2018-02-03 04:36:56 -05:00
commit 9da69c3310
No known key found for this signature in database
GPG Key ID: 2F343EC247CA4B06
7 changed files with 7 additions and 7 deletions

View File

@ -627,7 +627,7 @@ MIT. Go crazy. See [LICENSE.md][1] for details.
[10]: https://github.com/beautify-web/js-beautify [10]: https://github.com/beautify-web/js-beautify
[11]: http://weasyprint.org/ [11]: http://weasyprint.org/
[fresh]: https://github.com/fluentdesk/FRESH [fresh]: https://github.com/fluentdesk/FRESH
[fresca]: https://github.com/fluentdesk/FRESCA [fresca]: https://github.com/fresh-standard/fresh-resume-schema
[dry]: https://en.wikipedia.org/wiki/Don%27t_repeat_yourself [dry]: https://en.wikipedia.org/wiki/Don%27t_repeat_yourself
[img-release]: https://img.shields.io/github/release/hacksalot/HackMyResume.svg?label=version [img-release]: https://img.shields.io/github/release/hacksalot/HackMyResume.svg?label=version
[img-master]: https://img.shields.io/travis/hacksalot/HackMyResume/master.svg [img-master]: https://img.shields.io/travis/hacksalot/HackMyResume/master.svg

View File

@ -352,7 +352,7 @@ Definition of the FRESHResume class.
FreshResume.prototype.isValid = function(info) { FreshResume.prototype.isValid = function(info) {
var ret, schemaObj, validate; var ret, schemaObj, validate;
schemaObj = require('fresca'); schemaObj = require('fresh-resume-schema');
validator = require('is-my-json-valid'); validator = require('is-my-json-valid');
validate = validator(schemaObj, { validate = validator(schemaObj, {
formats: { formats: {

View File

@ -52,7 +52,7 @@ Implementation of the 'validate' verb for HackMyResume.
} }
validator = require('is-my-json-valid'); validator = require('is-my-json-valid');
schemas = { schemas = {
fresh: require('fresca'), fresh: require('fresh-resume-schema'),
jars: require('../core/resume.json') jars: require('../core/resume.json')
}; };
results = _.map(sources, function(t) { results = _.map(sources, function(t) {

View File

@ -54,8 +54,8 @@
"copy": "^0.1.3", "copy": "^0.1.3",
"escape-latex": "^0.1.2", "escape-latex": "^0.1.2",
"extend": "^3.0.0", "extend": "^3.0.0",
"fresca": "~0.6.1",
"fresh-jrs-converter": "^0.2.3", "fresh-jrs-converter": "^0.2.3",
"fresh-resume-schema": "^1.0.0-beta",
"fresh-resume-starter": "^0.3.1", "fresh-resume-starter": "^0.3.1",
"fresh-themes": "^0.16.0-beta", "fresh-themes": "^0.16.0-beta",
"fs-extra": "^0.26.4", "fs-extra": "^0.26.4",

View File

@ -285,7 +285,7 @@ class FreshResume extends AbstractResume
###* Validate the sheet against the FRESH Resume schema. ### ###* Validate the sheet against the FRESH Resume schema. ###
isValid: ( info ) -> isValid: ( info ) ->
schemaObj = require 'fresca' schemaObj = require 'fresh-resume-schema'
validator = require 'is-my-json-valid' validator = require 'is-my-json-valid'
validate = validator( schemaObj, { # See Note [1]. validate = validator( schemaObj, { # See Note [1].
formats: { date: /^\d{4}(?:-(?:0[0-9]{1}|1[0-2]{1})(?:-[0-9]{2})?)?$/ } formats: { date: /^\d{4}(?:-(?:0[0-9]{1}|1[0-2]{1})(?:-[0-9]{2})?)?$/ }

View File

@ -36,7 +36,7 @@ _validate = (sources, unused, opts) ->
validator = require 'is-my-json-valid' validator = require 'is-my-json-valid'
schemas = schemas =
fresh: require 'fresca' fresh: require 'fresh-resume-schema'
jars: require '../core/resume.json' jars: require '../core/resume.json'
results = _.map sources, (t) -> results = _.map sources, (t) ->

View File

@ -60,7 +60,7 @@ function testResume(opts) {
it('should validate against the FRESH resume schema', function() { it('should validate against the FRESH resume schema', function() {
var result = _sheet.isValid(); var result = _sheet.isValid();
// var schemaJson = require('fresca'); // var schemaJson = require('fresh-resume-schema');
// var validate = validator( schemaJson, { verbose: true } ); // var validate = validator( schemaJson, { verbose: true } );
// var result = validate( JSON.parse( _sheet.imp.raw ) ); // var result = validate( JSON.parse( _sheet.imp.raw ) );
result || console.log("\n\nOops, resume didn't validate. " + result || console.log("\n\nOops, resume didn't validate. " +