moved

craigspaeth · Jan 10, 2014 · 1f11afe · 1f11afe
1 parent ff6e048
commit 1f11afe
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/lib/nap.coffee b/lib/nap.coffee
@@ -28,10 +28,10 @@ module.exports = (options = {}) =>
     throw new Error "You must specify an 'assets' obj with keys 'js', 'css', or 'jst'"
   @assets = _.clone options.assets
   @originalAssets = _.clone options.assets
+  @appDir = (if options.appDir? then options.appDir else process.cwd())
   expandAssetGlobs()
 
   # Config defaults
-  @appDir = (if options.appDir? then options.appDir else process.cwd())
   @publicDir = path.resolve(@appDir, options.publicDir || 'public')
   @mode = options.mode ? switch process.env.NODE_ENV
     when 'staging' then 'production'

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nap",
-  "version": "0.7.14",
+  "version": "0.7.15",
   "author": {
     "name": "Craig Spaeth",
     "email": "craigspaeth@gmail.com",

diff --git a/test/fixtures/app_dir/public/assets/src/boo.js b/test/fixtures/app_dir/public/assets/src/boo.js
@@ -0,0 +1,6 @@
+(function() {
+  var boo;
+
+  boo = 'bam';
+
+}).call(this);
diff --git a/test/fixtures/app_dir/src/boo.coffee b/test/fixtures/app_dir/src/boo.coffee
@@ -0,0 +1 @@
+boo = 'bam'
diff --git a/test/nap_spec.coffee b/test/nap_spec.coffee
@@ -70,7 +70,7 @@ describe 'appDir', ->
         js:
           foo: ['/src/*.coffee']
     nap.js('foo').should
-      .equal "<script src='/assets/src/foo.js' type='text/javascript'></script>"
+      .include "<script src='/assets/src/foo.js' type='text/javascript'></script>"
 
 describe '#js', ->