Merge branch 'dev' into docs-2.0

README.md

@@ -627,7 +627,7 @@ MIT. Go crazy. See [LICENSE.md][1] for details.
 [10]: https://github.com/beautify-web/js-beautify
 [11]: http://weasyprint.org/
 [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
 [img-release]: https://img.shields.io/github/release/hacksalot/HackMyResume.svg?label=version
 [img-master]: https://img.shields.io/travis/hacksalot/HackMyResume/master.svg

dist/core/fresh-resume.js

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

dist/verbs/validate.js

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

package.json

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

src/core/fresh-resume.coffee

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

src/verbs/validate.coffee

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

test/scripts/test-fresh-sheet.js

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