joosy 1.2.0.alpha.25 → 1.2.0.alpha.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb41452972cac1239b34fd0ed756f463b448d760
-  data.tar.gz: 2dc59bf15b79e29083ce2a5dde8b25bfd28c0eff
+  metadata.gz: 445715a823b5e9524c6cd2619b390ff7c44fa046
+  data.tar.gz: 760917203bffb205418dd1c7566f71384d7ff712
 SHA512:
-  metadata.gz: af122c35f98c642ac85a99ce278f6264c528fcd37bc2fd197362d09cdb7c296e9f5cfdcbaee4c71bc7109459e49ef03f988bf46f1a26b62d75edec917775c120
-  data.tar.gz: 73a607cc8a9993b0359786ef3d3683d8913582855281613df15288553b668c912612d1e2e53a3260918140d96691afdaf008aa86bdabfd271d09bac73ff72618
+  metadata.gz: d94e2669db0419d20268e0b615456e9046fb51efe44ce9c12b892f96d3a27587b172a7d36d07f91679c2956d6e9e3b7a5d8dad39bac309ebc2e530e97f794f9a
+  data.tar.gz: a873ba2dc170f0619ea90b6e5c96489bed49149f46c3280db97ce67ea9c17b4f6a31d8215f53da6642197b9cccd26e1c5de414eac6cd340c38569dc9fb9510db

data/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "joosy",
-  "version": "1.2.0-alpha.25",
+  "version": "1.2.0-alpha.27",
   "main": "lib/joosy.js",
   "ignore": [
     "bin",

data/package.json

@@ -4,7 +4,7 @@
   "keywords": [
     "joosy"
   ],
-  "version": "1.2.0-alpha.25",
+  "version": "1.2.0-alpha.27",
   "author": "Boris Staal <boris@staal.io>",
   "homepage": "http://joosy.ws/",
   "repository": {
@@ -26,11 +26,17 @@
     "prompt": "~0.2.9",
     "commander": "~1.2.0",
     "colors": "~0.6.0-1",
-    "grunt": "~0.4.1"
-  },
-  "devDependencies": {
+    "grunt": "~0.4.1",
     "bower": "~0.9.2",
     "mincer": "~0.4.6",
+    "connect": "~2.7.11",
+    "haml-coffee": "~1.11.1",
+    "proxy-middleware": "~0.4.0",
+    "gzippo": "~0.2.0",
+    "stylus": "~0.32.1",
+    "nib": "~0.9.1"
+  },
+  "devDependencies": {
     "grunt-mincer": "~0.3.1",
     "grunt-contrib-jasmine": "~0.5.1",
     "grunt-contrib-watch": "~0.4.4",

data/tasks/joosy.coffee

@@ -1,92 +1,143 @@
 module.exports = (grunt) ->
 
+  Sugar   = require 'sugar'
+  Path    = require 'path'
   connect = require 'connect'
+  Mincer  = require 'mincer'
 
   grunt.joosy =
+    helpers:
+      list: (task, config, entry) ->
+        entries = grunt.config.get(config) || {} 
+
+        return if entry
+          task.requiresConfig "#{config}.#{entry}"
+          [ entries[entry] ]
+        else
+          Object.values entries
+
+    assets:
+      instance: (environment='development') ->
+        Mincer.logger.use console
+        Mincer.StylusEngine.registerConfigurator (stylus) ->
+          stylus.options.paths.push Path.join(process.cwd(), 'public')
+          stylus.define '$environment', environment
+          stylus.define '$config', grunt.config.get('joosy.config') || {}
+          stylus.use require('nib')()
+
+        assets = new Mincer.Environment(process.cwd())
+        assets.appendPath 'source',
+        assets.appendPath 'stylesheets',
+        assets.appendPath 'components'
+        assets.appendPath 'vendor'
+        assets.appendPath 'node_modules/joosy/src'
+
+        assets
+
+      compile: (environment, map, callbacks) ->
+        assets = grunt.joosy.assets.instance(environment)
+        deepness = 0
+
+        for entry in map
+          do (entry) ->
+            deepness++
+            asset = assets.findAsset entry.src
+            callbacks.error? "Cannot find #{entry.src}" unless asset
+
+            asset.compile (err) ->
+              deepness--
+              callbacks.error? asset, err if err
+              grunt.file.write entry.dest, asset.toString()
+              callbacks.compiled? asset, entry.dest
+              callbacks.success?() if deepness == 0
+
+    haml:
+      compile: (file, environment='development') ->
+        HAMLC = require 'haml-coffee'
+
+        HAMLC.compile(grunt.file.read file)(
+          environment: environment
+          config: grunt.config.get('joosy.config') || {}
+        )
+
     server:
       start: (port, setup) ->
-        console.log "=> Started on 4000"
         server = connect()
         setup?(server)
         server.listen port
 
+        console.log "=> Started on 4000"
+
       serveProxied: (server, map) ->
+        URL   = require 'url'
+        proxy = require 'proxy-middleware'
+
         return unless map?
 
-        proxy = require 'proxy-middleware'
-        url   = require 'url'
+        for entry in map
+          [from, to] = if entry.src
+            [entry.src, entry.dest]
+          else
+            key = Object.keys(entry).first()
+            [key, entry[key]]
 
-        for from, to of map
+          server.use from, proxy(URL.parse to)
           console.log "=> Proxying #{from} to #{to}"
-          server.use from, proxy(url.parse to)
 
-      serveAssets: (server, mincer, path='/assets') ->
-        console.log "=> Serving assets from #{path}"
-        assets = new mincer.Environment(process.cwd())
-        assets.appendPath 'source',
-        assets.appendPath 'stylesheets',
-        assets.appendPath 'components'
-        assets.appendPath 'vendor'
-        assets.appendPath 'node_modules/joosy/src'
+      serveAssets: (server, path='/assets') ->
+        assets = grunt.joosy.assets.instance()
+        server.use path, Mincer.createServer(assets)
 
-        server.use path, mincer.createServer(assets)
+        console.log "=> Serving assets from #{path}"
 
-      servePlayground: (server, path='/') ->
-        console.log "=> Serving playground from #{path}"
+      serveHAML: (server, path='/', source='source/index.haml') ->
         server.use path, (req, res, next) ->
           if req.url == path
-            res.end grunt.joosy.compilePlayground()
+            res.end grunt.joosy.haml.compile(source)
           else
             next()
 
+          console.log "=> Serving HAML at #{path} from #{source}"
+
       serveStatic: (server, compress=false) ->
-        console.log "=> Serving static from /public"
+        Gzippo = require 'gzippo'
+
         unless compress
           server.use connect.static('public')
         else
-          server.use require('gzippo').staticGzip('public')
-
-    mincer: (environment='development') ->
-      mincer  = require 'mincer'
+          server.use Gzippo.staticGzip('public')
 
-      mincer.logger.use console
-      mincer.StylusEngine.registerConfigurator (stylus) ->
-        grunt.joosy.setupStylus stylus, environment
-
-      mincer
-
-    compilePlayground: (environment='development') ->
-      require('haml-coffee').compile(grunt.file.read 'source/index.haml')(
-        environment: environment
-        config: grunt.config.get('joosy.config') || {}
-      )
+        console.log "=> Serving static from /public"
 
-    setupStylus: (stylus, environment='production') ->
-      stylus.options.paths.push require('path').join(process.cwd(), 'public')
-      stylus.define '$environment', environment
-      stylus.define '$config', grunt.config.get('joosy.config') || {}
-      stylus.use require('nib')()
+    bower: -> require('bower')
 
   # Dependencies
-  grunt.loadNpmTasks 'grunt-mincer'
-  grunt.loadNpmTasks 'grunt-contrib-connect'
   grunt.loadNpmTasks 'grunt-contrib-uglify'
   grunt.loadNpmTasks 'grunt-contrib-cssmin'
-  grunt.loadNpmTasks 'grunt-bower-task'
 
-  grunt.registerTask 'joosy:compile',        ['mince', 'uglify', 'cssmin', 'joosy:compile:playground']
-  grunt.registerTask 'joosy:compile:code',   ['mince:code', 'uglify:application']
-  grunt.registerTask 'joosy:compile:styles', ['mince:styles', 'cssmin:application']
+  # Tasks
+  grunt.registerTask 'joosy:postinstall', ->
+    complete  = @async()
+    bowerized = ->
+      if process.env['NODE_ENV'] == 'production'
+        grunt.task.run 'joosy:compile'
+
+      complete()
 
-  grunt.registerTask 'joosy:compile:playground', ->
-    grunt.file.write 'public/index.html', grunt.joosy.compilePlayground('production')
+    if grunt.file.exists('bower.json')
+      grunt.joosy.bower().commands.install()
+        .on('data', (msg) -> grunt.log.ok msg)
+        .on('error', (error) -> grunt.fail.fatal(error))
+        .on('end', bowerized)
+    else
+      bowerized()
 
   grunt.registerTask 'joosy:server', ->
     @async()
     
     grunt.joosy.server.start 4000, (server) ->
-      grunt.joosy.server.serveAssets server, grunt.joosy.mincer()
-      grunt.joosy.server.servePlayground server
+      grunt.joosy.server.serveAssets server
+      grunt.joosy.server.serveHAML server
       grunt.joosy.server.serveProxied server, grunt.config.get('joosy.server.proxy')
       grunt.joosy.server.serveStatic server
 
@@ -96,9 +147,18 @@ module.exports = (grunt) ->
     grunt.joosy.server.start process.env['PORT'] ? 4000, (server) ->
       grunt.joosy.server.serveStatic server, true
 
-  grunt.registerTask 'joosy:postinstall', ->
-    if grunt.file.exists('bower.json')
-      grunt.task.run 'bower:install'
+  grunt.registerTask 'joosy:compile', ['joosy:mince', 'joosy:haml', 'uglify', 'cssmin']
+
+  grunt.registerTask 'joosy:mince', ->
+    complete = @async()
+    assets   = grunt.joosy.helpers.list(@, 'joosy.assets', @args[0])
+
+    grunt.joosy.assets.compile 'production', assets,
+      error: (msg) -> grunt.fail.fatal msg
+      compiled: (asset, dest) -> grunt.log.ok "Compiled #{dest}"
+      success: complete
 
-    if process.env['NODE_ENV'] == 'production'
-      grunt.task.run 'joosy:compile'
+  grunt.registerTask 'joosy:haml', ->
+    for _, entry of grunt.joosy.helpers.list(@, 'joosy.haml', @args[0])
+      grunt.file.write entry.dest, grunt.joosy.haml.compile("source/#{entry.src}", 'production')
+      grunt.log.ok "Compiled #{entry.dest}"

data/templates/application/standalone/Gruntfile.coffee

@@ -5,33 +5,17 @@ module.exports = (grunt) ->
   grunt.initConfig
     joosy:
       config: {}
-
-    bower:
-      install:
-        options:
-          copy: false
-          verbose: true
-
-    connect:
-      server:
-        options:
-          port: 4000
-          base: 'public'
-
-    mince:
-      code:
-        include: ['source', 'components', 'vendor', 'node_modules/joosy/src']
-        src: 'application.coffee'
-        dest: 'public/assets/application.js'
-      styles:
-        include: ['stylesheets', 'public']
-        src: 'application.styl'
-        dest: 'public/assets/application.css'
-        configure: (mincer) ->
-          mincer.StylusEngine.registerConfigurator (stylus) ->
-            stylus.define '$environment', 'development'
-            stylus.define '$config', grunt.config.get('joosy.config') || {}
-            stylus.use require('nib')()
+      assets:
+        application:
+          src: 'application.coffee'
+          dest: 'public/assets/application.js'
+        styles:
+          src: 'application.styl'
+          dest: 'public/assets/application.css'
+      haml:
+        application:
+          src: 'index.haml'
+          dest: 'public/index.html'
 
     uglify:
       application:
@@ -41,6 +25,6 @@ module.exports = (grunt) ->
           'public/assets/application.js': 'public/assets/application.js'
 
     cssmin:
-      application:
+      styles:
         files:
           'public/assets/application.css': 'public/assets/application.css'

data/templates/application/standalone/package.json

@@ -1,22 +1,10 @@
 {
   "dependencies": {
     "joosy": "~<%= joosy_version %>",
-    "connect": "~2.7.11",
-    "proxy-middleware": "~0.4.0",
-    "gzippo": "~0.2.0",
-    "mincer": "~0.4.6",
-    "coffee-script": "~1.6.3",
-    "stylus": "~0.32.1",
-    "nib": "~0.9.1",
-    "haml-coffee": "~1.11.1",
     "grunt": "~0.4.1",
-    "grunt-mincer": "~0.3.2",
-    "grunt-contrib-connect": "~0.3.0",
+    "grunt-cli": "~0.1.9",
     "grunt-contrib-uglify": "~0.2.2",
-    "grunt-contrib-watch": "~0.4.4",
-    "grunt-contrib-cssmin": "~0.6.1",
-    "grunt-bower-task": "~0.2.3",
-    "grunt-cli": "~0.1.9"
+    "grunt-contrib-cssmin": "~0.6.1"
   },
   "scripts": {
     "postinstall": "node_modules/.bin/grunt joosy:postinstall"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joosy
 version: !ruby/object:Gem::Version
-  version: 1.2.0.alpha.25
+  version: 1.2.0.alpha.27
 platform: ruby
 authors:
 - Boris Staal