Merge pull request rails#346 from rails/camel-case

Change snake_case usage to camelCase

Author: rafaelfranca

src/rails.js

@@ -161,18 +161,18 @@
       var href = rails.href(link),
         method = link.data('method'),
         target = link.attr('target'),
-        csrf_token = $('meta[name=csrf-token]').attr('content'),
-        csrf_param = $('meta[name=csrf-param]').attr('content'),
+        csrfToken = $('meta[name=csrf-token]').attr('content'),
+        csrfParam = $('meta[name=csrf-param]').attr('content'),
         form = $('<form method="post" action="' + href + '"></form>'),
-        metadata_input = '<input name="_method" value="' + method + '" type="hidden" />';
+        metadataInput = '<input name="_method" value="' + method + '" type="hidden" />';
 
-      if (csrf_param !== undefined && csrf_token !== undefined) {
-        metadata_input += '<input name="' + csrf_param + '" value="' + csrf_token + '" type="hidden" />';
+      if (csrfParam !== undefined && csrfToken !== undefined) {
+        metadataInput += '<input name="' + csrfParam + '" value="' + csrfToken + '" type="hidden" />';
       }
 
       if (target) { form.attr('target', target); }
 
-      form.hide().append(metadata_input).appendTo('body');
+      form.hide().append(metadataInput).appendTo('body');
       form.submit();
     },
 
@@ -385,9 +385,9 @@
 
     $(function(){
       // making sure that all forms have actual up-to-date token(cached forms contain old one)
-      var csrf_token = $('meta[name=csrf-token]').attr('content');
-      var csrf_param = $('meta[name=csrf-param]').attr('content');
-      $('form input[name="' + csrf_param + '"]').val(csrf_token);
+      var csrfToken = $('meta[name=csrf-token]').attr('content');
+      var csrfParam = $('meta[name=csrf-param]').attr('content');
+      $('form input[name="' + csrfParam + '"]').val(csrfToken);
     });
   }
 

test/public/test/call-remote-callbacks.js

@@ -53,7 +53,7 @@ asyncTest('modifying data("type") with "ajax:before" requests new dataType in re
   $('form[data-remote]').data('type','html')
     .bind('ajax:before', function() {
       var form = $(this);
-      form.data('type','xml')
+      form.data('type','xml');
     });
 
   submit(function(form) {
@@ -67,7 +67,7 @@ asyncTest('setting data("cross-domain",true) with "ajax:before" uses new setting
   $('form[data-remote]').data('cross-domain',false)
     .bind('ajax:before', function() {
       var form = $(this);
-      form.data('cross-domain',true)
+      form.data('cross-domain',true);
     });
 
   submit(function(form) {
@@ -94,7 +94,7 @@ asyncTest('setting data("with-credentials",true) with "ajax:before" uses new set
 asyncTest('stopping the "ajax:beforeSend" event aborts the request', 1, function() {
   submit(function(form) {
     form.bind('ajax:beforeSend', function() {
-      ok(true, 'aborting request in ajax:beforeSend')
+      ok(true, 'aborting request in ajax:beforeSend');
       return false;
     });
     form.unbind('ajax:complete').bind('ajax:complete', function() {

test/public/test/call-remote.js

@@ -1,6 +1,6 @@
 (function(){
 
-function build_form(attrs) {
+function buildForm(attrs) {
   attrs = $.extend({ action: '/echo', 'data-remote': 'true' }, attrs);
 
   $('#qunit-fixture').append($('<form />', attrs))
@@ -17,47 +17,47 @@ function submit(fn) {
 }
 
 asyncTest('form method is read from "method" and not from "data-method"', 1, function() {
-  build_form({ method: 'post', 'data-method': 'get' });
+  buildForm({ method: 'post', 'data-method': 'get' });
 
   submit(function(e, data, status, xhr) {
-    App.assert_post_request(data);
+    App.assertPostRequest(data);
   });
 });
 
 asyncTest('form method is not read from "data-method" attribute in case of missing "method"', 1, function() {
-  build_form({ 'data-method': 'put' });
+  buildForm({ 'data-method': 'put' });
 
   submit(function(e, data, status, xhr) {
-    App.assert_get_request(data);
+    App.assertGetRequest(data);
   });
 });
 
 asyncTest('form default method is GET', 1, function() {
-  build_form();
+  buildForm();
 
   submit(function(e, data, status, xhr) {
-    App.assert_get_request(data);
+    App.assertGetRequest(data);
   });
 });
 
 asyncTest('form url is picked up from "action"', 1, function() {
-  build_form({ method: 'post' });
+  buildForm({ method: 'post' });
 
   submit(function(e, data, status, xhr) {
-    App.assert_request_path(data, '/echo');
+    App.assertRequestPath(data, '/echo');
   });
 });
 
 asyncTest('form url is read from "action" not "href"', 1, function() {
-  build_form({ method: 'post', href: '/echo2' });
+  buildForm({ method: 'post', href: '/echo2' });
 
   submit(function(e, data, status, xhr) {
-    App.assert_request_path(data, '/echo');
+    App.assertRequestPath(data, '/echo');
   });
 });
 
 asyncTest('prefer JS, but accept any format', 1, function() {
-  build_form({ method: 'post' });
+  buildForm({ method: 'post' });
 
   submit(function(e, data, status, xhr) {
     var accept = data.HTTP_ACCEPT;
@@ -66,7 +66,7 @@ asyncTest('prefer JS, but accept any format', 1, function() {
 });
 
 asyncTest('accept application/json if "data-type" is json', 1, function() {
-  build_form({ method: 'post', 'data-type': 'json' });
+  buildForm({ method: 'post', 'data-type': 'json' });
 
   submit(function(e, data, status, xhr) {
     equal(data.HTTP_ACCEPT, 'application/json, text/javascript, */*; q=0.01');
@@ -75,7 +75,7 @@ asyncTest('accept application/json if "data-type" is json', 1, function() {
 
 asyncTest('allow empty "data-remote" attribute', 1, function() {
   var form = $('#qunit-fixture').append($('<form action="/echo" data-remote />')).find('form');
-  
+
   submit(function() {
     ok(true, 'form with empty "data-remote" attribute is also allowed');
   });
@@ -84,7 +84,7 @@ asyncTest('allow empty "data-remote" attribute', 1, function() {
 asyncTest('allow empty form "action"', 1, function() {
   var currentLocation, ajaxLocation;
 
-  build_form({ action: '' });
+  buildForm({ action: '' });
 
   $('#qunit-fixture').find('form')
     .bind('ajax:beforeSend', function(e, xhr, settings) {
@@ -114,7 +114,7 @@ asyncTest('allow empty form "action"', 1, function() {
 });
 
 asyncTest('sends CSRF token in custom header', 1, function() {
-  build_form({ method: 'post' });
+  buildForm({ method: 'post' });
   $('#qunit-fixture').append('<meta name="csrf-token" content="cf50faa3fe97702ca1ae" />');
 
   submit(function(e, data, status, xhr) {
@@ -123,7 +123,7 @@ asyncTest('sends CSRF token in custom header', 1, function() {
 });
 
 asyncTest('does not send CSRF token in custom header if crossDomain', 1, function() {
-  build_form({ 'data-cross-domain': 'true' });
+  buildForm({ 'data-cross-domain': 'true' });
   $('#qunit-fixture').append('<meta name="csrf-token" content="cf50faa3fe97702ca1ae" />');
 
   // Manually set request header to be XHR, since setting crossDomain: true in .ajax()
@@ -141,7 +141,7 @@ asyncTest('does not send CSRF token in custom header if crossDomain', 1, functio
 asyncTest('intelligently guesses crossDomain behavior when target URL is a different domain', 1, function(e, xhr) {
 
   // Don't set data-cross-domain here, just set action to be a different domain than localhost
-  build_form({ action: 'http://www.alfajango.com' });
+  buildForm({ action: 'http://www.alfajango.com' });
   $('#qunit-fixture').append('<meta name="csrf-token" content="cf50faa3fe97702ca1ae" />');
 
   $('#qunit-fixture').find('form')
@@ -158,7 +158,7 @@ asyncTest('intelligently guesses crossDomain behavior when target URL is a diffe
 });
 
 asyncTest('does not set crossDomain if explicitly set to false on element', 1, function() {
-  build_form({ action: 'http://www.alfajango.com', 'data-cross-domain': false });
+  buildForm({ action: 'http://www.alfajango.com', 'data-cross-domain': false });
   $('#qunit-fixture').append('<meta name="csrf-token" content="cf50faa3fe97702ca1ae" />');
 
   $('#qunit-fixture').find('form')

test/public/test/data-confirm.js

@@ -21,13 +21,13 @@ asyncTest('clicking on a link with data-confirm attribute. Confirm yes.', 6, fun
 
   $('a[data-confirm]')
     .bind('confirm:complete', function(e, data) {
-      App.assert_callback_invoked('confirm:complete');
+      App.assertCallbackInvoked('confirm:complete');
       ok(data == true, 'confirm:complete passes in confirm answer (true)');
     })
-    .bind('ajax:success', function(e, data, status, xhr) { 
-      App.assert_callback_invoked('ajax:success');
-      App.assert_request_path(data, '/echo');
-      App.assert_get_request(data); 
+    .bind('ajax:success', function(e, data, status, xhr) {
+      App.assertCallbackInvoked('ajax:success');
+      App.assertRequestPath(data, '/echo');
+      App.assertGetRequest(data);
 
       equal(message, 'Are you absolutely sure?');
       start();
@@ -42,11 +42,11 @@ asyncTest('clicking on a link with data-confirm attribute. Confirm No.', 3, func
 
   $('a[data-confirm]')
     .bind('confirm:complete', function(e, data) {
-      App.assert_callback_invoked('confirm:complete');
+      App.assertCallbackInvoked('confirm:complete');
       ok(data == false, 'confirm:complete passes in confirm answer (false)');
     })
     .bind('ajax:beforeSend', function(e, data, status, xhr) {
-      App.assert_callback_not_invoked('ajax:beforeSend');
+      App.assertCallbackNotInvoked('ajax:beforeSend');
     })
     .trigger('click');
 
@@ -65,11 +65,11 @@ asyncTest('binding to confirm event and returning false', 1, function() {
 
   $('a[data-confirm]')
     .bind('confirm', function() {
-      App.assert_callback_invoked('confirm');
+      App.assertCallbackInvoked('confirm');
       return false;
     })
     .bind('confirm:complete', function() {
-      App.assert_callback_not_invoked('confirm:complete')
+      App.assertCallbackNotInvoked('confirm:complete');
     })
     .trigger('click');
 
@@ -87,11 +87,11 @@ asyncTest('binding to confirm:complete event and returning false', 2, function()
 
   $('a[data-confirm]')
     .bind('confirm:complete', function() {
-      App.assert_callback_invoked('confirm:complete');
+      App.assertCallbackInvoked('confirm:complete');
       return false;
     })
     .bind('ajax:beforeSend', function() {
-      App.assert_callback_not_invoked('ajax:beforeSend');
+      App.assertCallbackNotInvoked('ajax:beforeSend');
     })
     .trigger('click');
 

test/public/test/data-remote.js

@@ -74,11 +74,11 @@ asyncTest('ctrl-clicking on a link still fires ajax for non-GET links and for li
 asyncTest('clicking on a link with data-remote attribute', 5, function() {
   $('a[data-remote]')
     .bind('ajax:success', function(e, data, status, xhr) {
-      App.assert_callback_invoked('ajax:success');
-      App.assert_request_path(data, '/echo');
+      App.assertCallbackInvoked('ajax:success');
+      App.assertRequestPath(data, '/echo');
       equal(data.params.data1, 'value1', 'ajax arguments should have key data1 with right value');
       equal(data.params.data2, 'value2', 'ajax arguments should have key data2 with right value');
-      App.assert_get_request(data);
+      App.assertGetRequest(data);
     })
     .bind('ajax:complete', function() { start() })
     .trigger('click');
@@ -87,11 +87,11 @@ asyncTest('clicking on a link with data-remote attribute', 5, function() {
 asyncTest('clicking on a button with data-remote attribute', 5, function() {
   $('button[data-remote]')
     .bind('ajax:success', function(e, data, status, xhr) {
-      App.assert_callback_invoked('ajax:success');
-      App.assert_request_path(data, '/echo');
+      App.assertCallbackInvoked('ajax:success');
+      App.assertRequestPath(data, '/echo');
       equal(data.params.data1, 'value1', 'ajax arguments should have key data1 with right value');
       equal(data.params.data2, 'value2', 'ajax arguments should have key data2 with right value');
-      App.assert_get_request(data);
+      App.assertGetRequest(data);
     })
     .bind('ajax:complete', function() { start() })
     .trigger('click');
@@ -112,11 +112,11 @@ asyncTest('changing a select option with data-remote attribute', 5, function() {
 
   $('select[data-remote]')
     .bind('ajax:success', function(e, data, status, xhr) {
-      App.assert_callback_invoked('ajax:success');
-      App.assert_request_path(data, '/echo');
+      App.assertCallbackInvoked('ajax:success');
+      App.assertRequestPath(data, '/echo');
       equal(data.params.user_data, 'optionValue2', 'ajax arguments should have key term with right value');
       equal(data.params.data1, 'value1', 'ajax arguments should have key data1 with right value');
-      App.assert_get_request(data);
+      App.assertGetRequest(data);
     })
     .bind('ajax:complete', function() { start() })
     .val('optionValue2')
@@ -126,10 +126,10 @@ asyncTest('changing a select option with data-remote attribute', 5, function() {
 asyncTest('submitting form with data-remote attribute', 4, function() {
   $('form[data-remote]')
     .bind('ajax:success', function(e, data, status, xhr) {
-      App.assert_callback_invoked('ajax:success');
-      App.assert_request_path(data, '/echo');
+      App.assertCallbackInvoked('ajax:success');
+      App.assertRequestPath(data, '/echo');
       equal(data.params.user_name, 'john', 'ajax arguments should have key user_name with right value');
-      App.assert_post_request(data);
+      App.assertPostRequest(data);
     })
     .bind('ajax:complete', function() { start() })
     .trigger('submit');

test/public/test/settings.js

@@ -1,23 +1,23 @@
 var App = App || {};
 
-App.assert_callback_invoked = function(callback_name) {
-  ok(true, callback_name + ' callback should have been invoked');
+App.assertCallbackInvoked = function(callbackName) {
+  ok(true, callbackName + ' callback should have been invoked');
 };
 
-App.assert_callback_not_invoked = function(callback_name) {
-  ok(false, callback_name + ' callback should not have been invoked');
+App.assertCallbackNotInvoked = function(callbackName) {
+  ok(false, callbackName + ' callback should not have been invoked');
 };
 
-App.assert_get_request = function(request_env){
-  equal(request_env['REQUEST_METHOD'], 'GET', 'request type should be GET');
+App.assertGetRequest = function(requestEnv){
+  equal(requestEnv['REQUEST_METHOD'], 'GET', 'request type should be GET');
 };
 
-App.assert_post_request = function(request_env){
-  equal(request_env['REQUEST_METHOD'], 'POST', 'request type should be POST');
+App.assertPostRequest = function(requestEnv){
+  equal(requestEnv['REQUEST_METHOD'], 'POST', 'request type should be POST');
 };
 
-App.assert_request_path = function(request_env, path) {
-  equal(request_env['PATH_INFO'], path, 'request should be sent to right url');
+App.assertRequestPath = function(requestEnv, path) {
+  equal(requestEnv['PATH_INFO'], path, 'request should be sent to right url');
 };
 
 // hijacks normal form submit; lets it submit to an iframe to prevent
@@ -27,10 +27,10 @@ $(document).bind('submit', function(e) {
     var form = $(e.target), action = form.attr('action'),
         name = 'form-frame' + jQuery.guid++,
         iframe = $('<iframe name="' + name + '" />'),
-        target_input = '<input name="_target" value="' + form.attr('target') + '" type="hidden" />';
+        targetInput = '<input name="_target" value="' + form.attr('target') + '" type="hidden" />';
 
     if (action.indexOf('iframe') < 0) form.attr('action', action + '?iframe=true')
-    form.attr('target', name).append(target_input);
+    form.attr('target', name).append(targetInput);
     $('#qunit-fixture').append(iframe);
     $.event.trigger('iframe:loading', form);
   }