Rename option drupap8 to version, overwrite model save method to PATCH is version is Drupal 8, Updated documentation and samples

Author: enzolutions

README.md

@@ -29,7 +29,7 @@ Check **test/index.html** for Drupal 8 example and **indexd7.html** for  Drupal
 
 Before to test in Drupal 8 be sure the REST Resource Content for methods Get, Post, Update , Delete and Patch has json as format and Basic Auth as Authentication method.
 
-You can the contributed module [Rest UI](https://www.drupal.org/project/restui) I recommend use the git version until Drupal 8 get his first official release.
+You can do this with the contributed module [Rest UI](https://www.drupal.org/project/restui) I recommend use the git version until Drupal 8 get his first official release.
 
 Your configuration must look similar to following image.
 
@@ -53,8 +53,9 @@ Your configuration must look similar to following image.
       $(function() {
         // Set API Information
         Backbone.Drupal.restEndpoint = {
-          root: 'http://onthisday/api',
-          dataType: '.json'
+          root: 'http://example.com', // Set Drupal Backend Server URL
+          version: 8
+          //dataType: '.json', // Only required in Drupal 7
         };
 
         // Define auth object, set crossDomain if is necessary

backbone.drupal.js

@@ -24,7 +24,7 @@ Backbone.Drupal.Auth = (function(Backbone, $, _){
 
     // Set defaults. These are the only attributes allowed.
     function defaults() {
-      return { crossDomain: false, drupal8: true };
+      return { crossDomain: false, version: 7, dataType: '' };
     }
 
     // Set attributes
@@ -53,7 +53,7 @@ Backbone.Drupal.Auth = (function(Backbone, $, _){
         var status = false;
         var restEndpoint = Backbone.Drupal.restEndpoint.root + (Backbone.Drupal.restEndpoint.root.charAt(Backbone.Drupal.restEndpoint.root.length - 1) === '/' ? '' : '/');
 
-        if(attributes.drupal8) {
+        if(attributes.version == 8) {
           // Prepare further calls to use Basic Auth againt drupal 8 and set a cookie
           var settings = {
             beforeSend: function (request) {
@@ -76,7 +76,7 @@ Backbone.Drupal.Auth = (function(Backbone, $, _){
 
           status=true;
         }
-        else if(attributes.drupal8 === false) {
+        else if(attributes.version != 8) {
           // Call user/login end point to get CSR token an use in following calls
           jQuery.ajax({
             async: false,
@@ -224,7 +224,7 @@ Backbone.Drupal.Models.Base = Backbone.Model.extend({
     if (this.isNew()) { return base; }
     var url_endpoint = base + (base.charAt(base.length - 1) === '/' ? '' : '/') + encodeURIComponent(this.get(this.idAttribute));
 
-    if(Backbone.Drupal.restEndpoint.drupal8 == false) {
+    if(Backbone.Drupal.restEndpoint.version != 8) {
       // Add .json for format here.
       url_endpoint = url_endpoint + urlBackbone.Drupal.restEndpoint.dataType;
     }

backbone.drupal.services.js

@@ -10,13 +10,19 @@
 Backbone.Drupal.Models.Node = Backbone.Drupal.Models.Base.extend({
   urlSource: "node",
   idAttribute: "nid",
-
   initialize: function(opts) {
     Backbone.Drupal.Models.Base.prototype.initialize.call(this, opts);
     // Set up common boolean fields for correct JSON format for services
     this.setToJSONProcessor('promote', this.toJSONBoolean);
   },
-
+  save: function(attrs, options) {
+    if(Backbone.Drupal.restEndpoint.version == 8) {
+      // If backend is Drupal 8 change save method to PATCH instead of PUT
+      options.patch = true;
+    }
+    // Proxy the call to the original save function
+    Backbone.Model.prototype.save.call(this, attrs, options);
+  },
   toJSON: function() {
     if(this.backform) {
       return Backbone.Drupal.Models.Base.prototype.toJSON.call(this);
@@ -59,7 +65,15 @@ Backbone.Drupal.Models.Node = Backbone.Drupal.Models.Base.extend({
 // * TODO: Add support for login and logout methods.
 Backbone.Drupal.Models.User = Backbone.Drupal.Models.Base.extend({
   urlSource: "user",
-  idAttribute: "uid"
+  idAttribute: "uid",
+  save: function(attrs, options) {
+    if(Backbone.Drupal.restEndpoint.version == 8) {
+      // If backend is Drupal 8 change save method to PATCH instead of PUT
+      options.patch = true;
+    }
+    // Proxy the call to the original save function
+    Backbone.Model.prototype.save.call(this, attrs, options);
+  },
 });
 
 // ### Backbone.Drupal.Comment
@@ -68,7 +82,14 @@ Backbone.Drupal.Models.User = Backbone.Drupal.Models.Base.extend({
 Backbone.Drupal.Models.Comment = Backbone.Drupal.Models.Base.extend({
   urlSource: "comment",
   idAttribute: "cid",
-
+  save: function(attrs, options) {
+    if(Backbone.Drupal.restEndpoint.version == 8) {
+      // If backend is Drupal 8 change save method to PATCH instead of PUT
+      options.patch = true;
+    }
+    // Proxy the call to the original save function
+    Backbone.Model.prototype.save.call(this, attrs, options);
+  },
   // Override toJSON function to nest all attributes in a { comment: ... } key
   // to make this work with the Services module implementation of comment PUSH/PUT.
   toJSON: function() {
@@ -101,7 +122,14 @@ Backbone.Drupal.Models.Comment = Backbone.Drupal.Models.Base.extend({
 Backbone.Drupal.Models.File = Backbone.Drupal.Models.Base.extend({
   urlSource: "file",
   idAttribute: "fid",
-
+  save: function(attrs, options) {
+    if(Backbone.Drupal.restEndpoint.version == 8) {
+      // If backend is Drupal 8 change save method to PATCH instead of PUT
+      options.patch = true;
+    }
+    // Proxy the call to the original save function
+    Backbone.Model.prototype.save.call(this, attrs, options);
+  },
   // Override toJSON function to nest all attributes in a { file: ... } key
   // to make this work with the Services module implementation of file PUSH/PUT.turn data;
   toJSON: function() {

bower.json

@@ -4,7 +4,7 @@
     "backbone.drupal.js",
     "backbone.drupal.services.js"
   ],
-  "version": "0.2.1-beta",
+  "version": "0.2.2-alpha",
   "homepage": "http://enzolutions.com/projects/backbone_drupal/",
   "author": {
     "name": "enzo - Eduardo Garcia",

test/index.html

@@ -15,7 +15,8 @@
       $(function() {
         // Set API Information
         Backbone.Drupal.restEndpoint = {
-          root: 'http://drupal8'
+          root: 'http://drupal8',
+          version: 8
         };
 
         // Set Backform Compatibility (amiliaapp.github.io/backform/index.html)

test/indexd7.html

@@ -19,7 +19,13 @@
           dataType: '.json'
         };
         // Define auth object, set crossDomain if is necessary
-        var Auth = new Backbone.Drupal.Auth({crossDomain: true, drupal8: false});
+        var Auth = new Backbone.Drupal.Auth(
+          {
+            crossDomain: true,
+            version: 7
+            dataType: '.json',
+          }
+        );
         // Request executed in sync mode
         // If status is token further ajax will use the proper token
         var status = Auth.login('admin', 'admin');