Merge pull request #2 from benjohnde/master

Latest upstream changes.

Author: abiskop

CHANGELOG.md

@@ -1,3 +1,21 @@
+## 2.1.1  April 16, 2015
+
+Update package.json with async dependency (tomasdev)
+
+Emit error if it failed to sign the zip with manifest file (tomasdev)
+
+
+## 2.1.0  March 2, 2015
+
+Add support for Node.js 0.12 and io.js 1.4
+
+Fix failing image tests on Node.js 0.12 and io.js 1.4
+
+Fix failing signature check on Node.js 0.12 and io.js 1.4
+
+Remove unused async dependency
+
+
 ## 2.0.1  November 14, 2012
 
 Fix addImage not working with buffers.

lib/images.js

@@ -20,11 +20,14 @@ function applyImageMethods(constructor) {
   //   pass.icon(function(callback) { ... };
   //   console.log(pass.icon());
   //
-  // The 2x suffix is used for high resolution version (file name uses @2x
-  // suffix).
+  // The 2x and 3x suffix is used for high resolution version (file name uses
+  // @2x or @3x suffix).
   //
   //   pass.icon2x("[email protected]");
   //   console.log(pass.icon2x());
+  //
+  //   pass.icon3x("[email protected]");
+  //   console.log(pass.icon3x());
   IMAGES.forEach(function(key) {
     prototype[key] = function(value) {
       if (arguments.length === 0) {

lib/pass.js

@@ -12,6 +12,7 @@ var HTTPS             = require("https");
 var Path              = require("path");
 var Zip               = require("./zip");
 var async             = require("async");
+var zlib              = require("zlib");
 
 
 // Top-level pass fields.
@@ -268,15 +269,20 @@ Pass.prototype.pipe = function(output) {
       zip.close();
       self.emit("error", lastError);
     } else {
-      self.signZip(zip, manifest, function(error) {
-        zip.close();
-        zip.on("end", function() {
-          self.emit("end");
-        });
-        zip.on("error", function(error) {
-          self.emit("error", error);
-        });
-      }, self.mockSignature, self.mockModifiedDate);
+      process.nextTick(function() {
+        self.signZip(zip, manifest, function(error) {
+          if (error) {
+            return self.emit("error", error);
+          }
+          zip.close();
+          zip.on("end", function() {
+            self.emit("end");
+          });
+          zip.on("error", function(error) {
+            self.emit("error", error);
+          });
+        }, self.mockSignature, self.mockModifiedDate);
+      });
     }
   }
 };
@@ -305,8 +311,12 @@ function writeFile(file, source, callback) {
       var protocol = /^https:/i.test(source) ? HTTPS : HTTP;
       protocol.get(source, function(response) {
         if (response.statusCode == 200) {
-          response.on("end", callback);
-          response.pipe(file);
+          file.on("close", callback);
+          if (response.headers['content-encoding'] === "gzip") {
+            response.pipe(zlib.createGunzip()).pipe(file);
+          } else {
+            response.pipe(file);
+          }
           response.resume();
         } else
           callback(new Error("Server returned " + response.statusCode + " for " + source));
@@ -441,11 +451,6 @@ function SHAWriteStream(manifest, filename, output) {
   this.sha = Crypto.createHash("sha1");
   output.on("close", this.emit.bind(this, "close"));
   output.on("error", this.emit.bind(this, "error"));
-  var self = this;
-  this.on("pipe", function(source) {
-    source.on("data", self.write.bind(self));
-    source.resume();
-  });
 }
 
 inherits(SHAWriteStream, Stream);

lib/template.js

@@ -16,7 +16,7 @@ var TEMPLATE            = [ "passTypeIdentifier", "teamIdentifier",
 // Create a new template.
 //
 // style  - Pass style (coupon, eventTicket, etc)
-// fields - Pass fields (passTypeIdentifier, teamIdentifier, etc) 
+// fields - Pass fields (passTypeIdentifier, teamIdentifier, etc)
 function Template(style, fields) {
   if (!~STYLES.indexOf(style))
     throw new Error("Unsupported pass style " + style);

package.json

@@ -1,7 +1,7 @@
 { "name": "passbook",
   "description": "iOS Passbook for the Node hacker",
   "homepage": "https://github.com/assaf/node-passbook",
-  "version": "2.0.2",
+  "version": "2.1.1",
   "author": {
     "name": "Assaf Arkin",
     "email": "[email protected]"
@@ -11,11 +11,11 @@
     "node-passbook": "./bin/node-passbook"
   },
   "dependencies": {
-    "async":  "0.2.9",
-    "cli":    "0.4.5"
+    "async": "^0.9.0",
+    "cli":    "0.6.5"
   },
   "devDependencies": {
-    "mocha":  "1.12.0"
+    "mocha":  "2.1.0"
   },
   "scripts": {
     "test": "mocha"
@@ -28,7 +28,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git://github.com/assaf/node-passbook"
+    "url": "git://github.com/assaf/node-passbook.git"
   },
   "bugs": {
     "url": "http://github.com/assaf/node-passbook/issues"