Updates from production

Author: Todd Wolfson

grunt.js

@@ -1,10 +1,10 @@
 module.exports = function (grunt) {
   grunt.initConfig({
     lint: {
-      all: ["grunt.js", "src/*.js", "src-test/*.js"]
+      all: ["grunt.js", "tasks/*.js", "src-test/*.js"]
     }
   });
 
   grunt.registerTask("default", "lint");
-  grunt.loadTasks("src");
+  grunt.loadTasks("tasks");
 };

package.json

@@ -2,7 +2,7 @@
   "name": "grunt-spritesmith",
   "version": "0.0.2",
   "description": "Grunt library for using spritesmith",
-  "main": "index.js",
+  "main": "grunt.js",
   "scripts": {
     "test": "grunt --base ./src-test/ --config ./src-test/grunt.js"
   },
@@ -13,17 +13,22 @@
     "spritesheet",
     "css"
   ],
-  "author": "Todd Wolfson <[email protected]>",
+  "author": {
+    "name": "Todd Wolfson",
+    "email": "[email protected]"
+  },
   "license": "MIT",
   "dependencies": {
     "spritesmith": "git+ssh://[email protected]:Ensighten/spritesmith.git"
   },
-  "optionalDependencies": {
+  "devDependencies": {
     "grunt": "~0.3.12"
   },
   "private": true,
-  "repositories": [{
-    "type": "git",
-    "url": "https://github.com/Ensighten/grunt-spritesmith.git"
-  }]
-}
+  "repositories": [
+    {
+      "type": "git",
+      "url": "https://github.com/Ensighten/grunt-spritesmith.git"
+    }
+  ]
+}

src-test/grunt.js

@@ -16,6 +16,6 @@ module.exports = function (grunt) {
     }
   });
 
-  grunt.loadTasks('../src');
+  grunt.loadTasks('../tasks');
   grunt.registerTask('default', 'sprite test');
 };

src/grunt-spritesmith.js

@@ -12,7 +12,7 @@ module.exports = function (grunt) {
 
     // Verify all properties are here
     if (!src || !img || !css) {
-      return grunt.fail("grunt.sprite requires a source, destImg, and destCSS property");
+      return grunt.fatal("grunt.sprite requires a source, destImg, and destCSS property");
     }
 
     // Load in all images from the src
@@ -52,10 +52,19 @@ module.exports = function (grunt) {
 
         // Record all of the properties into cssVars
         // TODO: Find out of we can just make it an object in some namespace
-        cssVars.push('$' + name + '_x = ' + coords.x + ';');
-        cssVars.push('$' + name + '_y = ' + coords.y + ';');
-        cssVars.push('$' + name + '_width = ' + coords.width + ';');
-        cssVars.push('$' + name + '_height = ' + coords.height + ';');
+        var x = coords.x + 'px',
+            y = coords.y + 'px',
+            offsetX = '-' + x,
+            offsetY = '-' + y,
+            width = coords.width + 'px',
+            height = coords.height + 'px';
+        cssVars.push('$' + name + '_x = ' + x + ';');
+        cssVars.push('$' + name + '_y = ' + y + ';');
+        cssVars.push('$' + name + '_offset_x = ' + offsetX + ';');
+        cssVars.push('$' + name + '_offset_y = ' + offsetY + ';');
+        cssVars.push('$' + name + '_width = ' + width + ';');
+        cssVars.push('$' + name + '_height = ' + height + ';');
+        cssVars.push('$' + name + ' = ' + [x, y, offsetX, offsetY, width, height].join(' ') + ';');
       });
 
       // Join the cssVars with line feeds

tasks/grunt-spritesmith.js

@@ -0,0 +1 @@
+module.exports = require('../src/grunt-spritesmith.js');