version 0.2

.gitignore

@@ -12,4 +12,4 @@ logs
 results
 
 node_modules
-npm-debug.log
+npm-debug.log

.jshintrc

@@ -1,5 +1,4 @@
 {
-    "es5": true,
     "esnext": true,
     "bitwise": true,
     "curly": true,
@@ -10,9 +9,11 @@
     "noempty": true,
     "regexp": true,
     "undef": true,
-    "strict": false,
+    "strict": true,
     "trailing": true,
     "smarttabs": true,
     "node": true,
-    "globalstrict": true
-}
+    "globalstrict": true,
+    "white": true,
+    "indent": 4
+}

.npmignore

@@ -1,4 +1,4 @@
 test/
 .jshintrc
 .travis.yml
-.gitignore
+.gitignore

Makefile

@@ -10,7 +10,7 @@ fulltest: clean install test
 clean:
 	rm -rf node_modules
 lint:
-	./node_modules/.bin/jshint datauri.js lib/*
+	./node_modules/.bin/jshint datauri.js cli.js lib/*
 spec:
 	@echo "Running test suite..."
 	$(NODE) test/run.js

README.md

@@ -5,14 +5,6 @@ A simple [Data URI scheme][datauri] generator built on top of [Node.js][nodejs].
 
 `npm install -g datauri` (it may require Root privileges)
 
-MODULE
-------
-
-```js
-var Datauri = require('datauri');
-
-console.log(Datauri('test/myfile.png')); //=> "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAA...";
-```
 
 CLIENT
 ------
@@ -33,6 +25,27 @@ If you want to define a Class Name, just type:
 $ datauri brand.png asset/background.css MyNewClass
 ```
 
+API
+---
+
+```js
+var Datauri = require('datauri');
+
+// without instance
+var datauri = Datauri('test/myfile.png');
+console.log(datauri); //=> "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAA...";
+
+// with instance
+var dUri = new Datauri('test/myfile.png');
+
+console.log(dUri.content); //=> "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAA...";
+console.log(dUri.mimetype); //=> "image/png";
+console.log(dUri.base64); //=> "iVBORw0KGgoAAAANSUhEUgAA...";
+console.log(dUri.getCSS()); //=> "\n.case {\n    background: url('data:image/png;base64,iVBORw...";
+console.log(dUri.getCSS("myClass")); //=> "\n.myClass {\n    background: url('data:image/png;base64,iVBORw...";
+
+```
+
 DEVELOPING
 ----------
 
@@ -55,4 +68,4 @@ MIT License
 (c) [Helder Santana](http://heldr.com)
 
 [nodejs]: http://nodejs.org/download
-[datauri]: http://en.wikipedia.org/wiki/Data_URI_scheme
+[datauri]: http://en.wikipedia.org/wiki/Data_URI_scheme

cli.js

@@ -7,50 +7,60 @@
  * https://raw.github.com/heldr/datauri/master/MIT-LICENSE.txt
  */
 
-var args    = process.argv,
-    fs      = require('fs'),
-    path    = require('path'),
-    DataURI = require('./datauri');
-
-function writeNewCssFile( file , content , action ) {
-    fs.writeFile( file , content , 'utf-8' , function(err) {
-        if(err) {
-            throw err;
-        }
+(function (args) {
+    "use strict";
 
-        console.log('File ' + action + ': ' + file);
-    });
-}
+    var fs      = require('fs'),
+        path    = require('path'),
+        DataURI = require('./datauri');
 
-function outputCSS( file , content ) {
+    function writeNewCssFile(file, content, action) {
+        fs.writeFile(file, content, 'utf-8', function (err) {
+            if (err) {
+                throw err;
+            }
 
-    if ( fs.existsSync(file) ) {
+            console.log('File ' + action + ': ' + file);
+        });
+    }
 
-        if ( path.extname(file).match(/(css|sass|less)/) ) {
-            fs.readFile( file , 'utf-8' , function( err , cssContent ) {
+    function outputCSS(file, content) {
 
-                cssContent += content;
+        if (fs.existsSync(file)) {
 
-                writeNewCssFile( file , cssContent , 'updated' );
+            if (path.extname(file).match(/(css|sass|less)/)) {
+                fs.readFile(file, 'utf-8', function (err, cssContent) {
 
-            });
-        } else {
-            console.log( 'Must be a CSS file' );
-        }
+                    cssContent += content;
+
+                    writeNewCssFile(file, cssContent, 'updated');
 
+                });
+            } else {
+                console.log('Must be a CSS file');
+            }
 
-    } else {
 
-        writeNewCssFile( file , content , 'created' );
+        } else {
 
+            writeNewCssFile(file, content, 'created');
+
+        }
     }
-}
 
-if (args.length > 2) {
+    if (args.length > 2) {
 
-    var cls = args[4] || '',
-        uri = new DataURI( args[2] );
+        var cls = args[4] || '',
+            uri = new DataURI(args[2]),
+            content;
 
-    ( args.length < 4 ) ? console.log( uri.content ) : outputCSS( args[3] , uri.getCss( cls ) );
+        if (args.length < 4) {
+            content = uri.content;
+            console.log(content);
+        } else {
+            content = uri.getCss(cls);
+            outputCSS(args[3], content);
+        }
 
-}
+    }
+}(process.argv));

lib/css.js

@@ -7,13 +7,16 @@
  * https://raw.github.com/heldr/datauri/master/MIT-LICENSE.txt
  */
 
-var _ = require('lodash');
+module.exports = (function (templayed) {
+    "use strict";
 
-var template = [
-	"",
-    ".<%= className %> {",
-    "    background: url('<%= background %>')",
-    "}"
-].join('\n');
+    var tpl = [
+        "",
+        ".{{ className }} {",
+        "    background: url('{{ background }}')",
+        "}"
+    ].join('\n');
 
-module.exports = _.template(template);
+    return templayed(tpl);
+
+}(require('templayed')));

lib/exec.js

@@ -7,37 +7,52 @@
  * https://raw.github.com/heldr/datauri/master/MIT-LICENSE.txt
  */
 
-var path = require('path'),
-    fs   = require('fs'),
-    mime = require('./mime'),
-    uri  = require('./uri'),
-    css  = require('./css');
+module.exports = (function () {
+    "use strict";
+
+    var path = require('path'),
+        fs   = require('fs'),
+        mimer = require('mimer'),
+        uri  = require('./uri'),
+        css  = require('./css'),
+        existsSync = fs.existsSync || path.existsSync;
 
+    var DataURI = function (fileName) {
+        if (!(this instanceof DataURI)) {
+            if (fileName) {
+                var dUri = new DataURI();
 
-function dataURI( fileName ) {
+                return dUri.createConfig(fileName);
+            }
+            return new DataURI();
+        }
 
-    var self = this,
-        existsSync = fs.existsSync || path.existsSync;
+        if (fileName) {
+            return this.createConfig(fileName);
+        }
+    };
 
-    if ( existsSync( fileName ) ) {
+    DataURI.prototype.createConfig = function (fileName) {
 
-        this.fileName = fileName;
-        this.base64   = fs.readFileSync( fileName , 'base64' );
-        this.mimetype = mime.getFromFile( fileName );
-        this.content  = uri( this );
+        if (existsSync(fileName)) {
+            this.fileName = fileName;
+            this.base64   = fs.readFileSync(fileName, 'base64');
+            this.mimetype = mimer(fileName);
+            this.content  = uri(this);
+        }
 
-    }
+        return this.content;
 
-    return this.content;
-}
+    };
+
+    DataURI.prototype.getCss = function (className) {
 
-dataURI.prototype = {
-    getCss: function( className ) {
         return css({
-            className: className || path.basename( this.fileName , path.extname( this.fileName ) ),
+            className: className || path.basename(this.fileName, path.extname(this.fileName)),
             background: this.content
         });
-    }
-};
+    };
+
+    return DataURI;
 
-module.exports = dataURI;
+}).call(this);