diff --git a/.rspec b/.rspec index a472683..83e16f8 100644 --- a/.rspec +++ b/.rspec @@ -1,3 +1,2 @@ --color --require spec_helper ---require rails_helper diff --git a/Gemfile b/Gemfile index f2947fb..5e461b4 100644 --- a/Gemfile +++ b/Gemfile @@ -26,9 +26,8 @@ gem "haml-rails", "~> 0.9" # Pure for css gem 'purecss-rails' -# Use DataGrid -gem 'datagrid' -gem 'kaminari' +# Use datatables +gem 'jquery-datatables-rails' # Use Select2 for selecting users gem 'select2-rails' @@ -91,4 +90,3 @@ gem 'simple_form' # Errors on errbit gem 'airbrake' - diff --git a/Gemfile.lock b/Gemfile.lock index ca42fcb..8f0edc5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -78,8 +78,6 @@ GEM simplecov (~> 0.10.0) term-ansicolor (~> 1.3) thor (~> 0.19.1) - datagrid (1.3.9) - rails (>= 3.2.18) debug_inspector (0.0.2) devise (3.5.2) bcrypt (~> 3.0) @@ -126,15 +124,17 @@ GEM jbuilder (2.3.1) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) + jquery-datatables-rails (3.3.0) + actionpack (>= 3.1) + jquery-rails + railties (>= 3.1) + sass-rails jquery-rails (4.0.5) rails-dom-testing (~> 1.0) railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (1.8.3) jwt (1.5.1) - kaminari (0.16.3) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) loofah (2.0.3) nokogiri (>= 1.5.9) mail (2.6.3) @@ -292,15 +292,14 @@ DEPENDENCIES capistrano-rbenv coffee-rails (~> 4.1.0) coveralls - datagrid devise factory_girl_rails faker haml-rails (~> 0.9) high_voltage (~> 2.4.0) jbuilder (~> 2.0) + jquery-datatables-rails jquery-rails - kaminari mysql2 (~> 0.3.0) omniauth-oauth2 purecss-rails diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 8933d07..f0b3d27 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,15 +12,15 @@ // //= require jquery //= require jquery_ujs +//= require dataTables/jquery.dataTables +//= require dataTables/extras/dataTables.responsive +//= require dataTables/jquery.dataTables //= require select2 //= require turbolinks //= require_tree . ready = function() { - $(".select2-selector").select2({ - width: 'resolve', - placeholder: "Ontvanger" - }); + $(".select2-selector").select2(); } $(document).ready(ready) diff --git a/app/assets/javascripts/jquery.dataTables.columnFilter.js b/app/assets/javascripts/jquery.dataTables.columnFilter.js new file mode 100644 index 0000000..ea4cec3 --- /dev/null +++ b/app/assets/javascripts/jquery.dataTables.columnFilter.js @@ -0,0 +1,829 @@ +/* +* File: jquery.dataTables.columnFilter.js +* Version: 1.5.6. +* Author: Jovan Popovic +* +* Copyright 2011-2014 Jovan Popovic, all rights reserved. +* +* This source file is free software, under either the GPL v2 license or a +* BSD style license, as supplied with this software. +* +* This source file is distributed in the hope that it will be useful, but +* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +* or FITNESS FOR A PARTICULAR PURPOSE. +* +* Parameters:" +* @sPlaceHolder String Place where inline filtering function should be placed ("tfoot", "thead:before", "thead:after"). Default is "tfoot" +* @sRangeSeparator String Separator that will be used when range values are sent to the server-side. Default value is "~". +* @sRangeFormat string Default format of the From ... to ... range inputs. Default is From {from} to {to} +* @aoColumns Array Array of the filter settings that will be applied on the columns +*/ +(function ($) { + + + $.fn.columnFilter = function (options) { + + var asInitVals, i, label, th; + + //var sTableId = "table"; + var sRangeFormat = "From {from} to {to}"; + //Array of the functions that will override sSearch_ parameters + var afnSearch_ = new Array(); + var aiCustomSearch_Indexes = new Array(); + + var oFunctionTimeout = null; + + var fnOnFiltered = function () { }; + + function _fnGetColumnValues(oSettings, iColumn, bUnique, bFiltered, bIgnoreEmpty) { + /// + ///Return values in the column + /// + ///DataTables settings + ///Id of the column + ///Return only distinct values + ///Return values only from the filtered rows + ///Ignore empty cells + + // check that we have a column id + if (typeof iColumn == "undefined") return new Array(); + + // by default we only wany unique data + if (typeof bUnique == "undefined") bUnique = true; + + // by default we do want to only look at filtered data + if (typeof bFiltered == "undefined") bFiltered = true; + + // by default we do not wany to include empty values + if (typeof bIgnoreEmpty == "undefined") bIgnoreEmpty = true; + + // list of rows which we're going to loop through + var aiRows; + + // use only filtered rows + if (bFiltered == true) aiRows = oSettings.aiDisplay; + // use all rows + else aiRows = oSettings.aiDisplayMaster; // all row numbers + + // set up data array + var asResultData = new Array(); + + for (var i = 0, c = aiRows.length; i < c; i++) { + var iRow = aiRows[i]; + var aData = oTable.fnGetData(iRow); + var sValue = aData[iColumn]; + + // ignore empty values? + if (bIgnoreEmpty == true && sValue.length == 0) continue; + + // ignore unique values? + else if (bUnique == true && jQuery.inArray(sValue, asResultData) > -1) continue; + + // else push the value onto the result data array + else asResultData.push(sValue); + } + + return asResultData.sort(); + } + + function _fnColumnIndex(iColumnIndex) { + if (properties.bUseColVis) + return iColumnIndex; + else + return oTable.fnSettings().oApi._fnVisibleToColumnIndex(oTable.fnSettings(), iColumnIndex); + //return iColumnIndex; + //return oTable.fnSettings().oApi._fnColumnIndexToVisible(oTable.fnSettings(), iColumnIndex); + } + + function fnCreateInput(oTable, regex, smart, bIsNumber, iFilterLength, iMaxLenght) { + var sCSSClass = "text_filter form-control"; + if (bIsNumber) + sCSSClass = "number_filter form-control"; + + label = label.replace(/(^\s*)|(\s*$)/g, ""); + var currentFilter = oTable.fnSettings().aoPreSearchCols[i].sSearch; + var search_init = 'search_init '; + var inputvalue = label; + if (currentFilter != '' && currentFilter != '^') { + if (bIsNumber && currentFilter.charAt(0) == '^') + inputvalue = currentFilter.substr(1); //ignore trailing ^ + else + inputvalue = currentFilter; + search_init = ''; + } + + var input = $(''); + if (iMaxLenght != undefined && iMaxLenght != -1) { + input.attr('maxlength', iMaxLenght); + } + th.html(input); + if (bIsNumber) + th.wrapInner(''); + else + th.wrapInner(''); + + asInitVals[i] = label; + var index = i; + + if (bIsNumber && !oTable.fnSettings().oFeatures.bServerSide) { + input.keyup(function () { + /* Filter on the column all numbers that starts with the entered value */ + oTable.fnFilter('^' + this.value, _fnColumnIndex(index), true, false); //Issue 37 + fnOnFiltered(); + }); + } else { + input.keyup(function () { + if (oTable.fnSettings().oFeatures.bServerSide && iFilterLength != 0) { + //If filter length is set in the server-side processing mode + //Check has the user entered at least iFilterLength new characters + + var currentFilter = oTable.fnSettings().aoPreSearchCols[index].sSearch; + var iLastFilterLength = $(this).data("dt-iLastFilterLength"); + if (typeof iLastFilterLength == "undefined") + iLastFilterLength = 0; + var iCurrentFilterLength = this.value.length; + if (Math.abs(iCurrentFilterLength - iLastFilterLength) < iFilterLength + //&& currentFilter.length == 0 //Why this? + ) { + //Cancel the filtering + return; + } + else { + //Remember the current filter length + $(this).data("dt-iLastFilterLength", iCurrentFilterLength); + } + } + /* Filter on the column (the index) of this element */ + oTable.fnFilter(this.value, _fnColumnIndex(index), regex, smart); //Issue 37 + fnOnFiltered(); + }); + } + + input.focus(function () { + if ($(this).hasClass("search_init")) { + $(this).removeClass("search_init"); + this.value = ""; + } + }); + input.blur(function () { + if (this.value == "") { + $(this).addClass("search_init"); + this.value = asInitVals[index]; + } + }); + } + + function fnCreateRangeInput(oTable) { + + //var currentFilter = oTable.fnSettings().aoPreSearchCols[i].sSearch; + th.html(_fnRangeLabelPart(0)); + var sFromId = oTable.attr("id") + '_range_from_' + i; + var from = $(''); + th.append(from); + th.append(_fnRangeLabelPart(1)); + var sToId = oTable.attr("id") + '_range_to_' + i; + var to = $(''); + th.append(to); + th.append(_fnRangeLabelPart(2)); + th.wrapInner(''); + var index = i; + aiCustomSearch_Indexes.push(i); + + + + //------------start range filtering function + + + /* Custom filtering function which will filter data in column four between two values + * Author: Allan Jardine, Modified by Jovan Popovic + */ + //$.fn.dataTableExt.afnFiltering.push( + oTable.dataTableExt.afnFiltering.push( + function (oSettings, aData, iDataIndex) { + if (oTable.attr("id") != oSettings.sTableId) + return true; + // Try to handle missing nodes more gracefully + if (document.getElementById(sFromId) == null) + return true; + var iMin = document.getElementById(sFromId).value * 1; + var iMax = document.getElementById(sToId).value * 1; + var iValue = aData[_fnColumnIndex(index)] == "-" ? 0 : aData[_fnColumnIndex(index)] * 1; + if (iMin == "" && iMax == "") { + return true; + } + else if (iMin == "" && iValue <= iMax) { + return true; + } + else if (iMin <= iValue && "" == iMax) { + return true; + } + else if (iMin <= iValue && iValue <= iMax) { + return true; + } + return false; + } + ); + //------------end range filtering function + + + + $('#' + sFromId + ',#' + sToId, th).keyup(function () { + + var iMin = document.getElementById(sFromId).value * 1; + var iMax = document.getElementById(sToId).value * 1; + if (iMin != 0 && iMax != 0 && iMin > iMax) + return; + + oTable.fnDraw(); + fnOnFiltered(); + }); + + + } + + + function fnCreateDateRangeInput(oTable) { + + var aoFragments = sRangeFormat.split(/[}{]/); + + th.html(""); + //th.html(_fnRangeLabelPart(0)); + var sFromId = oTable.attr("id") + '_range_from_' + i; + var from = $(''); + from.datepicker(); + //th.append(from); + //th.append(_fnRangeLabelPart(1)); + var sToId = oTable.attr("id") + '_range_to_' + i; + var to = $(''); + //th.append(to); + //th.append(_fnRangeLabelPart(2)); + + for (ti = 0; ti < aoFragments.length; ti++) { + + if (aoFragments[ti] == properties.sDateFromToken) { + th.append(from); + } else { + if (aoFragments[ti] == properties.sDateToToken) { + th.append(to); + } else { + th.append(aoFragments[ti]); + } + } + + + } + + + th.wrapInner(''); + to.datepicker(); + var index = i; + aiCustomSearch_Indexes.push(i); + + + //------------start date range filtering function + + //$.fn.dataTableExt.afnFiltering.push( + oTable.dataTableExt.afnFiltering.push( + function (oSettings, aData, iDataIndex) { + if (oTable.attr("id") != oSettings.sTableId) + return true; + + var dStartDate = from.datepicker("getDate"); + + var dEndDate = to.datepicker("getDate"); + + if (dStartDate == null && dEndDate == null) { + return true; + } + + var dCellDate = null; + try { + if (aData[_fnColumnIndex(index)] == null || aData[_fnColumnIndex(index)] == "") + return false; + dCellDate = $.datepicker.parseDate($.datepicker.regional[""].dateFormat, aData[_fnColumnIndex(index)]); + } catch (ex) { + return false; + } + if (dCellDate == null) + return false; + + + if (dStartDate == null && dCellDate <= dEndDate) { + return true; + } + else if (dStartDate <= dCellDate && dEndDate == null) { + return true; + } + else if (dStartDate <= dCellDate && dCellDate <= dEndDate) { + return true; + } + return false; + } + ); + //------------end date range filtering function + + $('#' + sFromId + ',#' + sToId, th).change(function () { + oTable.fnDraw(); + fnOnFiltered(); + }); + + + } + + function fnCreateColumnSelect(oTable, aData, iColumn, nTh, sLabel, bRegex, oSelected, bMultiselect) { + if (aData == null) + aData = _fnGetColumnValues(oTable.fnSettings(), iColumn, true, false, true); + var index = iColumn; + var currentFilter = oTable.fnSettings().aoPreSearchCols[i].sSearch; + if (currentFilter == null || currentFilter == "")//Issue 81 + currentFilter = oSelected; + + var r = ''; + } + var j = 0; + var iLen = aData.length; + for (j = 0; j < iLen; j++) { + if (typeof (aData[j]) != 'object') { + var selected = ''; + if (escape(aData[j]) == currentFilter + || escape(aData[j]) == escape(currentFilter) + ) + selected = 'selected ' + r += ''; + } + else { + var selected = ''; + if (bRegex) { + //Do not escape values if they are explicitely set to avoid escaping special characters in the regexp + if (aData[j].value == currentFilter) selected = 'selected '; + r += ''; + } else { + if (escape(aData[j].value) == currentFilter) selected = 'selected '; + r += ''; + } + } + } + + var select = $(r + ''); + nTh.html(select); + nTh.wrapInner(''); + + if(bMultiselect) { + select.change(function () { + if ($(this).val() != "") { + $(this).removeClass("search_init"); + } else { + $(this).addClass("search_init"); + } + var selectedOptions = $(this).val(); + var asEscapedFilters = []; + if(selectedOptions==null || selectedOptions==[]){ + var re = '^(.*)$'; + }else{ + $.each( selectedOptions, function( i, sFilter ) { + asEscapedFilters.push( fnRegExpEscape( sFilter ) ); + } ); + var re = '^(' + asEscapedFilters.join('|') + ')$'; + } + + oTable.fnFilter( re, index, true, false ); + }); + } else { + select.change(function () { + //var val = $(this).val(); + if ($(this).val() != "") { + $(this).removeClass("search_init"); + } else { + $(this).addClass("search_init"); + } + if (bRegex) + oTable.fnFilter($(this).val(), iColumn, bRegex); //Issue 41 + else + oTable.fnFilter(unescape($(this).val()), iColumn); //Issue 25 + fnOnFiltered(); + }); + if (currentFilter != null && currentFilter != "")//Issue 81 + oTable.fnFilter(unescape(currentFilter), iColumn); + } + } + + function fnCreateSelect(oTable, aData, bRegex, oSelected, bMultiselect) { + var oSettings = oTable.fnSettings(); + if ( (aData == null || typeof(aData) == 'function' ) && oSettings.sAjaxSource != "" && !oSettings.oFeatures.bServerSide) { + // Add a function to the draw callback, which will check for the Ajax data having + // been loaded. Use a closure for the individual column elements that are used to + // built the column filter, since 'i' and 'th' (etc) are locally "global". + oSettings.aoDrawCallback.push({ + "fn": (function (iColumn, nTh, sLabel) { + return function (oSettings) { + // Only rebuild the select on the second draw - i.e. when the Ajax + // data has been loaded. + if (oSettings.iDraw == 2 && oSettings.sAjaxSource != null && oSettings.sAjaxSource != "" && !oSettings.oFeatures.bServerSide) { + return fnCreateColumnSelect(oTable, aData && aData(oSettings.aoData, oSettings), _fnColumnIndex(iColumn), nTh, sLabel, bRegex, oSelected, bMultiselect); //Issue 37 + } + }; + })(i, th, label), + "sName": "column_filter_" + i + }); + } + // Regardless of the Ajax state, build the select on first pass + fnCreateColumnSelect(oTable, typeof(aData) == 'function' ? null: aData, _fnColumnIndex(i), th, label, bRegex, oSelected, bMultiselect); //Issue 37 + + } + + function fnRegExpEscape( sText ) { + return sText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"); + }; + + function fnCreateDropdown(aData) { + var index = i; + var r = ''); + th.html(select); + th.wrapInner(''); + select.find('li').click(function () { + oTable.fnFilter($(this).data('value'), index); + }); + } + + + function fnCreateCheckbox(oTable, aData) { + + if (aData == null) + aData = _fnGetColumnValues(oTable.fnSettings(), i, true, true, true); + var index = i; + + var r = '', j, iLen = aData.length; + + //clean the string + var localLabel = label.replace('%', 'Perc').replace("&", "AND").replace("$", "DOL").replace("£", "STERL").replace("@", "AT").replace(/\s/g, "_"); + localLabel = localLabel.replace(/[^a-zA-Z 0-9]+/g, ''); + //clean the string + + //button label override + var labelBtn = label; + if (properties.sFilterButtonText != null || properties.sFilterButtonText != undefined) { + labelBtn = properties.sFilterButtonText; + } + + var relativeDivWidthToggleSize = 10; + var numRow = 12; //numero di checkbox per colonna + var numCol = Math.floor(iLen / numRow); + if (iLen % numRow > 0) { + numCol = numCol + 1; + }; + + //count how many column should be generated and split the div size + var divWidth = 100 / numCol - 2; + + var divWidthToggle = relativeDivWidthToggleSize * numCol; + + if (numCol == 1) { + divWidth = 20; + } + + var divRowDef = '
'; + var divClose = '
'; + + var uniqueId = oTable.attr("id") + localLabel; + var buttonId = "chkBtnOpen" + uniqueId; + var checkToggleDiv = uniqueId + "-flt-toggle"; + r += ''; //filter button witch open dialog + r += '
'; //dialog div + //r+= '
'; //reset button and its div + r += divRowDef; + + for (j = 0; j < iLen; j++) { + + //if last check close div + if (j % numRow == 0 && j != 0) { + r += divClose + divRowDef; + } + + var sLabel = aData[j]; + var sValue = aData[j]; + + if (typeof (aData[j]) == 'object') { + sLabel = aData[j].label; + sValue = aData[j].value; + } + + //check button + r += '' + sLabel + '
'; + + var checkbox = $(r); + th.html(checkbox); + th.wrapInner(''); + //on every checkbox selection + checkbox.change(function () { + + var search = ''; + var or = '|'; //var for select checks in 'or' into the regex + var resSize = $('input:checkbox[name="' + localLabel + '"]:checked').size(); + $('input:checkbox[name="' + localLabel + '"]:checked').each(function (index) { + + //search = search + ' ' + $(this).val(); + //concatenation for selected checks in or + if ((index == 0 && resSize == 1) + || (index != 0 && index == resSize - 1)) { + or = ''; + } + //trim + search = search.replace(/^\s+|\s+$/g, ""); + search = search + $(this).val() + or; + or = '|'; + + }); + + + if (search != "") { + $('input:checkbox[name="' + localLabel + '"]').removeClass("search_init"); + } else { + $('input:checkbox[name="' + localLabel + '"]').addClass("search_init"); + } + /* Old code for setting search_init CSS class on checkboxes if any of them is checked + for (var jj = 0; jj < iLen; jj++) { + if (search != "") { + $('#' + aData[jj]).removeClass("search_init"); + } else { + $('#' + aData[jj]).addClass("search_init"); + } + } + */ + + //execute search + oTable.fnFilter(search, index, true, false); + fnOnFiltered(); + }); + } + + //filter button + $('#' + buttonId).button(); + //dialog + $('#' + checkToggleDiv).dialog({ + //height: 140, + autoOpen: false, + //show: "blind", + hide: "blind", + buttons: [{ + text: "Reset", + click: function () { + //$('#'+buttonId).removeClass("filter_selected"); //LM remove border if filter selected + $('input:checkbox[name="' + localLabel + '"]:checked').each(function (index3) { + $(this).attr('checked', false); + $(this).addClass("search_init"); + }); + oTable.fnFilter('', index, true, false); + fnOnFiltered(); + return false; + } + }, + { + text: "Close", + click: function () { $(this).dialog("close"); } + } + ] + }); + + + $('#' + buttonId).click(function () { + + $('#' + checkToggleDiv).dialog('open'); + var target = $(this); + $('#' + checkToggleDiv).dialog("widget").position({ my: 'top', + at: 'bottom', + of: target + }); + + return false; + }); + + var fnOnFilteredCurrent = fnOnFiltered; + + fnOnFiltered = function () { + var target = $('#' + buttonId); + $('#' + checkToggleDiv).dialog("widget").position({ my: 'top', + at: 'bottom', + of: target + }); + fnOnFilteredCurrent(); + }; + //reset + /* + $('#'+buttonId+"Reset").button(); + $('#'+buttonId+"Reset").click(function(){ + $('#'+buttonId).removeClass("filter_selected"); //LM remove border if filter selected + $('input:checkbox[name="'+localLabel+'"]:checked').each(function(index3) { + $(this).attr('checked', false); + $(this).addClass("search_init"); + }); + oTable.fnFilter('', index, true, false); + return false; + }); + */ + } + + + + + function _fnRangeLabelPart(iPlace) { + switch (iPlace) { + case 0: + return sRangeFormat.substring(0, sRangeFormat.indexOf("{from}")); + case 1: + return sRangeFormat.substring(sRangeFormat.indexOf("{from}") + 6, sRangeFormat.indexOf("{to}")); + default: + return sRangeFormat.substring(sRangeFormat.indexOf("{to}") + 4); + } + } + + + + + var oTable = this; + + var defaults = { + sPlaceHolder: "foot", + sRangeSeparator: "~", + iFilteringDelay: 500, + aoColumns: null, + sRangeFormat: "From {from} to {to}", + sDateFromToken: "from", + sDateToToken: "to" + }; + + var properties = $.extend(defaults, options); + + return this.each(function () { + + if (!oTable.fnSettings().oFeatures.bFilter) + return; + asInitVals = new Array(); + + var aoFilterCells = oTable.fnSettings().aoFooter[0]; + + var oHost = oTable.fnSettings().nTFoot; //Before fix for ColVis + var sFilterRow = "tr"; //Before fix for ColVis + + if (properties.sPlaceHolder == "head:after") { + var tr = $("tr:first", oTable.fnSettings().nTHead).detach(); + //tr.appendTo($(oTable.fnSettings().nTHead)); + if (oTable.fnSettings().bSortCellsTop) { + tr.prependTo($(oTable.fnSettings().nTHead)); + //tr.appendTo($("thead", oTable)); + aoFilterCells = oTable.fnSettings().aoHeader[1]; + } + else { + tr.appendTo($(oTable.fnSettings().nTHead)); + //tr.prependTo($("thead", oTable)); + aoFilterCells = oTable.fnSettings().aoHeader[0]; + } + + sFilterRow = "tr:last"; + oHost = oTable.fnSettings().nTHead; + + } else if (properties.sPlaceHolder == "head:before") { + + if (oTable.fnSettings().bSortCellsTop) { + var tr = $("tr:first", oTable.fnSettings().nTHead).detach(); + tr.appendTo($(oTable.fnSettings().nTHead)); + aoFilterCells = oTable.fnSettings().aoHeader[1]; + } else { + aoFilterCells = oTable.fnSettings().aoHeader[0]; + } + /*else { + //tr.prependTo($("thead", oTable)); + sFilterRow = "tr:first"; + }*/ + + sFilterRow = "tr:first"; + + oHost = oTable.fnSettings().nTHead; + + + } + + //$(sFilterRow + " th", oHost).each(function (index) {//bug with ColVis + $(aoFilterCells).each(function (index) {//fix for ColVis + i = index; + var aoColumn = { type: "text", + bRegex: false, + bSmart: true, + iMaxLenght: -1, + iFilterLength: 0 + }; + if (properties.aoColumns != null) { + if (properties.aoColumns.length < i || properties.aoColumns[i] == null) + return; + aoColumn = properties.aoColumns[i]; + } + //label = $(this).text(); //Before fix for ColVis + label = $($(this)[0].cell).text(); //Fix for ColVis + if (aoColumn.sSelector == null) { + //th = $($(this)[0]);//Before fix for ColVis + th = $($(this)[0].cell); //Fix for ColVis + } + else { + th = $(aoColumn.sSelector); + if (th.length == 0) + th = $($(this)[0].cell); + } + + if (aoColumn != null) { + if (aoColumn.sRangeFormat != null) + sRangeFormat = aoColumn.sRangeFormat; + else + sRangeFormat = properties.sRangeFormat; + switch (aoColumn.type) { + case "null": + break; + case "number": + fnCreateInput(oTable, true, false, true, aoColumn.iFilterLength, aoColumn.iMaxLenght); + break; + case "select": + if (aoColumn.bRegex != true) + aoColumn.bRegex = false; + fnCreateSelect(oTable, aoColumn.values, aoColumn.bRegex, aoColumn.selected, aoColumn.multiple); + break; + case "number-range": + fnCreateRangeInput(oTable); + break; + case "date-range": + fnCreateDateRangeInput(oTable); + break; + case "checkbox": + fnCreateCheckbox(oTable, aoColumn.values); + break; + case "twitter-dropdown": + case "dropdown": + fnCreateDropdown(aoColumn.values); + break; + case "text": + default: + bRegex = (aoColumn.bRegex == null ? false : aoColumn.bRegex); + bSmart = (aoColumn.bSmart == null ? false : aoColumn.bSmart); + fnCreateInput(oTable, bRegex, bSmart, false, aoColumn.iFilterLength, aoColumn.iMaxLenght); + break; + + } + } + }); + + for (j = 0; j < aiCustomSearch_Indexes.length; j++) { + //var index = aiCustomSearch_Indexes[j]; + var fnSearch_ = function () { + var id = oTable.attr("id"); + return $("#" + id + "_range_from_" + aiCustomSearch_Indexes[j]).val() + properties.sRangeSeparator + $("#" + id + "_range_to_" + aiCustomSearch_Indexes[j]).val() + } + afnSearch_.push(fnSearch_); + } + + if (oTable.fnSettings().oFeatures.bServerSide) { + + var fnServerDataOriginal = oTable.fnSettings().fnServerData; + + oTable.fnSettings().fnServerData = function (sSource, aoData, fnCallback) { + + for (j = 0; j < aiCustomSearch_Indexes.length; j++) { + var index = aiCustomSearch_Indexes[j]; + + for (k = 0; k < aoData.length; k++) { + if (aoData[k].name == "sSearch_" + index) + aoData[k].value = afnSearch_[j](); + } + } + aoData.push({ "name": "sRangeSeparator", "value": properties.sRangeSeparator }); + + if (fnServerDataOriginal != null) { + try { + fnServerDataOriginal(sSource, aoData, fnCallback, oTable.fnSettings()); //TODO: See Issue 18 + } catch (ex) { + fnServerDataOriginal(sSource, aoData, fnCallback); + } + } + else { + $.getJSON(sSource, aoData, function (json) { + fnCallback(json) + }); + } + }; + + } + + }); + + }; + + + + +})(jQuery); \ No newline at end of file diff --git a/app/assets/javascripts/transactions.coffee b/app/assets/javascripts/transactions.coffee index 9fbbb23..24f83d1 100644 --- a/app/assets/javascripts/transactions.coffee +++ b/app/assets/javascripts/transactions.coffee @@ -1,17 +1,3 @@ # Place all the behaviors and hooks related to the matching controller here. # All this logic will automatically be available in application.js. # You can use CoffeeScript in this file: http://coffeescript.org/ -ready = -> - $("#new_transaction").on("ajax:success", (e, data, status, xhr) -> - console.log("success") - ).on("ajax:error", (e, xhr, status, error) -> - console.log(e) - console.log(xhr) - console.log("failed") - ) -$.ajaxSetup({ - dataType: 'json' -}) - -$(document).ready(ready) -$(document).on('page:load', ready) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index bd8d49c..776ece0 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -11,8 +11,9 @@ * file per style scope. * *= require_tree . + *= require dataTables/extras/dataTables.responsive + *= require dataTables/jquery.dataTables *= require select2 - *= require datagrid *= require_self *= require purecss */ diff --git a/app/assets/stylesheets/purecss.css.scss b/app/assets/stylesheets/purecss.css similarity index 66% rename from app/assets/stylesheets/purecss.css.scss rename to app/assets/stylesheets/purecss.css index 94150c8..f6647f5 100644 --- a/app/assets/stylesheets/purecss.css.scss +++ b/app/assets/stylesheets/purecss.css @@ -43,23 +43,3 @@ background-color: rgb(83, 180, 79); color: #fff; } - -fieldset.pure-group-inline { - display: inline-block; - .pure-group-addon { - padding: .5em .6em; - box-shadow: inset 0 1px 3px #ddd; - border: 1px solid #ccc; - white-space: nowrap; - border-collapse: separate; - margin-left: -4px; - &:last-child { - border-radius: 0 4px 4px 0; - } - &:first-child { - margin-left: 0; - border-radius: 4px 0 0 4px; - border-right: 0; - } - } -} diff --git a/app/assets/stylesheets/transactions.scss b/app/assets/stylesheets/transactions.scss index 25d4ef0..c402390 100644 --- a/app/assets/stylesheets/transactions.scss +++ b/app/assets/stylesheets/transactions.scss @@ -1,6 +1,3 @@ // Place all the styles related to the transactions controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ -.price { - width: 100px; -} diff --git a/app/assets/stylesheets/users.css.scss b/app/assets/stylesheets/users.scss similarity index 83% rename from app/assets/stylesheets/users.css.scss rename to app/assets/stylesheets/users.scss index 994acd2..1efc835 100644 --- a/app/assets/stylesheets/users.css.scss +++ b/app/assets/stylesheets/users.scss @@ -1,4 +1,3 @@ // Place all the styles related to the users controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ -.euro:before { content:"\20AC"; } diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 47d756c..c7cc410 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -12,12 +12,12 @@ class ApplicationController < ActionController::Base end def current_client - @current_client ||= Client.find_by key: (request.headers["X_API_KEY"] || request.headers["HTTP_X_API_KEY"]) + @current_client ||= Client.find_by key: request.headers["X-API-KEY"] end def current_ability @current_ability ||= current_client.try { |c| ClientAbility.new(c) } || - UserAbility.new(current_user) + Ability.new(current_user) end end diff --git a/app/controllers/transactions_controller.rb b/app/controllers/transactions_controller.rb index 83f3dd5..7b5626d 100644 --- a/app/controllers/transactions_controller.rb +++ b/app/controllers/transactions_controller.rb @@ -1,30 +1,33 @@ class TransactionsController < ApplicationController + load_and_authorize_resource skip_before_filter :verify_authenticity_token, only: :create before_action :authenticate_user!, except: :create before_action :authenticate_user_or_client!, only: :create - # This line MUST be placed after authentication - load_and_authorize_resource - def index - gridparams = params[:transactions_grid] || Hash.new - gridparams = gridparams.merge( - order: :created_at, - descending: true, - current_user: current_user - ) - @grid = TransactionsGrid.new(gridparams) do |scope| - scope.page(params[:page]) - end + @transactions = Transaction.all + end + + def new + @transaction = Transaction.new end def create - transaction = Transaction.new(transaction_params) - if transaction.save - head :created - else - render json: transaction.errors.full_messages, status: :unprocessable_entity + @transaction = Transaction.new(transaction_params) + respond_to do |format| + format.html do + if @transaction.save + flash[:success] = "Transaction created" + redirect_to new_transaction_path + else + render 'new' + end + end + + format.json do + head(@transaction.save ? :created : :unprocessable_entity) + end end end @@ -38,13 +41,8 @@ class TransactionsController < ApplicationController debtor: User.find_by(name: t[:debtor]) || User.zeus, creditor: User.find_by(name: t[:creditor]) || User.zeus, issuer: current_client || current_user, - amount: (float(t[:euros]) * 100 + float(t[:cents])).to_i, + amount: (t[:euros].to_f*100 + t[:cents].to_f).to_i, message: t[:message] } end - - def float arg - if arg.is_a? String then arg.sub!(',', '.') end - arg.to_f - end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 80d122d..d1e5a0a 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -3,7 +3,6 @@ class UsersController < ApplicationController def show @user = User.find(params[:id]) - @transaction = Transaction.new respond_to do |format| format.html format.json do diff --git a/app/grids/transactions_grid.rb b/app/grids/transactions_grid.rb deleted file mode 100644 index f7e4ba8..0000000 --- a/app/grids/transactions_grid.rb +++ /dev/null @@ -1,34 +0,0 @@ -class TransactionsGrid - - include Datagrid - - attr_accessor :current_user - - scope do - Transaction - end - - self.default_column_options = { order: false } - - column(:created_at, order: true) { |model| model.created_at.to_date } - filter(:created_at, :date, range: true) - - column(:amount) - filter(:amount, :integer, range: true) - - column(:peer) { |model, grid| model.peer_of(grid.current_user).try(:name) } - filter(:peer, :string, header: 'Peer') do |value, scope, grid| - scope.joins(debtor: 'id', creditor: 'id') - .where("(debtor_id = :user AND creditor.name LIKE :name) OR (creditor_id = :user AND debtor.name LIKE :name)", user: grid.current_user.id, name: "%#{value}%") - end - # TODO this should probably by a SQL statement - - column(:issuer) { |model| model.issuer.name } - filter(:issuer, :string, header: 'Issuer') do |value| - self.joins(:issuer).where("issuer.name LIKE :value", value: "%#{value}%") - end - - column(:message) - filter(:message) { |value| where("message LIKE :value", value: "%#{value}%") } - -end diff --git a/app/grids/transactions_query.rb b/app/grids/transactions_query.rb deleted file mode 100644 index 36d2990..0000000 --- a/app/grids/transactions_query.rb +++ /dev/null @@ -1,64 +0,0 @@ -class TransactionsQuery - def initialize user - @user = user - @transactions = Arel::Table.new(:transactions) - @perspectived = Arel::Table.new(:perspectived_transactions) - @peers = Arel::Table.new(:users).alias('peers') - end - - def arel - Arel::SelectManager.new(ActiveRecord::Base) - .from(issued_by(User).union(:all, issued_by(Client))) - .project(Arel.star) - end - - def issued_by klass - issuers = klass.arel_table.alias('issuer') - Arel::SelectManager.new(ActiveRecord::Base) - .from(transactions) - .join(@peers).on(@peers[:id].eq(@perspectived[:peer_id])) - .join(issuers).on(issuers[:id].eq(@perspectived[:issuer_id])) - .where(@perspectived[:issuer_type].eq(klass.name)) - .project( - @perspectived[:amount], - @perspectived[:date], - @perspectived[:message], - @peers[:name].as('peer'), - issuers[:name].as('issuer') - ) - end - - def transactions - Arel::Nodes::TableAlias.new( - incoming.union(:all, outgoing), - @perspectived.name - ) - end - - def outgoing - @transactions - .where(@transactions[:debtor_id].eq(@user.id)) - .project( - (@transactions[:amount]*Arel::Nodes::SqlLiteral.new("-1")).as('amount'), - @transactions[:creditor_id].as('peer_id'), - @transactions[:created_at].as('date'), - @transactions[:issuer_id], - @transactions[:issuer_type], - @transactions[:message] - ) - end - - def incoming - @user.incoming_transactions.arel - @transactions - .where(@transactions[:debtor_id].eq(@user.id)) - .project( - @transactions[:amount], - @transactions[:debtor_id].as('peer_id'), - @transactions[:created_at].as('date'), - @transactions[:issuer_id], - @transactions[:issuer_type], - @transactions[:message] - ) - end -end diff --git a/app/helpers/transactions_helper.rb b/app/helpers/transactions_helper.rb index 704ea65..36098d1 100644 --- a/app/helpers/transactions_helper.rb +++ b/app/helpers/transactions_helper.rb @@ -1,5 +1,2 @@ module TransactionsHelper - def amount a - a.zero? ? nil : number_with_precision(a/100.0, precision: 2) - end end diff --git a/app/models/user_ability.rb b/app/models/ability.rb similarity index 91% rename from app/models/user_ability.rb rename to app/models/ability.rb index 47af0c8..c3a4c81 100644 --- a/app/models/user_ability.rb +++ b/app/models/ability.rb @@ -1,4 +1,4 @@ -class UserAbility +class Ability include CanCan::Ability def initialize(user) diff --git a/app/models/client_ability.rb b/app/models/client_ability.rb index 1a5dd66..1f804eb 100644 --- a/app/models/client_ability.rb +++ b/app/models/client_ability.rb @@ -1,4 +1,4 @@ -class ClientAbility +class Ability include CanCan::Ability def initialize(client) diff --git a/app/models/user.rb b/app/models/user.rb index 6e98824..c5886cf 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -12,7 +12,6 @@ class User < ActiveRecord::Base devise :timeoutable, :omniauthable, :omniauth_providers => [:zeuswpi] - has_many :incoming_transactions, class_name: 'Transaction', foreign_key: 'creditor_id' has_many :outgoing_transactions, diff --git a/app/views/datagrid/_enum_checkboxes.html.haml b/app/views/datagrid/_enum_checkboxes.html.haml deleted file mode 100644 index 330234e..0000000 --- a/app/views/datagrid/_enum_checkboxes.html.haml +++ /dev/null @@ -1,5 +0,0 @@ -- elements.each do |value, text, checked| - - id = [form.object_name, filter.name, value].join('_').underscore - = form.label filter.name, options.merge(:for => id) do - = form.check_box(filter.name, form.datagrid_extra_checkbox_options.merge(:multiple => true, :id => id, :checked => checked), value.to_s, nil) - = text diff --git a/app/views/datagrid/_form.html.haml b/app/views/datagrid/_form.html.haml deleted file mode 100644 index 4c337d1..0000000 --- a/app/views/datagrid/_form.html.haml +++ /dev/null @@ -1,9 +0,0 @@ -= form_for grid, options do |f| - - grid.filters.each do |filter| - .datagrid-filter.filter - = f.datagrid_label filter - = f.datagrid_filter filter, partials: options[:partials] - .datagrid-actions - = f.submit I18n.t("datagrid.form.search").html_safe, :class => "datagrid-submit" - - empty_parameter = Rails.version >= "4.1.0" && Rails.version <= '4.1.2' ? nil : {} - = link_to I18n.t('datagrid.form.reset').html_safe, url_for(grid.to_param => empty_parameter), :class => "datagrid-reset" diff --git a/app/views/datagrid/_head.html.haml b/app/views/datagrid/_head.html.haml deleted file mode 100644 index 8cfe7c6..0000000 --- a/app/views/datagrid/_head.html.haml +++ /dev/null @@ -1,4 +0,0 @@ -%tr - - grid.html_columns(*options[:columns]).each do |column| - %th{:class => "#{datagrid_column_classes(grid, column)}"} - = column.header diff --git a/app/views/datagrid/_range_filter.html.haml b/app/views/datagrid/_range_filter.html.haml deleted file mode 100644 index 7ab4337..0000000 --- a/app/views/datagrid/_range_filter.html.haml +++ /dev/null @@ -1,3 +0,0 @@ -= form.text_field(filter.name, from_options) -%span{:class => "separator #{filter.type}"} - -= form.text_field(filter.name, to_options) diff --git a/app/views/datagrid/_row.html.haml b/app/views/datagrid/_row.html.haml deleted file mode 100644 index 82c9918..0000000 --- a/app/views/datagrid/_row.html.haml +++ /dev/null @@ -1,4 +0,0 @@ -%tr{class: "#{options[:cycle] && cycle(*options[:cycle])}"} - - grid.html_columns(*options[:columns]).each do |column| - %td{:class => "#{datagrid_column_classes(grid, column)}"} - = datagrid_value(grid, column, asset) diff --git a/app/views/datagrid/_table.html.haml b/app/views/datagrid/_table.html.haml deleted file mode 100644 index 59f32da..0000000 --- a/app/views/datagrid/_table.html.haml +++ /dev/null @@ -1,9 +0,0 @@ -= content_tag :table, options[:html] do - %thead - = datagrid_header(grid, options) - %tbody - - if assets.any? - = datagrid_rows(grid, assets, options) - - else - %tr - %td.noresults{:colspan => "100%"}= I18n.t('datagrid.no_results').html_safe diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 897b33c..0f335a3 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -14,6 +14,8 @@ - if current_user %li.pure-menu-item = link_to current_user.name.capitalize, current_user, class: "pure-menu-link" + %li.pure-menu-item + = link_to "New Transaction", new_transaction_path, class: "pure-menu-link" - else = link_to "Sign in", user_omniauth_authorize_path(:zeuswpi), class: "pure-menu-link" unless current_user .pure-u-1 diff --git a/app/views/transactions/_new.html.haml b/app/views/transactions/_new.html.haml deleted file mode 100644 index 727d574..0000000 --- a/app/views/transactions/_new.html.haml +++ /dev/null @@ -1,20 +0,0 @@ -= render 'partials/form_errors', object: @transaction -= form_for @transaction, remote: true, html: { class: "pure-form" } do |f| - - if current_user.penning - = f.collection_select :debtor, User.all, :name, :name, - { selected: @transaction.debtor.try(:name) || current_user.name }, { class: 'select2-selector'} - - else - = f.hidden_field :debtor, value: current_user.name - = f.select :creditor, - options_from_collection_for_select(User.all.order(:name), :name, :name), - { include_blank: true }, - { class: 'select2-selector', size: 50 } - -# { class: 'select2-selector', size: 50, required: true } - = f.text_field :message, placeholder: "Message", size: 75 - -# = f.text_field :message, required: true, placeholder: "Message", size: 75 - %fieldset.pure-group-inline - %span.euro.pure-group-addon - = f.number_field :euros, value: amount(@transaction.amount), - placeholder: "Bedrag", step: 0.01, min: 0.01, class: "pure-group-addon price", size: 20 - -# placeholder: "Bedrag", step: 0.01, min: 0.01, class: "pure-group-addon price", size: 20, required: true - = f.submit "Send it!", class: "pure-button pure-button-primary" diff --git a/app/views/transactions/index.html.haml b/app/views/transactions/index.html.haml index f8ad708..e69de29 100644 --- a/app/views/transactions/index.html.haml +++ b/app/views/transactions/index.html.haml @@ -1,4 +0,0 @@ -= datagrid_form_for @grid, method: :get, url: transactions_path -= paginate(@grid.assets) -= datagrid_table @grid -= paginate(@grid.assets) diff --git a/app/views/transactions/new.html.haml b/app/views/transactions/new.html.haml new file mode 100644 index 0000000..bd46894 --- /dev/null +++ b/app/views/transactions/new.html.haml @@ -0,0 +1,13 @@ += render 'partials/form_errors', object: @transaction += simple_form_for @transaction do |f| + - if current_user.penning + = f.collection_select :debtor, User.all, :name, :name, + { selected: @transaction.debtor.try(:name) || current_user.name }, { class: 'select2-selector'} + - else + = f.hidden_field :debtor, value: current_user.name + = f.collection_select :creditor, User.all, :name, :name, + { selected: @transaction.creditor.try(:name) || User.zeus.name }, { class: 'select2-selector' } + = f.input :message, required: true + = f.input :euros, input_html: { value: @transaction.amount/100} + .pure-controls + = f.button :submit, "Send it!" diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 054c155..95b8f8f 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -1,7 +1,5 @@ %h2= @user.name -= render 'transactions/new' - .panel.panel-default.data-table-filters .panel-header %h3.panel-title Filters diff --git a/config/routes.rb b/config/routes.rb index 7d6f8fa..3ac9949 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,6 +5,6 @@ Rails.application.routes.draw do root to: 'high_voltage/pages#show', id: "landing" - resources :transactions, only: [:index, :create] + resources :transactions, only: [:new, :index, :create] resources :users, only: [:show, :index] end diff --git a/spec/apis/transactions_controller_spec.rb b/spec/apis/transactions_controller_spec.rb deleted file mode 100644 index 32c7eb2..0000000 --- a/spec/apis/transactions_controller_spec.rb +++ /dev/null @@ -1,58 +0,0 @@ -describe TransactionsController, type: :api do - before :each do - @debtor = create :user - @creditor = create :user - @api_attributes = { - debtor: @debtor.name, - creditor: @creditor.name, - message: Faker::Lorem.sentence, - euros: 1, - cents: 25 - } - end - - def post_transaction(extra_attributes = {}) - post '/transactions', { transaction: @api_attributes.merge(extra_attributes) }, - { 'HTTP_ACCEPT' => "application/json", "X_API_KEY" => @key } - end - - before :each do - @client = Client.create name: "Tap" - @key = @client.key - end - - describe "Authentication" do - it "should require a client authentication key" do - post '/transactions' - expect(last_response.status).to eq(401) - end - - it "should work with valid key" do - post_transaction - expect(last_response.status).to eq(201) - end - end - - describe "successfull creating transaction" do - it "should create a transaction" do - expect { post_transaction }.to change { Transaction.count }.by(1) - end - - it "should set issuer" do - post_transaction - @transaction = Transaction.last - expect(@transaction.issuer).to eq(@client) - end - end - - describe "failed creating transaction" do - it "should create a transaction" do - expect { post_transaction(euros: -5) }.to change { Transaction.count }.by(0) - end - - it "should give 402 status" do - post_transaction(euros: -4) - expect(last_response.status).to eq(422) - end - end -end diff --git a/spec/controllers/transactions_controller_spec.rb b/spec/controllers/transactions_controller_spec.rb index 3c6ced4..e96cc51 100644 --- a/spec/controllers/transactions_controller_spec.rb +++ b/spec/controllers/transactions_controller_spec.rb @@ -1,4 +1,7 @@ -describe TransactionsController, type: :controller do +require 'rails_helper' +require 'spec_helper' + +RSpec.describe TransactionsController, type: :controller do describe "creating transaction" do before :each do @debtor = create(:user) @@ -19,7 +22,7 @@ describe TransactionsController, type: :controller do end it "should create a new transaction" do - expect { post :create, @attributes }.to change { Transaction.count }.by(1) + expect {post :create, @attributes}.to change {Transaction.count}.by(1) end it "should set debtor" do @@ -55,7 +58,7 @@ describe TransactionsController, type: :controller do it "should be refused" do expect do post :create, transaction: attributes_for(:transaction, cents: -20) - end.not_to change { Transaction.count } + end.not_to change {Transaction.count} end end @@ -68,7 +71,7 @@ describe TransactionsController, type: :controller do euros: 10000000, message: 'DIT IS OVERVAL' } - end.not_to change { Transaction.count } + end.not_to change {Transaction.count} end end end diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index 86d0660..e2c3d3b 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -1,36 +1,5 @@ -describe UsersController, type: :controller do - before :each do - @user = create :penning - sign_in @user - end +require 'rails_helper' - describe 'GET show' do - before :each do - get :show, id: @user - end +RSpec.describe UsersController, type: :controller do - it 'should be successful' do - expect(response).to render_template(:show) - expect(response).to have_http_status(200) - end - - it 'should load the correct user' do - expect(assigns(:user)).to eq(@user) - end - end - - describe 'GET index' do - before :each do - get :index - end - - it 'should load an array of all users' do - expect(assigns(:users)).to eq([@user]) - end - - it 'should render the correct template' do - expect(response).to have_http_status(200) - expect(response).to render_template(:index) - end - end end diff --git a/spec/factories/transactions.rb b/spec/factories/transactions.rb index 71e7e00..716b419 100644 --- a/spec/factories/transactions.rb +++ b/spec/factories/transactions.rb @@ -18,7 +18,7 @@ FactoryGirl.define do association :debtor, factory: :user association :creditor, factory: :user issuer { debtor } - amount { 1 + rand(100) } + amount { rand(100) } message { Faker::Lorem.sentence } end end diff --git a/spec/helpers/transactions_helper_spec.rb b/spec/helpers/transactions_helper_spec.rb index 3b3e225..48c6c73 100644 --- a/spec/helpers/transactions_helper_spec.rb +++ b/spec/helpers/transactions_helper_spec.rb @@ -1,2 +1,14 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the TransactionsHelper. For example: +# +# describe TransactionsHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end RSpec.describe TransactionsHelper, type: :helper do end diff --git a/spec/helpers/users_helper_spec.rb b/spec/helpers/users_helper_spec.rb index bb943ca..890768c 100644 --- a/spec/helpers/users_helper_spec.rb +++ b/spec/helpers/users_helper_spec.rb @@ -1,2 +1,14 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the UsersHelper. For example: +# +# describe UsersHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end RSpec.describe UsersHelper, type: :helper do end diff --git a/spec/models/client_spec.rb b/spec/models/client_spec.rb index d96c171..33e905f 100644 --- a/spec/models/client_spec.rb +++ b/spec/models/client_spec.rb @@ -9,20 +9,14 @@ # updated_at :datetime not null # -describe Client, type: :model do - before :each do - @client = create :client - end +require 'rails_helper' + +RSpec.describe Client, type: :model do it "should have a valid factory" do - expect(@client).to be_valid + expect(create(:client)).to be_valid end it "should generate a key" do - expect(@client.key).to be_present - end - - it "should have a unique name" do - client = build :client, name: @client.name - expect(client).to_not be_valid + expect(create(:client).key).to be_present end end diff --git a/spec/models/transaction_spec.rb b/spec/models/transaction_spec.rb index 4cd2a8f..d05aaf8 100644 --- a/spec/models/transaction_spec.rb +++ b/spec/models/transaction_spec.rb @@ -13,7 +13,9 @@ # updated_at :datetime not null # -describe Transaction, type: :model do +require 'rails_helper' + +RSpec.describe Transaction, type: :model do it "has a valid factory" do expect(create(:transaction)).to be_valid end @@ -34,20 +36,4 @@ describe Transaction, type: :model do end end - describe "amount" do - it "should be positive" do - expect(build :transaction, amount: -5).to_not be_valid - end - - it "should not be 0" do - expect(build :transaction, amount: 0).to_not be_valid - end - end - - describe "debtor/creditor" do - it "should be different" do - @user = create :user - expect(build :transaction, debtor: @user, creditor: @user).to_not be_valid - end - end end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index e188fc1..cc98894 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -10,17 +10,10 @@ # updated_at :datetime not null # -describe User, type: :model do - before :each do - @user = create :user - end +require 'rails_helper' +RSpec.describe User, type: :model do it "has a valid factory" do - expect(@user).to be_valid - end - - it "has a unique name" do - user = build :user, name: @user.name - expect(user).to_not be_valid + expect(create(:user)).to be_valid end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index f3829a4..831f776 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -22,11 +22,6 @@ Coveralls.wear!('rails') # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration require 'factory_girl' require 'devise' - -Dir[File.join(File.dirname(__FILE__), 'support', '**', '*.rb')].each do |f| - require f -end - RSpec.configure do |config| config.include FactoryGirl::Syntax::Methods config.include Devise::TestHelpers, type: :controller diff --git a/spec/support/api_helper.rb b/spec/support/api_helper.rb deleted file mode 100644 index b67d167..0000000 --- a/spec/support/api_helper.rb +++ /dev/null @@ -1,11 +0,0 @@ -module ApiHelper - include Rack::Test::Methods - - def app - Rails.application - end -end - -RSpec.configure do |config| - config.include ApiHelper, type: :api #apply to all spec for apis folder -end