second commit

Author: bezoerb

.editorconfig

@@ -0,0 +1,13 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

Gruntfile.js

@@ -42,14 +42,18 @@ module.exports = function(grunt) {
             }
         },
         critical: {
-            options: {
-
-            },
             test: {
+                options: {
+                    base: './',
+                    css: [
+                        'test/fixture/styles/main.css',
+                        'test/fixture/styles/bootstrap.css'
+                    ],
+                    width: 320,
+                    height: 70
+                },
                 src: 'test/fixture/index.html',
-                dest: 'test/generated/critical.css',
-                width: 320,
-                height: 480
+                dest: 'test/generated/critical.css'
             }
         }
     });

README.md

@@ -1,19 +1,65 @@
 # grunt-critical
 
-Grunt plugin to extract & inline critical-path CSS from HTML WiP WiP WiP
+Grunt plugin to extract & inline critical-path CSS from HTML (WiP alpha version)
 
 [![build status](https://secure.travis-ci.org/bezoerb/grunt-critical.png)](http://travis-ci.org/bezoerb/grunt-critical)
 
-## Installation
+## Getting Started
 
-This module is installed via npm:
+This plugin requires Grunt `~0.4.0`
 
-``` bash
-$ npm install grunt-critical
+If you haven't used [Grunt](http://gruntjs.com/) before, be sure to check out the [Getting Started](http://gruntjs.com/getting-started) guide, as it explains how to create a [Gruntfile](http://gruntjs.com/sample-gruntfile) as well as install and use Grunt plugins. Once you're familiar with that process, you may install this plugin with this command:
+
+```shell
+npm install grunt-critical --save-dev
 ```
 
-## Example Usage
+Once the plugin has been installed, it may be enabled inside your Gruntfile with this line of JavaScript:
+
+```js
+grunt.loadNpmTasks('grunt-critical');
+
+
+## Critical task
+
+_Run this task with the `grunt critical` command._
+
+Task targets, files and options may be specified according to the grunt [Configuring tasks](http://gruntjs.com/configuring-tasks) guide.
+
+Generate critical path css and inline it with  [critical](https://github.com/addyosmani/critical).
+
+### Usage
 
-``` js
-var gruntCritical = require('grunt-critical');
+Use the `grunt-critical` task by specifying a target destination (file) for your critical CSS. Below this is `test/generated/critical.css`.
+
+Along-side, specify the input HTML file you would like scanned as well as the width and height of the critical viewport.
+In this case `test/fixture/index.html`.
+
+```shell
+critical: {
+    test: {
+        options: {
+            base: './',
+            css: [
+                'test/fixture/styles/main.css',
+                'test/fixture/styles/bootstrap.css'
+            ],
+            width: 320,
+            height: 70
+        },
+        src: 'test/fixture/index.html',
+        dest: 'test/generated/critical.css'
+    }
+}
 ```
+
+## Options
+
+Sample use of all supported options:
+```shell
+TODO
+```
+
+## License
+
+(C) Ben Zörb 2014, released under an MIT license

package.json

@@ -1,34 +1,38 @@
 {
-  "name": "grunt-critical",
-  "version": "1.0.0",
-  "description": "Grunt plugin to extract & inline critical-path CSS from HTML",
-  "main": "index.js",
-  "scripts": {
-    "test": "node_modules/.bin/grunt ci"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/bezoerb/grunt-critical"
-  },
-  "keywords": [
-    "critical-path css perf gruntplugin"
-  ],
-  "author": "Ben Zörb <ben@sommerlaune.com>",
-  "license": "BSD-3-Clause",
-  "bugs": {
-    "url": "https://github.com/bezoerb/grunt-critical/issues"
-  },
-  "dependencies": {
-    "critical": "^0.1.5"
-  },
-  "devDependencies": {
-    "chai": "~1.8.1",
-    "grunt": "~0.4.1",
-    "grunt-cli": "~0.1.9",
-    "grunt-complexity": "~0.1.3",
-    "grunt-contrib-jshint": "~0.6.4",
-    "grunt-contrib-watch": "~0.5.3",
-    "grunt-simple-mocha": "^0.4.0",
-    "load-grunt-tasks": "^0.6.0"
-  }
+    "name": "grunt-critical",
+    "version": "1.0.0",
+    "description": "Grunt task to extract & inline critical-path CSS from HTML",
+    "main": "index.js",
+    "scripts": {
+        "test": "node_modules/.bin/grunt ci"
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/bezoerb/grunt-critical"
+    },
+    "keywords": [
+        "critical-path css perf gruntplugin"
+    ],
+    "author": "Ben Zörb <ben@sommerlaune.com>",
+    "licenses": [
+        {
+            "type": "MIT"
+        }
+    ],
+    "bugs": {
+        "url": "https://github.com/bezoerb/grunt-critical/issues"
+    },
+    "dependencies": {
+        "critical": "git+https://github.com/addyosmani/critical.git"
+    },
+    "devDependencies": {
+        "chai": "~1.8.1",
+        "grunt": "~0.4.1",
+        "grunt-cli": "~0.1.9",
+        "grunt-complexity": "~0.1.3",
+        "grunt-contrib-jshint": "~0.6.4",
+        "grunt-contrib-watch": "~0.5.3",
+        "grunt-simple-mocha": "^0.4.0",
+        "load-grunt-tasks": "^0.6.0"
+    }
 }

tasks/critical.js

@@ -40,10 +40,16 @@ module.exports = function (grunt) {
             options.base = path.normalize(options.base || '');
 
 
+            // absolutize filepath
+            var basereplace = path.resolve(options.base || './') + '/';
+
+
+
             grunt.util.async.concatSeries(src, function(file, next) {
                 try {
-                    options.src = file;
-                    options.dest = f.dest;
+
+                    options.src = path.resolve(file).replace(basereplace,'');
+//                    options.dest = path.resolve(f.dest).replace(basereplace,'');
 
                     critical.generate(options, function (err, output){
                         if (err) {