Page MenuHomeSealhub
Files F8922129

No OneTemporary
Actions

View Options

diff --git a/lib/base-chips/_base-chips.js b/lib/base-chips/_base-chips.js
index 85723cf0..ace77670 100644
--- a/lib/base-chips/_base-chips.js
+++ b/lib/base-chips/_base-chips.js
@@ -1,28 +1,27 @@
/*
var fs = require("fs");
var path = require("path");
fs.readdirSync(__dirname).forEach(function(filename){
if(filename[0]!="_"){
require("./" + filename);
}
})
*/
-require("./datastore.mongo.js");
require("./access_strategy.id_starts_with_digit.js");
require("./access_strategy.noone.js");
require("./access_strategy.public.js");
require("./field_type.date.js");
require("./field_type.datetime.js");
require("./field_type.email.js");
require("./field_type.file.js");
require("./field_type.float.js");
require("./field_type.int.js");
require("./field_type.reference.js");
require("./field_type.text.js");
require("./field_type.boolean.js");
require("./resource_type.user.js");
diff --git a/lib/base-chips/datastore.mongo.js b/lib/base-chips/datastore.mongo.js
deleted file mode 100644
index 90eb0139..00000000
--- a/lib/base-chips/datastore.mongo.js
+++ /dev/null
@@ -1,139 +0,0 @@
-var Sealious = require("../main.js");
-var Promise = require("bluebird");
-var path = require("path");
-var fs = require("fs");
-var mongodb = null;
-var TingoDB = null;
-
-var db = null;
-
-var datastore_mongo = new Sealious.ChipTypes.Datastore("mongo");
-
-Sealious.ConfigManager.set_default_config(
- "datastore_mongo",
- {
- embedded: false,
- host: 'localhost',
- port: 27017,
- db_name: 'sealious'
- }
-);
-
-
-datastore_mongo.start = function(){
- var config = Sealious.ConfigManager.get_config("datastore_mongo");
-
- if(config.embedded){
- TingoDB = require('tingodb')();
-
- var storage_path = path.resolve("./db");
-
- try{
- var stats = fs.lstatSync(storage_path);
- }catch(error){
- //the dir does not exist
- fs.mkdirSync(storage_path);
- }
-
- db = new TingoDB.Db('./db', {});
- console.log("Statring datastoremongo");
- return Promise.resolve();
- }else{
- mongodb = require("mongodb")
- var mongo_client = new mongodb.MongoClient(new mongodb.Server(config.host, config.port));
- return new Promise(function(resolve, reject){
- mongo_client.open(function(err, mongoClient){
- db = mongoClient.db(config.db_name);
- resolve();
- });
- });
- }
-}
-
-function process_query(query){
- if(!query){
- return {};
- }
- var new_query = {};
- for(var attribute_name in query){
- if(attribute_name=="sealious_id"){
- new_query[attribute_name] = query[attribute_name];
- }else{
- if(query[attribute_name] instanceof Object){
- for(var i in query[attribute_name]){
- new_query[attribute_name + "." + i] = query[attribute_name][i];
- }
- }else{
- new_query[attribute_name] = query[attribute_name];
- }
- }
- }
- return new_query;
-}
-
-datastore_mongo.find = function(collection_name, query, options, output_options){
- query = process_query(query);
- options = options || {};
- output_options = output_options || {};
- return new Promise(function(resolve, reject){
- var cursor = db.collection(collection_name).find(query, options);
- if (output_options.sort) {
- cursor.sort(output_options.sort);
- }
- if (output_options.skip) {
- cursor.skip(output_options.skip);
- }
- if (output_options.amount) {
- cursor.limit(output_options.amount);
- }
- cursor.toArray(function(err, val) {
- if (err) {
- reject(err)
- } else {
- resolve(val);
- }
- })
- })
-}
-
-datastore_mongo.insert = function(collection_name, to_insert, options){
- return new Promise(function(resolve, reject){
- db.collection(collection_name).insert(to_insert, options, function(err, inserted){
- if (err) {
- reject(err);
- } else {
- resolve(inserted[0]);
- }
- })
- })
-}
-
-datastore_mongo.update = function(collection_name, query, new_value){
- query = process_query(query);
- return new Promise(function(resolve, reject){
- db.collection(collection_name).update(query, new_value, function(err, WriteResult) {
- if (err) {
- reject(err);
- } else {
- resolve(WriteResult);
- }
- })
- })
-}
-
-datastore_mongo.remove = function(collection_name, query, just_one){
- query = process_query(query);
- return new Promise(function(resolve, reject){
- if(just_one===undefined){
- just_one=0;
- }
- just_one = just_one? 1 : 0;
- db.collection(collection_name).remove(query, just_one, function(err, delete_response) {
- if (err) {
- reject(err);
- } else {
- resolve(delete_response);
- }
- })
- })
-}
diff --git a/package.json b/package.json
index a2a26b6c..2ac940b1 100644
--- a/package.json
+++ b/package.json
@@ -1,63 +1,63 @@
{
"name": "sealious",
"homepage": "http://sealious.github.io/",
"version": "0.5.2",
"description": "",
"main": "./lib/main.js",
"scripts": {
"prepublish": "require-self",
- "test": "./node_modules/mocha/bin/mocha --delay ./tests/test.js",
+ "test": "mocha --delay .\\tests\\test.js",
"test-coverage": "./node_modules/mocha/bin/mocha -R html-cov --delay ./tests/test.js >> coverage.html && xdg-open coverage.html",
"test-no-blanket": "mocha --delay ./tests/test.js"
},
"repository": {
"type": "git",
"url": "https://github.com/Sealious/Sealious/"
},
"keywords": [
"sealious"
],
"author": "Kuba Orlik",
"license": "BSD-2-Clause",
"bugs": {
"url": "https://github.com/Sealious/Sealious/issues"
},
"dependencies": {
"Set": "~0.4.1",
"bluebird": "~2.9.9",
"clone": "^1.0.2",
"fs": "0.0.2",
"fs-extra": "^0.18.2",
"hapi": "^8.5.0",
"immutable": "^3.7.2",
"merge": "^1.2.0",
"path": "^0.11.14",
"sanitize-html": "^1.6.1",
"sealious-datastore-tingo": "^0.1.1",
"sha1": "^1.1.0",
"socket.io": "~1.2.0",
"socket.io-client": "~1.2.0",
"uid": "0.0.2",
"winston": "^1.0.0"
},
"devDependencies": {
"blanket": "git://github.com/alex-seville/blanket.git",
"mocha": "*",
"mocha-multi": "^0.7.1",
"require-self": "^0.1.0",
"travis-cov ": "*"
},
"config": {
"blanket": {
"pattern": "lib",
"data-cover-never": [
"node_modules",
"public"
],
"data-cover-reporter-options": {
"shortnames": false,
"relativepath": true
}
}
}
}

File Metadata

Mime Type
text/x-diff
Expires
Sat, Sep 20, 14:18 (1 d, 19 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
949265
Default Alt Text
(6 KB)

Event Timeline