Merge branch 'master' of https://github.com/FieldDB/FieldDBWebServer

Author: fieldlinguist

app/components/App/index.jsx

@@ -4,8 +4,8 @@ import Helmet from 'react-helmet'
 import Q from 'q'
 import React, { Component } from 'react'
 
-FieldDBObject.todo = function () {};
-FieldDBObject.warn = function () {};
+FieldDBObject.todo = function () {}
+FieldDBObject.warn = function () {}
 FieldDBObject.confirm = function (message, optionalLocale) {
   const deferred = Q.defer()
   console.warn('Not confirming: ', message)

app/components/CorpusMask/CorpusMaskContainer.test.js

@@ -21,7 +21,7 @@ describe('Container::CorpusMask', function () {
       },
       children: [], // To avoid rendering the Search component
       corpusMask: Immutable.fromJS({
-        dbname: 222,
+        dbname: 'abc',
         title: 'the-corpusMask-title',
         team: {
           id: 1234,
@@ -30,6 +30,9 @@ describe('Container::CorpusMask', function () {
         fields: [],
         prototypeApp: {
           url: ''
+        },
+        connection: {
+          dbname: 'abc'
         }
       }),
       searchResults: Immutable.fromJS([])
@@ -42,6 +45,13 @@ describe('Container::CorpusMask', function () {
     })
 
     expect(doc).to.have.keys(['component', 'root', 'node', 'nodes', 'length', 'options', 'complexSelector'])
+
+    const images = doc.find('img')
+    expect(images).to.exist
+    expect(images.length).to.equal(2)
+
+    const avatar = images.nodes[0]
+    expect(avatar.getAttribute('src')).to.equal('https://secure.gravatar.com/avatar/900150983cd24fb0d6963f7d28e17f72.jpg?s=96&d=retro&r=pg')
   })
 
   it('should support OLAC metadata in header', function () {
@@ -52,16 +62,19 @@ describe('Container::CorpusMask', function () {
         teamname: 'someone'
       },
       corpusMask: Immutable.fromJS({
-        dbname: 222,
+        dbname: 'abc',
         title: 'the-corpusMask-title',
+        connection: {
+          dbname: 'abc'
+        },
         description: 'hi \n* a \n* list',
         dateCreated: 1411424261782,
         dateModified: 1490462360903,
         keywords: 'kartuli, batumi, natural speech',
         copyright: 'Georgian Together Users',
         termsOfUse: 'any \nterms',
         team: {
-          id: 1234,
+          id: '123-efg',
           name: 'jack'
         },
         fields: [{
@@ -129,7 +142,10 @@ describe('Container::CorpusMask', function () {
         teamname: 'someone'
       },
       corpusMask: Immutable.fromJS({
-        dbname: 222,
+        dbname: 'abc',
+        connection: {
+          dbname: 'abc'
+        },
         title: 'the-corpusMask-title',
         description: 'hi \n* a \n* list',
         termsOfUse: 'some \nterms',

app/components/CorpusMask/index.jsx

@@ -42,7 +42,8 @@ class CorpusMaskContainer extends Component {
     })
   }
   render () {
-    let {corpusMask} = this.props
+    let { corpusMask } = this.props
+    const fielddbCorpusMask = new CorpusMask(corpusMask.toJS())
 
     if (!corpusMask || !corpusMask.get('team')) {
       return (
@@ -160,7 +161,7 @@ class CorpusMaskContainer extends Component {
                 <h1 className='media-heading'>{corpusMask.get('title')}</h1>
                 <div className='media'>
                   <a href={`${corpusMask.get('prototypeApp').get('url')}/prototype/_design/prototype/user.html#login/${corpusMask.get('dbname')}`} className='pull-right'>
-                    <img src={'https://secure.gravatar.com/avatar/' + corpusMask.getIn(['connection', 'gravatar']) + '.jpg?s=96&d=retro&r=pg'} alt='Corpus image' className='media-object' />
+                    <img src={'https://secure.gravatar.com/avatar/' + fielddbCorpusMask.connection.gravatar + '.jpg?s=96&d=retro&r=pg'} alt='Corpus image' className='media-object' />
                   </a>
                   <div className='media-body'>
                     <div className='description' dangerouslySetInnerHTML={{

bower.json

@@ -22,6 +22,6 @@
     "tests"
   ],
   "dependencies": {
-    "fielddb": "^5.5.29"
+    "fielddb": "5.121.19-rc0"
   }
 }

lib/corpus.js

@@ -41,9 +41,10 @@ var getCorpusMask = function(dbname, next) {
     corpusMask.team.corpus = corpusMask;
     corpusMask.connection = corpusMask.connection || {};
     corpusMask.team.fetch(config.corpus.url + "/" + validateIdentifier.identifier).then(function() {
-      // console.log(new Date() + " owners's gravatar in this database " + corpusMask.team.gravatar, corpusMask.startYear);
-      // console.log(new Date() + " corpus connection's gravatar in this database " + corpusMask.connection.gravatar);
-      // console.log(new Date() + "  TODO consider saving corpus.json with the team inside.");
+      // Must prime the gravatar:
+      // corpusMask.debug(new Date() + " owners's gravatar in this database " + corpusMask.team.gravatar, corpusMask.startYear);
+      // corpusMask.debug(new Date() + " corpus connection's gravatar in this database " + corpusMask.connection.gravatar);
+      // corpusMask.debug(new Date() + "  TODO consider saving corpus.json with the team inside.");
       deferred.resolve(corpusMask);
     }, function(err) {
       console.log(new Date() + "error fetching corpus team", err);

lib/user.js

@@ -73,8 +73,8 @@ var getUserMask = function getUserMask(username, next) {
         connection: corpusConnection
       });
       promises.push(corpusMask.fetch(config.corpus.url + "/" + corpusConnection.dbname).then(function() {
-        // Must prime the gravatar
-        // console.log(new Date() + " Using connection from the corpus mask details", corpusMask.connection.owner, corpusMask.connection.gravatar);
+        // Must prime the gravatar:
+        corpusMask.debug(new Date() + " Using connection from the corpus mask details", corpusMask.connection.owner, corpusMask.connection.gravatar);
         corpusMask.connection.title = corpusMask.connection.title;
         corpusMask.connection.description = corpusMask.connection.description;
         if (!corpusMask.connection.websiteUrl || corpusMask.connection.websiteUrl === config.public.url || corpusMask.connection.websiteUrl.indexOf("lingsync.org") === corpusMask.connection.websiteUrl.length - 12) {
@@ -90,7 +90,7 @@ var getUserMask = function getUserMask(username, next) {
     });
 
     // console.log(new Date() + " Waiting for " + promises.length + " to download details");
-    Q.allSettled(promises).done(function(results) {
+    Q.allSettled(promises).done(function() {
       // console.log(new Date() + " TODO Consider saving in the user to avoid making requests again ", results.length);
       // console.log(new Date() + " userPrivate.userMask.corpora.titles ", userPrivate.userMask.corpora.map(function(mask) {
       //   return mask.title;

package.json

@@ -39,7 +39,7 @@
     "consolidate": "^0.13.1",
     "debug": "^2.6.3",
     "express": "^4.13.3",
-    "fielddb": "https://github.com/FieldDB/FieldDB.git",
+    "fielddb": "^5.168.13-rc0",
     "forever": "^0.15.1",
     "handlebars": "^4.0.2",
     "history": "^1.17.0",
@@ -66,7 +66,7 @@
     "fielddb-web": "./bin/fielddb-web-server"
   },
   "engines": {
-    "node": "~4.0 || ^6.0"
+    "node": "^4.0 || ^6.0"
   },
   "scripts": {
     "build": "npm run webpack && gulp build",
@@ -76,7 +76,7 @@
     "lint:es6": "eslint --fix --ext .jsx --ext .js app bin",
     "start": "./bin/fielddb-web-server",
     "start:watch": "NODE_PATH=./app concurrently --kill-others \"nodemon ./bin/fielddb-web-server\" \"node webpack.server.js\" \"gulp css:watch\"",
-    "start:production": "NODE_ENV=production PORT=8000 API_BASE_URL=http://localhost:8000 NODE_PATH=./app node app/server",
+    "start:production": "NODE_ENV=production PORT=8000 API_BASE_URL=http://localhost:8000 NODE_PATH=./app node bin/fielddb-web-server",
     "test": "NODE_ENV=test mocha test/**/*-spec.js",
     "test:ci": "NODE_ENV=test NODE_PATH=./app mocha --compilers js:babel-register -r app/spec/support/setup.mocha.js --recursive 'app/**/*.test.js'",
     "test:site": "node test/integration/links.js",

public/components/fielddb/.bower.json

@@ -1,6 +1,6 @@
 {
   "name": "fielddb",
-  "version": "5.5.29",
+  "version": "5.121.19-rc0",
   "homepage": "http://fielddb.github.io/FieldDB/",
   "bugs": {
     "url": "https://github.com/FieldDB/FieldDB/issues"
@@ -68,13 +68,13 @@
   "dependencies": {},
   "main": "fielddb.js",
   "devDependencies": {},
-  "_release": "5.5.29",
+  "_release": "5.121.19-rc0",
   "_resolution": {
     "type": "version",
-    "tag": "v5.5.29",
-    "commit": "6d248da3ef96a0faa7b64cee550a14a167db6f7b"
+    "tag": "v5.121.19-rc0",
+    "commit": "be23290812ef88c0648186517a0e66ca246c2c98"
   },
   "_source": "https://github.com/OpenSourceFieldlinguistics/bower-fielddb.git",
-  "_target": "^5.5.29",
+  "_target": "5.121.19-rc0",
   "_originalSource": "fielddb"
 }

public/components/fielddb/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "fielddb",
-  "version": "5.5.29",
+  "version": "5.121.19-rc0",
   "homepage": "http://fielddb.github.io/FieldDB/",
   "bugs": {
     "url": "https://github.com/FieldDB/FieldDB/issues"