diff --git a/.gitignore b/.gitignore index 2db30da..e920c16 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,33 @@ -.idea -.project -.DS_Store -*.sublime* -*.seed +# Logs +logs *.log -*.csv -*.dat -*.out +npm-debug.log* + +# Runtime data +pids *.pid -*.swp -*.swo +*.seed + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (http://nodejs.org/api/addons.html) +build/Release + +# Dependency directory node_modules -checkstyle.xml -loopback-connector-*.tgz + +# Optional npm cache directory +.npm + +# Optional REPL history +.node_repl_history diff --git a/.jshintignore b/.jshintignore deleted file mode 100644 index 25fbf5a..0000000 --- a/.jshintignore +++ /dev/null @@ -1,2 +0,0 @@ -node_modules/ -coverage/ diff --git a/.jshintrc b/.jshintrc deleted file mode 100644 index f9aa219..0000000 --- a/.jshintrc +++ /dev/null @@ -1,23 +0,0 @@ -{ - "node": true, - "browser": true, - "camelcase": true, - "eqnull": true, - "indent": 2, - "undef": true, - "unused": "vars", - "quotmark": "true", - "maxlen": 110, - "trailing": true, - "newcap": true, - "nonew": true, - "sub": true, - "globals": { - "describe": true, - "it": true, - "before": true, - "beforeEach": true, - "after": true, - "afterEach": true - } -} diff --git a/CHANGES.md b/CHANGES.md deleted file mode 100644 index 16589f1..0000000 --- a/CHANGES.md +++ /dev/null @@ -1,120 +0,0 @@ -2015-07-29, Version 2.3.0 -========================= - - * Fix RegExp coercion (Simon Ho) - - * Add support for RegExp operator (Simon Ho) - - * Add a test for nesting and/or (Raymond Feng) - - -2015-06-23, Version 2.2.2 -========================= - - * Enable Inversion of Control in connector hooks through modifications of the context object. (Frank Steegmans) - - -2015-05-27, Version 2.2.1 -========================= - - * Fix the callback (Raymond Feng) - - -2015-05-27, Version 2.2.0 -========================= - - * Update deps (Raymond Feng) - - * Add hooks to sql based connectors (Raymond Feng) - - -2015-05-22, Version 2.1.2 -========================= - - * Fix for https://github.com/strongloop/loopback-connector-mssql/issues/45 (Raymond Feng) - - * Fix the jsdoc for applyPagination (Raymond Feng) - - -2015-05-20, Version 2.1.1 -========================= - - * Fix for https://github.com/strongloop/loopback-connector-postgresql/issues/80 (Raymond Feng) - - -2015-05-18, Version 2.1.0 -========================= - - * Update sql-connector.md (Rand McKinney) - - * Add tests for propagating a transaction over relations (Raymond Feng) - - * Add transaction support (Raymond Feng) - - -2015-05-18, Version 2.0.1 -========================= - - * Replace with link to Confluence (Rand McKinney) - - * Update sql-connector.md (Rand McKinney) - - -2015-05-13, Version 2.0.0 -========================= - - * Upgrade deps (Raymond Feng) - - * Make sure invalid fields are filtered out (Raymond Feng) - - * Refactor base and sql connector (Raymond Feng) - - * Update README.md (Paulo McNally) - - -2015-01-28, Version 1.2.1 -========================= - - * package: add jshint to devDependencies (Miroslav Bajtoš) - - * Fix crash in `id(model, property)` (Miroslav Bajtoš) - - * Fix bad CLA URL in CONTRIBUTING.md (Ryan Graham) - - -2014-10-13, Version 1.2.0 -========================= - - * Bump version (Raymond Feng) - - * Make sure callback happens if a model is not attached to the data source (Raymond Feng) - - * Update contribution guidelines (Ryan Graham) - - -2014-07-20, Version 1.1.1 -========================= - - * Bump version (Raymond Feng) - - * Fix updateAttributes impl (Raymond Feng) - - -2014-06-20, Version 1.1.0 -========================= - - * Bump version (Raymond Feng) - - * Fix style to pass jlint (Raymond Feng) - - * Add space (Raymond Feng) - - * Add bulk update support (Raymond Feng) - - * Fix the count() impl to use buildWhere() from the subclass (Raymond Feng) - - -2014-06-03, Version 1.0.0 -========================= - - * First release! diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index fc953a7..0000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,151 +0,0 @@ -### Contributing ### - -Thank you for your interest in `loopback-connector`, an open source project -administered by StrongLoop. - -Contributing to `loopback-connector` is easy. In a few simple steps: - - * Ensure that your effort is aligned with the project's roadmap by - talking to the maintainers, especially if you are going to spend a - lot of time on it. - - * Make something better or fix a bug. - - * Adhere to code style outlined in the [Google C++ Style Guide][] and - [Google Javascript Style Guide][]. - - * Sign the [Contributor License Agreement](https://cla.strongloop.com/agreements/strongloop/loopback-connector) - - * Submit a pull request through Github. - - -### Contributor License Agreement ### - -``` - Individual Contributor License Agreement - - By signing this Individual Contributor License Agreement - ("Agreement"), and making a Contribution (as defined below) to - StrongLoop, Inc. ("StrongLoop"), You (as defined below) accept and - agree to the following terms and conditions for Your present and - future Contributions submitted to StrongLoop. Except for the license - granted in this Agreement to StrongLoop and recipients of software - distributed by StrongLoop, You reserve all right, title, and interest - in and to Your Contributions. - - 1. Definitions - - "You" or "Your" shall mean the copyright owner or the individual - authorized by the copyright owner that is entering into this - Agreement with StrongLoop. - - "Contribution" shall mean any original work of authorship, - including any modifications or additions to an existing work, that - is intentionally submitted by You to StrongLoop for inclusion in, - or documentation of, any of the products owned or managed by - StrongLoop ("Work"). For purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication - sent to StrongLoop or its representatives, including but not - limited to communication or electronic mailing lists, source code - control systems, and issue tracking systems that are managed by, - or on behalf of, StrongLoop for the purpose of discussing and - improving the Work, but excluding communication that is - conspicuously marked or otherwise designated in writing by You as - "Not a Contribution." - - 2. You Grant a Copyright License to StrongLoop - - Subject to the terms and conditions of this Agreement, You hereby - grant to StrongLoop and recipients of software distributed by - StrongLoop, a perpetual, worldwide, non-exclusive, no-charge, - royalty-free, irrevocable copyright license to reproduce, prepare - derivative works of, publicly display, publicly perform, - sublicense, and distribute Your Contributions and such derivative - works under any license and without any restrictions. - - 3. You Grant a Patent License to StrongLoop - - Subject to the terms and conditions of this Agreement, You hereby - grant to StrongLoop and to recipients of software distributed by - StrongLoop a perpetual, worldwide, non-exclusive, no-charge, - royalty-free, irrevocable (except as stated in this Section) - patent license to make, have made, use, offer to sell, sell, - import, and otherwise transfer the Work under any license and - without any restrictions. The patent license You grant to - StrongLoop under this Section applies only to those patent claims - licensable by You that are necessarily infringed by Your - Contributions(s) alone or by combination of Your Contributions(s) - with the Work to which such Contribution(s) was submitted. If any - entity institutes a patent litigation against You or any other - entity (including a cross-claim or counterclaim in a lawsuit) - alleging that Your Contribution, or the Work to which You have - contributed, constitutes direct or contributory patent - infringement, any patent licenses granted to that entity under - this Agreement for that Contribution or Work shall terminate as - of the date such litigation is filed. - - 4. You Have the Right to Grant Licenses to StrongLoop - - You represent that You are legally entitled to grant the licenses - in this Agreement. - - If Your employer(s) has rights to intellectual property that You - create, You represent that You have received permission to make - the Contributions on behalf of that employer, that Your employer - has waived such rights for Your Contributions, or that Your - employer has executed a separate Corporate Contributor License - Agreement with StrongLoop. - - 5. The Contributions Are Your Original Work - - You represent that each of Your Contributions are Your original - works of authorship (see Section 8 (Submissions on Behalf of - Others) for submission on behalf of others). You represent that to - Your knowledge, no other person claims, or has the right to claim, - any right in any intellectual property right related to Your - Contributions. - - You also represent that You are not legally obligated, whether by - entering into an agreement or otherwise, in any way that conflicts - with the terms of this Agreement. - - You represent that Your Contribution submissions include complete - details of any third-party license or other restriction (including, - but not limited to, related patents and trademarks) of which You - are personally aware and which are associated with any part of - Your Contributions. - - 6. You Don't Have an Obligation to Provide Support for Your Contributions - - You are not expected to provide support for Your Contributions, - except to the extent You desire to provide support. You may provide - support for free, for a fee, or not at all. - - 6. No Warranties or Conditions - - StrongLoop acknowledges that unless required by applicable law or - agreed to in writing, You provide Your Contributions on an "AS IS" - BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER - EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES - OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY, OR - FITNESS FOR A PARTICULAR PURPOSE. - - 7. Submission on Behalf of Others - - If You wish to submit work that is not Your original creation, You - may submit it to StrongLoop separately from any Contribution, - identifying the complete details of its source and of any license - or other restriction (including, but not limited to, related - patents, trademarks, and license agreements) of which You are - personally aware, and conspicuously marking the work as - "Submitted on Behalf of a Third-Party: [named here]". - - 8. Agree to Notify of Change of Circumstances - - You agree to notify StrongLoop of any facts or circumstances of - which You become aware that would make these representations - inaccurate in any respect. Email us at callback@strongloop.com. -``` - -[Google C++ Style Guide]: https://google-styleguide.googlecode.com/svn/trunk/cppguide.xml -[Google Javascript Style Guide]: https://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index 9ee149f..0000000 --- a/LICENSE.md +++ /dev/null @@ -1,9 +0,0 @@ -Copyright (c) 2013-2015 StrongLoop, Inc and other contributors. - -loopback-connector uses a dual license model. - -You may use this library under the terms of the [MIT License][], -or under the terms of the [StrongLoop Subscription Agreement][]. - -[MIT License]: http://opensource.org/licenses/MIT -[StrongLoop Subscription Agreement]: http://strongloop.com/license diff --git a/README.md b/README.md index 576b04f..7f34826 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,3 @@ -# LoopBack Connector - -LoopBack Connector is a set of building blocks simplifying implementation -of datasource-specific connectors like Oracle, MongoDB, REST. - -**For full documentation, see the official StrongLoop documentation**: - * [Data sources and connectors](http://docs.strongloop.com/display/public/LB/Database+connectors) - -## Installation - - npm install loopback-connector - -## Usage - -See [loopback-connector-mysql](https://github.com/strongloop/loopback-connector-mysql) -for an example of connector using this module. +# loopback-connector +Foundational components for LoopBack connectors. diff --git a/docs.json b/docs.json deleted file mode 100644 index 3ed5576..0000000 --- a/docs.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "content": [ - { - "title": "Build a SQL connector", - "depth": 2 - }, - "docs/sql-connector.md", - { - "title": "Base Connector", - "depth": 2 - }, - "lib/connector.js", - { - "title": "SQL Connector", - "depth": 2 - }, - "lib/sql.js", - "lib/parameterized-sql.js" - ], - "codeSectionDepth": 3 -} - diff --git a/docs/connector-architecture.png b/docs/connector-architecture.png deleted file mode 100644 index 3709668..0000000 Binary files a/docs/connector-architecture.png and /dev/null differ diff --git a/docs/crud-connector.png b/docs/crud-connector.png deleted file mode 100644 index d1e8581..0000000 Binary files a/docs/crud-connector.png and /dev/null differ diff --git a/docs/sql-connector.md b/docs/sql-connector.md deleted file mode 100644 index 5f40b94..0000000 --- a/docs/sql-connector.md +++ /dev/null @@ -1,7 +0,0 @@ -Use the loopback-connector module to build a LoopBack connector to back-end data sources -such as databases or web services. There are many existing connectors for the most popular data sources; see: -- [Database connectors](http://docs.strongloop.com/display/LB/Database+connectors) (for example, MongoDB, MySQL, Oracle). -- [Non-database connectors](http://docs.strongloop.com/display/LB/Non-database+connectors) (for example, REST, SOAP). - -To build a new data source connector that doesn't yet exist, please see [Building a connector for a relational database](http://docs.strongloop.com/display/LB/Building+a+connector+for+a+relational+database). - diff --git a/lib/connectors/memory.js b/lib/connectors/memory.js index d397644..29d947f 100644 --- a/lib/connectors/memory.js +++ b/lib/connectors/memory.js @@ -76,12 +76,12 @@ Memory.prototype.getCollection = function(model) { model = modelClass.settings.memory.collection || model; } return model; -} +}; Memory.prototype.initCollection = function(model) { this.collection(model, {}); this.collectionSeq(model, 1); -} +}; Memory.prototype.collection = function(model, val) { model = this.getCollection(model); diff --git a/package.json b/package.json index 9e59690..e707c22 100644 --- a/package.json +++ b/package.json @@ -1,31 +1,41 @@ { "name": "loopback-connector", "version": "2.3.0", - "description": "Building blocks for LoopBack connectors", - "keywords": [ - "StrongLoop", - "LoopBack", - "Connector" - ], - "repository": { - "type": "git", - "url": "https://github.com/strongloop/loopback-connector" - }, + "description": "Foundational components for LoopBack connectors.", "main": "index.js", - "scripts": { - "test": "mocha", - "posttest": "jshint ." - }, - "license": "MIT", "dependencies": { - "async": "^1.0.0", + "async": "^1.5.2", "bluebird": "^3.1.5", "debug": "^2.2.0", - "qs": "^6.0.2" + "loopback-model": "^1.0.0", + "loopback-model-persistence": "^1.0.0", + "qs": "^6.0.2", + "traverse": "^0.6.6" }, "devDependencies": { - "chai": "~2.3.0", - "jshint": "^2.7.0", - "mocha": "^2.2.5" - } + "chai": "^2.3.0", + "eslint": "^1.10.3", + "eslint-config-loopback": "^1.0.0", + "mocha": "^2.3.4", + "should": "^8.2.0" + }, + "scripts": { + "lint": "eslint .", + "test": "mocha", + "posttest": "npm run lint" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/strongloop/loopback-connector.git" + }, + "keywords": [ + "loopback", + "connector" + ], + "author": "StrongLoop ", + "license": "MIT", + "bugs": { + "url": "https://github.com/strongloop/loopback-connector/issues" + }, + "homepage": "https://github.com/strongloop/loopback-connector#readme" } diff --git a/test/spec_helper.js b/test/spec_helper.js index df3ac9d..2c86730 100644 --- a/test/spec_helper.js +++ b/test/spec_helper.js @@ -6,11 +6,11 @@ } */ -var group_name = false, EXT_EXP; +var groupName = false, EXT_EXP; function it(should, test_case) { check_external_exports(); - if (group_name) { - EXT_EXP[group_name][should] = test_case; + if (groupName) { + EXT_EXP[groupName][should] = test_case; } else { EXT_EXP[should] = test_case; } @@ -21,7 +21,7 @@ global.it = it; function context(name, tests) { check_external_exports(); EXT_EXP[name] = {}; - group_name = name; + groupName = name; tests({ before: function (f) { it('setUp', f); @@ -30,7 +30,7 @@ function context(name, tests) { it('tearDown', f); } }); - group_name = false; + groupName = false; } global.context = context;