mirage/crate: Replace keywords property with relationship

Author: Turbo87

mirage/factories/crate.js

@@ -23,7 +23,6 @@ export default Factory.extend({
   updated_at: '2017-02-24T12:34:56Z',
 
   badges: () => [],
-  keywords: () => [],
   versions: () => [],
   _extra_downloads: () => [],
   _owner_teams: () => [],

mirage/fixtures/crates.js

@@ -15,7 +15,7 @@ export default [
     recent_downloads: 125,
     homepage: 'https://icorderi.github.io/icorderi/kinetic-rust',
     id: 'kinetic-rust',
-    keywords: ['Protocol', 'Kinetic', 'Storage'],
+    keywordIds: [],
     max_version: '0.0.16',
     newest_version: '0.0.16',
     name: 'kinetic-rust',
@@ -40,7 +40,7 @@ export default [
     recent_downloads: 800,
     homepage: 'https://github.com/thehydroimpulse/nanomsg.rs',
     id: 'nanomsg',
-    keywords: ['network'],
+    keywordIds: ['network'],
     max_version: '0.7.0-alpha',
     newest_version: '0.6.1',
     name: 'nanomsg',
@@ -70,7 +70,7 @@ export default [
     exact_match: true,
     homepage: 'https://github.com/huonw/external_mixin',
     id: 'rust_mixin',
-    keywords: ['rust', 'plugin', 'code-generation'],
+    keywordIds: ['rust', 'plugin', 'code-generation'],
     max_version: '0.0.1',
     newest_version: '0.0.1',
     name: 'rust_mixin',
@@ -143,7 +143,7 @@ export default [
     recent_downloads: 497,
     homepage: 'https://github.com/huonw/external_mixin',
     id: 'external_mixin',
-    keywords: ['python', 'ruby', 'shell', 'plugin', 'code-generation'],
+    keywordIds: ['python', 'ruby', 'shell', 'plugin', 'code-generation'],
     max_version: '0.0.1',
     newest_version: '0.0.1',
     name: 'external_mixin',
@@ -159,7 +159,7 @@ export default [
     recent_downloads: 0,
     homepage: 'https://github.com/huonw/external_mixin',
     id: 'external_mixin_umbrella',
-    keywords: ['plugin', 'code-generation'],
+    keywordIds: ['plugin', 'code-generation'],
     max_version: '0.0.2',
     newest_version: '0.0.2',
     name: 'external_mixin_umbrella',
@@ -176,7 +176,7 @@ export default [
     recent_downloads: 1,
     homepage: 'https://github.com/whatisinternet/inflector',
     id: 'Inflector',
-    keywords: ['string', 'case', 'camel', 'snake', 'inflection'],
+    keywordIds: ['string', 'case', 'camel', 'snake', 'inflection'],
     max_version: '0.1.6',
     newest_version: '0.1.6',
     name: 'Inflector',
@@ -192,7 +192,7 @@ export default [
     recent_downloads: 21,
     homepage: null,
     id: 'rs-es',
-    keywords: ['elasticsearch', 'elastic'],
+    keywordIds: ['elasticsearch', 'elastic'],
     max_version: '0.1.17',
     newest_version: '0.1.17',
     name: 'rs-es',
@@ -208,7 +208,7 @@ export default [
     recent_downloads: 2000,
     homepage: 'https://github.com/DaGenix/rust-crypto/',
     id: 'rust-crypto',
-    keywords: ['Crypto', 'MD5', 'Sha1', 'Sha2', 'AES'],
+    keywordIds: [],
     max_version: '0.2.34',
     newest_version: '0.2.34',
     name: 'rust-crypto',
@@ -224,7 +224,7 @@ export default [
     recent_downloads: 85,
     homepage: null,
     id: 'rust-htslib',
-    keywords: ['htslib', 'bam', 'bioinformatics', 'pileup', 'sequencing'],
+    keywordIds: [],
     max_version: '0.5.2',
     newest_version: '0.5.2',
     name: 'rust-htslib',
@@ -240,7 +240,7 @@ export default [
     recent_downloads: 500,
     homepage: 'https://github.com/rustless/rustless',
     id: 'rustless',
-    keywords: ['api', 'web', 'hyper', 'iron', 'rest'],
+    keywordIds: [],
     max_version: '0.8.0',
     newest_version: '0.8.0',
     name: 'rustless',
@@ -256,7 +256,7 @@ export default [
     recent_downloads: 854,
     homepage: null,
     id: 'serde',
-    keywords: ['serde', 'serialization'],
+    keywordIds: [],
     max_version: '0.6.1',
     newest_version: '0.6.1',
     name: 'serde',
@@ -272,7 +272,7 @@ export default [
     recent_downloads: 54,
     homepage: 'https://github.com/livioribeiro/rusted-cypher',
     id: 'rusted_cypher',
-    keywords: ['neo4j', 'database', 'query', 'cypher', 'graph'],
+    keywordIds: [],
     max_version: '0.7.1',
     newest_version: '0.7.1',
     name: 'rusted_cypher',
@@ -289,7 +289,7 @@ export default [
     recent_downloads: 23,
     homepage: null,
     id: 'zlib',
-    keywords: [],
+    keywordIds: [],
     max_version: '0.0.1',
     newest_version: '0.0.1',
     name: 'zlib',
@@ -306,7 +306,7 @@ export default [
     recent_downloads: 76,
     homepage: null,
     id: 'rustful',
-    keywords: ['web', 'rest', 'framework', 'http', 'routing'],
+    keywordIds: [],
     max_version: '0.5.0',
     newest_version: '0.5.0',
     name: 'rustful',
@@ -322,7 +322,7 @@ export default [
     recent_downloads: 13,
     homepage: null,
     id: 'postgres',
-    keywords: ['database', 'sql'],
+    keywordIds: [],
     max_version: '0.10.1',
     newest_version: '0.10.1',
     name: 'postgres',
@@ -338,7 +338,7 @@ export default [
     recent_downloads: 143,
     homepage: 'https://github.com/BurntSushi/quickcheck',
     id: 'quickcheck',
-    keywords: ['testing', 'quickcheck', 'property', 'shrinking', 'fuzz'],
+    keywordIds: [],
     max_version: '0.2.24',
     newest_version: '0.2.24',
     name: 'quickcheck',
@@ -354,7 +354,7 @@ export default [
     recent_downloads: 768,
     homepage: 'https://github.com/BurntSushi/quickcheck',
     id: 'quickcheck_macros',
-    keywords: ['testing', 'quickcheck', 'property', 'shrinking', 'fuzz'],
+    keywordIds: [],
     max_version: '0.2.24',
     newest_version: '0.2.24',
     name: 'quickcheck_macros',
@@ -371,7 +371,7 @@ export default [
     recent_downloads: 0,
     homepage: 'https://github.com/nicolas-cherel/rustlex',
     id: 'unicorn-rpc',
-    keywords: ['lexer', 'lexical', 'analyser', 'generator'],
+    keywordIds: [],
     max_version: '0.3.1',
     newest_version: '0.3.1',
     name: 'unicorn-rpc',
@@ -387,7 +387,7 @@ export default [
     recent_downloads: 69,
     homepage: null,
     id: 'nom',
-    keywords: ['parser', 'parser-combinators', 'parsing', 'streaming', 'bit'],
+    keywordIds: [],
     max_version: '1.0.1',
     newest_version: '1.0.1',
     name: 'nom',

mirage/fixtures/keywords.js

@@ -5,4 +5,82 @@ export default [
     id: 'network',
     keyword: 'network',
   },
+  {
+    crates_cnt: 1,
+    created_at: '2014-11-23T06:47:40Z',
+    id: 'rust',
+    keyword: 'rust',
+  },
+  {
+    crates_cnt: 1,
+    created_at: '2014-11-23T06:47:40Z',
+    id: 'plugin',
+    keyword: 'plugin',
+  },
+  {
+    crates_cnt: 1,
+    created_at: '2014-11-23T06:47:40Z',
+    id: 'code-generation',
+    keyword: 'code-generation',
+  },
+  {
+    crates_cnt: 1,
+    created_at: '2014-11-23T06:47:40Z',
+    id: 'python',
+    keyword: 'python',
+  },
+  {
+    crates_cnt: 1,
+    created_at: '2014-11-23T06:47:40Z',
+    id: 'ruby',
+    keyword: 'ruby',
+  },
+  {
+    crates_cnt: 1,
+    created_at: '2014-11-23T06:47:40Z',
+    id: 'shell',
+    keyword: 'shell',
+  },
+  {
+    crates_cnt: 1,
+    created_at: '2014-11-23T06:47:40Z',
+    id: 'string',
+    keyword: 'string',
+  },
+  {
+    crates_cnt: 1,
+    created_at: '2014-11-23T06:47:40Z',
+    id: 'case',
+    keyword: 'case',
+  },
+  {
+    crates_cnt: 1,
+    created_at: '2014-11-23T06:47:40Z',
+    id: 'camel',
+    keyword: 'camel',
+  },
+  {
+    crates_cnt: 1,
+    created_at: '2014-11-23T06:47:40Z',
+    id: 'snake',
+    keyword: 'snake',
+  },
+  {
+    crates_cnt: 1,
+    created_at: '2014-11-23T06:47:40Z',
+    id: 'inflection',
+    keyword: 'inflection',
+  },
+  {
+    crates_cnt: 1,
+    created_at: '2014-11-23T06:47:40Z',
+    id: 'elastic',
+    keyword: 'elastic',
+  },
+  {
+    crates_cnt: 1,
+    created_at: '2014-11-23T06:47:40Z',
+    id: 'elasticsearch',
+    keyword: 'elasticsearch',
+  },
 ];

mirage/models/crate.js

@@ -2,4 +2,5 @@ import { Model, hasMany } from 'ember-cli-mirage';
 
 export default Model.extend({
   categories: hasMany(),
+  keywords: hasMany(),
 });

mirage/route-handlers/crates.js

@@ -38,15 +38,14 @@ export function register(server) {
     let crate = schema.crates.find(crateId);
     if (!crate) return notFound();
 
-    let keywords = schema.keywords.all().filter(keyword => (crate.keywords || []).indexOf(keyword.id) !== -1);
     let versions = schema.versions
       .all()
       .filter(version => (crate.versions || []).indexOf(parseInt(version.id, 10)) !== -1);
 
     return {
       ...this.serialize(crate),
       ...this.serialize(crate.categories),
-      ...this.serialize(keywords),
+      ...this.serialize(crate.keywords),
       ...this.serialize(versions),
     };
   });

mirage/serializers/crate.js

@@ -48,5 +48,8 @@ export default BaseSerializer.extend({
   _adjust(hash) {
     hash.categories = hash.category_ids;
     delete hash.category_ids;
+
+    hash.keywords = hash.keyword_ids;
+    delete hash.keyword_ids;
   },
 });

tests/mirage/crates-test.js

@@ -304,12 +304,13 @@ module('Mirage | Keywords', function(hooks) {
     test('includes related keywords', async function(assert) {
       this.server.create('keyword', { keyword: 'no-std' });
       this.server.create('keyword', { keyword: 'cli' });
-      this.server.create('crate', { name: 'rand', keywords: ['no-std'] });
+      this.server.create('crate', { name: 'rand', keywordIds: ['no-std'] });
 
       let response = await fetch('/api/v1/crates/rand');
       assert.equal(response.status, 200);
 
       let responsePayload = await response.json();
+      assert.deepEqual(responsePayload.crate.keywords, ['no-std']);
       assert.deepEqual(responsePayload.keywords, [
         {
           crates_cnt: 0,