From 890d93fe773ea5cde41d19125d4bad626e54059e Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Sat, 21 Jul 2018 10:35:27 +0900
Subject: Buffer completion on Clean Architecture

---
 src/background/repositories/completions.js | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 src/background/repositories/completions.js

(limited to 'src/background/repositories')

diff --git a/src/background/repositories/completions.js b/src/background/repositories/completions.js
new file mode 100644
index 0000000..30ede05
--- /dev/null
+++ b/src/background/repositories/completions.js
@@ -0,0 +1,11 @@
+export default class CompletionsRepository {
+  async queryTabs(keywords, excludePinned) {
+    let tabs = await browser.tabs.query({ currentWindow: true });
+    return tabs.filter((t) => {
+      return t.url.toLowerCase().includes(keywords.toLowerCase()) ||
+        t.title && t.title.toLowerCase().includes(keywords.toLowerCase());
+    }).filter((t) => {
+      return !(excludePinned && t.pinned);
+    });
+  }
+}
-- 
cgit v1.2.3


From fc5e6b2b410d6850278dd982990ce42552a3b1b2 Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Sat, 21 Jul 2018 11:17:51 +0900
Subject: Complete open histories and bookmarks

---
 src/background/controllers/completions.js  |  2 +-
 src/background/repositories/completions.js | 97 ++++++++++++++++++++++++++++++
 src/background/usecases/completions.js     | 24 +++++++-
 3 files changed, 120 insertions(+), 3 deletions(-)

(limited to 'src/background/repositories')

diff --git a/src/background/controllers/completions.js b/src/background/controllers/completions.js
index c22ba83..f8eade9 100644
--- a/src/background/controllers/completions.js
+++ b/src/background/controllers/completions.js
@@ -21,7 +21,7 @@ export default class ContentMessageController {
     case 'tabopen':
     case 'w':
     case 'winopen':
-      return this.completionsInteractor.queryOpen(name);
+      return this.completionsInteractor.queryOpen(name, keywords);
     case 'b':
     case 'buffer':
       return this.completionsInteractor.queryBuffer(name, keywords);
diff --git a/src/background/repositories/completions.js b/src/background/repositories/completions.js
index 30ede05..c4e956e 100644
--- a/src/background/repositories/completions.js
+++ b/src/background/repositories/completions.js
@@ -1,4 +1,101 @@
 export default class CompletionsRepository {
+  async queryBookmarks(keywords) {
+    let items = await browser.bookmarks.search({ query: keywords });
+    return items.filter((item) => {
+      let url = undefined;
+      try {
+        url = new URL(item.url);
+      } catch (e) {
+        return false;
+      }
+      return item.type === 'bookmark' && url.protocol !== 'place:';
+    });
+  }
+
+  // eslint-disable-next-line complexity, max-lines-per-function
+  async queryHistories(keywords) {
+    const filterHttp = (items) => {
+      const httpsHosts = items
+        .filter(item => item[1].protocol === 'https:')
+        .map(item => item[1].host);
+      const httpsHostSet = new Set(httpsHosts);
+      return items.filter(
+        item => !(item[1].protocol === 'http:' &&
+          httpsHostSet.has(item[1].host))
+      );
+    };
+
+    const filterEmptyTitle = (items) => {
+      return items.filter(item => item[0].title && item[0].title !== '');
+    };
+
+    const filterClosedPath = (items) => {
+      const allSimplePaths = items
+        .filter(item => item[1].hash === '' && item[1].search === '')
+        .map(item => item[1].origin + item[1].pathname);
+      const allSimplePathSet = new Set(allSimplePaths);
+      return items.filter(
+        item => !(item[1].hash === '' && item[1].search === '' &&
+          (/\/$/).test(item[1].pathname) &&
+          allSimplePathSet.has(
+            (item[1].origin + item[1].pathname).replace(/\/$/, '')
+          )
+        )
+      );
+    };
+
+    const reduceByPathname = (items, min) => {
+      let hash = {};
+      for (let item of items) {
+        let pathname = item[1].origin + item[1].pathname;
+        if (!hash[pathname]) {
+          hash[pathname] = item;
+        } else if (hash[pathname][1].href.length > item[1].href.length) {
+          hash[pathname] = item;
+        }
+      }
+      let filtered = Object.values(hash);
+      if (filtered.length < min) {
+        return items;
+      }
+      return filtered;
+    };
+
+    const reduceByOrigin = (items, min) => {
+      let hash = {};
+      for (let item of items) {
+        let origin = item[1].origin;
+        if (!hash[origin]) {
+          hash[origin] = item;
+        } else if (hash[origin][1].href.length > item[1].href.length) {
+          hash[origin] = item;
+        }
+      }
+      let filtered = Object.values(hash);
+      if (filtered.length < min) {
+        return items;
+      }
+      return filtered;
+    };
+
+
+    let historyItems = await browser.history.search({
+      text: keywords,
+      startTime: 0,
+    });
+    return [historyItems.map(item => [item, new URL(item.url)])]
+      .map(filterEmptyTitle)
+      .map(filterHttp)
+      .map(filterClosedPath)
+      .map(items => reduceByPathname(items, 10))
+      .map(items => reduceByOrigin(items, 10))
+      .map(items => items
+        .sort((x, y) => x[0].visitCount < y[0].visitCount)
+        .slice(0, 10)
+        .map(item => item[0])
+      )[0];
+  }
+
   async queryTabs(keywords, excludePinned) {
     let tabs = await browser.tabs.query({ currentWindow: true });
     return tabs.filter((t) => {
diff --git a/src/background/usecases/completions.js b/src/background/usecases/completions.js
index 21049d2..0bc34d1 100644
--- a/src/background/usecases/completions.js
+++ b/src/background/usecases/completions.js
@@ -27,8 +27,28 @@ export default class CompletionsInteractor {
     );
   }
 
-  queryOpen() {
-    return Promise.resolve(Completions.empty());
+  async queryOpen(name, keywords) {
+    let groups = [];
+    let histories = await this.completionRepository.queryHistories(keywords);
+    if (histories.length > 0) {
+      let items = histories.map(page => new CompletionItem({
+        caption: page.title,
+        content: name + ' ' + page.url,
+        url: page.url
+      }));
+      groups.push(new CompletionGroup('History', items));
+    }
+
+    let bookmarks = await this.completionRepository.queryBookmarks(keywords);
+    if (bookmarks.length > 0) {
+      let items = bookmarks.map(page => new CompletionItem({
+        caption: page.title,
+        content: name + ' ' + page.url,
+        url: page.url
+      }));
+      groups.push(new CompletionGroup('Bookmarks', items));
+    }
+    return new Completions(groups);
   }
 
   queryBuffer(name, keywords) {
-- 
cgit v1.2.3


From 0652131de885df3ebb7c9c0e762fd1604486a892 Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Sat, 21 Jul 2018 15:59:30 +0900
Subject: Clean and tests for filters on open command

---
 src/background/repositories/completions.js |  81 +--------------------
 src/background/usecases/completions.js     |  12 +++
 src/background/usecases/filters.js         |  72 ++++++++++++++++++
 test/background/usecases/filters.test.js   | 113 +++++++++++++++++++++++++++++
 4 files changed, 199 insertions(+), 79 deletions(-)
 create mode 100644 src/background/usecases/filters.js
 create mode 100644 test/background/usecases/filters.test.js

(limited to 'src/background/repositories')

diff --git a/src/background/repositories/completions.js b/src/background/repositories/completions.js
index c4e956e..1318d36 100644
--- a/src/background/repositories/completions.js
+++ b/src/background/repositories/completions.js
@@ -12,88 +12,11 @@ export default class CompletionsRepository {
     });
   }
 
-  // eslint-disable-next-line complexity, max-lines-per-function
-  async queryHistories(keywords) {
-    const filterHttp = (items) => {
-      const httpsHosts = items
-        .filter(item => item[1].protocol === 'https:')
-        .map(item => item[1].host);
-      const httpsHostSet = new Set(httpsHosts);
-      return items.filter(
-        item => !(item[1].protocol === 'http:' &&
-          httpsHostSet.has(item[1].host))
-      );
-    };
-
-    const filterEmptyTitle = (items) => {
-      return items.filter(item => item[0].title && item[0].title !== '');
-    };
-
-    const filterClosedPath = (items) => {
-      const allSimplePaths = items
-        .filter(item => item[1].hash === '' && item[1].search === '')
-        .map(item => item[1].origin + item[1].pathname);
-      const allSimplePathSet = new Set(allSimplePaths);
-      return items.filter(
-        item => !(item[1].hash === '' && item[1].search === '' &&
-          (/\/$/).test(item[1].pathname) &&
-          allSimplePathSet.has(
-            (item[1].origin + item[1].pathname).replace(/\/$/, '')
-          )
-        )
-      );
-    };
-
-    const reduceByPathname = (items, min) => {
-      let hash = {};
-      for (let item of items) {
-        let pathname = item[1].origin + item[1].pathname;
-        if (!hash[pathname]) {
-          hash[pathname] = item;
-        } else if (hash[pathname][1].href.length > item[1].href.length) {
-          hash[pathname] = item;
-        }
-      }
-      let filtered = Object.values(hash);
-      if (filtered.length < min) {
-        return items;
-      }
-      return filtered;
-    };
-
-    const reduceByOrigin = (items, min) => {
-      let hash = {};
-      for (let item of items) {
-        let origin = item[1].origin;
-        if (!hash[origin]) {
-          hash[origin] = item;
-        } else if (hash[origin][1].href.length > item[1].href.length) {
-          hash[origin] = item;
-        }
-      }
-      let filtered = Object.values(hash);
-      if (filtered.length < min) {
-        return items;
-      }
-      return filtered;
-    };
-
-
-    let historyItems = await browser.history.search({
+  queryHistories(keywords) {
+    return browser.history.search({
       text: keywords,
       startTime: 0,
     });
-    return [historyItems.map(item => [item, new URL(item.url)])]
-      .map(filterEmptyTitle)
-      .map(filterHttp)
-      .map(filterClosedPath)
-      .map(items => reduceByPathname(items, 10))
-      .map(items => reduceByOrigin(items, 10))
-      .map(items => items
-        .sort((x, y) => x[0].visitCount < y[0].visitCount)
-        .slice(0, 10)
-        .map(item => item[0])
-      )[0];
   }
 
   async queryTabs(keywords, excludePinned) {
diff --git a/src/background/usecases/completions.js b/src/background/usecases/completions.js
index 0bc34d1..1c0fe38 100644
--- a/src/background/usecases/completions.js
+++ b/src/background/usecases/completions.js
@@ -3,6 +3,9 @@ import CompletionGroup from '../domains/completion-group';
 import Completions from '../domains/completions';
 import CompletionRepository from '../repositories/completions';
 import CommandDocs from 'background/shared/commands/docs';
+import * as filters from './filters';
+
+const COMPLETION_ITEM_LIMIT = 10;
 
 export default class CompletionsInteractor {
   constructor() {
@@ -28,9 +31,18 @@ export default class CompletionsInteractor {
   }
 
   async queryOpen(name, keywords) {
+    // TODO get search engines from settings
     let groups = [];
     let histories = await this.completionRepository.queryHistories(keywords);
     if (histories.length > 0) {
+      histories = [histories]
+        .map(filters.filterBlankTitle)
+        .map(filters.filterHttp)
+        .map(filters.filterByTailingSlash)
+        .map(pages => filters.filterByPathname(pages, COMPLETION_ITEM_LIMIT))
+        .map(pages => filters.filterByOrigin(pages, COMPLETION_ITEM_LIMIT))[0]
+        .sort((x, y) => x.visitCount < y.visitCount)
+        .slice(0, COMPLETION_ITEM_LIMIT);
       let items = histories.map(page => new CompletionItem({
         caption: page.title,
         content: name + ' ' + page.url,
diff --git a/src/background/usecases/filters.js b/src/background/usecases/filters.js
new file mode 100644
index 0000000..d057dca
--- /dev/null
+++ b/src/background/usecases/filters.js
@@ -0,0 +1,72 @@
+const filterHttp = (items) => {
+  let httpsHosts = items.map(x => new URL(x.url))
+    .filter(x => x.protocol === 'https:')
+    .map(x => x.host);
+  httpsHosts = new Set(httpsHosts);
+
+  return items.filter((item) => {
+    let url = new URL(item.url);
+    return url.protocol === 'https:' || !httpsHosts.has(url.host);
+  });
+};
+
+const filterBlankTitle = (items) => {
+  return items.filter(item => item.title && item.title !== '');
+};
+
+const filterByTailingSlash = (items) => {
+  let urls = items.map(item => new URL(item.url));
+  let simplePaths = urls
+    .filter(url => url.hash === '' && url.search === '')
+    .map(url => url.origin + url.pathname);
+  simplePaths = new Set(simplePaths);
+
+  return items.filter((item) => {
+    let url = new URL(item.url);
+    if (url.hash !== '' || url.search !== '' ||
+      url.pathname.slice(-1) !== '/') {
+      return true;
+    }
+    return !simplePaths.has(url.origin + url.pathname.slice(0, -1));
+  });
+};
+
+const filterByPathname = (items, min) => {
+  let hash = {};
+  for (let item of items) {
+    let url = new URL(item.url);
+    let pathname = url.origin + url.pathname;
+    if (!hash[pathname]) {
+      hash[pathname] = item;
+    } else if (hash[pathname].url.length > item.url.length) {
+      hash[pathname] = item;
+    }
+  }
+  let filtered = Object.values(hash);
+  if (filtered.length < min) {
+    return items;
+  }
+  return filtered;
+};
+
+const filterByOrigin = (items, min) => {
+  let hash = {};
+  for (let item of items) {
+    let origin = new URL(item.url).origin;
+    if (!hash[origin]) {
+      hash[origin] = item;
+    } else if (hash[origin].url.length > item.url.length) {
+      hash[origin] = item;
+    }
+  }
+  let filtered = Object.values(hash);
+  if (filtered.length < min) {
+    return items;
+  }
+  return filtered;
+};
+
+export {
+  filterHttp, filterBlankTitle, filterByTailingSlash,
+  filterByPathname, filterByOrigin
+};
diff --git a/test/background/usecases/filters.test.js b/test/background/usecases/filters.test.js
new file mode 100644
index 0000000..bdfb0be
--- /dev/null
+++ b/test/background/usecases/filters.test.js
@@ -0,0 +1,113 @@
+import * as filters from 'background/usecases/filters';
+
+describe("background/usecases/filters", () => {
+  describe('filterHttp', () => {
+    it('filters http URLs duplicates to https hosts', () => {
+      let pages = [
+        { url: 'http://i-beam.org/foo' },
+        { url: 'https://i-beam.org/bar' },
+        { url: 'http://i-beam.net/hoge' },
+        { url: 'http://i-beam.net/fuga' },
+      ];
+      let filtered = filters.filterHttp(pages);
+
+      let urls = filtered.map(x => x.url);
+      expect(urls).to.deep.equal([
+        'https://i-beam.org/bar', 'http://i-beam.net/hoge', 'http://i-beam.net/fuga'
+      ]);
+    })
+  });
+
+  describe('filterBlankTitle', () => {
+    it('filters blank titles', () => {
+      let pages = [
+        { title: 'hello' },
+        { title: '' },
+        {},
+      ];
+      let filtered = filters.filterBlankTitle(pages);
+
+      expect(filtered).to.deep.equal([{ title: 'hello' }]);
+    });
+  })
+
+  describe('filterByTailingSlash', () => {
+    it('filters duplicated pathname on tailing slash', () => {
+      let pages = [
+        { url: 'http://i-beam.org/content' },
+        { url: 'http://i-beam.org/content/' },
+        { url: 'http://i-beam.org/search' },
+        { url: 'http://i-beam.org/search?q=apple_banana_cherry' },
+      ];
+      let filtered = filters.filterByTailingSlash(pages);
+
+      let urls = filtered.map(x => x.url);
+      expect(urls).to.deep.equal([
+        'http://i-beam.org/content',
+        'http://i-beam.org/search',
+        'http://i-beam.org/search?q=apple_banana_cherry',
+      ]);
+    });
+  })
+
+  describe('filterByPathname', () => {
+    it('remains items less than minimam length', () => {
+      let pages = [
+        { url: 'http://i-beam.org/search?q=apple' },
+        { url: 'http://i-beam.org/search?q=apple_banana' },
+        { url: 'http://i-beam.org/search?q=apple_banana_cherry' },
+        { url: 'http://i-beam.org/request?q=apple' },
+        { url: 'http://i-beam.org/request?q=apple_banana' },
+        { url: 'http://i-beam.org/request?q=apple_banana_cherry' },
+      ];
+      let filtered = filters.filterByPathname(pages, 10);
+      expect(filtered).to.have.lengthOf(6);
+    });
+
+    it('filters by length of pathname', () => {
+      let pages = [
+        { url: 'http://i-beam.org/search?q=apple' },
+        { url: 'http://i-beam.org/search?q=apple_banana' },
+        { url: 'http://i-beam.org/search?q=apple_banana_cherry' },
+        { url: 'http://i-beam.net/search?q=apple' },
+        { url: 'http://i-beam.net/search?q=apple_banana' },
+        { url: 'http://i-beam.net/search?q=apple_banana_cherry' },
+      ];
+      let filtered = filters.filterByPathname(pages, 0);
+      expect(filtered).to.deep.equal([
+        { url: 'http://i-beam.org/search?q=apple' },
+        { url: 'http://i-beam.net/search?q=apple' },
+      ]);
+    });
+  })
+
+  describe('filterByOrigin', () => {
+    it('remains items less than minimam length', () => {
+      let pages = [
+        { url: 'http://i-beam.org/search?q=apple' },
+        { url: 'http://i-beam.org/search?q=apple_banana' },
+        { url: 'http://i-beam.org/search?q=apple_banana_cherry' },
+        { url: 'http://i-beam.org/request?q=apple' },
+        { url: 'http://i-beam.org/request?q=apple_banana' },
+        { url: 'http://i-beam.org/request?q=apple_banana_cherry' },
+      ];
+      let filtered = filters.filterByOrigin(pages, 10);
+      expect(filtered).to.have.lengthOf(6);
+    });
+
+    it('filters by length of pathname', () => {
+      let pages = [
+        { url: 'http://i-beam.org/search?q=apple' },
+        { url: 'http://i-beam.org/search?q=apple_banana' },
+        { url: 'http://i-beam.org/search?q=apple_banana_cherry' },
+        { url: 'http://i-beam.org/request?q=apple' },
+        { url: 'http://i-beam.org/request?q=apple_banana' },
+        { url: 'http://i-beam.org/request?q=apple_banana_cherry' },
+      ];
+      let filtered = filters.filterByOrigin(pages, 0);
+      expect(filtered).to.deep.equal([
+        { url: 'http://i-beam.org/search?q=apple' },
+      ]);
+    });
+  })
+});
-- 
cgit v1.2.3


From 89c28d67fd7b961833b557da904bd17aa28660c5 Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Sun, 22 Jul 2018 00:01:24 +0900
Subject: Settings as clean architecture

---
 src/background/actions/setting.js                  | 20 ---------
 src/background/components/background.js            |  6 ---
 src/background/controllers/setting.js              | 18 ++++++++
 src/background/domains/setting.js                  | 51 ++++++++++++++++++++++
 src/background/index.js                            |  6 +--
 .../infrastructures/content-message-client.js      | 12 +++++
 .../infrastructures/content-message-listener.js    | 21 +++++++--
 src/background/infrastructures/memory-storage.js   | 11 +++++
 src/background/repositories/persistent-setting.js  | 16 +++++++
 src/background/repositories/setting.js             | 17 ++++++++
 src/background/usecases/setting.js                 | 31 +++++++++++++
 11 files changed, 176 insertions(+), 33 deletions(-)
 delete mode 100644 src/background/actions/setting.js
 create mode 100644 src/background/controllers/setting.js
 create mode 100644 src/background/domains/setting.js
 create mode 100644 src/background/infrastructures/content-message-client.js
 create mode 100644 src/background/infrastructures/memory-storage.js
 create mode 100644 src/background/repositories/persistent-setting.js
 create mode 100644 src/background/repositories/setting.js
 create mode 100644 src/background/usecases/setting.js

(limited to 'src/background/repositories')

diff --git a/src/background/actions/setting.js b/src/background/actions/setting.js
deleted file mode 100644
index 7eeb5de..0000000
--- a/src/background/actions/setting.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import actions from '../actions';
-import * as settingsStorage from 'shared/settings/storage';
-
-const load = async() => {
-  let value = await settingsStorage.loadValue();
-  return {
-    type: actions.SETTING_SET_SETTINGS,
-    value,
-  };
-};
-
-const setProperty = (name, value) => {
-  return {
-    type: actions.SETTING_SET_PROPERTY,
-    name,
-    value,
-  };
-};
-
-export { load, setProperty };
diff --git a/src/background/components/background.js b/src/background/components/background.js
index d933d7b..9ba733d 100644
--- a/src/background/components/background.js
+++ b/src/background/components/background.js
@@ -1,6 +1,5 @@
 import messages from 'shared/messages';
 import * as commandActions from 'background/actions/command';
-import * as settingActions from 'background/actions/setting';
 import * as findActions from 'background/actions/find';
 import * as tabActions from 'background/actions/tab';
 
@@ -38,11 +37,6 @@ export default class BackgroundComponent {
         commandActions.exec(sender.tab, message.text, settings.value),
       );
       return this.broadcastSettingsChanged();
-    case messages.SETTINGS_QUERY:
-      return Promise.resolve(this.store.getState().setting.value);
-    case messages.SETTINGS_RELOAD:
-      this.store.dispatch(settingActions.load());
-      return this.broadcastSettingsChanged();
     case messages.FIND_GET_KEYWORD:
       return Promise.resolve(find.keyword);
     case messages.FIND_SET_KEYWORD:
diff --git a/src/background/controllers/setting.js b/src/background/controllers/setting.js
new file mode 100644
index 0000000..9e6019e
--- /dev/null
+++ b/src/background/controllers/setting.js
@@ -0,0 +1,18 @@
+import SettingInteractor from '../usecases/setting';
+import ContentMessageClient from '../infrastructures/content-message-client';
+
+export default class SettingController {
+  constructor() {
+    this.settingInteractor = new SettingInteractor();
+    this.contentMessageClient = new ContentMessageClient();
+  }
+
+  getSetting() {
+    return this.settingInteractor.get();
+  }
+
+  async reload() {
+    await this.settingInteractor.reload();
+    this.contentMessageClient.broadcastSettingsChanged();
+  }
+}
diff --git a/src/background/domains/setting.js b/src/background/domains/setting.js
new file mode 100644
index 0000000..106ec0f
--- /dev/null
+++ b/src/background/domains/setting.js
@@ -0,0 +1,51 @@
+import DefaultSettings from '../../shared/settings/default';
+import * as settingsValues from '../../shared/settings/values';
+
+export default class Setting {
+  constructor({ source, json, form }) {
+    this.obj = {
+      source, json, form
+    };
+  }
+
+  get source() {
+    return this.obj.source;
+  }
+
+  get json() {
+    return this.obj.json;
+  }
+
+  get form() {
+    return this.obj.form;
+  }
+
+  value() {
+    let value = JSON.parse(DefaultSettings.json);
+    if (this.obj.source === 'json') {
+      value = settingsValues.valueFromJson(this.obj.json);
+    } else if (this.obj.source === 'form') {
+      value = settingsValues.valueFromForm(this.obj.form);
+    }
+    if (!value.properties) {
+      value.properties = {};
+    }
+    return { ...settingsValues.valueFromJson(DefaultSettings.json), ...value };
+  }
+
+  serialize() {
+    return this.obj;
+  }
+
+  static deserialize(obj) {
+    return new Setting({ source: obj.source, json: obj.json, form: obj.form });
+  }
+
+  static defaultSettings() {
+    return new Setting({
+      source: DefaultSettings.source,
+      json: DefaultSettings.json,
+      form: {},
+    });
+  }
+}
diff --git a/src/background/index.js b/src/background/index.js
index 619b076..69dbe06 100644
--- a/src/background/index.js
+++ b/src/background/index.js
@@ -1,4 +1,3 @@
-import * as settingActions from 'background/actions/setting';
 import BackgroundComponent from 'background/components/background';
 import OperationComponent from 'background/components/operation';
 import TabComponent from 'background/components/tab';
@@ -9,6 +8,7 @@ import promise from 'redux-promise';
 import * as versions from './shared/versions';
 
 import ContentMessageListener from './infrastructures/content-message-listener';
+import SettingController from './controllers/setting';
 
 const store = createStore(
   reducers,
@@ -31,8 +31,8 @@ const tabComponent = new TabComponent(store);
 const indicatorComponent = new IndicatorComponent(store);
 /* eslint-enable no-unused-vars */
 
-store.dispatch(settingActions.load());
-
 checkAndNotifyUpdated();
 
+new SettingController().reload();
+
 new ContentMessageListener().run();
diff --git a/src/background/infrastructures/content-message-client.js b/src/background/infrastructures/content-message-client.js
new file mode 100644
index 0000000..b3b37b4
--- /dev/null
+++ b/src/background/infrastructures/content-message-client.js
@@ -0,0 +1,12 @@
+import messages from '../../shared/messages';
+
+export default class ContentMessageClient {
+  async broadcastSettingsChanged() {
+    let tabs = await browser.tabs.query({});
+    for (let tab of tabs) {
+      browser.tabs.sendMessage(tab.id, {
+        type: messages.SETTINGS_CHANGED,
+      });
+    }
+  }
+}
diff --git a/src/background/infrastructures/content-message-listener.js b/src/background/infrastructures/content-message-listener.js
index a0ed66c..6236f1c 100644
--- a/src/background/infrastructures/content-message-listener.js
+++ b/src/background/infrastructures/content-message-listener.js
@@ -1,8 +1,10 @@
 import messages from '../../shared/messages';
 import CompletionsController from '../controllers/completions';
+import SettingController from '../controllers/setting';
 
 export default class ContentMessageListener {
   constructor() {
+    this.settingController = new SettingController();
     this.completionsController = new CompletionsController();
   }
 
@@ -22,13 +24,24 @@ export default class ContentMessageListener {
   onMessage(message) {
     switch (message.type) {
     case messages.CONSOLE_QUERY_COMPLETIONS:
-      return this.onConsoleQueryCompletions(message);
+      return this.onConsoleQueryCompletions(message.text);
+    case messages.SETTINGS_QUERY:
+      return this.onSettingsQuery();
+    case messages.SETTINGS_RELOAD:
+      return this.onSettingsReload();
     }
   }
 
-  async onConsoleQueryCompletions(message) {
-    let completions =
-      await this.completionsController.getCompletions(message.text);
+  async onConsoleQueryCompletions(line) {
+    let completions = await this.completionsController.getCompletions(line);
     return Promise.resolve(completions.serialize());
   }
+
+  onSettingsQuery() {
+    return this.settingController.getSetting();
+  }
+
+  onSettingsReload() {
+    return this.settingController.reload();
+  }
 }
diff --git a/src/background/infrastructures/memory-storage.js b/src/background/infrastructures/memory-storage.js
new file mode 100644
index 0000000..0a05928
--- /dev/null
+++ b/src/background/infrastructures/memory-storage.js
@@ -0,0 +1,11 @@
+const db = {};
+
+export default class MemoryStorage {
+  set(name, value) {
+    db[name] = value;
+  }
+
+  get(name) {
+    return db[name];
+  }
+}
diff --git a/src/background/repositories/persistent-setting.js b/src/background/repositories/persistent-setting.js
new file mode 100644
index 0000000..247ea6f
--- /dev/null
+++ b/src/background/repositories/persistent-setting.js
@@ -0,0 +1,16 @@
+import Setting from '../domains/setting';
+
+export default class SettingRepository {
+  save(settings) {
+    return browser.storage.local.set({ settings: settings.serialize() });
+  }
+
+  async load() {
+    let { settings } = await browser.storage.local.get('settings');
+    if (!settings) {
+      return null;
+    }
+    return Setting.deserialize(settings);
+  }
+}
+
diff --git a/src/background/repositories/setting.js b/src/background/repositories/setting.js
new file mode 100644
index 0000000..d9c481d
--- /dev/null
+++ b/src/background/repositories/setting.js
@@ -0,0 +1,17 @@
+import MemoryStorage from '../infrastructures/memory-storage';
+
+const CACHED_SETTING_KEY = 'setting';
+
+export default class SettingRepository {
+  constructor() {
+    this.cache = new MemoryStorage();
+  }
+
+  get() {
+    return Promise.resolve(this.cache.get(CACHED_SETTING_KEY));
+  }
+
+  update(value) {
+    return this.cache.set(CACHED_SETTING_KEY, value);
+  }
+}
diff --git a/src/background/usecases/setting.js b/src/background/usecases/setting.js
new file mode 100644
index 0000000..656fc3f
--- /dev/null
+++ b/src/background/usecases/setting.js
@@ -0,0 +1,31 @@
+import Setting from '../domains/setting';
+import PersistentSettingRepository from '../repositories/persistent-setting';
+import SettingRepository from '../repositories/setting';
+
+export default class SettingInteractor {
+  constructor() {
+    this.persistentSettingRepository = new PersistentSettingRepository();
+    this.settingRepository = new SettingRepository();
+  }
+
+  save(settings) {
+    this.persistentSettingRepository.save(settings);
+  }
+
+  get() {
+    return this.settingRepository.get();
+  }
+
+  async reload() {
+    let settings = await this.persistentSettingRepository.load();
+    if (!settings) {
+      settings = Setting.defaultSettings();
+    }
+
+    let value = settings.value();
+
+    this.settingRepository.update(value);
+
+    return value;
+  }
+}
-- 
cgit v1.2.3


From a1e5e97200bd96ba918744dfa2758f977ca823c6 Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Sun, 22 Jul 2018 00:01:24 +0900
Subject: Find as clean architecture

---
 src/background/components/background.js                |  7 -------
 src/background/controllers/find.js                     | 15 +++++++++++++++
 .../infrastructures/content-message-listener.js        | 14 ++++++++++++++
 src/background/repositories/find.js                    | 18 ++++++++++++++++++
 src/background/usecases/find.js                        | 15 +++++++++++++++
 5 files changed, 62 insertions(+), 7 deletions(-)
 create mode 100644 src/background/controllers/find.js
 create mode 100644 src/background/repositories/find.js
 create mode 100644 src/background/usecases/find.js

(limited to 'src/background/repositories')

diff --git a/src/background/components/background.js b/src/background/components/background.js
index 9ba733d..3667f14 100644
--- a/src/background/components/background.js
+++ b/src/background/components/background.js
@@ -1,6 +1,5 @@
 import messages from 'shared/messages';
 import * as commandActions from 'background/actions/command';
-import * as findActions from 'background/actions/find';
 import * as tabActions from 'background/actions/tab';
 
 export default class BackgroundComponent {
@@ -21,7 +20,6 @@ export default class BackgroundComponent {
 
   onMessage(message, sender) {
     let settings = this.store.getState().setting;
-    let find = this.store.getState().find;
 
     switch (message.type) {
     case messages.OPEN_URL:
@@ -37,11 +35,6 @@ export default class BackgroundComponent {
         commandActions.exec(sender.tab, message.text, settings.value),
       );
       return this.broadcastSettingsChanged();
-    case messages.FIND_GET_KEYWORD:
-      return Promise.resolve(find.keyword);
-    case messages.FIND_SET_KEYWORD:
-      this.store.dispatch(findActions.setKeyword(message.keyword));
-      return Promise.resolve({});
     }
   }
 
diff --git a/src/background/controllers/find.js b/src/background/controllers/find.js
new file mode 100644
index 0000000..7096014
--- /dev/null
+++ b/src/background/controllers/find.js
@@ -0,0 +1,15 @@
+import FindInteractor from '../usecases/find';
+
+export default class FindController {
+  constructor() {
+    this.findInteractor = new FindInteractor();
+  }
+
+  getKeyword() {
+    return this.findInteractor.getKeyword();
+  }
+
+  setKeyword(keyword) {
+    return this.findInteractor.setKeyword(keyword);
+  }
+}
diff --git a/src/background/infrastructures/content-message-listener.js b/src/background/infrastructures/content-message-listener.js
index 6236f1c..00dba51 100644
--- a/src/background/infrastructures/content-message-listener.js
+++ b/src/background/infrastructures/content-message-listener.js
@@ -1,11 +1,13 @@
 import messages from '../../shared/messages';
 import CompletionsController from '../controllers/completions';
 import SettingController from '../controllers/setting';
+import FindController from '../controllers/find';
 
 export default class ContentMessageListener {
   constructor() {
     this.settingController = new SettingController();
     this.completionsController = new CompletionsController();
+    this.findController = new FindController();
   }
 
   run() {
@@ -29,6 +31,10 @@ export default class ContentMessageListener {
       return this.onSettingsQuery();
     case messages.SETTINGS_RELOAD:
       return this.onSettingsReload();
+    case messages.FIND_GET_KEYWORD:
+      return this.onFindGetKeyword();
+    case messages.FIND_SET_KEYWORD:
+      return this.onFindSetKeyword(message.keyword);
     }
   }
 
@@ -44,4 +50,12 @@ export default class ContentMessageListener {
   onSettingsReload() {
     return this.settingController.reload();
   }
+
+  onFindGetKeyword() {
+    return this.findController.getKeyword();
+  }
+
+  onFindSetKeyword(keyword) {
+    return this.findController.setKeyword(keyword);
+  }
 }
diff --git a/src/background/repositories/find.js b/src/background/repositories/find.js
new file mode 100644
index 0000000..9482e78
--- /dev/null
+++ b/src/background/repositories/find.js
@@ -0,0 +1,18 @@
+import MemoryStorage from '../infrastructures/memory-storage';
+
+const FIND_KEYWORD_KEY = 'find-keyword';
+
+export default class FindRepository {
+  constructor() {
+    this.cache = new MemoryStorage();
+  }
+
+  getKeyword() {
+    return Promise.resolve(this.cache.get(FIND_KEYWORD_KEY));
+  }
+
+  setKeyword(keyword) {
+    return this.cache.set(FIND_KEYWORD_KEY, keyword);
+  }
+}
+
diff --git a/src/background/usecases/find.js b/src/background/usecases/find.js
new file mode 100644
index 0000000..eae480d
--- /dev/null
+++ b/src/background/usecases/find.js
@@ -0,0 +1,15 @@
+import FindRepository from '../repositories/find';
+
+export default class FindInteractor {
+  constructor() {
+    this.findRepository = new FindRepository();
+  }
+
+  getKeyword() {
+    return this.findRepository.getKeyword();
+  }
+
+  setKeyword(keyword) {
+    return this.findRepository.setKeyword(keyword);
+  }
+}
-- 
cgit v1.2.3


From 87ed1f43a96a67c4901c267aee96784de1d45889 Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Sun, 22 Jul 2018 09:30:01 +0900
Subject: Version as Clean Architecture

---
 src/background/controllers/version.js           | 11 +++++++
 src/background/index.js                         | 14 ++-------
 src/background/infrastructures/notifier.js      | 23 ++++++++++++++
 src/background/repositories/tab.js              |  5 +++
 src/background/repositories/version.js          | 10 ++++++
 src/background/shared/versions/index.js         | 38 -----------------------
 src/background/shared/versions/release-notes.js |  8 -----
 src/background/shared/versions/storage.js       | 10 ------
 src/background/usecases/version.js              | 41 +++++++++++++++++++++++++
 test/background/repositories/version.js         | 34 ++++++++++++++++++++
 test/background/shared/versions/index.test.js   | 40 ------------------------
 test/background/shared/versions/storage.test.js | 28 -----------------
 12 files changed, 126 insertions(+), 136 deletions(-)
 create mode 100644 src/background/controllers/version.js
 create mode 100644 src/background/infrastructures/notifier.js
 create mode 100644 src/background/repositories/tab.js
 create mode 100644 src/background/repositories/version.js
 delete mode 100644 src/background/shared/versions/index.js
 delete mode 100644 src/background/shared/versions/release-notes.js
 delete mode 100644 src/background/shared/versions/storage.js
 create mode 100644 src/background/usecases/version.js
 create mode 100644 test/background/repositories/version.js
 delete mode 100644 test/background/shared/versions/index.test.js
 delete mode 100644 test/background/shared/versions/storage.test.js

(limited to 'src/background/repositories')

diff --git a/src/background/controllers/version.js b/src/background/controllers/version.js
new file mode 100644
index 0000000..04d99fe
--- /dev/null
+++ b/src/background/controllers/version.js
@@ -0,0 +1,11 @@
+import VersionInteractor from '../usecases/version';
+
+export default class VersionController {
+  constructor() {
+    this.versionInteractor = new VersionInteractor();
+  }
+
+  notifyIfUpdated() {
+    this.versionInteractor.notifyIfUpdated();
+  }
+}
diff --git a/src/background/index.js b/src/background/index.js
index 69dbe06..e753c48 100644
--- a/src/background/index.js
+++ b/src/background/index.js
@@ -5,25 +5,16 @@ import IndicatorComponent from 'background/components/indicator';
 import reducers from 'background/reducers';
 import { createStore, applyMiddleware } from 'redux';
 import promise from 'redux-promise';
-import * as versions from './shared/versions';
 
 import ContentMessageListener from './infrastructures/content-message-listener';
 import SettingController from './controllers/setting';
+import VersionRepository from './controllers/version';
 
 const store = createStore(
   reducers,
   applyMiddleware(promise),
 );
 
-const checkAndNotifyUpdated = async() => {
-  let updated = await versions.checkUpdated();
-  if (!updated) {
-    return;
-  }
-  await versions.notify();
-  await versions.commit();
-};
-
 /* eslint-disable no-unused-vars */
 const backgroundComponent = new BackgroundComponent(store);
 const operationComponent = new OperationComponent(store);
@@ -31,8 +22,7 @@ const tabComponent = new TabComponent(store);
 const indicatorComponent = new IndicatorComponent(store);
 /* eslint-enable no-unused-vars */
 
-checkAndNotifyUpdated();
-
 new SettingController().reload();
+new VersionRepository().notifyIfUpdated();
 
 new ContentMessageListener().run();
diff --git a/src/background/infrastructures/notifier.js b/src/background/infrastructures/notifier.js
new file mode 100644
index 0000000..1eccc47
--- /dev/null
+++ b/src/background/infrastructures/notifier.js
@@ -0,0 +1,23 @@
+const NOTIFICATION_ID = 'vimvixen-update';
+
+export default class Notifier {
+  notify(title, message, onclick) {
+    const listener = (id) => {
+      if (id !== NOTIFICATION_ID) {
+        return;
+      }
+
+      onclick();
+
+      browser.notifications.onClicked.removeListener(listener);
+    };
+    browser.notifications.onClicked.addListener(listener);
+
+    return browser.notifications.create(NOTIFICATION_ID, {
+      'type': 'basic',
+      'iconUrl': browser.extension.getURL('resources/icon_48x48.png'),
+      title,
+      message,
+    });
+  }
+}
diff --git a/src/background/repositories/tab.js b/src/background/repositories/tab.js
new file mode 100644
index 0000000..16989e1
--- /dev/null
+++ b/src/background/repositories/tab.js
@@ -0,0 +1,5 @@
+export default class TabRepository {
+  create(url) {
+    browser.tabs.create({ url, });
+  }
+}
diff --git a/src/background/repositories/version.js b/src/background/repositories/version.js
new file mode 100644
index 0000000..4c71d05
--- /dev/null
+++ b/src/background/repositories/version.js
@@ -0,0 +1,10 @@
+export default class VersionRepository {
+  async get() {
+    let { version } = await browser.storage.local.get('version');
+    return version;
+  }
+
+  update(version) {
+    return browser.storage.local.set({ version });
+  }
+}
diff --git a/src/background/shared/versions/index.js b/src/background/shared/versions/index.js
deleted file mode 100644
index aa09c92..0000000
--- a/src/background/shared/versions/index.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import * as storage from './storage';
-import * as releaseNotes from './release-notes';
-import manifest from '../../../../manifest.json';
-
-const NOTIFICATION_ID = 'vimvixen-update';
-
-const notificationClickListener = (id) => {
-  if (id !== NOTIFICATION_ID) {
-    return;
-  }
-
-  browser.tabs.create({ url: releaseNotes.url(manifest.version) });
-  browser.notifications.onClicked.removeListener(notificationClickListener);
-};
-
-const checkUpdated = async() => {
-  let prev = await storage.load();
-  if (!prev) {
-    return true;
-  }
-  return manifest.version !== prev;
-};
-
-const notify = () => {
-  browser.notifications.onClicked.addListener(notificationClickListener);
-  return browser.notifications.create(NOTIFICATION_ID, {
-    'type': 'basic',
-    'iconUrl': browser.extension.getURL('resources/icon_48x48.png'),
-    'title': 'Vim Vixen ' + manifest.version + ' has been installed',
-    'message': 'Click here to see release notes',
-  });
-};
-
-const commit = () => {
-  storage.save(manifest.version);
-};
-
-export { checkUpdated, notify, commit };
diff --git a/src/background/shared/versions/release-notes.js b/src/background/shared/versions/release-notes.js
deleted file mode 100644
index 6ef2335..0000000
--- a/src/background/shared/versions/release-notes.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const url = (version) => {
-  if (version) {
-    return 'https://github.com/ueokande/vim-vixen/releases/tag/' + version;
-  }
-  return 'https://github.com/ueokande/vim-vixen/releases/';
-};
-
-export { url };
diff --git a/src/background/shared/versions/storage.js b/src/background/shared/versions/storage.js
deleted file mode 100644
index 7883258..0000000
--- a/src/background/shared/versions/storage.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const load = async() => {
-  let { version } = await browser.storage.local.get('version');
-  return version;
-};
-
-const save = (version) => {
-  return browser.storage.local.set({ version });
-};
-
-export { load, save };
diff --git a/src/background/usecases/version.js b/src/background/usecases/version.js
new file mode 100644
index 0000000..a681bdf
--- /dev/null
+++ b/src/background/usecases/version.js
@@ -0,0 +1,41 @@
+import manifest from '../../../manifest.json';
+import VersionRepository from '../repositories/version';
+import TabRepository from '../repositories/tab';
+import Notifier from '../infrastructures/notifier';
+
+export default class VersionInteractor {
+  constructor() {
+    this.versionRepository = new VersionRepository();
+    this.tabRepository = new TabRepository();
+    this.notifier = new Notifier();
+  }
+
+  async notifyIfUpdated() {
+    if (!await this.checkUpdated()) {
+      return;
+    }
+
+    let title = 'Vim Vixen ' + manifest.version + ' has been installed';
+    let message = 'Click here to see release notes';
+    this.notifier.notify(title, message, () => {
+      let url = this.releaseNoteUrl(manifest.version);
+      this.tabRepository.create(url);
+    });
+    this.versionRepository.update(manifest.version);
+  }
+
+  async checkUpdated() {
+    let prev = await this.versionRepository.get();
+    if (!prev) {
+      return true;
+    }
+    return manifest.version !== prev;
+  }
+
+  releaseNoteUrl(version) {
+    if (version) {
+      return 'https://github.com/ueokande/vim-vixen/releases/tag/' + version;
+    }
+    return 'https://github.com/ueokande/vim-vixen/releases/';
+  }
+}
diff --git a/test/background/repositories/version.js b/test/background/repositories/version.js
new file mode 100644
index 0000000..8510ae6
--- /dev/null
+++ b/test/background/repositories/version.js
@@ -0,0 +1,34 @@
+import VersionRepository from 'background/repositories/version';
+
+describe("background/repositories/version", () => {
+  let versionRepository;
+
+  beforeEach(() => {
+    versionRepository = new VersionRepository;
+  });
+
+  describe('#get', () => {
+    beforeEach(() => {
+      return browser.storage.local.remove('version');
+    });
+
+    it('loads saved version', async() => {
+      await browser.storage.local.set({ version: '1.2.3' });
+      let version = await this.versionRepository.get();
+      expect(version).to.equal('1.2.3');
+    });
+
+    it('returns undefined if no versions in storage', async() => {
+      let version = await storage.load();
+      expect(version).to.be.a('undefined');
+    });
+  });
+
+  describe('#update', () => {
+    it('saves version string', async() => {
+      await versionRepository.update('2.3.4');
+      let { version } = await browser.storage.local.get('version');
+      expect(version).to.equal('2.3.4');
+    });
+  });
+});
diff --git a/test/background/shared/versions/index.test.js b/test/background/shared/versions/index.test.js
deleted file mode 100644
index d65dd9a..0000000
--- a/test/background/shared/versions/index.test.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import * as versions from 'background/shared/versions';
-import manifest from '../../../../manifest.json';
-
-describe("shared/versions/storage", () => {
-  describe('#checkUpdated', () => {
-    beforeEach(() => {
-      return browser.storage.local.remove('version');
-    });
-
-    it('return true if no previous versions', async() => {
-      let updated = await versions.checkUpdated();
-      expect(updated).to.be.true;
-    });
-
-    it('return true if updated', async() => {
-      await browser.storage.local.set({ version: '0.001' });
-      let updated = await versions.checkUpdated();
-      expect(updated).to.be.true;
-    });
-
-    it('return false if not updated', async() => {
-      await browser.storage.local.set({ version: manifest.version });
-      let updated = await versions.checkUpdated();
-      expect(updated).to.be.false;
-    });
-  });
-
-  describe('#commit', () => {
-    beforeEach(() => {
-      return browser.storage.local.remove('version');
-    });
-
-    it('saves current version from manifest.json', async() => {
-      await versions.commit();
-      let { version } = await browser.storage.local.get('version');
-      expect(version).to.be.a('string');
-      expect(version).to.equal(manifest.version);
-    });
-  });
-});
diff --git a/test/background/shared/versions/storage.test.js b/test/background/shared/versions/storage.test.js
deleted file mode 100644
index f452516..0000000
--- a/test/background/shared/versions/storage.test.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import * as storage from 'background/shared/versions/storage';
-
-describe("shared/versions/storage", () => {
-  describe('#load', () => {
-    beforeEach(() => {
-      return browser.storage.local.remove('version');
-    });
-
-    it('loads saved version', async() => {
-      await browser.storage.local.set({ version: '1.2.3' });
-      let version = await storage.load();
-      expect(version).to.equal('1.2.3');
-    });
-
-    it('returns undefined if no versions in storage', async() => {
-      let version = await storage.load();
-      expect(version).to.be.a('undefined');
-    });
-  });
-
-  describe('#save', () => {
-    it('saves version string', async() => {
-      await storage.save('2.3.4');
-      let { version } = await browser.storage.local.get('version');
-      expect(version).to.equal('2.3.4');
-    });
-  });
-});
-- 
cgit v1.2.3


From b130fd52681a4e3f381d3d09a48589fc42996a8b Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Sun, 22 Jul 2018 11:33:52 +0900
Subject: TabPresenter

---
 src/background/presenters/tab.js   | 5 +++++
 src/background/repositories/tab.js | 5 -----
 src/background/usecases/version.js | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 src/background/presenters/tab.js
 delete mode 100644 src/background/repositories/tab.js

(limited to 'src/background/repositories')

diff --git a/src/background/presenters/tab.js b/src/background/presenters/tab.js
new file mode 100644
index 0000000..8f60535
--- /dev/null
+++ b/src/background/presenters/tab.js
@@ -0,0 +1,5 @@
+export default class TabPresenter {
+  create(url) {
+    browser.tabs.create({ url, });
+  }
+}
diff --git a/src/background/repositories/tab.js b/src/background/repositories/tab.js
deleted file mode 100644
index 16989e1..0000000
--- a/src/background/repositories/tab.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export default class TabRepository {
-  create(url) {
-    browser.tabs.create({ url, });
-  }
-}
diff --git a/src/background/usecases/version.js b/src/background/usecases/version.js
index a681bdf..a71f90d 100644
--- a/src/background/usecases/version.js
+++ b/src/background/usecases/version.js
@@ -1,12 +1,12 @@
 import manifest from '../../../manifest.json';
 import VersionRepository from '../repositories/version';
-import TabRepository from '../repositories/tab';
+import TabPresenter from '../presenters/tab';
 import Notifier from '../infrastructures/notifier';
 
 export default class VersionInteractor {
   constructor() {
     this.versionRepository = new VersionRepository();
-    this.tabRepository = new TabRepository();
+    this.tabPresenter = new TabPresenter();
     this.notifier = new Notifier();
   }
 
@@ -19,7 +19,7 @@ export default class VersionInteractor {
     let message = 'Click here to see release notes';
     this.notifier.notify(title, message, () => {
       let url = this.releaseNoteUrl(manifest.version);
-      this.tabRepository.create(url);
+      this.tabPresenter.create(url);
     });
     this.versionRepository.update(manifest.version);
   }
-- 
cgit v1.2.3


From c4afd7237b7720acbf642fc4c6eb529420295dcd Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Mon, 23 Jul 2018 21:26:47 +0900
Subject: [wip] implement command usecases

---
 src/background/controllers/command.js              |  89 ++++++++++++++++
 src/background/controllers/completions.js          |  43 --------
 .../infrastructures/content-message-listener.js    |  13 ++-
 src/background/presenters/bookmark.js              |   0
 src/background/presenters/console.js               |  16 +++
 src/background/presenters/tab.js                   |  45 +++++++-
 src/background/presenters/window.js                |   5 +
 src/background/repositories/bookmark.js            |  13 +++
 src/background/usecases/command.js                 | 114 +++++++++++++++++++++
 src/background/usecases/completions.js             |   2 +-
 10 files changed, 291 insertions(+), 49 deletions(-)
 create mode 100644 src/background/controllers/command.js
 delete mode 100644 src/background/controllers/completions.js
 create mode 100644 src/background/presenters/bookmark.js
 create mode 100644 src/background/presenters/console.js
 create mode 100644 src/background/presenters/window.js
 create mode 100644 src/background/repositories/bookmark.js
 create mode 100644 src/background/usecases/command.js

(limited to 'src/background/repositories')

diff --git a/src/background/controllers/command.js b/src/background/controllers/command.js
new file mode 100644
index 0000000..41057e0
--- /dev/null
+++ b/src/background/controllers/command.js
@@ -0,0 +1,89 @@
+import CompletionsInteractor from '../usecases/completions';
+import CommandInteractor from '../usecases/command';
+import Completions from '../domains/completions';
+
+export default class CommandController {
+  constructor() {
+    this.completionsInteractor = new CompletionsInteractor();
+    this.commandIndicator = new CommandInteractor();
+  }
+
+  getCompletions(line) {
+    let trimmed = line.trimStart();
+    let words = trimmed.split(/ +/);
+    let name = words[0];
+    if (words.length === 1) {
+      return this.completionsInteractor.queryConsoleCommand(name);
+    }
+    let keywords = trimmed.slice(name.length).trimStart();
+    switch (words[0]) {
+    case 'o':
+    case 'open':
+    case 't':
+    case 'tabopen':
+    case 'w':
+    case 'winopen':
+      return this.completionsInteractor.queryOpen(name, keywords);
+    case 'b':
+    case 'buffer':
+      return this.completionsInteractor.queryBuffer(name, keywords);
+    case 'bd':
+    case 'bdel':
+    case 'bdelete':
+    case 'bdeletes':
+      return this.completionsInteractor.queryBdelete(name, keywords);
+    case 'bd!':
+    case 'bdel!':
+    case 'bdelete!':
+    case 'bdeletes!':
+      return this.completionsInteractor.queryBdeleteForce(name, keywords);
+    case 'set':
+      return this.completionsInteractor.querySet(name, keywords);
+    }
+    return Promise.resolve(Completions.empty());
+  }
+
+  // eslint-disable-next-line complexity
+  exec(line) {
+    let trimmed = line.trimStart();
+    let words = trimmed.split(/ +/);
+    let name = words[0];
+    let keywords = trimmed.slice(name.length).trimStart();
+    switch (words[0]) {
+    case 'o':
+    case 'open':
+      return this.commandIndicator.open(keywords);
+    case 't':
+    case 'tabopen':
+      return this.commandIndicator.tabopen(keywords);
+    case 'w':
+    case 'winopen':
+      return this.commandIndicator.winopen(keywords);
+    case 'b':
+    case 'buffer':
+      return this.commandIndicator.buffer(keywords);
+    case 'bd':
+    case 'bdel':
+    case 'bdelete':
+      return this.commandIndicator.bdelete(false, keywords);
+    case 'bd!':
+    case 'bdel!':
+    case 'bdelete!':
+      return this.commandIndicator.bdelete(true, keywords);
+    case 'bdeletes':
+      return this.commandIndicator.bdeletes(false, keywords);
+    case 'bdeletes!':
+      return this.commandIndicator.bdeletes(true, keywords);
+    case 'addbookmark':
+      return this.commandIndicator.addbookmark(keywords);
+    case 'q':
+    case 'quit':
+      return this.commandIndicator.quit();
+    case 'qa':
+    case 'quitall':
+      return this.commandIndicator.quitAll();
+    case 'set':
+      return this.commandIndicator.set(keywords);
+    }
+  }
+}
diff --git a/src/background/controllers/completions.js b/src/background/controllers/completions.js
deleted file mode 100644
index f8eade9..0000000
--- a/src/background/controllers/completions.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import CompletionsInteractor from '../usecases/completions';
-import Completions from '../domains/completions';
-
-export default class ContentMessageController {
-  constructor() {
-    this.completionsInteractor = new CompletionsInteractor();
-  }
-
-  getCompletions(line) {
-    let trimmed = line.trimStart();
-    let words = trimmed.split(/ +/);
-    let name = words[0];
-    if (words.length === 1) {
-      return this.completionsInteractor.queryConsoleCommand(name);
-    }
-    let keywords = trimmed.slice(name.length).trimStart();
-    switch (words[0]) {
-    case 'o':
-    case 'open':
-    case 't':
-    case 'tabopen':
-    case 'w':
-    case 'winopen':
-      return this.completionsInteractor.queryOpen(name, keywords);
-    case 'b':
-    case 'buffer':
-      return this.completionsInteractor.queryBuffer(name, keywords);
-    case 'bd':
-    case 'bdel':
-    case 'bdelete':
-    case 'bdeletes':
-      return this.completionsInteractor.queryBdelete(name, keywords);
-    case 'bd!':
-    case 'bdel!':
-    case 'bdelete!':
-    case 'bdeletes!':
-      return this.completionsInteractor.queryBdeleteForce(name, keywords);
-    case 'set':
-      return this.completionsInteractor.querySet(name, keywords);
-    }
-    return Promise.resolve(Completions.empty());
-  }
-}
diff --git a/src/background/infrastructures/content-message-listener.js b/src/background/infrastructures/content-message-listener.js
index f16804f..2e84fcc 100644
--- a/src/background/infrastructures/content-message-listener.js
+++ b/src/background/infrastructures/content-message-listener.js
@@ -1,5 +1,5 @@
 import messages from '../../shared/messages';
-import CompletionsController from '../controllers/completions';
+import CommandController from '../controllers/command';
 import SettingController from '../controllers/setting';
 import FindController from '../controllers/find';
 import AddonEnabledController from '../controllers/addon-enabled';
@@ -8,7 +8,7 @@ import LinkController from '../controllers/link';
 export default class ContentMessageListener {
   constructor() {
     this.settingController = new SettingController();
-    this.completionsController = new CompletionsController();
+    this.commandController = new CommandController();
     this.findController = new FindController();
     this.addonEnabledController = new AddonEnabledController();
     this.linkController = new LinkController();
@@ -31,6 +31,8 @@ export default class ContentMessageListener {
     switch (message.type) {
     case messages.CONSOLE_QUERY_COMPLETIONS:
       return this.onConsoleQueryCompletions(message.text);
+    case messages.CONSOLE_ENTER_COMMAND:
+      return this.onConsoleEnterCommand(message.text);
     case messages.SETTINGS_QUERY:
       return this.onSettingsQuery();
     case messages.SETTINGS_RELOAD:
@@ -48,10 +50,15 @@ export default class ContentMessageListener {
   }
 
   async onConsoleQueryCompletions(line) {
-    let completions = await this.completionsController.getCompletions(line);
+    let completions = await this.commandController.getCompletions(line);
     return Promise.resolve(completions.serialize());
   }
 
+  onConsoleEnterCommand(text) {
+    return this.commandController.exec(text);
+  }
+
+
   onSettingsQuery() {
     return this.settingController.getSetting();
   }
diff --git a/src/background/presenters/bookmark.js b/src/background/presenters/bookmark.js
new file mode 100644
index 0000000..e69de29
diff --git a/src/background/presenters/console.js b/src/background/presenters/console.js
new file mode 100644
index 0000000..f7d3777
--- /dev/null
+++ b/src/background/presenters/console.js
@@ -0,0 +1,16 @@
+import messages from '../../shared/messages';
+
+export default class ConsolePresenter {
+  showInfo(tabId, message) {
+    return browser.tabs.sendMessage(tabId, {
+      type: messages.CONSOLE_SHOW_INFO,
+      text: message,
+    });
+  }
+  showError(tabId, message) {
+    return browser.tabs.sendMessage(tabId, {
+      type: messages.CONSOLE_SHOW_ERROR,
+      text: message,
+    });
+  }
+}
diff --git a/src/background/presenters/tab.js b/src/background/presenters/tab.js
index 66a207f..be6955a 100644
--- a/src/background/presenters/tab.js
+++ b/src/background/presenters/tab.js
@@ -3,8 +3,49 @@ export default class TabPresenter {
     return browser.tabs.update(tabId, { url });
   }
 
-  create(url, { openerTabId, active }) {
-    return browser.tabs.create({ url, openerTabId, active });
+  create(url, opts) {
+    return browser.tabs.create({ url, ...opts });
+  }
+
+  async getCurrent() {
+    let tabs = await browser.tabs.query({
+      active: true, currentWindow: true
+    });
+    return tabs[0];
+  }
+
+  getAll() {
+    return browser.tabs.query({ currentWindow: true });
+  }
+
+  async getByKeyword(keyword, excludePinned = false) {
+    let tabs = await browser.tabs.query({ currentWindow: true });
+    return tabs.filter((t) => {
+      return t.url.toLowerCase().includes(keyword.toLowerCase()) ||
+        t.title && t.title.toLowerCase().includes(keyword.toLowerCase());
+    }).filter((t) => {
+      return !(excludePinned && t.pinned);
+    });
+  }
+
+  select(tabId) {
+    return browser.tabs.update(tabId, { active: true });
+  }
+
+  async selectAt(index) {
+    let tabs = await browser.tabs.query({ currentWindow: true });
+    if (tabs.length < 2) {
+      return;
+    }
+    if (index < 0 || tabs.length <= index) {
+      throw new RangeError(`tab ${index + 1} does not exist`);
+    }
+    let id = tabs[index].id;
+    return browser.tabs.update(id, { active: true });
+  }
+
+  remove(ids) {
+    return browser.tabs.remove(ids);
   }
 
   async createAdjacent(url, { openerTabId, active }) {
diff --git a/src/background/presenters/window.js b/src/background/presenters/window.js
new file mode 100644
index 0000000..a82c4a2
--- /dev/null
+++ b/src/background/presenters/window.js
@@ -0,0 +1,5 @@
+export default class WindowPresenter {
+  create(url) {
+    return browser.windows.create({ url });
+  }
+}
diff --git a/src/background/repositories/bookmark.js b/src/background/repositories/bookmark.js
new file mode 100644
index 0000000..99f7ec4
--- /dev/null
+++ b/src/background/repositories/bookmark.js
@@ -0,0 +1,13 @@
+export default class BookmarkRepository {
+  async create(title, url) {
+    let item = await browser.bookmarks.create({
+      type: 'bookmark',
+      title,
+      url,
+    });
+    if (!item) {
+      throw new Error('Could not create a bookmark');
+    }
+    return item;
+  }
+}
diff --git a/src/background/usecases/command.js b/src/background/usecases/command.js
new file mode 100644
index 0000000..1d4744e
--- /dev/null
+++ b/src/background/usecases/command.js
@@ -0,0 +1,114 @@
+import TabPresenter from '../presenters/tab';
+import WindowPresenter from '../presenters/window';
+import SettingRepository from '../repositories/setting';
+import BookmarkRepository from '../repositories/bookmark';
+import ConsolePresenter from '../presenters/console';
+
+export default class CommandIndicator {
+  constructor() {
+    this.tabPresenter = new TabPresenter();
+    this.windowPresenter = new WindowPresenter();
+    this.settingRepository = new SettingRepository();
+    this.bookmarkRepository = new BookmarkRepository();
+    this.consolePresenter = new ConsolePresenter();
+  }
+
+  async open(keywords) {
+    let url = await this.urlOrSearch(keywords);
+    return this.tabPresenter.open(url);
+  }
+
+  async tabopen(keywords) {
+    let url = await this.urlOrSearch(keywords);
+    return this.tabPresenter.create(url);
+  }
+
+  async winopen(keywords) {
+    let url = await this.urlOrSearch(keywords);
+    return this.windowPresenter.create(url);
+  }
+
+  async buffer(keywords) {
+    if (keywords.length === 0) {
+      return;
+    }
+    if (!isNaN(keywords)) {
+      let index = parseInt(keywords, 10) - 1;
+      return tabs.selectAt(index);
+    }
+
+    let current = await this.tabPresenter.getCurrent();
+    let tabs = await this.tabPresenter.getByKeyword(keywords);
+    if (tabs.length === 0) {
+      throw new RangeError('No matching buffer for ' + keywords);
+    }
+    for (let tab of tabs) {
+      if (tab.index > current.index) {
+        return this.tabPresenter.select(tab.id);
+      }
+    }
+    return this.tabPresenter.select(tabs[0].id);
+  }
+
+  async bdelete(force, keywords) {
+    let excludePinned = !force;
+    let tabs = await this.tabPresenter.getByKeyword(keywords, excludePinned);
+    if (tabs.length === 0) {
+      throw new Error('No matching buffer for ' + keywords);
+    } else if (tabs.length > 1) {
+      throw new Error('More than one match for ' + keywords);
+    }
+    return this.tabPresenter.remove([tabs[0].id]);
+  }
+
+  async bdeletes(force, keywords) {
+    let excludePinned = !force;
+    let tabs = await this.tabPresenter.getByKeyword(keywords, excludePinned);
+    let ids = tabs.map(tab => tab.id);
+    return this.tabPresenter.remove(ids);
+  }
+
+  async quit() {
+    let tab = await this.tabPresenter.getCurrent();
+    return this.tabPresenter.remove([tab.id]);
+  }
+
+  async quitall() {
+    let tabs = await this.tabPresenter.getAll();
+    let ids = tabs.map(tab => tab.id);
+    this.tabPresenter.tabPresenter.remove(ids);
+  }
+
+  async addbookmark(title) {
+    let tab = await this.tabPresenter.getCurrent();
+    let item = await this.bookmarkRepository.create(title, tab.url);
+    let message = 'Saved current page: ' + item.url;
+    return this.consolePresenter.showInfo(tab.id, message);
+  }
+
+  set(keywords) {
+    // TODO implement set command
+  }
+
+  async urlOrSearch(keywords) {
+    try {
+      return new URL(keywords).href;
+    } catch (e) {
+      if (keywords.includes('.') && !keywords.includes(' ')) {
+        return 'http://' + keywords;
+      }
+      let settings = await this.settingRepository.get();
+      let engines = settings.search.engines;
+
+      let template = engines[settings.search.default];
+      let query = keywords;
+
+      let first = keywords.trimStart().split(' ')[0];
+      if (Object.keys(engines).includes(first)) {
+        template = engines[first];
+        query = keywords.trimStart().slice(first.length).trimStart();
+      }
+      return template.replace('{}', encodeURIComponent(query));
+    }
+  }
+}
diff --git a/src/background/usecases/completions.js b/src/background/usecases/completions.js
index 18174bd..ee519e1 100644
--- a/src/background/usecases/completions.js
+++ b/src/background/usecases/completions.js
@@ -50,7 +50,7 @@ export default class CompletionsInteractor {
   }
 
   queryBuffer(name, keywords) {
-    return this.queryTabs(name, true, keywords);
+    return this.queryTabs(name, false, keywords);
   }
 
   queryBdelete(name, keywords) {
-- 
cgit v1.2.3


From 86c4841964db7988a32b8c2a5edd0a0998eb34e2 Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Thu, 26 Jul 2018 21:41:00 +0900
Subject: Implement set-command

---
 src/background/components/background.js  |  5 ---
 src/background/repositories/setting.js   |  6 +++
 src/background/usecases/command.js       | 36 +++++++---------
 src/background/usecases/parsers.js       | 50 +++++++++++++++++++++
 test/background/usecases/parsers.test.js | 74 ++++++++++++++++++++++++++++++++
 5 files changed, 145 insertions(+), 26 deletions(-)
 create mode 100644 src/background/usecases/parsers.js
 create mode 100644 test/background/usecases/parsers.test.js

(limited to 'src/background/repositories')

diff --git a/src/background/components/background.js b/src/background/components/background.js
index 86e96fa..23131d2 100644
--- a/src/background/components/background.js
+++ b/src/background/components/background.js
@@ -21,11 +21,6 @@ export default class BackgroundComponent {
     let settings = this.store.getState().setting;
 
     switch (message.type) {
-    case messages.CONSOLE_ENTER_COMMAND:
-      this.store.dispatch(
-        commandActions.exec(sender.tab, message.text, settings.value),
-      );
-      return this.broadcastSettingsChanged();
     }
   }
 
diff --git a/src/background/repositories/setting.js b/src/background/repositories/setting.js
index d9c481d..6d48525 100644
--- a/src/background/repositories/setting.js
+++ b/src/background/repositories/setting.js
@@ -14,4 +14,10 @@ export default class SettingRepository {
   update(value) {
     return this.cache.set(CACHED_SETTING_KEY, value);
   }
+
+  async setProperty(name, value) {
+    let current = await this.get();
+    current.properties[name] = value;
+    return this.update(current);
+  }
 }
diff --git a/src/background/usecases/command.js b/src/background/usecases/command.js
index 1d4744e..7887509 100644
--- a/src/background/usecases/command.js
+++ b/src/background/usecases/command.js
@@ -1,8 +1,11 @@
+import * as parsers from './parsers';
 import TabPresenter from '../presenters/tab';
 import WindowPresenter from '../presenters/window';
 import SettingRepository from '../repositories/setting';
 import BookmarkRepository from '../repositories/bookmark';
 import ConsolePresenter from '../presenters/console';
+import ContentMessageClient from '../infrastructures/content-message-client';
+import * as properties from 'shared/settings/properties';
 
 export default class CommandIndicator {
   constructor() {
@@ -11,6 +14,8 @@ export default class CommandIndicator {
     this.settingRepository = new SettingRepository();
     this.bookmarkRepository = new BookmarkRepository();
     this.consolePresenter = new ConsolePresenter();
+
+    this.contentMessageClient = new ContentMessageClient();
   }
 
   async open(keywords) {
@@ -86,29 +91,18 @@ export default class CommandIndicator {
     return this.consolePresenter.showInfo(tab.id, message);
   }
 
-  set(keywords) {
-    // TODO implement set command
+  async set(keywords) {
+    if (keywords.length === 0) {
+      return;
+    }
+    let [name, value] = parsers.parseSetOption(keywords, properties.types);
+    await this.settingRepository.setProperty(name, value);
+
+    return this.contentMessageClient.broadcastSettingsChanged();
   }
 
   async urlOrSearch(keywords) {
-    try {
-      return new URL(keywords).href;
-    } catch (e) {
-      if (keywords.includes('.') && !keywords.includes(' ')) {
-        return 'http://' + keywords;
-      }
-      let settings = await this.settingRepository.get();
-      let engines = settings.search.engines;
-
-      let template = engines[settings.search.default];
-      let query = keywords;
-
-      let first = keywords.trimStart().split(' ')[0];
-      if (Object.keys(engines).includes(first)) {
-        template = engines[first];
-        query = keywords.trimStart().slice(first.length).trimStart();
-      }
-      return template.replace('{}', encodeURIComponent(query));
-    }
+    let settings = await this.settingRepository.get();
+    return parsers.normalizeUrl(keywords, settings.search);
   }
 }
diff --git a/src/background/usecases/parsers.js b/src/background/usecases/parsers.js
new file mode 100644
index 0000000..650ccd0
--- /dev/null
+++ b/src/background/usecases/parsers.js
@@ -0,0 +1,50 @@
+const normalizeUrl = (keywords, searchSettings) => {
+  try {
+    return new URL(keywords).href;
+  } catch (e) {
+    if (keywords.includes('.') && !keywords.includes(' ')) {
+      return 'http://' + keywords;
+    }
+    let template = searchSettings.engines[searchSettings.default];
+    let query = keywords;
+
+    let first = keywords.trimStart().split(' ')[0];
+    if (Object.keys(searchSettings.engines).includes(first)) {
+      template = searchSettings.engines[first];
+      query = keywords.trimStart().slice(first.length).trimStart();
+    }
+    return template.replace('{}', encodeURIComponent(query));
+  }
+};
+
+const mustNumber = (v) => {
+  let num = Number(v);
+  if (isNaN(num)) {
+    throw new Error('Not number: ' + v);
+  }
+  return num;
+};
+
+const parseSetOption = (word, types) => {
+  let [key, value] = word.split('=');
+  if (value === undefined) {
+    value = !key.startsWith('no');
+    key = value ? key : key.slice(2);
+  }
+  let type = types[key];
+  if (!type) {
+    throw new Error('Unknown property: ' + key);
+  }
+  if (type === 'boolean' && typeof value !== 'boolean' ||
+       type !== 'boolean' && typeof value === 'boolean') {
+    throw new Error('Invalid argument: ' + word);
+  }
+
+  switch (type) {
+  case 'string': return [key, value];
+  case 'number': return [key, mustNumber(value)];
+  case 'boolean': return [key, value];
+  }
+};
+
+export { normalizeUrl, parseSetOption };
diff --git a/test/background/usecases/parsers.test.js b/test/background/usecases/parsers.test.js
new file mode 100644
index 0000000..fa0e757
--- /dev/null
+++ b/test/background/usecases/parsers.test.js
@@ -0,0 +1,74 @@
+import * as parsers from 'background/usecases/parsers';
+
+describe("background/usecases/parsers", () => {
+  describe("#parsers.parseSetOption", () => {
+    it('parse set string', () => {
+      let [key, value] = parsers.parseSetOption('encoding=utf-8', { encoding: 'string' });
+      expect(key).to.equal('encoding');
+      expect(value).to.equal('utf-8');
+    });
+
+    it('parse set empty string', () => {
+      let [key, value] = parsers.parseSetOption('encoding=', { encoding: 'string' });
+      expect(key).to.equal('encoding');
+      expect(value).to.equal('');
+    });
+
+    it('parse set string', () => {
+      let [key, value] = parsers.parseSetOption('history=50', { history: 'number' });
+      expect(key).to.equal('history');
+      expect(value).to.equal(50);
+    });
+
+    it('parse set boolean', () => {
+      let [key, value] = parsers.parseSetOption('paste', { paste: 'boolean' });
+      expect(key).to.equal('paste');
+      expect(value).to.be.true;
+
+      [key, value] = parsers.parseSetOption('nopaste', { paste: 'boolean' });
+      expect(key).to.equal('paste');
+      expect(value).to.be.false;
+    });
+
+    it('throws error on unknown property', () => {
+      expect(() => parsers.parseSetOption('charset=utf-8', {})).to.throw(Error, 'Unknown');
+      expect(() => parsers.parseSetOption('smoothscroll', {})).to.throw(Error, 'Unknown');
+      expect(() => parsers.parseSetOption('nosmoothscroll', {})).to.throw(Error, 'Unknown');
+    })
+
+    it('throws error on invalid property', () => {
+      expect(() => parsers.parseSetOption('charset=utf-8', { charset: 'number' })).to.throw(Error, 'Not number');
+      expect(() => parsers.parseSetOption('charset=utf-8', { charset: 'boolean' })).to.throw(Error, 'Invalid');
+      expect(() => parsers.parseSetOption('charset=', { charset: 'boolean' })).to.throw(Error, 'Invalid');
+      expect(() => parsers.parseSetOption('smoothscroll', { smoothscroll: 'string' })).to.throw(Error, 'Invalid');
+      expect(() => parsers.parseSetOption('smoothscroll', { smoothscroll: 'number' })).to.throw(Error, 'Invalid');
+    })
+  });
+
+  describe('#normalizeUrl', () => {
+    const config = {
+      default: 'google',
+      engines: {
+        google: 'https://google.com/search?q={}',
+        yahoo: 'https://yahoo.com/search?q={}',
+      }
+    };
+
+    it('convertes search url', () => {
+      expect(parsers.normalizeUrl('google apple', config))
+        .to.equal('https://google.com/search?q=apple');
+      expect(parsers.normalizeUrl('yahoo apple', config))
+        .to.equal('https://yahoo.com/search?q=apple');
+      expect(parsers.normalizeUrl('google apple banana', config))
+        .to.equal('https://google.com/search?q=apple%20banana');
+      expect(parsers.normalizeUrl('yahoo C++CLI', config))
+        .to.equal('https://yahoo.com/search?q=C%2B%2BCLI');
+    });
+
+    it('user default search engine', () => {
+      expect(parsers.normalizeUrl('apple banana', config))
+        .to.equal('https://google.com/search?q=apple%20banana');
+    });
+  });
+});
+
-- 
cgit v1.2.3