Skip to content

Commit ed87b37

Browse files
timtiantimtian
committed
1.0.8
1 parent f43dea0 commit ed87b37

File tree

3 files changed

+90
-77
lines changed

3 files changed

+90
-77
lines changed

‎README.md‎

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ var gulp = require("gulp");
3535
var reveasy = require("gulp-rev-easy");
3636

3737
gulp.task("reveasy", function (argument) {
38-
gulp.src("test.html")
39-
.pipe(reveasy())
40-
.pipe(gulp.dest("./dist"))
38+
gulp.src("test.html")
39+
.pipe(reveasy())
40+
.pipe(gulp.dest("./dist"))
4141
})
4242
```
4343

@@ -93,9 +93,9 @@ var gulp = require("gulp");
9393
var reveasy = require("gulp-rev-easy");
9494

9595
gulp.task("reveasy", function (argument) {
96-
gulp.src("test.html")
97-
.pipe(reveasy({cwd:'./test/'}))
98-
.pipe(gulp.dest("./dist"))
96+
gulp.src("test.html")
97+
.pipe(reveasy({cwd:'./test/'}))
98+
.pipe(gulp.dest("./dist"))
9999
})
100100
```
101101

@@ -113,20 +113,20 @@ var gulp = require("gulp");
113113
var reveasy = require("gulp-rev-easy");
114114

115115
gulp.task("reveasy", function (argument) {
116-
gulp.src("test.html")
117-
.pipe(reveasy({revType:'date'}))
118-
.pipe(gulp.dest("./dist"))
119-
116+
gulp.src("test.html")
117+
.pipe(reveasy({revType:'date'}))
118+
.pipe(gulp.dest("./dist"))
119+
120120
})
121121
```
122122

123123
```html
124124
<link type="text/css" rel="stylesheet" media="all"
125-
href="assets/index.css?max_age=1024">
125+
href="assets/index.css?max_age=1024">
126126
```
127127
```html
128128
<link type="text/css" rel="stylesheet" media="all"
129-
href="assets/index.css?max_age=1024&amp;v=201503061144">
129+
href="assets/index.css?max_age=1024&amp;v=201503061144">
130130
```
131131

132132
## options.dateFormat
@@ -139,16 +139,16 @@ var gulp = require("gulp");
139139
var reveasy = require("gulp-rev-easy");
140140

141141
gulp.task("reveasy", function (argument) {
142-
gulp.src("test.html")
143-
.pipe(reveasy({revType:'date', dateFormat:'yymmddHHmm'}))
144-
.pipe(gulp.dest("./dist"))
145-
142+
gulp.src("test.html")
143+
.pipe(reveasy({revType:'date', dateFormat:'yymmddHHmm'}))
144+
.pipe(gulp.dest("./dist"))
145+
146146
})
147147
```
148148
#### Output
149149
```html
150150
<link type="text/css" rel="stylesheet" media="all"
151-
href="assets/index.css?max_age=1024&amp;v=1503061144">
151+
href="assets/index.css?max_age=1024&amp;v=1503061144">
152152
```
153153

154154
## options.hashLength
@@ -161,23 +161,23 @@ var gulp = require("gulp");
161161
var reveasy = require("gulp-rev-easy");
162162

163163
gulp.task("reveasy", function (argument) {
164-
gulp.src("test.html")
165-
.pipe(reveasy({revType:'hash', hashLength:5}))
166-
.pipe(gulp.dest("./dist"))
167-
164+
gulp.src("test.html")
165+
.pipe(reveasy({revType:'hash', hashLength:5}))
166+
.pipe(gulp.dest("./dist"))
167+
168168
})
169169
```
170170
#### Output
171171

172172
```html
173173
<!--default output-->
174174
<img data-src="assets/audrey-hepburn.jpg"
175-
src="assets/audrey-hepburn.jpg?v=7c5d110d">
175+
src="assets/audrey-hepburn.jpg?v=7c5d110d">
176176
```
177177
-->
178178
```html
179179
<img data-src="assets/audrey-hepburn.jpg"
180-
src="assets/audrey-hepburn.jpg?v=7c5d1">
180+
src="assets/audrey-hepburn.jpg?v=7c5d1">
181181
```
182182

183183
## options.suffix
@@ -190,10 +190,10 @@ var gulp = require("gulp");
190190
var reveasy = require("gulp-rev-easy");
191191

192192
gulp.task("reveasy", function (argument) {
193-
gulp.src("test.html")
194-
.pipe(reveasy({suffix:'hashkey'}))
195-
.pipe(gulp.dest("./dist"))
196-
193+
gulp.src("test.html")
194+
.pipe(reveasy({suffix:'hashkey'}))
195+
.pipe(gulp.dest("./dist"))
196+
197197
})
198198
```
199199
#### Output
@@ -217,10 +217,10 @@ var gulp = require("gulp");
217217
var reveasy = require("gulp-rev-easy");
218218

219219
gulp.task("reveasy", function (argument) {
220-
gulp.src("test.html")
221-
.pipe(reveasy({fileTypes:['js']}))
222-
.pipe(gulp.dest("./dist"))
223-
220+
gulp.src("test.html")
221+
.pipe(reveasy({fileTypes:['js']}))
222+
.pipe(gulp.dest("./dist"))
223+
224224
})
225225
```
226226
#### Output
@@ -231,7 +231,7 @@ gulp.task("reveasy", function (argument) {
231231
<head>
232232
<title>gulp-rev-easy</title>
233233
<link type="text/css" rel="stylesheet" media="all"
234-
href="assets/index.css?max_age=1024">
234+
href="assets/index.css?max_age=1024">
235235
</head>
236236
<body>
237237
<img data-src="assets/audrey-hepburn.jpg"
@@ -265,7 +265,7 @@ gulp.task("reveasy", function (argument) {
265265
src: 'src'
266266
},
267267
css: {
268-
name: 'link',
268+
name: 'link[type="text/css"]',
269269
src: 'href'
270270
},
271271
img:{
@@ -280,45 +280,45 @@ var gulp = require("gulp");
280280
var reveasy = require("gulp-rev-easy");
281281

282282
gulp.task("reveasy", function (argument) {
283-
gulp.src("test.html")
284-
.pipe(reveasy({
285-
fileTypes:['img1'],
286-
elementAttributes:{
287-
img1:{
288-
name:'img',
289-
src:'data-src'
290-
}
291-
}))
292-
.pipe(gulp.dest("./dist"))
283+
gulp.src("test.html")
284+
.pipe(reveasy({
285+
fileTypes:['img1'],
286+
elementAttributes:{
287+
img1:{
288+
name:'img',
289+
src:'data-src'
290+
}
291+
}))
292+
.pipe(gulp.dest("./dist"))
293293
})
294294
```
295295
#### Output
296296
```html
297297
<!--default out-->
298298
<img data-src="assets/audrey-hepburn.jpg"
299-
src="assets/audrey-hepburn.jpg?v=7c5d110d">
299+
src="assets/audrey-hepburn.jpg?v=7c5d110d">
300300
```
301301
-->
302302
```html
303303
<img data-src="assets/audrey-hepburn.jpg?v=7c5d110d"
304-
src="assets/audrey-hepburn.jpg">
304+
src="assets/audrey-hepburn.jpg">
305305
```
306306
307307
```js
308308
var gulp = require("gulp");
309309
var reveasy = require("gulp-rev-easy");
310310

311311
gulp.task("reveasy", function (argument) {
312-
gulp.src("test.html")
313-
.pipe(reveasy({
314-
fileTypes:['img1'],
315-
elementAttributes:{
316-
img1:{
317-
name:'img',
318-
src:'data-src'
319-
}
320-
}))
321-
.pipe(gulp.dest("./dist"))
312+
gulp.src("test.html")
313+
.pipe(reveasy({
314+
fileTypes:['img1'],
315+
elementAttributes:{
316+
img1:{
317+
name:'img',
318+
src:'data-src'
319+
}
320+
}))
321+
.pipe(gulp.dest("./dist"))
322322
})
323323
```
324324
## options.transformPath
@@ -330,27 +330,27 @@ var gulp = require("gulp");
330330
var reveasy = require("gulp-rev-easy");
331331

332332
gulp.task("reveasy", function (argument) {
333-
gulp.src("test.html")
334-
.pipe(reveasy({
335-
transformPath:function(orgpath, ver){
336-
var newpath = "http://s1.cdn.com/" + orgpath
337-
+ (orgpath.indexOf('?') > -1 ? "&" : "?")
338-
+ "v=" + ver;
339-
return newpath;
340-
}
341-
}))
342-
.pipe(gulp.dest("./dist"))
333+
gulp.src("test.html")
334+
.pipe(reveasy({
335+
transformPath:function(orgpath, ver){
336+
var newpath = "http://s1.cdn.com/" + orgpath
337+
+ (orgpath.indexOf('?') > -1 ? "&" : "?")
338+
+ "v=" + ver;
339+
return newpath;
340+
}
341+
}))
342+
.pipe(gulp.dest("./dist"))
343343
})
344344
```
345345
#### Output
346346
```html
347347
<!--default out-->
348348
<img data-src="assets/audrey-hepburn.jpg"
349-
src="assets/audrey-hepburn.jpg?v=7c5d110d">
349+
src="assets/audrey-hepburn.jpg?v=7c5d110d">
350350
```
351351
-->
352352
```html
353353
<img data-src="assets/audrey-hepburn.jpg"
354354
src="http://s1.cdn.com/assets/audrey-hepburn.jpg?v=7c5d110d">
355355
```
356-
#Other
356+
# Other

‎index.js‎

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ var fs = require('fs');
66
var dateformat = require('dateformat')
77
var url = require('url');
88
var _ = require('lodash');
9+
var crypto = require('crypto');
910

1011
module.exports = function (options) {
1112

@@ -26,7 +27,7 @@ module.exports = function (options) {
2627
src: 'src'
2728
},
2829
css: {
29-
name: 'link',
30+
name: 'link[type="text/css"]',
3031
src: 'href'
3132
},
3233
img:{
@@ -45,6 +46,8 @@ module.exports = function (options) {
4546

4647
return through.obj(function (file, enc, cb) {
4748

49+
50+
gutil.log("====begin rev:" + gutil.colors.cyan(file.path));
4851
if (file.isNull()) {
4952
this.push(file);
5053
return cb();
@@ -73,22 +76,32 @@ module.exports = function (options) {
7376

7477
if(options.revType == "hash"){
7578
var filepath = path.join(options.cwd, url.parse(src).pathname);
76-
revv = require('crypto')
77-
.createHash('md5')
78-
.update(
79-
fs.readFileSync(filepath, {encoding: 'utf8'}))
80-
.digest("hex").substring(0, options.hashLength);
79+
if(fs.existsSync(filepath)){
80+
revv = crypto
81+
.createHash('md5')
82+
.update(
83+
fs.readFileSync(filepath, {encoding: 'utf8'}))
84+
.digest("hex").substring(0, options.hashLength);
85+
}else{
86+
gutil.log(gutil.colors.red(filepath + " not found"));
87+
}
8188
}else{
8289
revv = dateformat(new Date(), options.dateFormat)
8390
}
8491

85-
var newname = options.transformPath(src, revv);
86-
$asset.attr(attributes.src, newname);
87-
gutil.log(src +"-->" + newname);
92+
if(revv != ""){
93+
var newname = options.transformPath(src, revv);
94+
$asset.attr(attributes.src, newname);
95+
gutil.log(src + " --> ", gutil.colors.green(newname));
96+
}else{
97+
gutil.log(gutil.colors.blue("ignore:rev is empty "), src);
98+
}
8899
}
89100
}
90101
}
91102
file.contents = new Buffer($.html());
103+
104+
gutil.log("====end rev:" + gutil.colors.cyan(file.path));
92105
}
93106
catch (err) {
94107
this.emit('error', new gutil.PluginError('gulp-rev-easy', err));

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gulp-rev-easy",
3-
"version": "1.0.7",
3+
"version": "1.0.8",
44
"description": "easy add hash to asset path uc.js -> uc.js?v=afb23 or simple add date uc.js -> uc.js?v=201503031214",
55
"main": "index.js",
66
"scripts": {

0 commit comments

Comments
 (0)