rails-pretty-logger 0.1.0 → 0.2.0

data/app/controllers/rails/pretty/logger/dashboards_controller.rb

@@ -2,9 +2,9 @@ require_dependency "rails/pretty/logger/application_controller"
 
 module Rails::Pretty::Logger
   class DashboardsController < ApplicationController
+    before_action :set_logger, except: [:index]
 
     def logs
-      @log = PrettyLogger.new(params)
       @log_data = @log.log_data
     end
 
@@ -13,9 +13,18 @@ module Rails::Pretty::Logger
     end
 
     def clear_logs
-      PrettyLogger.new(params).clear_logs
+      @log.clear_logs
       redirect_to logs_dashboards_path({log_file: params[:log_file]})
     end
 
+    private
+
+    def dashboard_params
+      params.permit( :log_file, :utf8, :_method, :authenticity_token, :commit, :page, date_range: [:end, :start, :divider])
+    end
+
+    def set_logger
+      @log = PrettyLogger.new(dashboard_params)
+    end
   end
 end

data/app/controllers/rails/pretty/logger/hourly_logs_controller.rb

@@ -0,0 +1,30 @@
+require_dependency "rails/pretty/logger/application_controller"
+
+module Rails::Pretty::Logger
+  class HourlyLogsController < ApplicationController
+    before_action :set_logger, except: [:index]
+
+    def logs
+      @log_data = @log.log_data
+    end
+
+    def index
+      @log_file_list = PrettyLogger.get_hourly_log_file_list.select{ |_,file| file[:file_size] > 0 }
+    end
+
+    def clear_logs
+      @log.clear_logs
+      redirect_to hourly_logs_path({log_file: params[:log_file]})
+    end
+
+    private
+
+    def hourly_params
+      params.permit( :log_file, :utf8, :_method, :authenticity_token, :commit, :page, date_range: [:end, :start, :divider])
+    end
+
+    def set_logger
+      @log = PrettyLogger.new(hourly_params)
+    end
+  end
+end

data/app/helpers/rails/pretty/logger/application_helper.rb

@@ -2,6 +2,15 @@ module Rails
   module Pretty
     module Logger
       module ApplicationHelper
+
+        def modify_name(name)
+          return "#{name [-13..-10]}/#{name[-9..-8]}/#{name[-7..-6]} : #{name[-4..-1]}"
+        end
+
+        def trim_name(name)
+          index = name.split("/log/").last.capitalize
+        end
+
       end
     end
   end

data/app/helpers/rails/pretty/logger/dashboards_helper.rb

@@ -1,9 +1,7 @@
 module Rails::Pretty::Logger
   module DashboardsHelper
     def check_highlight(line)
-      if line.include?("[HIGHLIGHT]")
-        return "<div class='highlight'>#{line.delete('[HIGHLIGHT]')}</div>".html_safe
-      end
+      return "<div class='highlight'>#{line.remove('[HIGHLIGHT]')}</div>".html_safe if line.include?("[HIGHLIGHT]")
       line
     end
 
@@ -11,6 +9,10 @@ module Rails::Pretty::Logger
       Time.now.strftime("%Y-%m-%d")
     end
 
+    def is_stdout?
+      ENV["RAILS_LOG_TO_STDOUT"].present?
+    end
+
     def set_divider(params)
       if params[:date_range].blank?
         100
@@ -22,15 +24,11 @@ module Rails::Pretty::Logger
     end
 
     def is_file_active(name, params)
-      if params[:log_file] == name
-        "active"
-      end
+      "active" if params[:log_file] == name
     end
 
     def is_page_active(index, params)
-      if params[:page].to_i == index
-        "active"
-      end
+      "active" if params[:page].to_i == index
     end
 
     def check_rails_version

data/app/views/partials/_error_pagination.html.erb

@@ -0,0 +1,21 @@
+<% if log_data.fetch(:error).present? %>
+<p>
+  <%= log_data.fetch(:error) %>
+</p>
+<% end %>
+
+<% if log_data.fetch(:error).blank? %>
+  <% log_data.fetch(:logs_count).times do |index| %>
+    <%= link_to(
+        index + 1,
+        send(locals[:path],
+          log_file: params.fetch(:log_file),
+          page: index,
+          date_range: { start: log.start_date, end: log.end_date, divider: set_divider(params) }
+        ),
+        html_options = {class: "#{is_page_active(index, params)}"}
+
+      ) %>
+  <% end %>
+<% end %>
+<hr>

data/app/views/partials/_navbar.html.erb

@@ -0,0 +1,14 @@
+
+<div class="logger_navbar">
+  <p>
+    <%= link_to(path_name, hourly_logs_path, html_options = {class: "dashboard_button"}) %>
+  </p>
+  Log Files:
+  <% Rails::Pretty::Logger::PrettyLogger.get_log_file_list.each do |key, value| %>
+  <%= link_to(trim_name(value[:file_name]),
+      logs_dashboards_path(log_file: value[:file_name], date_range: { start: time_now, end: time_now }),
+      html_options = {class: "#{is_file_active(value[:file_name], params)}",
+      data: { confirm: "Log file size is #{ value[:file_size] } MB. Are you sure to open this file? " }}) %>
+  <% end %>
+</div>
+<hr>

data/app/views/rails/pretty/logger/dashboards/index.html.erb

@@ -1,23 +1,31 @@
 <% if @log_file_list.count == 0 %>
-<div>
-   <h1 class="message">There is no log file to show</h1>
-</div>
+  <div>
+    <h1 class="message">There is no log file to show</h1>
+  </div>
+
+<%  elsif is_stdout?%>
+  <div>
+    <h1 class="message">  "RAILS_LOG_TO_STDOUT" is present. no logs kept, remove it for logging </h1>
+  </div>
 
 <% else %>
-<div>
-   Choose your log file :
-   <% @log_file_list .each do |key, value| %>
-     <%= link_to(value[:file_name].capitalize,
-         logs_dashboards_path(log_file: value[:file_name], date_range: { start: time_now, end: time_now }),
-         html_options = {class: "dashboard_button",
-         data: { confirm: "Log file size is #{ value[:file_size] } MB. Are you sure to open this file? " }}) %>
+  <div class="logger_navbar">
+    <p>
+      <%= link_to('Hourly logs', hourly_logs_path, html_options = {class: "dashboard_button"}) %>
+    </p>
+      Log Files:
+      <% @log_file_list .each do |key, value| %>
+        <%= link_to(trim_name(value.fetch(:file_name)),
+        logs_dashboards_path(log_file: value.fetch(:file_name), date_range: { start: time_now, end: time_now }),
+        html_options = {class: "dashboard_button",
+        data: { confirm: "Log file size is #{ value[:file_size] } MB. Are you sure to open this file? " }}) %>
 
-         <%= link_to("x",
-             clear_logs_dashboards_path(log_file: value[:file_name]),
-             html_options = {class: "clear_logs",
-             method: :post,
-             data: { confirm: "Are you sure to clear all logs from #{value[:file_name].capitalize}? " }}) %>
-   <% end %>
+        <%= link_to("x",
+        clear_logs_dashboards_path(log_file: value.fetch(:file_name)),
+        html_options = {class: "clear_logs",
+        method: :post,
+        data: { confirm: "Are you sure to clear all logs from #{value.fetch(:file_name).capitalize}? " }}) %>
+      <% end %>
 
-</div>
+  </div>
 <% end %>

data/app/views/rails/pretty/logger/dashboards/logs.html.erb

@@ -1,36 +1,6 @@
+<%= render "partials/navbar", path_name: 'Hourly logs' %>
 
-<div>
-  Log Files:
-  <% @log.file_list.each do |key, value| %>
-  <%= link_to(value[:file_name].capitalize,
-      logs_dashboards_path(log_file: value[:file_name], date_range: { start: time_now, end: time_now }),
-      html_options = {class: "#{is_file_active(value[:file_name], params)}",
-      data: { confirm: "Log file size is #{ value[:file_size] } MB. Are you sure to open this file? " }}) %>
-  <% end %>
-</div>
-<hr>
-
-<% if @log_data[:error].present? %>
-<p>
-  <%= @log_data[:error] %>
-</p>
-<% end %>
-
-<% if @log_data[:error].blank? %>
-  <% @log_data[:logs_count].times do |index| %>
-    <%= link_to(
-        index + 1,
-        logs_dashboards_path(
-          log_file: params[:log_file],
-          page: index,
-          date_range: { start: @log.start_date, end: @log.end_date, divider: set_divider(params) }
-        ),
-        html_options = {class: "#{is_page_active(index, params)}"}
-
-      ) %>
-  <% end %>
-<% end %>
-<hr>
+<%= render "partials/error_pagination", log: @log, log_data: @log_data , locals: {path: "logs_dashboards_path"} %>
 
 <div class="form-group">
   <%= form_for :date_range, url: logs_dashboards_path(log_file: params[:log_file]), method: :post do |f| %>
@@ -56,7 +26,6 @@
 <% end %>
 </div>
 
-
 <hr>
 
 <%  @log_data[:paginated_logs].each do |line| %>

data/app/views/rails/pretty/logger/hourly_logs/index.html.erb

@@ -0,0 +1,39 @@
+<% if @log_file_list.count == 0 %>
+<div>
+   <h1 class="message">There is no log file to show</h1>
+</div>
+
+<% else %>
+
+<div class="hourly-list">
+
+   <div id="hourly">
+
+      <div class="logger_navbar">
+        <p>
+          <%= link_to('Main Logs',dashboards_path, html_options = {class: "dashboard_button"}) %>
+        </p>
+
+
+      </div>
+      <input class="search" placeholder="Search" />
+      <button class="sort" data-sort="name">
+         Sort
+      </button>
+      <ul class="pagination"></ul>
+
+      <ul class="list">
+         <% @log_file_list .each do |key, value| %>
+         <li>
+            <h5 class="name">
+               <%= link_to(modify_name(value.fetch(:file_name)),
+               logs_hourly_logs_path(log_file: value.fetch(:file_name), date_range: { start: time_now, end: time_now }),
+               html_options = {class: "dashboard_button",
+               data: { confirm: "Log file size is #{ value.fetch(:file_size) } MB. Are you sure to open this file? " }}) %>
+            </h5>
+            <% end %>
+         </li>
+      </ul>
+   </div>
+</div>
+<% end %>

data/app/views/rails/pretty/logger/hourly_logs/logs.html.erb

@@ -0,0 +1,37 @@
+<div class="logger_navbar">
+  <p>
+    <%= link_to('Main Logs',dashboards_path, html_options = {class: "dashboard_button"}) %>
+    <%= link_to('Hourly Logs ', hourly_logs_path, html_options = {class: "dashboard_button"}) %>
+  </p>
+</div>
+<hr>
+<% if  @log_data[:logs_count] > 0 %>
+
+<%= render "partials/error_pagination", log: @log, log_data: @log_data, locals: {path: "logs_hourly_logs_path"} %>
+
+  <% if @log_data[:logs_count] > 0 %>
+    <p>
+      <%= link_to("Clear logs",
+          clear_logs_hourly_logs_path(log_file: params[:log_file]),
+          html_options = {class: "clear_logs",
+          method: :post,
+          data: { confirm: "Are you sure to clear all logs? " }}) %>
+    </p>
+  <% end %>
+</div>
+
+
+  <hr>
+
+  <%  @log_data[:paginated_logs].each do |line| %>
+    <p>
+      <%= check_highlight(line) %>
+    </p>
+  <% end %>
+
+<% else %>
+
+  <div>
+    <h1 class="message">There is no log file to show</h1>
+  </div>
+<% end %>

data/config/routes.rb

@@ -5,4 +5,10 @@ Rails::Pretty::Logger::Engine.routes.draw do
     post :logs, on: :collection
     post :clear_logs, on: :collection
   end
+
+  resources :hourly_logs, only: [:index] do
+    get :logs, on: :collection
+    post :logs, on: :collection
+    post :clear_logs, on: :collection
+  end
 end

data/lib/rails/pretty/logger.rb

@@ -1,156 +1,146 @@
 require "rails/pretty/logger/engine"
 
-module Rails
-  module Pretty
-    module Logger
+module Rails::Pretty::Logger
 
-      class PrettyLogger
+  class PrettyLogger
 
-        def initialize(params)
-          @log_file = File.join(Rails.root, 'log', "#{params[:log_file]}.log")
-          @filter_params = params
-        end
-
-        def self.logger
-          Rails.logger
-        end
+    def initialize(params)
+      @log_file = params[:log_file]
+      @filter_params = params
+    end
 
-        def self.highlight(log)
-          self.logger.tagged('HIGHLIGHT') { logger.info log }
-        end
+    def self.logger
+      Rails.logger
+    end
 
-        def self.file_size(log_file)
-          File.size?("./#{log_file}").to_f / 2**20
-        end
+    def self.highlight(log)
+      self.logger.tagged('HIGHLIGHT') { logger.info log }
+    end
 
+    def self.file_size(log_file)
+      File.size?("#{log_file}").to_f / 2**20
+    end
 
-        def self.get_log_file_list
-          log = {}
-          log_files =  Dir["**/*.log"]
-          log_files.each_with_index do |log_file,index|
-            log[index] = {}
-            log[index][:file_name] =  File.basename(log_file, ".log")
-            log[index][:file_size] = self.file_size(log_file).round(4)
-          end
-          return log
-        end
+    def self.get_log_file_list
+      log_files =  Dir["#{File.join(Rails.root, 'log')}" + "/**.*"]
+      self.logs_atr(log_files)
+    end
 
-        def error
-          @error
-        end
+    def self.get_hourly_log_file_list
+      log_files =  Dir["#{Rails.root}/log/hourly/**/*.*"].sort
+      self.logs_atr(log_files)
+    end
 
-        def clear_logs
-          open(@log_file, File::TRUNC) {}
-        end
+    def self.logs_atr(log_files)
+      log = {}
+      log_files.each_with_index do |log_file,index|
+        log[index] = {}
+        log[index][:file_name] =  log_file
+        log[index][:file_size] = self.file_size(log_file).round(4)
+      end
+      log
+    end
 
-        def start_date
-          if @filter_params[:date_range].present?
-            @filter_params[:date_range][:start]
-          else
-            Time.now.strftime("%Y-%m-%d")
-          end
-        end
+    def clear_logs
+      open(@log_file, File::TRUNC) {}
+    end
 
-        def end_date
-          if @filter_params[:date_range].present?
-            @filter_params[:date_range][:end]
-          else
-            Time.now.strftime("%Y-%m-%d")
-          end
-        end
+    def start_date
+      @filter_params.dig(:date_range, :start) || Time.now.strftime("%Y-%m-%d")
+    end
 
-        def file_list
-          PrettyLogger.get_log_file_list
-        end
+    def end_date
+      @filter_params.dig(:date_range, :end) || Time.now.strftime("%Y-%m-%d")
+    end
 
-        def filter_logs_with_date(file)
-          arr = []
+    def filter_logs_with_date(file)
+      arr = []
+      start = false
+
+      IO.foreach(file) do |line|
+        if get_date_from_log_line(line)
+          start = true
+          arr.push(line)
+        elsif start && !(line_include_date?(line))
+          arr.push(line)
+        else
           start = false
-
-          IO.foreach(file) do |line|
-            if get_date_from_log_line(line)
-              start = true
-              arr.push(line)
-            elsif start && !(line_include_date?(line))
-              arr.push(line)
-            else
-              start = false
-            end
-          end
-          return arr
         end
+      end
+      return arr
+    end
 
-        def get_test_logs(file)
-          arr = []
-          IO.foreach(file) do |line|
-            arr.push(line)
-          end
-          return arr
-        end
+    def get_test_logs(file)
+      arr = []
+      IO.foreach(file) do |line|
+        arr.push(line)
+      end
+      return arr
+    end
 
-        def get_logs_from_file(file)
-          if @filter_params[:log_file].include?("test")
-            get_test_logs(file)
-          else
-            filter_logs_with_date(file)
-          end
-        end
+    def get_logs_from_file(file)
+      if @filter_params[:log_file].include?("test") || @filter_params[:log_file].include?("hourly")
+        get_test_logs(file)
+      else
+        filter_logs_with_date(file)
+      end
+    end
 
-        def get_date_from_log_line(line)
-          params = @filter_params[:date_range]
-          if line_include_date?(line)
-            date_string_index = line.index("at ")
-            string_date = line[date_string_index .. date_string_index + 13]
-            date = string_date.to_date.strftime("%Y-%m-%d")
-            if params.present?
-              date.between?(params[:start], params[:end])
-            else
-              date.between?(Time.now.strftime("%Y-%m-%d"), Time.now.strftime("%Y-%m-%d"))
-            end
-          end
+    def get_date_from_log_line(line)
+      params = @filter_params[:date_range]
+      if line_include_date?(line)
+        date_string_index = line.index("at ")
+        string_date = line[date_string_index .. date_string_index + 13]
+        date = string_date.to_date.strftime("%Y-%m-%d")
+        start_date = @filter_params.dig(:date_range, :start)
+        end_date = @filter_params.dig(:date_range, :end)
+        if start_date.present? && end_date.present?
+          date.between?(start_date, end_date)
+        else
+          date.between?(Time.now.strftime("%Y-%m-%d"), Time.now.strftime("%Y-%m-%d"))
         end
+      end
+    end
 
-        def line_include_date?(line)
-          line.include?("Started")
-        end
+    def line_include_date?(line)
+      line.include?("Started")
+    end
 
-        def validate_date
-          params = @filter_params[:date_range]
-          if params.present?
-            if (params[:start].present? && params[:end].present?)
-              if (params[:start] > params[:end])
-                "End Date should not be less than Start Date."
-              end
-            elsif  params[:start].blank? || params[:end].blank?
-              "Start and End Date must be given."
-            end
-          end
+    def validate_date
+      start_date = @filter_params.dig(:date_range, :start)
+      end_date = @filter_params.dig(:date_range, :end)
+      if (start_date.present? && end_date.present?)
+        if (start_date > end_date)
+          "End Date should not be less than Start Date."
         end
+      else
+        "Start and End Date must be given."
+      end
+    end
 
-        def log_data
-          error = validate_date
-          divider = set_divider_value
-          logs = get_logs_from_file(@log_file)
-          logs_count =  (logs.count.to_f / divider).ceil
-          paginated_logs = logs[ @filter_params[:page].to_i * divider ..
-          (@filter_params[:page].to_i * divider) + divider ]
-          data = {}
-          data[:logs_count] = logs_count
-          data[:paginated_logs] = paginated_logs
-          data[:error] = error
-          return data
-        end
+    def log_data
+      error = validate_date
+      divider = set_divider_value
+      logs = get_logs_from_file(@log_file)
+      logs_count =  (logs.count.to_f / divider).ceil
+      paginated_logs = logs[ @filter_params[:page].to_i * divider ..
+      (@filter_params[:page].to_i * divider) + divider ]
+      data = {}
+      data[:logs_count] = logs_count
+      data[:paginated_logs] = paginated_logs
+      data[:error] = error
+      return data
+    end
 
-        def set_divider_value
-          if @filter_params[:date_range].blank?
-            100
-          elsif @filter_params[:date_range][:divider].blank?
-            100
-          else
-            @filter_params[:date_range][:divider].to_i
-          end
-        end
+    def set_divider_value
+      if @filter_params[:date_range].blank?
+        100
+      elsif @filter_params[:date_range][:divider].blank?
+        100
+      else
+        @filter_params[:date_range][:divider].to_i
       end
     end
+
   end
 end