Merge branch 'master' of github.com:mechanoid/wintersmith-stylus into…

… jw/rebasing Conflicts: package.json plugin.coffee test/mocha.opts test/nib.coffee
jnwng · Jun 28, 2015 · 52f9288 · 52f9288
2 parents 99503b3 + 9533b14
commit 52f9288
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -14,6 +14,7 @@
   },
   "devDependencies": {
     "mocha": "^1.21.3",
+    "should": "~4.0.4",
     "wintersmith": "^2.1.0"
   },
   "scripts": {

diff --git a/plugin.coffee b/plugin.coffee
@@ -13,18 +13,35 @@ module.exports = (env, callback) ->
       @_filepath.relative.replace /styl$/, 'css'
 
     getView: ->
-      return (env, locals, contents, templates, callback) ->
+      return (env, locals, contents, templates, callback) =>
+
         try
           options = env.config.stylus or {}
-          options.filename = this.getFilename()
+          options.filename = @getFilename()
           options.paths = [path.dirname(@_filepath.full)]
-          stylus(@_text, options)
-            .use(nib())
-            .render (err, css) ->
-              if err
-                callback err
-              else
-                callback null, new Buffer css
+
+          renderer = stylus(@_text, options)
+
+          # allowing to specify dependencies (including nib) via config file
+          #
+          #  "stylus": {
+          #   "dependencies": [
+          #     "nib",
+          #     "jeet"
+          #   ]
+          # }
+          dependencies = options.dependencies
+
+          if dependencies?
+            for dependency in dependencies
+              currentLib = require(dependency)
+              renderer.use(currentLib()) if currentLib?
+
+          renderer.render (err, css) ->
+            if err
+              callback err
+            else
+              callback null, new Buffer css
         catch error
           callback error
 

diff --git a/test/mocha.opts b/test/mocha.opts
@@ -1 +1,3 @@
+--require should
+--ui bdd
 --compilers coffee:coffee-script/register
diff --git a/test/nib.coffee b/test/nib.coffee
@@ -4,6 +4,8 @@ wsStylus = require './../'
 
 # new wintersmith environment
 env = wintersmith new Config, __dirname
+env.config.stylus ?= {}
+env.config.stylus.dependencies = ['nib']
 
 describe "Nib integration", ->
 
@@ -20,11 +22,14 @@ describe "Nib integration", ->
       tree['style.styl'].getView() env, null, null, null, (err, content)->
 
         if content?
-          content.should.equal("""
+          content.toString().should.equal("""
           body {
             -webkit-box-shadow: 0 0 1px #000;
-            -moz-box-shadow: 0 0 1px #000;
             box-shadow: 0 0 1px #000;
-          }""")
+          }
+
+          """)
+        else
+          throw err
 
         do done