oh_my_log 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d38cf6c6258aaa07963ca2d81d7856fbeddf171002d421816b44b60ef8300278
-  data.tar.gz: 9cdf4c4a912f38677cff0891dbfb13456c43b608415a7077fc7e878589ed6ab5
+  metadata.gz: ea12189e28a7ff710bee96c376acea0797c7530612cd294878e6da28f1b5e896
+  data.tar.gz: 0c0b2163cfd7f3c4dc48a04f5a165d52c8c87a0b1f6447fe8be8acc7632860e6
 SHA512:
-  metadata.gz: d4c1d022e32dd410ee0ca905368dbfcfefa0101f780005b89b1c6f5597d8a6742dfc0f051b54da2de8dc162b0eccd0e1c122980f1a416bb204a5336b3c540137
-  data.tar.gz: c2043882304ab9ac77926480e2e9eb5ec08c7ed808ce2a3c051bf2c5864699b42b28f628bfa9a18d3d53d18740e7a48df7ee76bd8f2196f2930c41387d6a060a
+  metadata.gz: 27b8c2c5ba7b0f16a7e6f9b761dcb344f59225e152b714d1c7129b11782b9b0526186f739cabc035a938706de64f92eeadfba096324fe1884c780a0c11502509
+  data.tar.gz: 5a7e4cdff1395cb3621b1c3a019357fe7a74552d153016174572cbf88a9552973cce152f17a4ef7aeeedf4455071c4bb531bb2958551f852f6523768dceb4ce2

data/README.md

@@ -64,6 +64,8 @@ bundle exec rake oh_my_log:generate_observers
 
 >selectors Selector[] (instance list of all the selectors)
 
+>user_fields String[]/Symbol[] (fallback fields used to log an user)
+
 ###### Instance methods:
 
 >add_selector(selector ->Selector) (use this to add a new selector inside the configuration,
@@ -109,11 +111,12 @@ Complex initializer example:
 OhMyLog::Log.configure do |config|
   config.print_log = true
   selector = OhMyLog::Log::Selector.new
-  selector.set_controllers("EXCEPT" =>["ApplicationController"])
+  selector.set_controllers("EXCEPT" =>["Application","Hotel"])
   selector.set_actions("ONLY" =>["index","create","destroy"])
   selector.set_status_codes("ONLY" =>[(0..200)])
   selector.set_methods("EXCEPT" =>["GET"])
   selector.set_ips("EXCEPT"=>["192.168.0.1"])
+  config.user_fields = ["email", "full_name"]
   config.add_selector(selector)
   #put your configs here
 end

data/lib/oh_my_log/configuration.rb

@@ -1,7 +1,7 @@
 module OhMyLog
   module Log
     class Configuration
-      attr_accessor :models, :print_log, :record_history, :log_instance, :syslog
+      attr_accessor :models, :print_log, :record_history, :log_instance, :syslog, :user_fields
       attr_reader :selectors, :log_path
 
       def initialize(*args)
@@ -12,6 +12,7 @@ module OhMyLog
         @log_instance = Logger.new(File.join(Rails.root, 'log/oh_my_log.log')) unless @log_path
         @log_path = nil
         @syslog = nil
+        @user_fields = PrintableUser::DEFAULT_FIELDS
         #do we wanna keep track of all the actions?
         @record_history = false
       end

data/lib/oh_my_log/printable_user.rb

@@ -0,0 +1,32 @@
+class PrintableUser
+  DEFAULT_FIELDS = ["email", "full_name", ["first_name", "last_name"], "id"].freeze
+
+  def initialize(user, accepted_values)
+    raise "DIO" unless accepted_values
+    raise ArgumentError unless user || !accepted_values.is_a?(Array)
+    @user = user
+    @accepted_values = accepted_values
+  end
+
+  def to_s
+    try_val = ->(val) do
+      user.send(val.to_sym) rescue nil
+    end
+    accepted_values.each do |val|
+      if val.is_a?(Array)
+        tmp_val = val.map {|field| try_val.call(field)}.join(" ")
+        return tmp_val if tmp_val.present?
+      elsif [String, Symbol].include?(val.class)
+        return try_val.call(val) if try_val.call(val)
+      else
+        raise ArgumentError
+      end
+    end
+    raise "No values was found"
+  end
+
+  private
+
+  attr_reader :user, :accepted_values
+
+end

data/lib/oh_my_log/request.rb

@@ -14,7 +14,7 @@ module OhMyLog
       end
 
       def to_s
-        user_info = @sender.email rescue nil
+        user_info = PrintableUser.new(@sender, OhMyLog::Log.configuration.user_fields) rescue nil
         sender = user_info || Thread.current["remote_ip"]
         "#{@date}, #{sender}, #{@method}, #{@params}, #{@status}"
       end

data/lib/oh_my_log/syslog_implementor.rb

@@ -61,7 +61,11 @@ module OhMyLog
     # end
 
     def retrive_public_ip
-      Net::HTTP.get(URI("http://checkip.amazonaws.com")).gsub("\n", "") rescue nil
+      if Rails.env.test?
+        "127.0.0.1"
+      else
+        Net::HTTP.get(URI("http://checkip.amazonaws.com")).gsub("\n", "") rescue nil
+      end
     end
 
     def retrive_hostname

data/lib/oh_my_log/syslog_processors/r_f_c_3164.rb

@@ -11,7 +11,7 @@ module SyslogProcessors
     def message_text(ip:, user:, url:, m:, s:, p:)
       text = "#{@tag.upcase}:"
       text += "ip=#{ip};"
-      text += "u=#{user};"
+      text += "u=#{PrintableUser.new(user, OhMyLog::Log.configuration.user_fields) rescue "anonymous"};"
       text += "url=#{url};"
       text += "m=#{m};"
       text += "s=#{s};"

data/lib/oh_my_log/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OhMyLog
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oh_my_log
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Fabrizio Spadaro
@@ -202,6 +202,7 @@ files:
 - lib/oh_my_log/observer_factory.rb
 - lib/oh_my_log/orm/active_record.rb
 - lib/oh_my_log/orm/mongoid.rb
+- lib/oh_my_log/printable_user.rb
 - lib/oh_my_log/request.rb
 - lib/oh_my_log/result.rb
 - lib/oh_my_log/selector.rb