Merge pull request #107 from kevee/releases

2.1 release

.gitattributes

@@ -0,0 +1,2 @@
+# Auto detect text files and perform LF normalization
+* text=auto

.gitignore

@@ -5,10 +5,7 @@ examples/wysiwyg/editors/aloha/*
 examples/wysiwyg/editors/tinymce/*
 examples/wysiwyg/editors/ckeditor/*
 examples/wysiwyg/editors/ckeditor4/*
-_site
 node_modules/*
-utilities/printTable.php
-
-utilities/guidelineFinder.php
-
-utilities/tests.json
+.grunt/*
+bower_components/*
+lib/*

.jshintrc

@@ -0,0 +1,18 @@
+{
+  "curly": true,
+  "eqeqeq": true,
+  "immed": true,
+  "latedef": true,
+  "newcap": true,
+  "noarg": true,
+  "sub": true,
+  "undef": true,
+  "boss": true,
+  "eqnull": true,
+  "browser": true,
+  "jquery": true,
+  "globals": {
+    "quail": true,
+    "process": true
+  }
+}

.travis.yml

@@ -2,6 +2,14 @@ language: node_js
 node_js:
   - 0.8
 
+env:
+  global:
+    - secure: "chVihuGb0n35Lvu3H87JUCmVTg8UpIPLqRhtNHRQc/6a1bXH8Q0KMCIIhIO1lhSJXkIy/x9OwqXOve4Do8liXrwgJMuy673e9lGFxK4XFujTlvyEAwHhlMOhGpo/UYyt3wn3aFB0GY1lKn1+HtecJYSOqyVQ3unhY1lO1cCkkig="
+    - secure: "BWWoZltjRxfbKF4AlrPq9aSumY63n/xDnSvmuHXAEmbfJoWpOXXB0me5H6515I0zH1hjpHyusmQ0UXfRQAie26kvpPyGIdjs12mfGT0hLrkdO2ua/OlosufatnZAb4F0eg9Z6AR2w+94BK5vNfc+gSbHWWI8SLjMa29Oz+WLdL0="
+
 install:
   - npm install grunt-cli -g
   - npm install
+
+after_success:
+  - grunt saucelabs --verbose

CHANGELOG.md

@@ -1,6 +1,28 @@
 QUAIL Changelog
 ===============
 
+2.1
+---
+- Changed license to MIT
+- Quail is now split into various components and custom callbacks that are build using `grunt build`
+- Configuration is now in YAML format
+- Tests are explicitly aligned with WCAG techniques or success criteria.
+- Tests can have translatable titles and default descriptions.
+- Tests now support different configurations based on guideline alignment.
+
+2.0.4
+-----
+- Moved source files to different files in `/src`, `/dist` is now built versions of quail.
+- Renamed all test files to match their accessibility tests.
+- Updated most test files to HTML5 doctype.
+- Got rid of dependencies for pxtoem and hasEvent libraries.
+- Made strings build into JS instead of needing ajax calls.
+
+2.0.3
+-----
+- Added tags to tests so that they could be categorized by implementations.
+- Cleaned up some Grunt linting.
+
 2.0.2
 -----
  - Added filtering as an extra option.

Gruntfile.js

@@ -2,70 +2,187 @@
 /*global module:false*/
 module.exports = function(grunt) {
 
+  var buildId = (typeof process.env.TRAVIS_BUILD_ID !== 'undefined') ? process.env.TRAVIS_BUILD_ID : Date.now();
   // Project configuration.
   grunt.initConfig({
     pkg: grunt.file.readJSON('quail.json'),
+    convert: {
+      yml2json: {
+        files: [
+          {
+            expand: true,
+            cwd: 'src/resources/guidelines',
+            src: ['*.yml'],
+            dest: 'dist/guidelines/',
+            ext: '.json'
+          },
+          {
+            expand: true,
+            cwd: 'src/resources',
+            src: ['*.yml'],
+            dest: 'dist/',
+            ext: '.json'
+          }
+        ]
+      }
+    },
+    shell: {
+      hooks: {
+        command: 'cp git-hooks/pre-commit .git/hooks/'
+      }
+    },
     concat: {
       options: {
-        banner: '/*! QUAIL quailjs.org | quailjs.org/license */',
+        banner: '<%= pkg.options.banner %>' + "\n" + ';(function($) {' + "\n",
+        footer: "\n" + '})(jQuery);',
         stripBanners: true
-      },
+      },  
       dist: {
-        src: ['src/<%= pkg.name %>.js']
+        src: ['src/js/core.js', 'src/js/components/*.js', 'src/js/strings/*.js', 'src/js/custom/*.js'],
+        dest: 'dist/quail.jquery.js'
       }
     },
     uglify: {
-      options: {
-        banner: '<%= concat.options.banner %>'
-      },
       dist: {
-        files : {
-          'src/quail.min.js' : 'src/quail.js'
+        files: {
+          'dist/quail.jquery.min.js': 'dist/quail.jquery.js'
         }
+      },
+      options: {
+        banner: '<%= pkg.options.banner %>'
       }
     },
     qunit: {
       files: ['test/quail.html']
     },
-    watch: {
-      files: '<%= jshint.files %>',
-      tasks: 'test'
-    },
     jshint: {
       options: {
-        curly: true,
-        eqeqeq: true,
-        immed: true,
-        latedef: true,
-        newcap: true,
-        noarg: true,
-        sub: true,
-        undef: true,
-        boss: true,
-        eqnull: true,
-        browser: true,
-        globals: {
-            jQuery: true
+        jshintrc: '.jshintrc'
+      },
+      files: ['Gruntfile.js', 'src/**/*.js']
+    },
+    watch: {
+      scripts: {
+        files: ['src/**/*.js', 'src/**/*.yml'],
+        tasks: ['convert', 'concat', 'jshint', 'buildGuideline', 'uglify'],
+        options: {
+          spawn: false
         }
+      }
+    },
+    buildGuideline: {
+      dist: {
+        files: [
+          { guideline: '508', src: 'dist/tests.json', dest: 'dist/guidelines/508.tests.json' },
+          { guideline: 'wcag', src: 'dist/tests.json', dest: 'dist/guidelines/wcag.tests.json' }
+        ]
+      }
+    },
+    compressTestsJson: {
+      dist: {
+        files: [
+          { src: 'dist/tests.json', dest: 'dist/tests.min.json' }
+        ]
+      }
+    },
+    'gh-pages': {
+      options: {
+        base: '',
+        add: true
       },
-      files: ['Gruntfile.js', 'src/quail.js', 'src/resources/**/*.json']
+      src: ['dist/**']
+    },
+    connect: {
+      server: {
+        options: {
+          port: 9999
+        }
+      }
+    },
+    'saucelabs-qunit': {
+      all: {
+        options: {
+          urls: ['http://127.0.0.1:9999/test/quail.html'],
+          tunnelTimeout: 10,
+          testTimeout: 900000000,
+          concurrency: 3,
+          detailedError: true,
+          build: buildId,
+          testname: buildId,
+          tags: [
+            process.env.TRAVIS_BRANCH,
+            process.env.TRAVIS_COMMIT
+          ],
+          browsers: [
+            {
+              browserName: 'chrome',
+              platform: 'OS X 10.9'
+            },
+            {
+              browserName: 'chrome',
+              platform: 'Windows 8'
+            },
+            {
+              browserName: 'firefox',
+              platform: 'OS X 10.9'
+            },
+            {
+              browserName: 'firefox',
+              platform: 'Windows 8'
+            },
+            {
+              browserName: 'opera'
+            },
+            {
+              browserName: 'internet explorer',
+              version: '10'
+            },
+            {
+              browserName: 'internet explorer',
+              version: '11',
+              platform: 'Windows 8.1'
+            },
+            {
+              browserName: 'iphone'
+            }
+          ]
+        }
+      }
+    },
+    bower: {
+      install: { }
+    },
+    supressSaucelabsOutput: {
+      all: { }
     }
   });
-
+  grunt.loadTasks('tasks');
   grunt.loadNpmTasks('grunt-contrib-qunit');
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-contrib-watch');
-
-  // Linting, mostly to test JSON.
-  grunt.registerTask('lint', ['jshint']);
+  grunt.loadNpmTasks('grunt-contrib-concat');
+  grunt.loadNpmTasks('grunt-convert');
+  grunt.loadNpmTasks('grunt-shell');
+  grunt.loadNpmTasks('grunt-gh-pages');
+  grunt.loadNpmTasks('grunt-bower-task');
+  grunt.loadNpmTasks('grunt-saucelabs');
+  grunt.loadNpmTasks('grunt-contrib-connect');
 
   // By default, just run tests
-  grunt.registerTask('default', ['test']);
+  grunt.registerTask('default', ['bower:install', 'convert', 'concat', 'jshint', 'buildGuideline', 'compressTestsJson', 'qunit']);
+
+  // Build task.
+  grunt.registerTask('build', ['bower:install', 'convert', 'concat', 'jshint', 'buildGuideline', 'compressTestsJson', 'uglify']);
 
   // Release task.
-  grunt.registerTask('release', ['jshint', 'qunit', 'uglify']);
+  grunt.registerTask('release', ['bower:install', 'convert', 'concat', 'jshint', 'qunit', 'buildGuideline', 'compressTestsJson', 'uglify', 'gh-pages']);
 
   // Test task.
-  grunt.registerTask('test', ['jshint', 'qunit']);
+  grunt.registerTask('test', ['bower:install', 'convert', 'concat', 'jshint', 'buildGuideline', 'compressTestsJson', 'qunit']);
+
+  // Saucelabs task (need to add your own environment variables)
+  grunt.registerTask('saucelabs', ['bower:install', 'convert', 'concat', 'jshint', 'buildGuideline', 'compressTestsJson', 'connect', 'supressSaucelabsOutput', 'saucelabs-qunit']);
+
+  grunt.registerTask('publish', ['gh-pages']);
 };