From 114732ec25ad5a57995bfab5ccede1ad3604c1f0 Mon Sep 17 00:00:00 2001
From: Kevin Brown <kevin@kevinbrown.in>
Date: Sun, 21 Sep 2014 15:05:26 -0400
Subject: [PATCH] Broke out a base data adapter

This should allow us to create a basic interface that all adapters
must follow.
---
 dist/js/select2.amd.full.js   | 25 +++++++++++++++++++++++--
 dist/js/select2.amd.js        | 25 +++++++++++++++++++++++--
 dist/js/select2.full.js       | 25 +++++++++++++++++++++++--
 dist/js/select2.js            | 25 +++++++++++++++++++++++--
 src/js/select2/data/base.js   | 19 +++++++++++++++++++
 src/js/select2/data/select.js |  5 +++--
 tests/data/base-tests.js      | 29 +++++++++++++++++++++++++++++
 tests/data/base.html          | 20 ++++++++++++++++++++
 8 files changed, 163 insertions(+), 10 deletions(-)
 create mode 100644 src/js/select2/data/base.js
 create mode 100644 tests/data/base-tests.js
 create mode 100644 tests/data/base.html

diff --git a/dist/js/select2.amd.full.js b/dist/js/select2.amd.full.js
index 778a2d89..517d024c 100644
--- a/dist/js/select2.amd.full.js
+++ b/dist/js/select2.amd.full.js
@@ -136,17 +136,38 @@ define('select2/utils',[], function () {
   return Utils;
 });
 
+define('select2/data/base',[
+  '../utils'
+], function (Utils) {
+  function BaseAdapter ($element, options) {
+    BaseAdapter.__super__.constructor.call(this);
+  }
+
+  Utils.Extend(BaseAdapter, Utils.Observable);
+
+  BaseAdapter.prototype.current = function (callback) {
+    throw new Error("The `current` method must be defined in child classes.");
+  }
+
+  BaseAdapter.prototype.query = function (params, callback) {
+    throw new Error("The `query` method must be defined in child classes.");
+  }
+
+  return BaseAdapter;
+});
+
 define('select2/data/select',[
+  './base',
   '../utils',
   'jquery'
-], function (Utils, $) {
+], function (BaseAdapter, Utils, $) {
   function SelectAdapter ($element, options) {
     this.$element = $element;
 
     SelectAdapter.__super__.constructor.call(this);
   }
 
-  Utils.Extend(SelectAdapter, Utils.Observable);
+  Utils.Extend(SelectAdapter, BaseAdapter);
 
   SelectAdapter.prototype.current = function (callback) {
     var data = [];
diff --git a/dist/js/select2.amd.js b/dist/js/select2.amd.js
index 778a2d89..517d024c 100644
--- a/dist/js/select2.amd.js
+++ b/dist/js/select2.amd.js
@@ -136,17 +136,38 @@ define('select2/utils',[], function () {
   return Utils;
 });
 
+define('select2/data/base',[
+  '../utils'
+], function (Utils) {
+  function BaseAdapter ($element, options) {
+    BaseAdapter.__super__.constructor.call(this);
+  }
+
+  Utils.Extend(BaseAdapter, Utils.Observable);
+
+  BaseAdapter.prototype.current = function (callback) {
+    throw new Error("The `current` method must be defined in child classes.");
+  }
+
+  BaseAdapter.prototype.query = function (params, callback) {
+    throw new Error("The `query` method must be defined in child classes.");
+  }
+
+  return BaseAdapter;
+});
+
 define('select2/data/select',[
+  './base',
   '../utils',
   'jquery'
-], function (Utils, $) {
+], function (BaseAdapter, Utils, $) {
   function SelectAdapter ($element, options) {
     this.$element = $element;
 
     SelectAdapter.__super__.constructor.call(this);
   }
 
-  Utils.Extend(SelectAdapter, Utils.Observable);
+  Utils.Extend(SelectAdapter, BaseAdapter);
 
   SelectAdapter.prototype.current = function (callback) {
     var data = [];
diff --git a/dist/js/select2.full.js b/dist/js/select2.full.js
index 0565aa39..8ab296bc 100644
--- a/dist/js/select2.full.js
+++ b/dist/js/select2.full.js
@@ -9673,17 +9673,38 @@ define('select2/utils',[], function () {
   return Utils;
 });
 
+define('select2/data/base',[
+  '../utils'
+], function (Utils) {
+  function BaseAdapter ($element, options) {
+    BaseAdapter.__super__.constructor.call(this);
+  }
+
+  Utils.Extend(BaseAdapter, Utils.Observable);
+
+  BaseAdapter.prototype.current = function (callback) {
+    throw new Error("The `current` method must be defined in child classes.");
+  }
+
+  BaseAdapter.prototype.query = function (params, callback) {
+    throw new Error("The `query` method must be defined in child classes.");
+  }
+
+  return BaseAdapter;
+});
+
 define('select2/data/select',[
+  './base',
   '../utils',
   'jquery'
-], function (Utils, $) {
+], function (BaseAdapter, Utils, $) {
   function SelectAdapter ($element, options) {
     this.$element = $element;
 
     SelectAdapter.__super__.constructor.call(this);
   }
 
-  Utils.Extend(SelectAdapter, Utils.Observable);
+  Utils.Extend(SelectAdapter, BaseAdapter);
 
   SelectAdapter.prototype.current = function (callback) {
     var data = [];
diff --git a/dist/js/select2.js b/dist/js/select2.js
index 0d8af4d3..7bff98ee 100644
--- a/dist/js/select2.js
+++ b/dist/js/select2.js
@@ -564,17 +564,38 @@ define('select2/utils',[], function () {
   return Utils;
 });
 
+define('select2/data/base',[
+  '../utils'
+], function (Utils) {
+  function BaseAdapter ($element, options) {
+    BaseAdapter.__super__.constructor.call(this);
+  }
+
+  Utils.Extend(BaseAdapter, Utils.Observable);
+
+  BaseAdapter.prototype.current = function (callback) {
+    throw new Error("The `current` method must be defined in child classes.");
+  }
+
+  BaseAdapter.prototype.query = function (params, callback) {
+    throw new Error("The `query` method must be defined in child classes.");
+  }
+
+  return BaseAdapter;
+});
+
 define('select2/data/select',[
+  './base',
   '../utils',
   'jquery'
-], function (Utils, $) {
+], function (BaseAdapter, Utils, $) {
   function SelectAdapter ($element, options) {
     this.$element = $element;
 
     SelectAdapter.__super__.constructor.call(this);
   }
 
-  Utils.Extend(SelectAdapter, Utils.Observable);
+  Utils.Extend(SelectAdapter, BaseAdapter);
 
   SelectAdapter.prototype.current = function (callback) {
     var data = [];
diff --git a/src/js/select2/data/base.js b/src/js/select2/data/base.js
new file mode 100644
index 00000000..a64298bc
--- /dev/null
+++ b/src/js/select2/data/base.js
@@ -0,0 +1,19 @@
+define([
+  '../utils'
+], function (Utils) {
+  function BaseAdapter ($element, options) {
+    BaseAdapter.__super__.constructor.call(this);
+  }
+
+  Utils.Extend(BaseAdapter, Utils.Observable);
+
+  BaseAdapter.prototype.current = function (callback) {
+    throw new Error("The `current` method must be defined in child classes.");
+  }
+
+  BaseAdapter.prototype.query = function (params, callback) {
+    throw new Error("The `query` method must be defined in child classes.");
+  }
+
+  return BaseAdapter;
+});
diff --git a/src/js/select2/data/select.js b/src/js/select2/data/select.js
index a89697f1..6772f536 100644
--- a/src/js/select2/data/select.js
+++ b/src/js/select2/data/select.js
@@ -1,14 +1,15 @@
 define([
+  './base',
   '../utils',
   'jquery'
-], function (Utils, $) {
+], function (BaseAdapter, Utils, $) {
   function SelectAdapter ($element, options) {
     this.$element = $element;
 
     SelectAdapter.__super__.constructor.call(this);
   }
 
-  Utils.Extend(SelectAdapter, Utils.Observable);
+  Utils.Extend(SelectAdapter, BaseAdapter);
 
   SelectAdapter.prototype.current = function (callback) {
     var data = [];
diff --git a/tests/data/base-tests.js b/tests/data/base-tests.js
new file mode 100644
index 00000000..31d3cecd
--- /dev/null
+++ b/tests/data/base-tests.js
@@ -0,0 +1,29 @@
+module("Data adapters - Base")
+
+var BaseData = require("select2/data/base");
+var $ = require("jquery");
+var Options = require("select2/options");
+
+var options = new Options({});
+
+test("current is required", function (assert) {
+  var data = new BaseData($("#qunit-fixture select"), options);
+
+  assert.throws(
+    function () {
+      data.current(function () {});
+    },
+    "current has no default implementation"
+  )
+});
+
+test("query is required", function (assert) {
+  var data = new BaseData($("#qunit-fixture select"), options);
+
+  assert.throws(
+    function () {
+      data.query({}, function () {});
+    },
+    "query has no default implementation"
+  );
+});
diff --git a/tests/data/base.html b/tests/data/base.html
new file mode 100644
index 00000000..17dcbbe3
--- /dev/null
+++ b/tests/data/base.html
@@ -0,0 +1,20 @@
+<!doctype html>
+<html>
+  <head>
+    <link rel="stylesheet" href="../vendor/qunit-1.14.0.css" type="text/css" />
+    <link rel="stylesheet" href="../../dist/css/select2.css" type="text/css" />
+  </head>
+  <body>
+    <div id="qunit"></div>
+    <div id="qunit-fixture">
+      <select></select>
+    </div>
+
+    <script src="../vendor/qunit-1.14.0.js" type="text/javascript"></script>
+    <script src="../../vendor/almond-0.2.9.js" type="text/javascript"></script>
+    <script src="../../vendor/jquery-2.1.0.js" type="text/javascript"></script>
+    <script src="../../dist/js/select2.amd.js" type="text/javascript"></script>
+
+    <script src="base-tests.js" type="text/javascript"></script>
+  </body>
+</html>