Merge pull request #166 from openmcac/ac_sermons_tagging

Tag sermons

Author: achan

app/models/sermon.js

@@ -8,5 +8,24 @@ export default DS.Model.extend({
   notes: DS.attr("string"),
   publishedAt: DS.attr('date'),
   series: DS.attr("string"),
-  speaker: DS.attr("string")
+  speaker: DS.attr("string"),
+  tags: DS.attr(),
+  tagList: Ember.computed("tags.[]", {
+    get: function() {
+      return getTags(this).toArray().join(", ");
+    },
+    set: function(key, value) {
+      this.set("tags", tagListToArray(value));
+      return value;
+    }
+  })
 });
+
+function getTags(context) {
+  var tags = context.get("tags");
+  return tags ? tags : [];
+}
+
+function tagListToArray(tagList) {
+  return tagList.split(/\s*,\s*/);
+}

app/templates/components/sermon-editor.hbs

@@ -17,6 +17,10 @@
             class="form-control"
             data-auto-id="speaker"}}
   </div>
+  <div class="form-group">
+    <label for="tags">Tags</label>
+    {{input value=sermon.tags class="form-control" data-auto-id="tags"}}
+  </div>
   <div class="form-group">
     <label for="audio">Audio</label>
     <div class="form-control audio">

mirage/factories/sermon.js

@@ -25,6 +25,9 @@ export default Factory.extend({
   },
   bannerUrl() {
     return null;
+  },
+  tags() {
+    return faker.lorem.words(faker.random.number(4) + 1);
   }
 });
 

tests/acceptance/bulletin/edit-test.js

@@ -39,7 +39,8 @@ test("it displays the bulletin to be edited", assert => {
   const group = server.create("group");
   const sermon = server.create("sermon", {
     audioUrl: `${faker.internet.url()}/audio.mp3`,
-    notes: "these are shorter notes"
+    notes: "these are shorter notes",
+    tags: "faith,humility"
   });
   const bulletin = server.create("bulletin", {
     bannerUrl: `${faker.internet.url()}/banner.png`,
@@ -61,6 +62,7 @@ test("it displays the bulletin to be edited", assert => {
     assert.equal(page.sermon.speaker, sermon.speaker);
     assert.equal(page.sermon.series, sermon.series);
     assert.equal(page.sermon.name, sermon.name);
+    assert.equal(page.sermon.tags(), sermon.tags);
   });
 });
 
@@ -148,7 +150,9 @@ test("it updates the current bulletin", assert => {
     fillPublishedAt("05/27/1984 9:30 AM").
     fillServiceOrder("updated service order");
 
-  page.sermon.fillNotes("updated sermon notes");
+  page.sermon.
+    fillNotes("updated sermon notes").
+    fillTags("joy,prayer");
 
   page.announcements(0).
     fillUrl("http://updated.com").
@@ -171,6 +175,7 @@ test("it updates the current bulletin", assert => {
     equalDate(assert, updatedSermon.publishedAt, page.publishedAt);
     assert.equal(updatedSermon.audioUrl, page.sermon.audioUrl());
     assert.equal(updatedSermon.bannerUrl, page.bannerUrl());
+    assert.equal(updatedSermon.tags, page.sermon.tags());
 
     const updatedAnnouncement = server.db.announcements.find(announcement.id);
     const announcementEditor = page.announcements(0);

tests/acceptance/bulletins/new-test.js

@@ -43,7 +43,8 @@ test("it can create a new bulletin", assert => {
     name: "My Sermon",
     notes: "",
     series: "Super series",
-    speaker: "Mr. Speaker"
+    speaker: "Mr. Speaker",
+    tags: "humility,faith,temptation"
   };
 
   page.
@@ -56,17 +57,22 @@ test("it can create a new bulletin", assert => {
     fillName(sermon.name).
     fillNotes(sermon.notes).
     fillSeries(sermon.series).
-    fillSpeaker(sermon.speaker);
+    fillSpeaker(sermon.speaker).
+    fillTags(sermon.tags);
 
   page.submit();
 
   andThen(() => {
     const bulletins = server.db.bulletins;
     const createdBulletin = bulletins[bulletins.length - 1];
 
+    const sermons = server.db.sermons;
+    const createdSermon = sermons[sermons.length - 1];
+
     assert.equal(createdBulletin.name, bulletin.name);
     equalDate(assert, createdBulletin.publishedAt, bulletin.publishedAt);
     assert.equal(createdBulletin.serviceOrder, bulletin.serviceOrder);
+    assert.equal(createdSermon.tags, sermon.tags.split(","));
     assert.equal(currentURL(), "/dashboard");
   });
 });

tests/pages/components/sermon-editor.js

@@ -7,10 +7,14 @@ export default {
   fillNotes: fillable(selector("notes")),
   fillSeries: fillable(selector("series")),
   fillSpeaker: fillable(selector("speaker")),
+  fillTags: fillable(selector("tags")),
   name: PageObject.value(selector("name")),
   notes: PageObject.value(selector("notes")),
   series: PageObject.value(selector("series")),
   speaker: PageObject.value(selector("speaker")),
+  tags() {
+    return find(selector("tags")).val().split(",");
+  },
   audioUrl() {
     return find(`${selector("audio-preview")} *[data-auto-id='preview']`).
       attr("href");

tests/unit/models/sermon-test.js

@@ -5,8 +5,29 @@ moduleForModel('sermon', 'Unit | Model | sermon', {
   needs: ["model:group"]
 });
 
-test('it exists', function(assert) {
-  let model = this.subject();
-  // let store = this.store();
-  assert.ok(!!model);
+test('tags: contains an array of tag strings', function(assert) {
+  var tags = ['tag1', 'tag2', 'tag3'];
+  var model = this.subject({ tags: tags });
+
+  assert.equal(model.get('tags'), tags);
+});
+
+test('tagList: returns the list of tags separated by commas', function(assert) {
+  var tagList = 'tag1, tag2, tag3';
+  var tags = ['tag1', 'tag2', 'tag3'];
+  var model = this.subject({ tags: tags });
+
+  assert.equal(model.get('tagList'), tagList);
+});
+
+test('tagList: set tags from a comma delimited string', function(assert) {
+  var tagList = 'tag2, tag3, tag4';
+  var tags = ['tag2', 'tag3', 'tag4'];
+  var model = this.subject({ tags: ['random', 'tags'] });
+
+  Ember.run(function() {
+    model.set('tagList', tagList);
+  });
+
+  assert.deepEqual(model.get('tags'), tags);
 });