chaltron 0.3.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 78e7ad0467fc7cd5cb0c3f25f464ce436a3dbbc0be719abdc45c7a385243ebe1
-  data.tar.gz: 43f59c6078ba453dccab6430113b76161d241f6d612efb05af1fc896d08e406a
+SHA1:
+  metadata.gz: 4e9ae962f2dd9c241da700b59ffff814b0e10483
+  data.tar.gz: 738cf12df8205c411047c8e245e4580d86b95204
 SHA512:
-  metadata.gz: fe8451fed953ce40aa38a3f8353186f0679ea52809ee283fa19adc36a496648219782c209de7b0fdddcc3b612532a4e5246395aad087ede4a6968f297752f7cc
-  data.tar.gz: 57daa0f86e0b61a34975660476deb35bb5ef59e567a31bc897deb8af4027653c360f1969a17357f294be014ed198df5353ab8934f51b531982b1eeb472435b03
+  metadata.gz: ab99ee8301b42f336a2f9f844978787b456fc8ada3bc422cf49ad244a93396a9f63dcbefc7748f7438e535d27de11ee30d979062aade8d5ef98e267e0f34c73e
+  data.tar.gz: 3120ad2fd6985cbeda1e4ace7e7e0eaf319ee6e8cc81af4a80d2907f0f520e5952609bb192cbba90d1ab6f0a38dd98c72ef67fc37064310c2c290bb9b6ccddae

data/README.md

@@ -1,4 +1,5 @@
-# Chaltron [![Gem Version](https://badge.fury.io/rb/chaltron.svg)](http://badge.fury.io/rb/chaltron) [![Build Status](https://travis-ci.org/vicvega/chaltron.svg?branch=master)](http://travis-ci.org/vicvega/chaltron) 
+# Chaltron [![Gem Version](https://badge.fury.io/rb/chaltron.svg)](http://badge.fury.io/rb/chaltron) [![Build Status](https://travis-ci.org/vicvega/chaltron.svg?branch=master)](http://travis-ci.org/vicvega/chaltron) [![Dependency Status](https://gemnasium.com/vicvega/chaltron.svg)](https://gemnasium.com/vicvega/chaltron)
+
 [![Coverage Status](https://coveralls.io/repos/vicvega/chaltron/badge.svg?branch=master&service=github)](https://coveralls.io/github/vicvega/chaltron?branch=master)
 [![Code Climate](https://codeclimate.com/github/vicvega/chaltron/badges/gpa.svg)](https://codeclimate.com/github/vicvega/chaltron)
 [![PullReview stats](https://www.pullreview.com/github/vicvega/chaltron/badges/master.svg?)](https://www.pullreview.com/github/vicvega/chaltron/reviews/master)

data/app/assets/javascripts/chaltron.js

@@ -1,10 +1,12 @@
 //= require jquery
 //= require jquery_ujs
-//= require bootstrap-sprockets
-//= require dataTables/jquery.dataTables
-//= require dataTables/extras/dataTables.responsive
-//= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
-//= require dataTables/extras/dataTables.select.min
+//= require popper
+//= require bootstrap
+//= require datatables/jquery.dataTables
+//= require datatables/dataTables.bootstrap4
+//= require datatables/extensions/Responsive/dataTables.responsive
+//= require datatables/extensions/Responsive/responsive.bootstrap4
+//= require datatables/extensions/Select/dataTables.select
 //= require nprogress
 //= require nprogress-turbolinks
 //= require nprogress-ajax

data/app/assets/javascripts/chaltron/datatables.js.coffee

@@ -20,7 +20,6 @@ class DataTableBuilder
       columnDefs: [
         { orderable: false, className: 'select-checkbox', targets: 0 }
       ]
-      dom: 'T<"clear">lfrtip'
       select: { style: 'multi', info: false }
     })
 
@@ -39,7 +38,8 @@ class DataTableBuilder
         { data: 'category', searchable: false }
       ]
       columnDefs: [
-        { orderSequence: ['desc', 'asc'], targets: [ 1 ] }
+        { orderSequence: ['desc', 'asc'], targets: [ 1 ] },
+        { className: 'text-center', "targets": [ 0 ] }
       ]
     })
 

data/app/assets/javascripts/chaltron/navbar.js.coffee

@@ -0,0 +1,46 @@
+class NavbarBuilder
+
+  render: ->
+    @prepend_class(i, 'navbar-nav mr-auto') for i in $('#navigation ul')
+    $('#navigation ul li').addClass('nav-item')
+    $('#navigation ul li a').addClass('nav-link')
+    $('#navigation ul li ul').parent().addClass('dropdown')
+    $('#navigation ul li.dropdown').children('a').addClass('dropdown-toggle').attr(
+      {id: 'navbarDropdown', role: 'button', 'aria-haspopup': 'true', 'aria-expanded': 'false', 'data-toggle': 'dropdown'}
+    )
+    @render_dropdown_menu i for i in $('#navigation ul li.dropdown')
+    @render_icon_a i for i in $('#navigation ul li a')
+
+  render_dropdown_menu: (item) ->
+    links = jQuery(item).find('ul li a')
+    jQuery(l).addClass('dropdown-item').removeClass('nav-link') for l in links
+    @render_dropdown_links (i) for i in jQuery(item).find('ul')
+
+  render_dropdown_links: (item) ->
+    el = jQuery(item)
+    links = el.find('li a')
+
+    klass = 'dropdown-menu'
+    klass += ' dropdown-menu-right' if el.hasClass('dropdown-menu-right')
+    div = $('<div></div>').addClass('dropdown-menu').attr('aria-labelledby': 'navbarDropdown').append(links)
+    el.replaceWith(div)
+
+  prepend_class: (item, klass) ->
+    el = jQuery(item)
+    if el.attr('class')
+      klass += " #{el.attr('class')}"
+      el.removeClass(jQuery(item).attr('class'))
+
+    el.addClass(klass)
+
+    if el.hasClass('justify-content-end')
+      el.removeClass('mr-auto')
+
+  render_icon_a: (item) ->
+    el = jQuery(item)
+    if el.attr('icon')
+      el.html("<i class=\"fa fa-fw fa-#{el.attr('icon')}\"></i>&nbsp;#{el.text()}")
+
+$(document).on 'turbolinks:load', ->
+  navbar = new NavbarBuilder
+  navbar.render()

data/app/assets/javascripts/dataTables/dataTables.bootstrap4.min.js

@@ -0,0 +1,8 @@
+/*!
+ DataTables Bootstrap 3 integration
+ ©2011-2015 SpryMedia Ltd - datatables.net/license
+*/
+(function(b){"function"===typeof define&&define.amd?define(["jquery","datatables.net"],function(a){return b(a,window,document)}):"object"===typeof exports?module.exports=function(a,d){a||(a=window);if(!d||!d.fn.dataTable)d=require("datatables.net")(a,d).$;return b(d,a,a.document)}:b(jQuery,window,document)})(function(b,a,d,m){var f=b.fn.dataTable;b.extend(!0,f.defaults,{dom:"<'row'<'col-sm-12 col-md-6'l><'col-sm-12 col-md-6'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-12 col-md-5'i><'col-sm-12 col-md-7'p>>",
+renderer:"bootstrap"});b.extend(f.ext.classes,{sWrapper:"dataTables_wrapper container-fluid dt-bootstrap4",sFilterInput:"form-control form-control-sm",sLengthSelect:"form-control form-control-sm",sProcessing:"dataTables_processing card",sPageButton:"paginate_button page-item"});f.ext.renderer.pageButton.bootstrap=function(a,h,r,s,j,n){var o=new f.Api(a),t=a.oClasses,k=a.oLanguage.oPaginate,u=a.oLanguage.oAria.paginate||{},e,g,p=0,q=function(d,f){var l,h,i,c,m=function(a){a.preventDefault();!b(a.currentTarget).hasClass("disabled")&&
+o.page()!=a.data.action&&o.page(a.data.action).draw("page")};l=0;for(h=f.length;l<h;l++)if(c=f[l],b.isArray(c))q(d,c);else{g=e="";switch(c){case "ellipsis":e="&#x2026;";g="disabled";break;case "first":e=k.sFirst;g=c+(0<j?"":" disabled");break;case "previous":e=k.sPrevious;g=c+(0<j?"":" disabled");break;case "next":e=k.sNext;g=c+(j<n-1?"":" disabled");break;case "last":e=k.sLast;g=c+(j<n-1?"":" disabled");break;default:e=c+1,g=j===c?"active":""}e&&(i=b("<li>",{"class":t.sPageButton+" "+g,id:0===r&&
+"string"===typeof c?a.sTableId+"_"+c:null}).append(b("<a>",{href:"#","aria-controls":a.sTableId,"aria-label":u[c],"data-dt-idx":p,tabindex:a.iTabIndex,"class":"page-link"}).html(e)).appendTo(d),a.oApi._fnBindAction(i,{action:c},m),p++)}},i;try{i=b(h).find(d.activeElement).data("dt-idx")}catch(v){}q(b(h).empty().html('<ul class="pagination"/>').children("ul"),s);i!==m&&b(h).find("[data-dt-idx="+i+"]").focus()};return f});

data/app/assets/stylesheets/chaltron.scss

@@ -1,20 +1,17 @@
 // Bootstrap
-$font-size-base: 13px;
-$navbar-height: 40px;
-
-@import 'bootstrap-sprockets';
 @import 'bootstrap';
-@import 'bootstrap/theme';
 
 // font-awesome
 @import 'font-awesome-sprockets';
 @import 'font-awesome';
 
 // datatables
-@import 'dataTables/bootstrap/3/jquery.dataTables.bootstrap';
-@import 'dataTables/extras/dataTables.responsive';
-@import 'dataTables/extras/select.dataTables';
-//@import 'chaltron/datatables';
+@import 'datatables/dataTables.bootstrap4';
+@import 'datatables/extensions/Responsive/responsive.bootstrap4';
+@import 'datatables/extensions/Select/select.bootstrap4';
+
+// bootstrap_form
+@import 'rails_bootstrap_forms';
 
 // minor fix
 .dataTables_wrapper .dataTables_filter input {
@@ -30,3 +27,6 @@ $navbar-height: 40px;
 
 // Core CSS
 @import 'chaltron/layout';
+
+// logs
+@import 'chaltron/logs';

data/app/assets/stylesheets/chaltron/layout.scss

@@ -1,10 +1,9 @@
 body {
-//  background-color: #E1E1E1;
 }
 
 div#content {
-  margin-top: 40px;
-  margin-bottom: 40px;
+  margin-top: 2.5rem;
+  margin-bottom: 2.5rem;
 }
 
 /**
@@ -16,7 +15,7 @@ div#content {
   margin: 0;
   text-align: center;
   position: fixed;
-  top: 40px;
+  top: 2.5rem;
   width: 100%;
   opacity: 0.8;
   z-index: 100;
@@ -35,14 +34,6 @@ div#content {
   @include form-box(650px);
 }
 
-/**
- * Navbar tabs
- *
- */
- .nav-tabs {
-    margin-bottom: 15px;
-}
-
 #nprogress .spinner {
   display: block;
   position: fixed;
@@ -50,20 +41,3 @@ div#content {
   top: 12px;
   right: 5px;
 }
-
-/**
- * Scaffold
- *
- */
-.side-filters fieldset {
-  margin-bottom: 15px;
-}
-
-.form-actions {
-  background-color: whitesmoke;
-  border-top: 1px solid #e5e5e5;
-  margin-bottom: 18px;
-  margin-top: 18px;
-  padding-bottom: 18px;
-  padding-top: 18px;
-}

data/app/assets/stylesheets/chaltron/logs.scss

@@ -0,0 +1,5 @@
+table#logs{
+  th.severity {
+    width: 4rem
+  }
+}

data/app/controllers/chaltron/ldap_controller.rb

@@ -15,11 +15,11 @@ class Chaltron::LdapController < ApplicationController
     userid = params[:userid]
     if userid.present?
       entry = Chaltron::LDAP::Person.find_by_uid(userid)
-      @entries << entry
+      @entries << entry unless entry.nil?
     else
-      @entries = Chaltron::LDAP::Person.find_by_fields(find_options)
+      res = Chaltron::LDAP::Person.find_by_fields(find_options)
+      @entries = res
     end
-    @entries.compact!
   end
 
   def multi_create
@@ -41,12 +41,12 @@ class Chaltron::LdapController < ApplicationController
   private
   def find_options
     department = params[:department]
-    name       = params[:lastname]
+    name       = params[:fullname]
     limit      = params[:limit].to_i
 
     ret = {}
     ret[:department] = "*#{department}*" unless department.blank?
-    ret[:last_name]  = "*#{name}*"       unless name.blank?
+    ret[:cn]         = "*#{name}*"       unless name.blank?
     ret[:limit]      = limit.zero? ? default_limit : limit
     ret
   end

data/app/controllers/chaltron/omniauth_callbacks_controller.rb

@@ -12,7 +12,6 @@ module Chaltron
       # We only find ourselves here
       # if the authentication to LDAP was successful.
       user = Chaltron::LDAP::User.find_or_create(oauth, Chaltron.ldap_allow_all)
-      user = Chaltron.ldap_after_authenticate.call(user, Chaltron::LDAP::Connection.new)
       if user.nil?
         redirect_to root_url, alert: I18n.t('chaltron.not_allowed_to_sign_in')
       else

data/app/controllers/chaltron/sessions_controller.rb

@@ -1,5 +1,3 @@
-require 'chaltron/ldap/connection'
-
 class Chaltron::SessionsController  < Devise::SessionsController
   after_action :after_login, only: :create
   before_action :before_logout, only: :destroy
@@ -11,7 +9,6 @@ class Chaltron::SessionsController  < Devise::SessionsController
   end
 
   def before_logout
-    Chaltron.ldap_before_logout.call(current_user, Chaltron::LDAP::Connection.new) if current_user.ldap_user?
     info I18n.t('chaltron.logs.logout', user: current_user.display_name)
   end
 end

data/app/controllers/chaltron/users_controller.rb

@@ -81,9 +81,7 @@ class Chaltron::UsersController < ApplicationController
   end
 
   def self_update_params
-    allowed = [:fullname]
-    allowed << :email if current_user.provider.nil?
-    params.require(:user).permit(allowed)
+    params.require(:user).permit(:email, :fullname)
   end
 
   def filter_params

data/app/datatables/log_datatable.rb

@@ -1,6 +1,6 @@
 class LogDatatable < AjaxDatatablesRails::Base
 
-  def_delegators :@view, :link_to, :tag_label, :bootstrap_severity, :current_ability
+  def_delegators :@view, :link_to, :content_tag, :bootstrap_severity, :current_ability
 
   def view_columns
     # Declare strings in this format: ModelName.column_name
@@ -18,7 +18,8 @@ class LogDatatable < AjaxDatatablesRails::Base
   def data
     records.map do |log|
       {
-        severity: tag_label(I18n.t("chaltron.logs.severity.#{log.severity}"), bootstrap_severity(log.severity)),
+        severity: content_tag(:span, I18n.t("chaltron.logs.severity.#{log.severity}"),
+          class: "badge badge-#{bootstrap_severity(log.severity)}"),
         date:     I18n.l(log.created_at, format: :short),
         message:  link_to(log.message, log),
         category: I18n.t("chaltron.logs.category.#{log.category}")

data/app/helpers/chaltron/ldap_helper.rb

@@ -2,8 +2,8 @@ module Chaltron::LdapHelper
 
   def display_entry_name(entry)
     if User.exists?(username: entry.username)
-      (entry.name + ' ').html_safe +
-        tag_label(I18n.t('chaltron.users.already_present'), :danger)
+      (entry.name + '&nbsp').html_safe +
+        content_tag(:span, I18n.t('chaltron.users.already_present'), class: 'badge badge-danger')
     else
       entry.name
     end
@@ -12,7 +12,7 @@ module Chaltron::LdapHelper
   def display_entry_email(entry)
     mail = entry.email
     if mail.blank?
-      tag_label(I18n.t('chaltron.users.missing_field'), :danger)
+      content_tag(:span, I18n.t('chaltron.users.missing_field'), class: 'badge badge-danger')
     else
       mail
     end

data/app/helpers/chaltron/logs_helper.rb

@@ -1,19 +1,10 @@
 module Chaltron::LogsHelper
-  def display_panel(log, &block)
-    klass = "panel panel-#{bootstrap_severity(log.severity)}"
-    content_tag :div, capture(&block), class: klass
-  end
-
   def bootstrap_severity(severity)
     case severity.to_s
-    when 'emerg', 'alert', 'crit', 'err'
-      'danger'
-    when 'warning'
-      'warning'
-    when 'debug'
-      'info'
-    else
-      'primary'
+    when 'info'  then 'primary'
+    when 'error' then 'danger'
+    when 'debug' then 'info'
+    else 'default'
     end
   end
 end

data/app/helpers/chaltron/users_helper.rb

@@ -1,10 +1,28 @@
 module Chaltron::UsersHelper
   def display_username(user)
     if user == current_user
-      link_to(user.username, user) + ' '.html_safe +
-        tag_label(I18n.t('chaltron.users.it_s_you'), :success)
+      link_to(user.username, user) + '&nbsp'.html_safe +
+        content_tag(:span, I18n.t('chaltron.users.it_s_you'), class: 'badge badge-success')
     else
       link_to user.username, user
     end
   end
+
+  def display_side_filter_link(url, active, text, count)
+
+    klass = 'list-group-item list-group-item-action'
+    klass += ' active' if active
+
+    badge_klass = 'badge badge-pill float-right'
+    if active
+      badge_klass += ' badge-light'
+    else
+      badge_klass += ' badge-primary'
+    end
+
+    link_to url, class: klass do
+      content_tag(:span, count, class: badge_klass) + text
+    end
+
+  end
 end

data/app/helpers/chaltron_helper.rb

@@ -33,17 +33,6 @@ module ChaltronHelper
     end
   end
 
-  #
-  # Badge and label helpers
-  #
-  def badge(*args)
-    badge_label(:badge, *args)
-  end
-
-  def tag_label(*args)
-    badge_label(:label, *args)
-  end
-
   #
   # Get current revision
   #
@@ -61,9 +50,4 @@ module ChaltronHelper
     end
   end
 
-  def badge_label(what, value, type = nil)
-    klass = [what]
-    klass << "#{what}-#{type}" if type.present?
-    content_tag :span, value, class: "#{klass.join(' ')}"
-  end
 end

data/app/models/authorizable.rb

@@ -1,6 +1,6 @@
 module Authorizable
   def roles=(roles)
-    self.roles_mask = (roles & Chaltron.roles).map { |r| 2**Chaltron.roles.index(r) }.inject(:+)
+    self.roles_mask = (roles & Chaltron.roles).map { |r| 2**Chaltron.roles.index(r) }.sum
   end
 
   def roles

data/app/models/log.rb

@@ -1,24 +1,22 @@
-class Log < ApplicationRecord
-  Severities = %w( emerg alert crit err warning notice info debug )
+class Log < ActiveRecord::Base
+  Severities = %w( info debug error )
 
   validates_presence_of :severity, :message
   validates_inclusion_of :severity, in: Severities
 
-  before_validation :change_severity
-
   after_create :to_syslog if Chaltron.enable_syslog
 
   private
-
-  def change_severity
-    self.severity = :emerg   if self.severity && self.severity.to_sym == :panic
-    self.severity = :err     if self.severity && self.severity.to_sym == :error
-    self.severity = :warning if self.severity && self.severity.to_sym == :warn
-  end
-
   def to_syslog
+    syslog_method =
+      case self.severity
+      when 'info' then :notice
+      when 'debug' then :debug
+      when 'error' then :err
+      else :info
+    end
     Syslog.open(Rails.application.class.parent.to_s, Syslog::LOG_PID, Chaltron.syslog_facility) do |s|
-      s.send(self.severity.to_sym, self.category.upcase + ' - ' + self.message)
+      s.send(syslog_method, self.category.upcase + ' - ' + self.message)
     end
   end
 

data/app/models/user.rb

@@ -1,4 +1,4 @@
-class User < ApplicationRecord
+class User < ActiveRecord::Base
   include Authorizable
   # Include default devise modules. Others available are:
   # :registerable, :confirmable, :lockable and :omniauthable
@@ -26,8 +26,4 @@ class User < ApplicationRecord
     end
   end
 
-  def ldap_user?
-    provider == 'ldap'
-  end
-
 end