joosy 1.2.0.alpha.29 → 1.2.0.alpha.30

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 55b355ada7a0001804d42210974f94012d73a4e8
4
- data.tar.gz: 9f3a31a023c39a5915409c5834415d9c9afe2a87
3
+ metadata.gz: 084cd622f83fd157f9e586637073a5b7805b589c
4
+ data.tar.gz: b951da4e5b77d1abbef183ef324041a8fbfa0d6d
5
5
  SHA512:
6
- metadata.gz: 70fa6b84cd65fc9aff13bfb45761edb192c6dba33fe3aaa7a812527c48cbbb25729c42a96447e007f86c70408d7ee841ea4124a4148b55a43370f14fb74ba8e1
7
- data.tar.gz: ec4a6ba3a6f40d6b2472a0b6c0be28f7a96e2d8f4a4a624e2ae239f420e1ff95eff29085914b2593228397fed7950a9a391ff42023a253747ee197819f0ea730
6
+ metadata.gz: f2fec6f565c55716ab899bceda1f8b393f914f4a9470285b3e02bcfe970f5a1de7021f060d7b148fd437e24138733f60db6190dae2742508b2e8b7c0b4094857
7
+ data.tar.gz: 14885cd6dc062877e29715dcc3244403c565f48da98a6190d51fd517c57f78db030e400eb903d0330809d5f50cbcf5be69c5748fdf9a54fa5cf11c73956c86a4
data/bower.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "joosy",
3
- "version": "1.2.0-alpha.29",
3
+ "version": "1.2.0-alpha.30",
4
4
  "main": "lib/joosy.js",
5
5
  "ignore": [
6
6
  "bin",
data/package.json CHANGED
@@ -4,7 +4,7 @@
4
4
  "keywords": [
5
5
  "joosy"
6
6
  ],
7
- "version": "1.2.0-alpha.29",
7
+ "version": "1.2.0-alpha.30",
8
8
  "author": "Boris Staal <boris@staal.io>",
9
9
  "homepage": "http://joosy.ws/",
10
10
  "repository": {
data/tasks/joosy.coffee CHANGED
@@ -90,13 +90,21 @@ module.exports = (grunt) ->
90
90
 
91
91
  console.log "=> Serving assets from #{path}"
92
92
 
93
- serveHAML: (server, path='/', source='source/index.haml') ->
94
- server.use path, (req, res, next) ->
95
- if req.url == path
96
- console.log "Served #{path} (#{source})"
97
- res.end grunt.joosy.haml.compile(source)
98
- else
99
- next()
93
+ serveHAML: (server, map) ->
94
+ return unless map?
95
+
96
+ for _, entry of map
97
+ paths = entry.path
98
+ paths = [paths] unless Object.isArray(paths)
99
+
100
+ for path in paths
101
+ server.use path, (req, res, next) ->
102
+ if req.url == path
103
+ res.end grunt.joosy.haml.compile("source/"+entry.src)
104
+ console.log "Served #{path} (#{entry.src})"
105
+ else
106
+ next()
107
+ console.log "=> Serving #{entry.src} from #{paths.join(', ')}"
100
108
 
101
109
  serveStatic: (server, compress=false) ->
102
110
  Gzippo = require 'gzippo'
@@ -132,7 +140,7 @@ module.exports = (grunt) ->
132
140
 
133
141
  grunt.joosy.server.start 4000, (server) ->
134
142
  grunt.joosy.server.serveAssets server
135
- grunt.joosy.server.serveHAML server
143
+ grunt.joosy.server.serveHAML server, grunt.config.get('joosy.haml')
136
144
  grunt.joosy.server.serveProxied server, grunt.config.get('joosy.server.proxy')
137
145
  grunt.joosy.server.serveStatic server
138
146
 
@@ -25,8 +25,6 @@ module.exports = (grunt) ->
25
25
 
26
26
  uglify:
27
27
  application:
28
- options:
29
- sourceMap: 'public/assets/application.js.map'
30
28
  files:
31
29
  'public/assets/application.js': 'public/assets/application.js'
32
30
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: joosy
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0.alpha.29
4
+ version: 1.2.0.alpha.30
5
5
  platform: ruby
6
6
  authors:
7
7
  - Boris Staal