From fbdec04786e28bad45021bef4a74e7077e34282f Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Thu, 4 Jan 2018 18:55:24 +0900
Subject: move settings validator

---
 src/settings/components/index.jsx |  2 +-
 src/shared/settings/validator.js  | 61 +++++++++++++++++++++++++++++++++++++++
 src/shared/validators/setting.js  | 61 ---------------------------------------
 3 files changed, 62 insertions(+), 62 deletions(-)
 create mode 100644 src/shared/settings/validator.js
 delete mode 100644 src/shared/validators/setting.js

(limited to 'src')

diff --git a/src/settings/components/index.jsx b/src/settings/components/index.jsx
index 73520ca..074c4c7 100644
--- a/src/settings/components/index.jsx
+++ b/src/settings/components/index.jsx
@@ -5,7 +5,7 @@ import SearchForm from './form/search-form';
 import KeymapsForm from './form/keymaps-form';
 import BlacklistForm from './form/blacklist-form';
 import * as settingActions from 'settings/actions/setting';
-import * as validator from 'shared/validators/setting';
+import * as validator from 'shared/settings/validator';
 import * as settingsValues from 'shared/settings/values';
 
 const DO_YOU_WANT_TO_CONTINUE =
diff --git a/src/shared/settings/validator.js b/src/shared/settings/validator.js
new file mode 100644
index 0000000..949ab29
--- /dev/null
+++ b/src/shared/settings/validator.js
@@ -0,0 +1,61 @@
+import operations from 'shared/operations';
+
+const VALID_TOP_KEYS = ['keymaps', 'search', 'blacklist'];
+const VALID_OPERATION_VALUES = Object.keys(operations).map((key) => {
+  return operations[key];
+});
+
+const validateInvalidTopKeys = (settings) => {
+  let invalidKey = Object.keys(settings).find((key) => {
+    return !VALID_TOP_KEYS.includes(key);
+  });
+  if (invalidKey) {
+    throw Error(`Unknown key: "${invalidKey}"`);
+  }
+};
+
+const validateKeymaps = (keymaps) => {
+  for (let key of Object.keys(keymaps)) {
+    let value = keymaps[key];
+    if (!VALID_OPERATION_VALUES.includes(value.type)) {
+      throw Error(`Unknown operation: "${value.type}"`);
+    }
+  }
+};
+
+const validateSearch = (search) => {
+  let engines = search.engines;
+  for (let key of Object.keys(engines)) {
+    if (/\s/.test(key)) {
+      throw new Error(
+        `While space in search engine name is not allowed: "${key}"`
+      );
+    }
+    let url = engines[key];
+    if (!url.match(/{}/)) {
+      throw new Error(`No {}-placeholders in URL of "${key}"`);
+    }
+    if (url.match(/{}/g).length > 1) {
+      throw new Error(`Multiple {}-placeholders in URL of "${key}"`);
+    }
+  }
+
+  if (!search.default) {
+    throw new Error(`Default engine is not set`);
+  }
+  if (!Object.keys(engines).includes(search.default)) {
+    throw new Error(`Default engine "${search.default}" not found`);
+  }
+};
+
+const validate = (settings) => {
+  validateInvalidTopKeys(settings);
+  if (settings.keymaps) {
+    validateKeymaps(settings.keymaps);
+  }
+  if (settings.search) {
+    validateSearch(settings.search);
+  }
+};
+
+export { validate };
diff --git a/src/shared/validators/setting.js b/src/shared/validators/setting.js
deleted file mode 100644
index 949ab29..0000000
--- a/src/shared/validators/setting.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import operations from 'shared/operations';
-
-const VALID_TOP_KEYS = ['keymaps', 'search', 'blacklist'];
-const VALID_OPERATION_VALUES = Object.keys(operations).map((key) => {
-  return operations[key];
-});
-
-const validateInvalidTopKeys = (settings) => {
-  let invalidKey = Object.keys(settings).find((key) => {
-    return !VALID_TOP_KEYS.includes(key);
-  });
-  if (invalidKey) {
-    throw Error(`Unknown key: "${invalidKey}"`);
-  }
-};
-
-const validateKeymaps = (keymaps) => {
-  for (let key of Object.keys(keymaps)) {
-    let value = keymaps[key];
-    if (!VALID_OPERATION_VALUES.includes(value.type)) {
-      throw Error(`Unknown operation: "${value.type}"`);
-    }
-  }
-};
-
-const validateSearch = (search) => {
-  let engines = search.engines;
-  for (let key of Object.keys(engines)) {
-    if (/\s/.test(key)) {
-      throw new Error(
-        `While space in search engine name is not allowed: "${key}"`
-      );
-    }
-    let url = engines[key];
-    if (!url.match(/{}/)) {
-      throw new Error(`No {}-placeholders in URL of "${key}"`);
-    }
-    if (url.match(/{}/g).length > 1) {
-      throw new Error(`Multiple {}-placeholders in URL of "${key}"`);
-    }
-  }
-
-  if (!search.default) {
-    throw new Error(`Default engine is not set`);
-  }
-  if (!Object.keys(engines).includes(search.default)) {
-    throw new Error(`Default engine "${search.default}" not found`);
-  }
-};
-
-const validate = (settings) => {
-  validateInvalidTopKeys(settings);
-  if (settings.keymaps) {
-    validateKeymaps(settings.keymaps);
-  }
-  if (settings.search) {
-    validateSearch(settings.search);
-  }
-};
-
-export { validate };
-- 
cgit v1.2.3