joosy 1.2.0.alpha.33 → 1.2.0.alpha.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df2bca35b74d9c14728fd7262d3b7a96e7db37dc
-  data.tar.gz: 33b20930a8c3afbf402dfed6a4708073c9d8d669
+  metadata.gz: e781a0e6f7a0255ee66c756961ad0943b0624d13
+  data.tar.gz: 5eec16f1b2513fa0076581c246b923bda1457cf6
 SHA512:
-  metadata.gz: d7ccfaa7b808f9bec3ffa834548ae1918e4f6ab380056670e23c2b14d5edd52b2f2bb849cb93694dee50c6492e656bc3cba5cd89d3b31b06e182a3c940a705ff
-  data.tar.gz: 9e80a44f31ee9e465710101b7abbf936f4e901e5db384b5b8d49fadf533812124c9540abb1eab78f7b896667cd900bd60ef1dd9e17af121d1e7f1c564c3b97d3
+  metadata.gz: 03cab6c257006474cd4672f4748c1cd34873c6996fce3dd64e7f6a8a2447f36f5341f52e61205267045631a6996c0381714a2633112120c67a3f87016157b53a
+  data.tar.gz: 52c3043ccdc1fcd8c3adc57bb7dee72e375307e8c4665b9f2c1cf92facb1a7c66fbb4fa51cae2406cebfe8316d7f1c829fe46eb6b90ad95a733632b57a246ace

data/bower.json

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

data/package.json

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

data/tasks/joosy.coffee

@@ -5,29 +5,49 @@ module.exports = (grunt) ->
   connect = require 'connect'
   Mincer  = require 'mincer'
 
+  paths =
+    haml:        Path.join('source', 'haml')
+    javascript:  Path.join('source', 'javascript')
+    stylesheets: Path.join('source', 'stylesheets')
+    public:      'public'
+
   grunt.joosy =
     helpers:
-      list: (task, config, entry) ->
-        entries = grunt.config.get(config) || {} 
-
-        return if entry
-          task.requiresConfig "#{config}.#{entry}"
+      normalizeFiles: (config, target) ->
+        entries = grunt.config.get(config) || {}
+        entries = if target
+          grunt.config.requires "#{config}.#{target}"
           [ entries[entry] ]
         else
           Object.values entries
 
+        entries
+
+      expandFiles: (root, entry) ->
+        root  = Path.join(root, entry.cwd) if entry.cwd?
+        files = grunt.file.expand({cwd: Path.join(process.cwd(), root)}, entry.src)
+
+        return {
+          cwd: root,
+          list: files.map (file) ->
+            src:      file
+            extname:  Path.extname file
+            filename: Path.basename file, Path.extname(file)
+            dirname:  Path.dirname file
+        }
+
     assets:
       instance: (environment='development') ->
         Mincer.logger.use console
         Mincer.StylusEngine.registerConfigurator (stylus) ->
-          stylus.options.paths.push Path.join(process.cwd(), 'public')
+          stylus.options.paths.push Path.join(process.cwd(), paths.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/javascript'
-        assets.appendPath 'source/stylesheets'
+        assets.appendPath paths.javascript
+        assets.appendPath paths.stylesheets
         assets.appendPath 'vendor'
         assets.appendPath 'components'
         assets.appendPath 'node_modules/joosy/src'
@@ -52,14 +72,14 @@ module.exports = (grunt) ->
               callbacks.success?() if deepness == 0
 
     haml:
-      compile: (file, partials='source/haml', environment='development') ->
+      compile: (file, partials=paths.haml, environment='development') ->
         HAMLC = require 'haml-coffee'
 
         HAMLC.compile(grunt.file.read file)(
           environment: environment
           config: grunt.config.get('joosy.config') || {}
           partial: (location) ->
-            grunt.joosy.haml.compile(partials+'/'+location, environment)
+            grunt.joosy.haml.compile(Path.join(partials,location), environment)
         )
 
     server:
@@ -93,32 +113,42 @@ module.exports = (grunt) ->
         console.log "=> Serving assets from #{path}"
 
       serveHAML: (server, map) ->
-        return unless map?
+        serve = (urls, template, partials) ->
+          urls = [urls] unless Object.isArray(urls)
+
+          for url in urls
+            do (url) ->
+              server.use url, (req, res, next) ->
+                if req.originalUrl == url
+                  res.end grunt.joosy.haml.compile(template, partials)
+                  console.log "Served #{url} (#{template})"
+                else
+                  next()
+          console.log "=> Serving #{template} from #{urls.join(', ')}"
 
-        for _, entry of map
-          do (_, entry) ->
-            paths = entry.path
-            paths = [paths] unless Object.isArray(paths)
-
-            for path in paths
-              do (path) ->
-                server.use path, (req, res, next) ->
-                  if req.originalUrl == path
-                    res.end grunt.joosy.haml.compile("source/haml/"+entry.src, entry.partials)
-                    console.log "Served #{path} (#{entry.src})"
-                  else
-                    next()
-            console.log "=> Serving #{entry.src} from #{paths.join(', ')}"
+        for entry in map
+          do (entry) ->
+            unless entry.expand
+              serve(entry.url, Path.join(paths.haml, entry.src), entry.partials)
+            else
+              files = grunt.joosy.helpers.expandFiles(paths.haml, entry)
+
+              for file in files.list
+                serve(
+                  entry.url(file),
+                  Path.join(files.cwd, file.src),
+                  entry.partials
+                )
 
       serveStatic: (server, compress=false) ->
         Gzippo = require 'gzippo'
 
         unless compress
-          server.use connect.static('public')
+          server.use connect.static(paths.public)
         else
-          server.use Gzippo.staticGzip('public')
+          server.use Gzippo.staticGzip(paths.public)
 
-        console.log "=> Serving static from /public"
+        console.log "=> Serving static from /#{paths.public}"
 
     bower: -> require('bower')
 
@@ -144,7 +174,7 @@ module.exports = (grunt) ->
     
     grunt.joosy.server.start 4000, (server) ->
       grunt.joosy.server.serveAssets server
-      grunt.joosy.server.serveHAML server, grunt.config.get('joosy.haml')
+      grunt.joosy.server.serveHAML server, grunt.joosy.helpers.normalizeFiles('joosy.haml')
       grunt.joosy.server.serveProxied server, grunt.config.get('joosy.server.proxy')
       grunt.joosy.server.serveStatic server
 
@@ -156,16 +186,35 @@ module.exports = (grunt) ->
 
   grunt.registerTask 'joosy:compile', ['joosy:assets', 'joosy:haml']
 
-  grunt.registerTask 'joosy:assets', ->
+  grunt.registerTask 'joosy:assets', (target) ->
     complete = @async()
-    assets   = grunt.joosy.helpers.list(@, 'joosy.assets', @args[0])
+    assets   = grunt.joosy.helpers.normalizeFiles('joosy.assets', target)
 
     grunt.joosy.assets.compile 'production', assets,
       error: (asset, msg) -> grunt.fail.fatal msg
       compiled: (asset, dest) -> grunt.log.ok "Compiled #{dest}"
       success: complete
 
-  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/haml/#{entry.src}", entry.partials, 'production')
-      grunt.log.ok "Compiled #{entry.dest}"
+  grunt.registerTask 'joosy:haml', (target) ->
+    for _, entry of grunt.joosy.helpers.normalizeFiles('joosy.haml', target)
+      unless entry.expand
+        grunt.file.write entry.dest, grunt.joosy.haml.compile(
+            Path.join(paths.haml, entry.src),
+            entry.partials,
+            'production'
+          )
+
+        grunt.log.ok "Compiled #{entry.dest}"
+      else
+        files = grunt.joosy.helpers.expandFiles(paths.haml, entry)
+
+        for file in files.list
+          destination = Path.join entry.dest, file.dirname, file.filename+(entry.ext || '.html')
+
+          grunt.file.write destination, grunt.joosy.haml.compile(
+              Path.join(files.cwd, file.src),
+              entry.partials,
+              'production'
+            )
+
+          grunt.log.ok "Compiled #{destination}"

metadata

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