Remove trailing slashes from appropriate URLs

Rekord · Dec 7, 2015 · 4ef86b6 · 4ef86b6
1 parent 7522749
commit 4ef86b6
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 12 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "neurosync-jquery",
-  "version": "1.0.5",
+  "version": "1.1.1",
   "homepage": "https://github.com/ClickerMonkey/neurosync-jquery",
   "authors": [
     "Philip Diffenderfer <pdiffenderfer@gmail.com>"

diff --git a/build/neurosync-jquery.js b/build/neurosync-jquery.js
@@ -4,6 +4,11 @@
   Neuro.rest = function(database)
   {
 
+    function removeTrailingSlash(x)
+    {
+      return x.charAt(x.length - 1) === '/' ? x.substring(0, x.length - 1) : x;
+    }
+
     function execute( method, data, url, success, failure, offlineValue )
     {
       Neuro.debug( Neuro.Debugs.REST, this, method, url, data );
@@ -46,19 +51,19 @@
       },
       get: function( model, success, failure )
       {
-        execute( 'GET', undefined, database.api + model.$key(), success, failure );
+        execute( 'GET', undefined, removeTrailingSlash( database.api + model.$key() ), success, failure );
       },
       create: function( model, encoded, success, failure )
       {
-        execute( 'POST', encoded, database.api, success, failure, {} );
+        execute( 'POST', encoded, removeTrailingSlash( database.api ), success, failure, {} );
       },
       update: function( model, encoded, success, failure )
       {
-        execute( 'PUT', encoded, database.api + model.$key(), success, failure, {} );
+        execute( 'PUT', encoded, removeTrailingSlash( database.api + model.$key() ), success, failure, {} );
       },
       remove: function( model, success, failure )
       {
-        execute( 'DELETE', undefined, database.api + model.$key(), success, failure, {} );
+        execute( 'DELETE', undefined, removeTrailingSlash( database.api + model.$key() ), success, failure, {} );
       },
       query: function( query, success, failure )
       {

diff --git a/build/neurosync-jquery.min.js b/build/neurosync-jquery.min.js
diff --git a/build/neurosync-jquery.min.js.map b/build/neurosync-jquery.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "neurosync-jquery",
-  "version": "1.0.5",
+  "version": "1.1.1",
   "description": "A neurosync binding to jquery - implementing Neuro.rest",
   "author": "Philip Diffenderfer",
   "license": "MIT",

diff --git a/src/neurosync-jquery.js b/src/neurosync-jquery.js
@@ -4,6 +4,11 @@
   Neuro.rest = function(database)
   {
 
+    function removeTrailingSlash(x)
+    {
+      return x.charAt(x.length - 1) === '/' ? x.substring(0, x.length - 1) : x;
+    }
+
     function execute( method, data, url, success, failure, offlineValue )
     {
       Neuro.debug( Neuro.Debugs.REST, this, method, url, data );
@@ -46,19 +51,19 @@
       },
       get: function( model, success, failure )
       {
-        execute( 'GET', undefined, database.api + model.$key(), success, failure );
+        execute( 'GET', undefined, removeTrailingSlash( database.api + model.$key() ), success, failure );
       },
       create: function( model, encoded, success, failure )
       {
-        execute( 'POST', encoded, database.api, success, failure, {} );
+        execute( 'POST', encoded, removeTrailingSlash( database.api ), success, failure, {} );
       },
       update: function( model, encoded, success, failure )
       {
-        execute( 'PUT', encoded, database.api + model.$key(), success, failure, {} );
+        execute( 'PUT', encoded, removeTrailingSlash( database.api + model.$key() ), success, failure, {} );
       },
       remove: function( model, success, failure )
       {
-        execute( 'DELETE', undefined, database.api + model.$key(), success, failure, {} );
+        execute( 'DELETE', undefined, removeTrailingSlash( database.api + model.$key() ), success, failure, {} );
       },
       query: function( query, success, failure )
       {