From f7b70e9f5ebdd7c37be37b4efdadce8084c26a70 Mon Sep 17 00:00:00 2001 From: Sam Hiatt Date: Fri, 19 Sep 2014 17:04:05 -0700 Subject: [PATCH 1/2] Fixed bug when adding attachments to design doc that uses a directory-based app structure. --- tasks/couchapp.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tasks/couchapp.js b/tasks/couchapp.js index 0d24d33..17104c4 100755 --- a/tasks/couchapp.js +++ b/tasks/couchapp.js @@ -34,6 +34,9 @@ module.exports = function(grunt) { done = this.async(); if (require("fs").lstatSync(this.data.app).isDirectory()) { // if new-style (directory-based) couchapp app appobj = couchapp.loadFiles(this.data.app); + delete appobj._attachments; + delete appobj['']; + couchapp.loadAttachments(appobj, this.data.app+"/_attachments"); } else { // otherwise, fall back to old style. appobj = require(path.join(process.cwd(), path.normalize(this.data.app))) } From 37928a8ed6325688681295a69edd9b5ce0c64b26 Mon Sep 17 00:00:00 2001 From: Sam Hiatt Date: Fri, 19 Sep 2014 17:23:07 -0700 Subject: [PATCH 2/2] Reverting inadvertantly-committed changes to README and author/contributors in package.json. --- README.md | 3 +-- package.json | 13 +++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 6bf6a29..ba68fa6 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # grunt-couchapp -A grunt plugin for building and installing couchapps, -forked from https://github.com/garbados/grunt-couchapp +A grunt plugin for building and installing couchapps ## Getting Started diff --git a/package.json b/package.json index 55b1807..6ab87ca 100644 --- a/package.json +++ b/package.json @@ -4,18 +4,19 @@ "version": "0.2.2", "homepage": "https://github.com/garbados/grunt-couchapp", "author": { - "name":"Sam Hiatt", - "email": "sam.hiatt@weather.com" - }, - "contributors": [ - { "name": "Ken Elf Mathieu Sternberg", "email": "elf.sternberg@gmail.com", "url": "http://elfsternberg.com" - },{ + }, + "contributors": [ + { "name": "Max Thayer", "email": "garbados@gmail.com", "url": "http://maxthayer.org" + }, + { + "name":"Sam Hiatt", + "email": "sam.hiatt@weather.com" } ], "repository": {