joosy 1.2.0.alpha.24 → 1.2.0.alpha.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 208ba81c8cb99f14cf0196cd40b4c92967318eab
-  data.tar.gz: 8940f87ea8ec7c8a32b7bc8ec3b9bb038db018b4
+  metadata.gz: eb41452972cac1239b34fd0ed756f463b448d760
+  data.tar.gz: 2dc59bf15b79e29083ce2a5dde8b25bfd28c0eff
 SHA512:
-  metadata.gz: e50bc41ae73661119bc4f49fed20b6b7261b5220eb3fadcab36923b7a7bdcedc9c51d508e344fd90f7cf30433ba36df16f8481255f3d683619666c4fdbdebfdd
-  data.tar.gz: 5b575e8b165e69892d35a7e4cea2a1a7ae05383cb9deaa22051f85a1e1e312125a2d456c364bc5fd36f668206913133389c8500875186db6a8e037d6b5b8bf3b
+  metadata.gz: af122c35f98c642ac85a99ce278f6264c528fcd37bc2fd197362d09cdb7c296e9f5cfdcbaee4c71bc7109459e49ef03f988bf46f1a26b62d75edec917775c120
+  data.tar.gz: 73a607cc8a9993b0359786ef3d3683d8913582855281613df15288553b668c912612d1e2e53a3260918140d96691afdaf008aa86bdabfd271d09bac73ff72618

data/bower.json

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

data/package.json

@@ -4,7 +4,7 @@
   "keywords": [
     "joosy"
   ],
-  "version": "1.2.0-alpha.24",
+  "version": "1.2.0-alpha.25",
   "author": "Boris Staal <boris@staal.io>",
   "homepage": "http://joosy.ws/",
   "repository": {

data/tasks/joosy.coffee

@@ -1,78 +1,102 @@
 module.exports = (grunt) ->
 
+  connect = require 'connect'
+
+  grunt.joosy =
+    server:
+      start: (port, setup) ->
+        console.log "=> Started on 4000"
+        server = connect()
+        setup?(server)
+        server.listen port
+
+      serveProxied: (server, map) ->
+        return unless map?
+
+        proxy = require 'proxy-middleware'
+        url   = require 'url'
+
+        for from, to of map
+          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'
+
+        server.use path, mincer.createServer(assets)
+
+      servePlayground: (server, path='/') ->
+        console.log "=> Serving playground from #{path}"
+        server.use path, (req, res, next) ->
+          if req.url == path
+            res.end grunt.joosy.compilePlayground()
+          else
+            next()
+
+      serveStatic: (server, compress=false) ->
+        console.log "=> Serving static from /public"
+        unless compress
+          server.use connect.static('public')
+        else
+          server.use require('gzippo').staticGzip('public')
+
+    mincer: (environment='development') ->
+      mincer  = require 'mincer'
+
+      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') || {}
+      )
+
+    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')()
+
+  # 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',        ['mince', 'uglify', 'cssmin', 'joosy:compile:playground']
+  grunt.registerTask 'joosy:compile:code',   ['mince:code', 'uglify:application']
   grunt.registerTask 'joosy:compile:styles', ['mince:styles', 'cssmin:application']
 
   grunt.registerTask 'joosy:compile:playground', ->
-    hamlc = require 'haml-coffee'
-    grunt.file.write 'public/index.html', hamlc.compile(grunt.file.read 'source/index.haml')(
-      environment: 'production'
-      config: grunt.config.get('joosy.config') || {}
-    )
+    grunt.file.write 'public/index.html', grunt.joosy.compilePlayground('production')
 
   grunt.registerTask 'joosy:server', ->
     @async()
-    connect = require 'connect'
-    mincer  = require 'mincer'
-    hamlc   = require 'haml-coffee'
-    path    = require 'path'
-
-    mincer.logger.use console
-
-    mincer.StylusEngine.registerConfigurator (stylus) ->
-      stylus.options.paths.push path.join(process.cwd(), 'public')
-      stylus.define '$environment', 'development'
-      stylus.define '$config', config: grunt.config.get('joosy.config') || {}
-      stylus.use require('nib')()
-
-    server = connect()
-    assets = new mincer.Environment(process.cwd())
-    assets.appendPath 'source',
-    assets.appendPath 'stylesheets',
-    assets.appendPath 'components'
-    assets.appendPath 'vendor'
-    assets.appendPath 'node_modules/joosy/src'
-
-    server.use '/assets', mincer.createServer(assets)
-
-    server.use '/', (req, res, next) ->
-      if req.url == '/'
-        res.end hamlc.compile(grunt.file.read 'source/index.haml')(
-          environment: 'development'
-          config: grunt.config.get('joosy.config') || {}
-        )
-      else
-        next()
-
-    if grunt.config.get('joosy.server.proxy')
-      proxy = require 'proxy-middleware'
-      url   = require 'url'
-
-      for from, to of grunt.config.get('joosy.server.proxy')
-        console.log "-> Proxying #{from} to #{to}"
-        server.use from, proxy(url.parse to)
-
-    server.use connect.static('public')
-    server.listen 4000
-    console.log "-> Started on 4000\n"
+    
+    grunt.joosy.server.start 4000, (server) ->
+      grunt.joosy.server.serveAssets server, grunt.joosy.mincer()
+      grunt.joosy.server.servePlayground server
+      grunt.joosy.server.serveProxied server, grunt.config.get('joosy.server.proxy')
+      grunt.joosy.server.serveStatic server
 
   grunt.registerTask 'joosy:server:production', ->
     @async()
-    connect = require('connect')
-    server = connect()
-    server.use require('gzippo').staticGzip('public')
-    server.listen process.env['PORT'] ? 4000
 
-  grunt.registerTask 'joosy:postinstall', ->
-    @async
+    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'
 

data/templates/application/standalone/Gruntfile.coffee

@@ -30,7 +30,7 @@ module.exports = (grunt) ->
         configure: (mincer) ->
           mincer.StylusEngine.registerConfigurator (stylus) ->
             stylus.define '$environment', 'development'
-            stylus.define '$config', config: grunt.config.get('joosy.config') || {}
+            stylus.define '$config', grunt.config.get('joosy.config') || {}
             stylus.use require('nib')()
 
     uglify:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joosy
 version: !ruby/object:Gem::Version
-  version: 1.2.0.alpha.24
+  version: 1.2.0.alpha.25
 platform: ruby
 authors:
 - Boris Staal
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets