fix(preprocessor): calculate sha1 on content returned from a preprocessor

pkozlowski-opensource · pkozlowski-opensource · commit 6cf795576bd6 · 2014-10-13T19:12:34.000+02:00
Fixes #1204
diff --git a/lib/preprocessor.js b/lib/preprocessor.js
@@ -52,6 +52,7 @@ var createPreprocessor = function(config, basePath, injector) {
       if (!preprocessors.length) {
         file.contentPath = null;
         file.content = content;
+        file.sha = sha1(content);
         return done();
       }
 
@@ -93,7 +94,6 @@ var createPreprocessor = function(config, basePath, injector) {
       if (err) {
         throw err;
       }
-      file.sha = sha1(buffer);
       nextPreprocessor(null, thisFileIsBinary ? buffer : buffer.toString());
     });
   };
diff --git a/test/unit/preprocessor.spec.coffee b/test/unit/preprocessor.spec.coffee
@@ -11,6 +11,7 @@ describe 'preprocessor', ->
     mockFs = mocks.fs.create
       some:
         'a.js': mocks.fs.file 0, 'content'
+        'b.js': mocks.fs.file 0, 'content'
         'a.txt': mocks.fs.file 0, 'some-text'
         'photo.png': mocks.fs.file 0, 'binary'
 
@@ -96,6 +97,28 @@ describe 'preprocessor', ->
           expect(file.sha).not.to.equal previousSHA
           done()
 
+  it 'should compute SHA from content returned by a processor', (done) ->
+    fakePreprocessor = sinon.spy (content, file, done) ->
+      done null, content + '-processed'
+
+    injector = new di.Injector [{
+      'preprocessor:fake': ['factory', -> fakePreprocessor]
+    }]
+
+    pp = m.createPreprocessor {'**/a.js': ['fake']}, null, injector
+
+    fileProcess = {originalPath: '/some/a.js', path: 'path'}
+    fileSkip = {originalPath: '/some/b.js', path: 'path'}
+
+    pp fileProcess, ->
+      pp fileSkip, ->
+        expect(fileProcess.sha).to.exist
+        expect(fileProcess.sha.length).to.equal 40
+        expect(fileSkip.sha).to.exist
+        expect(fileSkip.sha.length).to.equal 40
+        expect(fileProcess.sha).not.to.equal fileSkip.sha
+        done()
+
 
   it 'should return error if any preprocessor fails', (done) ->
     failingPreprocessor = sinon.spy (content, file, done) ->

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ var createPreprocessor = function(config, basePath, injector) {`
`52`	`52`	`if (!preprocessors.length) {`
`53`	`53`	`file.contentPath = null;`
`54`	`54`	`file.content = content;`
	`55`	`+ file.sha = sha1(content);`
`55`	`56`	`return done();`
`56`	`57`	`}`
`57`	`58`
`@@ -93,7 +94,6 @@ var createPreprocessor = function(config, basePath, injector) {`
`93`	`94`	`if (err) {`
`94`	`95`	`throw err;`
`95`	`96`	`}`
`96`		`- file.sha = sha1(buffer);`
`97`	`97`	`nextPreprocessor(null, thisFileIsBinary ? buffer : buffer.toString());`
`98`	`98`	`});`
`99`	`99`	`};`