New build workflow

Author: mistic100

.gitignore

@@ -1,2 +1,6 @@
-bower_components
-node_modules
+/.idea
+/*.iml
+/.sass-cache
+/bower_components
+/node_modules
+/npm-debug.log

.jshintrc

@@ -0,0 +1,3 @@
+{
+  "-W055": true // non standard constructor name
+}

.scss-lint.yml

@@ -0,0 +1,6 @@
+linters:
+  ColorVariable:
+    enabled: false
+
+  HexLength:
+    enabled: false

Gruntfile.js

@@ -1,33 +1,85 @@
+'use strict';
+
 module.exports = function(grunt) {
+    require('time-grunt')(grunt);
+    require('jit-grunt')(grunt, {
+        scsslint: 'grunt-scss-lint'
+    });
+
     grunt.initConfig({
         pkg: grunt.file.readJSON('package.json'),
 
-        banner:
-            '/*!\n'+
-            ' * jQCloud <%= pkg.version %>\n'+
-            ' * Copyright 2011 Luca Ongaro (http://www.lucaongaro.eu)\n'+
-            ' * Copyright 2013 Daniel White (http://www.developerdan.com)\n'+
-            ' * Copyright 2014<%= grunt.template.today("yyyy") %> Damien "Mistic" Sorel (http://www.strangeplanet.fr)\n'+
-            ' * Licensed under MIT (http://opensource.org/licenses/MIT)\n'+
-            ' */',
-        
-        // copy src
+        banner: '/*!\n' +
+        ' * jQCloud <%= pkg.version %>\n' +
+        ' * Copyright 2011 Luca Ongaro (http://www.lucaongaro.eu)\n' +
+        ' * Copyright 2013 Daniel White (http://www.developerdan.com)\n' +
+        ' * Copyright 2014-<%= grunt.template.today("yyyy") %> Damien "Mistic" Sorel (http://www.strangeplanet.fr)\n' +
+        ' * Licensed under MIT (http://opensource.org/licenses/MIT)\n' +
+        ' */',
+
+        // serve folder content
+        connect: {
+            dev: {
+                options: {
+                    port: 9000,
+                    livereload: true
+                }
+            }
+        },
+
+        // watchers
+        watch: {
+            options: {
+                livereload: true
+            },
+            js: {
+                files: ['src/*.js'],
+                tasks: ['build_js']
+            },
+            css: {
+                files: ['src/*.scss'],
+                tasks: ['build_css']
+            },
+            example: {
+                files: ['example/**', 'test/**'],
+                tasks: []
+            }
+        },
+
+        // open example
+        open: {
+            dev: {
+                path: 'http://localhost:<%= connect.dev.options.port%>/example/index.html'
+            }
+        },
+
+        // add UMD
+        wrap: {
+            js: {
+                src: 'src/jqcloud.js',
+                dest: 'dist/jqcloud.js',
+                options: {
+                    separator: '',
+                    wrapper: function() {
+                        return grunt.file.read('src/.wrapper.js').replace(/\r\n/g, '\n').split(/@@js\n/);
+                    }
+                }
+            }
+        },
+
+        // add banner
         concat: {
             options: {
                 banner: '<%= banner %>\n',
-                stripBanners: {
-                    block: true
-                }
+                stripBanners: false
             },
-            src: {
-                files: {
-                    'dist/jqcloud.css': [
-                        'src/jqcloud.css'
-                    ],
-                    'dist/jqcloud.js': [
-                        'src/jqcloud.js'
-                    ]
-                }
+            js: {
+                src: 'dist/jqcloud.js',
+                dest: 'dist/jqcloud.js'
+            },
+            css: {
+                src: 'dist/jqcloud.css',
+                dest: 'dist/jqcloud.css'
             }
         },
 
@@ -37,11 +89,20 @@ module.exports = function(grunt) {
                 banner: '<%= banner %>\n'
             },
             dist: {
-                files: {
-                    'dist/jqcloud.min.js': [
-                        'dist/jqcloud.js'
-                    ]
-                }
+                src: 'dist/jqcloud.js',
+                dest: 'dist/jqcloud.min.js'
+            }
+        },
+
+        // parse scss
+        sass: {
+            options: {
+                sourcemap: 'none',
+                style: 'expanded'
+            },
+            dist: {
+                src: 'src/jqcloud.scss',
+                dest: 'dist/jqcloud.css'
             }
         },
 
@@ -52,45 +113,71 @@ module.exports = function(grunt) {
                 keepSpecialComments: 0
             },
             dist: {
-                files: {
-                    'dist/jqcloud.min.css': [
-                        'dist/jqcloud.css'
-                    ]
-                }
+                src: 'dist/jqcloud.css',
+                dest: 'dist/jqcloud.min.css'
             }
         },
 
         // jshint tests
         jshint: {
             lib: {
-                files: {
-                    src: [
-                        'src/jqcloud.js'
-                    ]
-                }
+                options: {
+                    jshintrc: '.jshintrc'
+                },
+                src: 'src/jqcloud.js'
+            }
+        },
+
+        // scss tests
+        scsslint: {
+            lib: {
+                options: {
+                    config: '.scss-lint.yml'
+                },
+                src: 'src/jqcloud.scss'
             }
         },
-        
+
         // qunit test suite
         qunit: {
-            all: ['test/*.html']
+            all: {
+                options: {
+                    urls: ['test/index.html'],
+                    noGlobals: true
+                }
+            }
         }
     });
 
-    grunt.loadNpmTasks('grunt-contrib-uglify');
-    grunt.loadNpmTasks('grunt-contrib-concat');
-    grunt.loadNpmTasks('grunt-contrib-cssmin');
-    grunt.loadNpmTasks('grunt-contrib-qunit');
-    grunt.loadNpmTasks('grunt-contrib-jshint');
 
-    grunt.registerTask('default', [
-        'concat',
-        'uglify',
+    grunt.registerTask('build_js', [
+        'wrap',
+        'concat:js',
+        'uglify'
+    ]);
+
+    grunt.registerTask('build_css', [
+        'sass',
+        'concat:css',
         'cssmin'
     ]);
-    
+
+    grunt.registerTask('default', [
+        'build_js',
+        'build_css'
+    ]);
+
     grunt.registerTask('test', [
-        'qunit',
-        'jshint'
+        'jshint',
+        'scsslint',
+        'default',
+        'qunit'
+    ]);
+
+    grunt.registerTask('serve', [
+        'default',
+        'open',
+        'connect',
+        'watch'
     ]);
 };

LICENSE.txt

@@ -2,7 +2,7 @@ The MIT License (MIT)
 
 Copyright (c) 2011 Luca Ongaro
 Copyright (c) 2013 Daniel White
-Copyright (c) 2014 Damien Sorel
+Copyright (c) 2014-2016 Damien Sorel
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

README.md

@@ -1,6 +1,7 @@
 # jQCloud
 
-[![Bower version](https://badge.fury.io/bo/jqcloud2.svg)](http://badge.fury.io/bo/jqcloud2)
+[![Bower version](https://img.shields.io/bower/v/jqcloud2.svg?style=flat-square)](http://mistic100.github.io/jQCloud)
+[![NPM version](https://img.shields.io/npm/v/jqcloud2.svg?style=flat-square)](https://www.npmjs.com/package/jqcloud2)
 
 ## Beautiful word clouds with jQuery
 
@@ -12,60 +13,5 @@ Also available as [AngularJS directive](https://github.com/mistic100/angular-jqc
 
 http://mistic100.github.io/jQCloud
 
-## Changelog
-
-2.0.0
-- Migrate to Grunt builder
-- New documentation
-- Big performances improvement (thanks to [saravanan4514](https://github.com/saravanan4514))
-- `delayedDraw` option replaced by `delay`
-- `center` now takes relative float values and not absolute integers
-- add `steps`, `autoResize`, `classPattern`, `colors` and `fontSize` options
-
-1.0.5 Added the capability to update dynamically the cloud, as well as an example (thanks to [acjzz](https://github.com/acjzz))
-
-1.0.4 Add option to remove overflowing words (thanks to [drewB](https://github.com/drewB))
-
-1.0.3 Fix bug when providing a context to jQuery
-
-1.0.2 Relative font sizes and easier to customize CSS (kudos to [daniel-toman](https://github.com/daniel-toman))
-
-1.0.1 Option to turn off URL encoding for links (thanks to [bboughton](https://github.com/bboughton))
-
-1.0.0 API redesign (warning: this is a major update, and background compatibility is not maintained)
-
-0.2.10 Fix bug occurring when the container element has no id
-
-0.2.9 Add dataAttributes option (thanks again to [cham](https://github.com/cham)) and fix bug when weights are all equal (thanks to [Grepsy](https://github.com/Grepsy))
-
-0.2.8 Add possibility to specify custom classes for words with the custom_class attribute (thanks to [cham](https://github.com/cham))
-
-0.2.7 Add possibility to draw rectangular-shaped clouds (an idea by [nithin2e](https://github.com/nithin2e))
-
-0.2.6 Fix bug with handlers, add nofollow option (thanks to [strobotta](https://github.com/strobotta)) and word callbacks.
-
-0.2.5 Add possibility to bind event handlers to words (thanks to [astintzing](https://github.com/astintzing))
-
-0.2.4 Option randomClasses can be an array of classes among which a random class is selected for each word
-
-0.2.3 Add option randomClasses, allowing for random CSS styling (inspired by issue about vertical words opened by [tttp](https://github.com/tttp))
-
-0.2.2 CSS improvements (as suggested by [NomikOS](https://github.com/NomikOS))
-
-0.2.1 Optimization and performance improvements (making 0.2.1 around 25% faster than 0.2.0)
-
-0.2.0 Add configuration options, passed as the second argument of jQCloud (include ideas proposed by [mindscratch](https://github.com/mindscratch) and [aaaa0441](https://github.com/aaaa0441))
-
-0.1.8 Fix bug in the algorithm causing sometimes unbalanced layouts (thanks to [isamochernov](https://github.com/isamochernov))
-
-0.1.7 Remove duplicated `</span>` when word has an URL (thanks to [rbrancher](https://github.com/rbrancher))
-
-0.1.6 JavaScript-friendly URL encode 'url' option; Typecast 'weight' option to float (thanks to [nudesign](https://github.com/nudesign))
-
-0.1.5 Apply CSS style to a "jqcloud" class, automatically added (previously an id was used. Again, thanks to [seanahrens](https://github.com/seanahrens))
-
-0.1.4 Fix bug with multiple clouds on the same page (kudos to [seanahrens](https://github.com/seanahrens))
-
-0.1.3 Added possibility to pass a callback function and to specify a custom HTML title attribute for each word in the cloud
-
-0.1.0 -> 0.1.2 I just started this tiny project, only minor improvements and optimization happened
+## License
+This library is available under the MIT license.

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "jqcloud2",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "homepage": "https://github.com/mistic100/jQCloud",
   "description": "jQuery plugin for drawing neat word clouds that actually look like clouds",
   "authors": [{
@@ -11,6 +11,7 @@
     "homepage": "http://www.developerdan.com"
   }, {
     "name": "Damien \"Mistic\" Sorel",
+    "email": "contact@git.strangeplanet.fr",
     "homepage": "http://www.strangeplanet.fr"
   }],
   "main": [
@@ -36,6 +37,8 @@
     "node_modules",
     "bower_components",
     "test",
-    "tests"
+    "tests",
+    "package.json",
+    "Gruntfile.js"
   ]
 }