joosy 1.2.0.alpha.32 → 1.2.0.alpha.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f367893c5c5aa8cfb194f066fb42b2d3747f17e
-  data.tar.gz: 41f4a55dd56425b69ecb198e7356e1f37633a4a9
+  metadata.gz: df2bca35b74d9c14728fd7262d3b7a96e7db37dc
+  data.tar.gz: 33b20930a8c3afbf402dfed6a4708073c9d8d669
 SHA512:
-  metadata.gz: 9f697b0c05d9055afbb945885be304960a24a52232f41b48b48e4b23f71aecc58dc9e125a09e810ea4c5cff78bbdd86622f038ccc1b0960a17eb02936f8f5281
-  data.tar.gz: 8c9bf63a0b478d1003cee6a006fbf82f0c1444e1ec078913e6958b17578aa60ab81fc278167d81f396866d69c062c9388b148385bcc4b129a2acb028f830e52f
+  metadata.gz: d7ccfaa7b808f9bec3ffa834548ae1918e4f6ab380056670e23c2b14d5edd52b2f2bb849cb93694dee50c6492e656bc3cba5cd89d3b31b06e182a3c940a705ff
+  data.tar.gz: 9e80a44f31ee9e465710101b7abbf936f4e901e5db384b5b8d49fadf533812124c9540abb1eab78f7b896667cd900bd60ef1dd9e17af121d1e7f1c564c3b97d3

data/bower.json

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

data/package.json

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

data/src/joosy/generators/project.coffee

@@ -7,11 +7,11 @@ module.exports = class
     @options.dependencies = """
                             #= require jquery/jquery.js
                             #= require jquery-form/jquery.form.js
-                            #= require sugar/release/sugar-full.min.js
+                            #= require sugar/release/sugar.min.js
                             """
 
     @standalone = new Standalone(@options)
-    @base       = new Base(@options, Path.join(@standalone.destination, 'source'))
+    @base       = new Base(@options, Path.join(@standalone.destination, 'source/javascript'))
 
   generate: ->
     @standalone.generate()

data/src/joosy/generators/project/standalone.coffee

@@ -18,10 +18,12 @@ class ProjectStandalone extends @Base
     @copy ['application', 'standalone', 'bower.json'],           ['bower.json']
     @copy ['application', 'standalone', 'Gruntfile.coffee'],     ['Gruntfile.coffee']
     @copy ['application', 'standalone', 'Procfile'],             ['Procfile']
-    @copy ['application', 'standalone', 'source', 'index.haml'], ['source', 'index.haml']
 
-    @copy ['application', 'standalone', 'stylesheets', 'application.styl'],
-                                       ['stylesheets', 'application.styl']
+    @copy ['application', 'standalone', 'source', 'haml', 'index.haml'], 
+                                       ['source', 'haml', 'index.haml']
+
+    @copy ['application', 'standalone', 'source', 'stylesheets', 'application.styl'],
+                                       ['source', 'stylesheets', 'application.styl']
 
     @template ['application', 'standalone', 'package.json'], ['package.json'],
       joosy_version: @version()

data/tasks/joosy.coffee

@@ -26,8 +26,8 @@ module.exports = (grunt) ->
           stylus.use require('nib')()
 
         assets = new Mincer.Environment(process.cwd())
-        assets.appendPath 'source'
-        assets.appendPath 'stylesheets'
+        assets.appendPath 'source/javascript'
+        assets.appendPath 'source/stylesheets'
         assets.appendPath 'vendor'
         assets.appendPath 'components'
         assets.appendPath 'node_modules/joosy/src'
@@ -52,7 +52,7 @@ module.exports = (grunt) ->
               callbacks.success?() if deepness == 0
 
     haml:
-      compile: (file, partials='./', environment='development') ->
+      compile: (file, partials='source/haml', environment='development') ->
         HAMLC = require 'haml-coffee'
 
         HAMLC.compile(grunt.file.read file)(
@@ -96,17 +96,19 @@ module.exports = (grunt) ->
         return unless map?
 
         for _, entry of map
-          paths = entry.path
-          paths = [paths] unless Object.isArray(paths)
-
-          for path in paths
-            server.use path, (req, res, next) ->
-              if req.originalUrl == path
-                res.end grunt.joosy.haml.compile("source/"+entry.src, entry.partials)
-                console.log "Served #{path} (#{entry.src})"
-              else
-                next()
-          console.log "=> Serving #{entry.src} from #{paths.join(', ')}"
+          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(', ')}"
 
       serveStatic: (server, compress=false) ->
         Gzippo = require 'gzippo'
@@ -165,5 +167,5 @@ module.exports = (grunt) ->
 
   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}", entry.partials, 'production')
+      grunt.file.write entry.dest, grunt.joosy.haml.compile("source/haml/#{entry.src}", entry.partials, 'production')
       grunt.log.ok "Compiled #{entry.dest}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joosy
 version: !ruby/object:Gem::Version
-  version: 1.2.0.alpha.32
+  version: 1.2.0.alpha.33
 platform: ruby
 authors:
 - Boris Staal
@@ -141,8 +141,8 @@ files:
 - templates/application/standalone/_gitignore
 - templates/application/standalone/bower.json
 - templates/application/standalone/package.json
-- templates/application/standalone/source/index.haml
-- templates/application/standalone/stylesheets/application.styl
+- templates/application/standalone/source/haml/index.haml
+- templates/application/standalone/source/stylesheets/application.styl
 - templates/layout/basic.coffee
 - templates/layout/namespaced.coffee
 - templates/page/basic.coffee