Log system

packages/accounts/create/admin.js

@@ -47,7 +47,7 @@ if (Meteor.isClient) {
         orion.accounts.invitations.insert({ roles: roles, email: email }, function(error, result) {
           if (error) {
             alert(error.reason);
-            console.log(error);
+            orion.log.error(error);
           } else {
             Session.set('accounts.create.invitationId', result);
           }
@@ -69,7 +69,7 @@ if (Meteor.isClient) {
         Meteor.call('accountsCreateUser', options, function(error, result) {
           if (error) {
             alert(error.reason);
-            console.log(error);
+            orion.log.error(error);
           } else {
             RouterLayer.go('accounts.index');
           }
@@ -144,12 +144,12 @@ if (Meteor.isClient) {
       }, function(error, result) {
         if (error) {
           Session.set('registerWithInvitationError', error.reason);
-          console.log(error);
+          orion.log.error(error);
         } else {
           Meteor.loginWithPassword(email, password, function(error) {
             if (error) {
               Session.set('registerWithInvitationError', error.reason);
-              console.log(error);
+              orion.log.error(error);
             } else {
               RouterLayer.go('admin');
             }

packages/accounts/package.js

@@ -1,21 +1,21 @@
 Package.describe({
   name: 'orionjs:accounts',
   summary: 'Orion accounts mannager',
-  version: '1.4.2',
+  version: '1.4.3',
   git: 'https://github.com/orionjs/orion'
 });
 
 Package.onUse(function(api) {
   api.versionsFrom('1.0');
 
   api.use([
-    'orionjs:base@1.4.0',
-    'orionjs:attributes@1.4.0',
+    'orionjs:base@1.4.2',
+    'orionjs:attributes@1.4.1',
     'accounts-base',
     'accounts-password',
     'useraccounts:core@1.12.0',
-    'aldeed:simple-schema@1.3.2',
-    'matb33:collection-hooks@0.7.11',
+    'aldeed:simple-schema@1.3.3',
+    'matb33:collection-hooks@0.7.13',
     'meteorhacks:inject-initial@1.0.2',
     ]);
 

packages/attributes/attributes.js

@@ -18,18 +18,18 @@ orion.attribute = function(name, schema, options) {
   if (!_.has(orion.attributes, name)) {
     throw 'The attribute "' + name + '" does not exist';
   }
-  var schema = schema || {};
-  var options = options || {};
-  var attributeSchema = orion.attributes[name].getSchema.call(this, options);
+  var _schema = schema || {};
+  var _options = options || {};
+  var attributeSchema = orion.attributes[name].getSchema.call(this, _options);
   var override = {
     orionAttribute: name,
     autoform: {
       type: 'orion.' + name
     }
-  }
-  var attribute = orion.helpers.deepExtend(orion.helpers.deepExtend(schema, attributeSchema), override);
+  };
+  var attribute = orion.helpers.deepExtend(orion.helpers.deepExtend(_schema, attributeSchema), override);
   return attribute;
-}
+};
 
 /**
  * Returns proper tabular column for the attribute
@@ -52,12 +52,12 @@ orion.attributeColumn = function(name, key, title) {
         item: rowData,
         collection: collection,
         schema: schema,
-      }
+      };
       var template = ReactiveTemplates.get('attributePreview.' + name);
       Blaze.renderWithData(Template[template], data, cell);
     }
-  }
-}
+  };
+};
 
 /**
  * Helper function to use arrays of attributes (Ex: array of images)
@@ -73,7 +73,7 @@ orion.arrayOfAttribute = function(name, schema, options) {
   return orion.helpers.deepExtend(schema, {
     type: [subSchema]
   });
-}
+};
 
 /**
  * Creates a new attribute
@@ -112,4 +112,4 @@ orion.attributes.registerAttribute = function(name, attribute) {
       });
     });
   }
-}
+};

packages/attributes/created-at/created-at.js

@@ -8,9 +8,9 @@ orion.attributes.registerAttribute('createdAt', {
       },
       autoValue: function() {
         if (this.isInsert) {
-          return new Date;
+          return new Date();
         } else if (this.isUpsert) {
-          return {$setOnInsert: new Date};
+          return {$setOnInsert: new Date()};
         } else {
           this.unset();
         }
@@ -25,4 +25,4 @@ if (Meteor.isClient) {
       return this.value && moment(this.value).format('LLL');
     }
   });
-}
+}

packages/attributes/created-by/created-by.js

@@ -28,12 +28,12 @@ if (Meteor.isServer) {
 }
 if (Meteor.isClient) {
   ReactiveTemplates.onRendered('attributePreview.createdBy', function() {
-    this.subscribe('userProfileForCreatedByAttributeColumn', this.data.value)
+    this.subscribe('userProfileForCreatedByAttributeColumn', this.data.value);
   });
   ReactiveTemplates.helpers('attributePreview.createdBy', {
     name: function() {
-      var user = Meteor.users.findOne(this.value)
+      var user = Meteor.users.findOne(this.value);
       return user && user.profile.name;
     }
   });
-}
+}

packages/attributes/package.js

@@ -1,18 +1,18 @@
 Package.describe({
   name: 'orionjs:attributes',
   summary: 'Orion attributes',
-  version: '1.4.0',
+  version: '1.4.1',
   git: 'https://github.com/orionjs/orion'
 });
 
 Package.onUse(function(api) {
   api.versionsFrom('1.0');
 
   api.use([
-    'orionjs:base@1.4.0',
-    'aldeed:collection2@2.0.0',
+    'orionjs:base@1.4.2',
+    'aldeed:collection2@2.3.3',
     'aldeed:autoform@5.4.0',
-    'momentjs:moment@2.10.3'
+    'momentjs:moment@2.10.6'
     ]);
 
   api.imply([

packages/attributes/updated-at/updated-at.js

@@ -8,9 +8,9 @@ orion.attributes.registerAttribute('updatedAt', {
       },
       autoValue: function() {
         if (this.isUpdate || this.isInsert) {
-          return new Date;
+          return new Date();
         } else if (this.isUpsert) {
-          return {$setOnInsert: new Date};
+          return {$setOnInsert: new Date()};
         } else {
           this.unset();
         }
@@ -25,4 +25,4 @@ if (Meteor.isClient) {
       return this.value && moment(this.value).format('LLL');
     }
   });
-}
+}

packages/base/helpers.js

@@ -1,7 +1,7 @@
 /**
  * Orion Helpers
  */
-orion.helpers = {}
+orion.helpers = {};
 
 /**
  * Searchs a object with a givin string
@@ -48,5 +48,5 @@ orion.helpers.deepExtend = function(target, source) {
 orion.helpers.getTranslation = function(key) {
   return function() {
     return i18n(key);
-  }
-}
+  };
+};

packages/base/helpers_client.js

@@ -7,4 +7,4 @@ orion.helpers.getBase64Image = function(file, callback) {
     callback(e.target.result);
   };
   FR.readAsDataURL(file);
-} 
+};

packages/base/links.js

@@ -40,7 +40,7 @@ orion.links.add = function(options) {
     }
     self._collection.upsert({ identifier: options.identifier }, { $set: options });
   });
-}
+};
 
 orion.links.get = function() {
   var links = this._collection.find({ index: { $exists: true }, parent: { $exists: false } }, { sort: { index: 1 } }).fetch();
@@ -50,11 +50,11 @@ orion.links.get = function() {
     }
     return true;
   });
-}
+};
 
 orion.links.getLink = function(identifier) {
   return this._collection.findOne({ identifier: identifier });
-}
+};
 
 orion.links._collection.helpers({
   childs: function() {
@@ -70,8 +70,8 @@ orion.links._collection.helpers({
 
 Template.registerHelper('adminLinks', function() {
   return orion.links.get();
-})
+});
 
 Template.registerHelper('getAdminLink', function(identifier) {
   return orion.links.getLink(identifier);
-})
+});

packages/base/package.js

@@ -1,7 +1,7 @@
 Package.describe({
   name: 'orionjs:base',
   summary: 'Orion',
-  version: '1.4.1',
+  version: '1.4.2',
   git: 'https://github.com/orionjs/orion'
 });
 
@@ -16,7 +16,9 @@ Package.onUse(function(api) {
     'nicolaslopezj:roles@1.2.0',
     'nicolaslopezj:router-layer@0.0.8',
     'aldeed:simple-schema@1.3.3',
-    'orionjs:lang-en@1.4.0'
+    'orionjs:namespace@1.4.0',
+    'orionjs:lang-en@1.4.0',
+    'orionjs:logging@1.4.0'
     ]);
 
   api.imply([
@@ -30,7 +32,6 @@ Package.onUse(function(api) {
     ]);
 
   api.addFiles([
-    'init.js',
     'helpers.js',
     'home-route.js',
     'layouts.js',
@@ -39,7 +40,7 @@ Package.onUse(function(api) {
   api.addFiles([
     'helpers_client.js',
     'links.js'
-    ], 'client')
+  ], 'client');
 
   api.export('orion');
 });

packages/bootstrap/package.js

@@ -1,7 +1,7 @@
 Package.describe({
   name: 'orionjs:bootstrap',
   summary: 'A simple theme for orion',
-  version: '1.4.0',
+  version: '1.4.1',
   git: 'https://github.com/orionjs/orion'
 });
 
@@ -10,10 +10,10 @@ Package.onUse(function(api) {
 
   api.use([
     'meteor-platform',
-    'orionjs:core@1.4.0',
+    'orionjs:core@1.4.1',
     'less',
     'aldeed:autoform@5.4.0',
-    'aldeed:tabular@1.1.0',
+    'aldeed:tabular@1.2.0',
     'useraccounts:bootstrap@1.11.1'
     ]);
 

packages/bootstrap/views/collections/index.js

@@ -21,7 +21,7 @@ Template.orionBootstrapCollectionsIndex.onRendered(function() {
       Session.set('orionBootstrapCollectionsIndex_showTable', true);
     });
   });
-})
+});
 
 Template.orionBootstrapCollectionsIndex.helpers({
   showTable: function () {

packages/bootstrap/views/config/update.js

@@ -10,7 +10,7 @@ Template.orionBootstrapConfigUpdate.helpers({
         class: function() {
           return Session.get('configUpdateCurrentCategory') == category ? 'btn-default disabled': 'btn-primary';
         }
-      }
+      };
     });
   }
-});
+});

packages/bootstrap/views/dictionary/update.js

@@ -10,7 +10,7 @@ Template.orionBootstrapDictionaryUpdate.helpers({
         class: function() {
           return Session.get('dictionaryUpdateCurrentCategory') == category ? 'btn-default disabled': 'btn-primary';
         }
-      }
+      };
     });
   }
-});
+});

packages/bootstrap/views/sidebar/sidebar.js

@@ -1,6 +1,6 @@
 Template.orionBootstrapSidebar.onRendered(function() {
   this.autorun(function() {
     var depend = orion.links._collection.find().fetch();
-    $('.orion-links a[data-toggle="collapse"]').collapse()
-  })
-})
+    $('.orion-links a[data-toggle="collapse"]').collapse();
+  });
+});

packages/collections/collections_client.js

@@ -17,12 +17,12 @@ orion.collections.onCreated(function() {
   var getCollection = function() {
     var collection = null;
     try {
-      collection = orion.collections.list[RouterLayer.getPath().split('/')[2]]
+      collection = orion.collections.list[RouterLayer.getPath().split('/')[2]];
     } catch (e) {
-      console.log('Error getting collection', e);
+      orion.log.error('Error getting collection', e);
     }
     return collection;
-  }
+  };
 
   ReactiveTemplates.helpers('collections.' + self.name + '.index', {
     collection: function() {
@@ -45,7 +45,7 @@ orion.collections.onCreated(function() {
 
   ReactiveTemplates.helpers('collections.' + self.name + '.update', {
     collection: function() {
-      return getCollection()
+      return getCollection();
     },
     item: function() {
       return getCollection().findOne(RouterLayer.getParam('_id'));
@@ -73,7 +73,7 @@ orion.collections.onCreated(function() {
       var objectId = RouterLayer.getParam('_id');
       self.remove(objectId, function(error, result) {
         if (error) {
-          console.warn('Error while deleting', objectId, 'in collection', getCollection().name, ':', error);
+          orion.log.warn('Error while deleting', objectId, 'in collection', getCollection().name, ':', error);
         }
         // Only go back to index in case the deletion has been properly achieved
         if (result === 1) {
@@ -82,4 +82,4 @@ orion.collections.onCreated(function() {
       });
     }
   });
-})
+});