simplify sqwidget layout to be more suitable for module

.bowerrc

@@ -1,3 +1,3 @@
 {
-  "directory": "sqwidget/lib"
+  "directory": "lib"
 }

.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 node_modules/
 config.js
+lib/
 
 # temporary!
 dist/

Gruntfile.coffee

@@ -3,6 +3,10 @@ module.exports = (grunt) ->
   grunt.loadNpmTasks 'grunt-contrib-coffee'
   grunt.loadNpmTasks 'grunt-contrib-clean'
   grunt.loadNpmTasks 'grunt-contrib-watch'
+  grunt.loadNpmTasks('grunt-contrib-connect')
+  grunt.loadNpmTasks('grunt-contrib-copy')
+  grunt.loadNpmTasks('grunt-karma')
+
 
   grunt.initConfig
 
@@ -21,21 +25,10 @@ module.exports = (grunt) ->
           port: 8001
           base: 'sqwidget'
 
-      widgets:
-        options:
-          middleware: (connect, options) -> [
-            (req, res, next) ->
-              res.setHeader('Access-Control-Allow-Origin', '*')
-              next()
-            connect.static(options.base)
-          ]
-          port: 8002
-          base: 'widgets'
-
     coffee:
       tests:
         expand: true
-        cwd: 'sqwidget/tests',
+        cwd: 'tests',
         src: '**/*.coffee'
         dest: 'compiled/tests/js'
         ext: '.js'
@@ -46,49 +39,29 @@ module.exports = (grunt) ->
 
       sqwidget:
         expand: true
-        cwd: 'sqwidget/app',
+        cwd: 'src',
         src: '**/*.coffee'
-        dest: 'compiled/sqwidget/js'
+        dest: 'compiled/js'
         ext: '.js'
         options:
           sourceRoot: '../../../app'
           bare: true
           sourceMap: true
 
-      widgets:
-        expand: true
-        cwd: 'widgets/',
-        src: '**/*.coffee'
-        dest: 'compiled/widgets/js'
-        ext: '.js'
-        options:
-          bare: true
-          sourceMap: true
-
     karma:
       integration:
-        configFile: 'config/karma.conf.js',
+        configFile: 'karma.conf.js',
 
     watch:
       sqwidget:
-        files: ["sqwidget/app/**/*.coffee"]
-        tasks: ["build"]
-
-      widgets:
-        files: ["widgets/**/*.coffee"]
+        files: ["src/**/*.coffee"]
         tasks: ["build"]
 
       karma:
-        files: ["sqwidget/**/*.coffee", "sqwidget/tests/**/*.coffee"]
+        files: ["src/**/*.coffee", "tests/**/*.coffee"]
         tasks: ["build", "karma"]
 
-  grunt.loadNpmTasks('grunt-contrib-coffee')
-  grunt.loadNpmTasks('grunt-contrib-watch');
-  grunt.loadNpmTasks('grunt-contrib-connect')
-  grunt.loadNpmTasks('grunt-contrib-copy')
-  grunt.loadNpmTasks('grunt-karma')
-
   grunt.registerTask "build", [ "coffee" ]
-  grunt.registerTask "test", [ "clean", "build", "karma", "watch:karma" ]
+  grunt.registerTask "test", [ "clean", "build", "karma" ]
   grunt.registerTask "default", [ "clean", "build", "connect", "watch" ]
 

Makefile

@@ -0,0 +1,21 @@
+PATH := ./node_modules/.bin:${PATH}
+
+.PHONY : init bower build test dist publish
+
+init: bower
+	npm install
+
+build:
+	grunt build
+
+test:
+	grunt test
+
+bower:
+	bower install
+
+dist:
+	grunt dist
+
+publish: dist
+	npm publish

config/karma.conf.js → karma.conf.js

@@ -6,7 +6,7 @@ module.exports = function(config) {
     // set pre-processors to empty since karma has stupid defaults
     preprocessors: { },
     // base path, that will be used to resolve files and exclude
-    basePath: '../',
+    basePath: '.',
 
     // frameworks to use
     frameworks: ['mocha', 'requirejs'],
@@ -15,11 +15,10 @@ module.exports = function(config) {
     files: [
       'compiled/tests/js/test-main.js',
       {pattern: 'node_modules/karma-chai-plugins/node_modules/chai/chai.js', included: false},
+      {pattern: 'compiled/js/**/*.js', included: false},
       {pattern: 'compiled/tests/js/spec/**/*.js', included: false},
-      {pattern: 'compiled/tests/js/spec/**/*.js', included: false},
-      {pattern: 'compiled/sqwidget/js/**/*.js', included: false},
-      {pattern: 'widgets/**', included: false, watch: true},
-      {pattern: 'sqwidget/lib/**/*.js', included: false, watched: false},
+      {pattern: 'lib/**/*.js', included: false, watched: false},
+      {pattern: 'widgets/test/**/*.js', included: false, watched: false},
     ],
 
     // list of files to exclude
@@ -53,7 +52,7 @@ module.exports = function(config) {
     browsers: [
     //'Chrome',
       //,'Firefox'
-      'PhantomJS'
+      'Chrome'
     ],
 
     // If browser does not capture in given timeout [ms], kill it

package.json

@@ -1,19 +1,22 @@
 {
-  "name": "pa-widgets",
-  "title": "Widgets for Press Association",
+  "name": "sqwidget",
+  "title": "Sqwidget",
   "version": "2.0.0",
   "contributors": [
     "Adhip Gupta <[email protected]>",
     "Simon Elliott <[email protected]>"
   ],
+  "main": "compiled/js/sqwidget.js",
+  "engines": {
+    "node": ">= 0.8.0"
+  },
   "dependencies": {},
   "devDependencies": {
     "grunt": "latest",
     "grunt-contrib-connect": "latest",
     "grunt-contrib-clean": "latest",
     "grunt-contrib-requirejs": "~0.4.1",
     "grunt-contrib-coffee": "latest",
-    "grunt-contrib-livereload": "latest",
     "grunt-contrib-watch": "~0.5.3",
     "grunt-contrib-copy": "~0.4.1",
     "karma-script-launcher": "~0.1.0",
@@ -27,5 +30,8 @@
     "karma-mocha": "~0.1.0",
     "karma-sinon": "0.0.1",
     "karma-chai-plugins": "~0.1.3"
-  }
+  },
+  "scripts": {
+    "test": "make test"
+  },
 }

sqwidget/app/component/core.coffee → src/component/core.coffee

@@ -1,4 +1,4 @@
-define ['underscore','backbone'], (_, Backbone) ->
+define ['underscore', 'backbone'], (_, Backbone) ->
 
   class SqwidgetCore
     constructor: () ->

sqwidget/app/widget.coffee → src/sqwidget.coffee

@@ -2,12 +2,6 @@ requirejs.config
   paths:
     jquery: '../../lib/jquery/jquery'
     underscore: '../../lib/underscore-amd/underscore'
-    backbone: '../../lib/backbone-amd/backbone'
-    Ractive: '../../lib/ractive/Ractive'
-    text: '../../lib/requirejs-text/text',
-    rv: '../../lib/requirejs-ractive/rv',
-    normalize: '../../lib/normalize-css/normalize'
-    config: '../../config'
 
 # The module that is loaded first
 requirejs [

sqwidget/tests/spec/core.coffee → tests/spec/core.coffee

@@ -18,7 +18,7 @@ define ['chai', 'jquery', 'component/core'], (chai, $, Core) ->
           assert.ok "Triggered event"
           assert.equal(src.html(),
             '<div>TEST</div>'
-            'Rendered Ractive view correctly'
+            'Rendered correctly'
           )
           done()
 

tests/test-main.coffee

@@ -0,0 +1,23 @@
+tests = []
+
+for file of window.__karma__.files
+  if /spec\//.test(file)
+    tests.push(file)
+
+
+requirejs.config
+  baseUrl: "/base/compiled/js/"
+  paths:
+    chai: '../../node_modules/karma-chai-plugins/node_modules/chai/chai'
+    jquery: '../../lib/jquery/jquery'
+    underscore: '../../lib/underscore-amd/underscore'
+    backbone: '../../lib/backbone-amd/backbone'
+
+  deps: tests
+  callback: ->
+    #set the URI for the example widgets to the karma server port
+    window.__karma__.start()
+
+#list all your unit files here
+#require ["angular", "angularMocks", "/compiled/js/test/unit.js"], ->
+  #window.__karma__.start()