rename mapFromRest to createFromRest, add BC layer to DataStore

marmelab · Jul 7, 2015 · 4e6209e · 4e6209e
1 parent 4203270
commit 4e6209e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/lib/DataStore/DataStore.js b/lib/DataStore/DataStore.js
@@ -51,6 +51,20 @@ class DataStore {
         return collection;
     }
 
+    /**
+     * Map a JS object from the REST API Response to an Entry
+     *
+     * @deprecated use Entry.createFromRest() instead
+     */
+    mapEntry(entityName, identifier, fields, restEntry) {
+        console.log('DataStore.mapEntry() is deprecated, please use Entry.createFromRest() instead');
+        return new Entry.createFromRest(restEntry, fields, entityName, identifier.name());
+    }
+
+    mapEntries(entityName, identifier, fields, restEntries) {
+        return restEntries.map(e => this.mapEntry(e, fields, entityName, identifier.name()));
+    }
+
     fillReferencesValuesFromEntry(entry, referencedValues, fillSimpleReference) {
         for (let referenceField in referencedValues) {
             let reference = referencedValues[referenceField],

diff --git a/lib/Entry.js b/lib/Entry.js
@@ -31,7 +31,7 @@ class Entry {
      *
      * @return {Entry}
      */
-    static mapFromRest(restEntry, fields, entityName, identifierName) {
+    static createFromRest(restEntry, fields, entityName, identifierName) {
         if (!restEntry || Object.keys(restEntry).length == 0) {
             return Entry.createForFields(fields, entityName);
         }

diff --git a/lib/View/View.js b/lib/View/View.js
@@ -265,7 +265,7 @@ class View {
      * Map a JS object from the REST API Response to an Entry
      */
     mapEntry(restEntry) {
-        return Entry.mapFromRest(restEntry, this._fields, this.entity.name(), this.entity.identifier().name());
+        return Entry.createFromRest(restEntry, this._fields, this.entity.name(), this.entity.identifier().name());
     }
 
     mapEntries(restEntries) {

diff --git a/tests/lib/EntryTest.js b/tests/lib/EntryTest.js
@@ -7,7 +7,7 @@ import ReferenceManyField from "../../lib/Field/ReferenceManyField";
 
 describe('Entry', function() {
 
-    describe('mapFromRest()', function() {
+    describe('createFromRest()', function() {
         var entity, fields;
 
         beforeEach(function() {
@@ -20,13 +20,13 @@ describe('Entry', function() {
 
         it('should return entry with no value if REST entry is empty', function() {
             var view = entity.listView();
-            var mappedEntry = Entry.mapFromRest({}, view.getFields(), entity.name(), view.identifier().name());
+            var mappedEntry = Entry.createFromRest({}, view.getFields(), entity.name(), view.identifier().name());
             assert.deepEqual({}, mappedEntry.values);
         });
 
         it('should map each value to related field if existing', function() {
             var view = entity.listView();
-            var mappedEntry = Entry.mapFromRest({
+            var mappedEntry = Entry.createFromRest({
                 id: 1,
                 title: 'ng-admin + ES6 = pure awesomeness!',
                 body: 'Really, it rocks!',
@@ -43,7 +43,7 @@ describe('Entry', function() {
 
         it('should set as identifierValue value for identifier field', function() {
             var view = entity.listView();
-            var mappedEntry = Entry.mapFromRest({ id: 1 }, view.getFields(), entity.name(), view.identifier().name());
+            var mappedEntry = Entry.createFromRest({ id: 1 }, view.getFields(), entity.name(), view.identifier().name());
             assert.equal(1, mappedEntry.identifierValue);
         });
     });