chaltron 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe253c545a570d0c0ac2fd32428e8c3dca008533
-  data.tar.gz: 87028397cfd5cdc255ffb56caf9366e29fa25544
+  metadata.gz: c137626426ad577a84df81068a09611fbcc40cd0
+  data.tar.gz: 9e3800ab7f2610b444bb8ad9f8e9c20e8a655542
 SHA512:
-  metadata.gz: d9a793bf210317cdb1f22296f01d09198b93ca2e3e2f3e758ea1c2f60d750409bf35467541f325c580691152526d283db11fd64f34369800e289df9e2b8d0bc3
-  data.tar.gz: 4a86568c2542143b584b4f60cd0ca4118f323d77bfd416846e58bc0c03ad499586181025f00dcd3785a6aac72a3a324642fe341d11e68ef35ac7a49661cf1af8
+  metadata.gz: 7d8213a9292b9463a63f139935ea62f677248e9a07a3da953222d0c3ed67a6bf3a4559f20e31bbac09ca275dea9ef339ec56a77b59a827787581282a7394210c
+  data.tar.gz: b34b3ff7e0bc27b1451b61991cacf23cd87f55360cf998393dbec091fc7e84cb5970d558520ece8f52ae29df53e16bb46a70897f2137b6f45fc5e7153edbaeca

data/app/helpers/chaltron/logs_helper.rb

@@ -1,10 +1,14 @@
 module Chaltron::LogsHelper
   def bootstrap_severity(severity)
     case severity.to_s
-    when 'info'  then 'primary'
-    when 'error' then 'danger'
-    when 'debug' then 'info'
-    else 'default'
+    when 'emerg', 'alert', 'crit', 'err'
+      'danger'
+    when 'warning', 'notice'
+      'warning'
+    when 'debug'
+      'info'
+    else
+      'primary'
     end
   end
 end

data/app/models/log.rb

@@ -1,22 +1,24 @@
 class Log < ActiveRecord::Base
-  Severities = %w( info debug error )
+  Severities = %w( emerg alert crit err warning notice info debug )
 
   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(syslog_method, self.category.upcase + ' - ' + self.message)
+      s.send(self.severity.to_sym, self.category.upcase + ' - ' + self.message)
     end
   end
 

data/app/views/chaltron/users/self_edit.html.erb

@@ -20,7 +20,7 @@
             <div class='col-sm-10'>
               <%= f.submit t('.submit'), class: 'btn btn-primary' %>
               <%= link_to self_show_users_path, class: 'btn btn-link pull-right' do %>
-                <%= icon :far, :times, t('chaltron.common.cancel') %>
+                <%= icon :fas, :times, t('chaltron.common.cancel') %>
               <% end %>
             </div>
           </div>

data/lib/chaltron/version.rb

@@ -1,3 +1,3 @@
 module Chaltron
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chaltron
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - vicvega
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-09 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails