By type keep structure

specs/layouts_manager_spec.js

@@ -21,6 +21,20 @@ describe('Layout Manager', function() {
       expect(byComponentLayout).to.exist;
       expect(byComponentLayout('sass', 'bourbone')).to.equal(path.normalize('bourbone/sass'));
     });
+
+    it('should support "byTypeKeepStructure" layout', function() {
+      var byTypeKeepStructure = layoutsManager.getLayout('byTypeKeepStructure');
+
+      expect(byTypeKeepStructure).to.exist;
+      expect(byTypeKeepStructure('styles', 'foundation', 'scss/foundation/components')).to.equal(path.normalize('styles/foundation/scss/foundation/components'));
+    });
+
+    it('should support "byComponentKeepStructure" layout', function() {
+      var byComponentKeepStructure = layoutsManager.getLayout('byComponentKeepStructure');
+
+      expect(byComponentKeepStructure).to.exist;
+      expect(byComponentKeepStructure('styles', 'foundation', 'scss/foundation/components')).to.equal(path.normalize('foundation/styles/scss/foundation/components'));
+    });
   });
 
   it('should support custom layouts as functions', function() {
@@ -31,4 +45,15 @@ describe('Layout Manager', function() {
     expect(customLayout).to.be.a('function');
     expect(customLayout('img', 'logo.png')).to.equal('imglogo.png');
   });
+
+  it('should support keeping structure in custom layouts as functions', function() {
+    var customLayout = layoutsManager.getLayout(function(type, pkg, sourceDir) {
+      return path.join(type, pkg, sourceDir);
+    });
+
+    expect(customLayout).to.be.a('function');
+    expect(customLayout('styles', 'bootstrap', 'less')).to.equal('styles/bootstrap/less');
+  });
+
+
 });

tasks/bower_task.js

@@ -64,7 +64,7 @@ module.exports = function (grunt) {
   function copy(options, callback) {
     var bowerAssets = new BowerAssets(bower, options.cwd);
     bowerAssets.on("end", function (assets) {
-      var copier = new AssetCopier(assets, options, function (source, destination, isFile) {
+      var copier = new AssetCopier(assets, options, bower.config.directory, function (source, destination, isFile) {
         log("grunt-bower " + "copying ".cyan + ((isFile ? "" : " dir ") + source + " -> " + destination).grey);
       });
 

tasks/lib/asset_copier.js

@@ -4,9 +4,10 @@ var path = require('path');
 var grunt = require('grunt');
 var fs = require('fs-extra');
 
-var Copier = function(assets, options, report) {
+var Copier = function(assets, options, componentsDir, report) {
   this.assets = assets;
   this.options = options;
+  this.componentsDir = componentsDir;
   this.report = report;
 };
 
@@ -39,7 +40,9 @@ Copier.prototype.copyAssets = function(type, assets) {
       var destination;
 
       var isFile = fs.statSync(source).isFile();
-      var destinationDir = path.join(self.options.targetDir, self.options.layout(type, pkg, source));
+      var sourceDir = path.relative(path.join(self.componentsDir, pkg), path.dirname(source));
+      var destinationDir = path.join(self.options.targetDir, self.options.layout(type, pkg, sourceDir));
+
       grunt.file.mkdir(destinationDir);
       if (isFile) {
         destination = path.join(destinationDir, path.basename(source));

tasks/lib/layouts_manager.js

@@ -2,11 +2,11 @@ var _ = require('lodash');
 var path = require('path');
 
 var handleUntyped = function(layout) {
-  return function(type, pkg) {
+  return function(type, pkg, sourceDir) {
     if (type === '__untyped__') {
       return pkg;
     }
-    return layout(type, pkg);
+    return layout(type, pkg, sourceDir);
   };
 };
 
@@ -17,6 +17,14 @@ var defaultLayouts = {
 
   byComponent: handleUntyped(function(type, pkg) {
     return path.join(pkg, type);
+  }),
+
+  byTypeKeepStructure: handleUntyped(function(type, pkg, sourceDir) {
+    return path.join(type, pkg, sourceDir);
+  }),
+
+  byComponentKeepStructure: handleUntyped(function(type, pkg, sourceDir) {
+    return path.join(pkg, type, sourceDir);
   })
 };