rslog 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e78583883f5087e1ce4e44c7d497ce68f1d7d9b37500bfc8223b4316a7b83853
-  data.tar.gz: 31f56aadc5936705e58b6e1b1f85b6b141d288e5d58acb542c1ef929d0cb2727
+  metadata.gz: '089ce1f53d07365d2cd5a8a132d3f016fd971aec94fb5e1d7d097b83c378d16b'
+  data.tar.gz: 690f6b582c62d555192f003bb9bf48f47c05c73e6144663fc5271ef263a8a6e2
 SHA512:
-  metadata.gz: 29ebd59a174be7ff7841bf2216b8520752067bddf0a81edfe1f46ad87df25c1f9377bd742ffccd1cb9b2367810ca4bbaf5fe6970e7cb34d2b3c1ddfea480fe4c
-  data.tar.gz: 0adb1f65ce181f65cb3a0415d9145c39c46c282236b4f4f8da8ae765f3f4a8319b3ccb44ef2ec2f2268cdc593c549cf1b3353c315b4e01277c1af13e85c2cb47
+  metadata.gz: 2607d6b3ba40a13ecba89d214d0ef3d92d8d7b28b3b0dedf96942b01ea939efd287797ad4fe56e99c6986eac2dcbe53feca954abe41b69f14633ed9a79249f82
+  data.tar.gz: f68723a370022e15d2df26516b60725cad3b20d60a3c59bc3d7c2fc55f4146d874cbd123b1900896f7cc5eeab9dbff3af027241a3e8d57fc1f41c734283c25c8

data/lib/rslog.rb

@@ -8,47 +8,47 @@ require_relative 'rslog/presenter'
 require 'set'
 
 module RSlog
-  VERSION = '0.0.15'
+  VERSION = '0.0.16'
 
-  class Main
+  # Module to hold main process
+  #
+  module Main
     def self.run
-      file_names = RSlog::ArgsHandler.handle(ARGV)
-
-      return unless file_names.any?
-  
       file_names.each do |file_name|
-        unless file_names.all?{|f| File.file?(f) }
-          puts "There is no file names given. Check input."
-          return
-        end
-        
+        puts "Statistics for file #{file_name}"
+
         lines = IO.readlines(file_name)
 
         RSlog::Validator.execute(lines)
-        
-        config_sets.each do |conf|
-          parsed = RSlog::Parser.new(lines, conf).execute
-          RSlog::Presenter.new(parsed, conf).present
-        end
+
+        process(config_sets, lines)
+      end
+    end
+
+    def self.process(config_sets, lines)
+      config_sets.each do |conf|
+        parsed = RSlog::Parser.new(lines, conf).execute
+        RSlog::Presenter.new(parsed, conf).present
       end
     end
-        
+
+    def self.file_names
+      file_names = RSlog::ArgsHandler.new(ARGV).handle
+      return file_names if file_names.all? { |file_name| File.file?(file_name) }
+
+      puts 'There is no file names given. Check input.'
+      []
+    end
+
     def self.config_sets
-      [
-        { title: %(List of webpages with most page views ordered from most pages views to less page views:),
-          format_string: "%-20s %3d",
-          suffix: "visits",
-          calc: proc { |visits| visits.size } },
-
-        { title: "List of webpages with most unique page views also ordered:", 
-          format_string: "%-20s %3d",
-          suffix: 'unique views',
-          calc: proc { |visits| Set.new(visits).size } },
-
-        { title: "Average visits sorted:", 
-          suffix: 'average visits',
-          calc: proc { |visits| Set.new(visits).size.to_f / visits.size } }
-      ]
+      [{ title:       %(List of webpages with most page views ordered from most pages views to less page views:),
+         #          head_titles:     %w[Url Visits Average],
+         head_titles: %w[Url Visits],
+         calc:        proc { |visits| visits.size } },
+       { title:       'List of webpages with most unique page views also ordered:',
+         #          head_titles:     %w[Url Unique\ views Average],
+         head_titles: %w[Url Unique\ views],
+         calc:        proc { |visits| Set.new(visits).size } }]
     end
   end
 end

data/lib/rslog/args_handler.rb

@@ -1,19 +1,68 @@
 # frozen_string_literal: true
 
-# Class to hold data and implement processing
-#
 module RSlog
-  module ArgsHandler
-    def self.handle(args)
-      options = args.select{|el| !(el =~ /^-/).nil?}
-      file_names = args - options
+  # Class to parse options and arguments
+  #
+  # returns Array of file names
+  #
+  class ArgsHandler
+    attr_reader :args, :options
 
-      puts "R(uby)S(imple)log statistics" if options.delete('-h') || args.empty?
-      puts "Version #{RSlog::VERSION}"    if options.delete('-v') || args.empty?
-      puts "Unknown options #{options.join(', ')}" if options.any?
+    def initialize(args)
+      @args = args
+      @options = @args.select { |el| el =~ /^-/ }
+    end
+
+    def handle
+      if options.any? || args.empty?
+        _handle_options
+        return []
+      end
+
+      # file_names array
+      args - options
+    end
+
+    private
+
+    def _handle_options
+      _show_help || _show_version || _show_unknown_options_warning
+    end
+
+    def _show_help
+      if options.delete('-h') || args.empty?
+        puts _help_message
+        return true
+      end
+      false
+    end
+
+    def _help_message
+      %[
+  R(uby)S(imple)log statistics
+  Usage:
+  > rslog filename[.log|.txt]
+
+  > rslog [-h|-v]
+     -h - show this info
+     -v - show version
+      ]
+    end
+
+    def _show_version
+      if @options.delete('-v')
+        puts "  Version #{RSlog::VERSION}"
+        return true
+      end
+      false
+    end
 
-      file_names
+    def _show_unknown_options_warning
+      if @options.any?
+        puts "  Unknown options #{@options.join(', ')}"
+        return true
+      end
+      false
     end
   end
 end
-  

data/lib/rslog/parser.rb

@@ -1,25 +1,68 @@
 # frozen_string_literal: true
 
-# Class to hold data and implement processing
-#
 module RSlog
-  class Parser
-    attr_reader :calc, :separator
-    attr_accessor :source, :container
+  # Class to hold data_processing methods
+  #
+  class DataProcessing
+    attr_reader :result
 
     def initialize(source, conf)
       @calc      = conf.fetch(:calc)      { proc }
-      @separator = conf.fetch(:separator) { ' ' }
-      @source = source
+      @separator = conf.fetch(:separator, ' ')
+      @result = Array(source)
+    end
+
+    # extract
+    def extract
+      @result = @result.map { |item| item.split(@separator) }
+      self
+    end
+
+    # group
+    def group
+      @result = @result.group_by { |url, _visits| url }.to_a
+      self
+    end
+
+    # calculate
+    def calculate
+      # calculate visits
+      @result = @result.map { |url, visits| [url, @calc.call(visits)] }
+      # calculate average
+      # @result = @result.map { |url, visits_qty| [url, visits_qty, (visits_qty.to_f / _total)] }
+      self
+    end
+
+    # sort
+    def order
+      @result = @result.sort_by { |_url, visits_by_page| visits_by_page }
+      @result.reverse!
+      self
+    end
+
+    private
+
+    # calculate total
+    def _total
+      @result.sum { |_url, visits_qty| visits_qty }
+    end
+  end
+
+  require 'forwardable'
+  # Class to parse data
+  #
+  class Parser
+    attr_reader :data_processing
+
+    extend Forwardable
+    def_delegators :@data_processing, :extract, :group, :calculate, :order
+
+    def initialize(source, conf)
+      @data_processing = DataProcessing.new(source, conf)
     end
 
     def execute
-      Array(source)
-      .map{|item| item.split(separator)}                        #extract, returns Array
-      .group_by{|page_name, _visits| page_name }                #group, returns Hash
-      .map{|page_name, visits| [page_name, calc.call(visits)] } #calculate, returns Array
-      .sort_by{|_page_name, visits_by_page| visits_by_page }    #sort, returns Array
-      .reverse
+      data_processing.extract.group.calculate.order.result
     end
   end
 end

data/lib/rslog/presenter.rb

@@ -1,39 +1,68 @@
 # frozen_string_literal: true
 
-# Class for format result according to passed 'format_string'
-#
-# result is array of formatted strings
-# e.g
-# [ "/about                 1 visits", 
-#   "/about/2               1 visits", 
-#   "/home                  1 visits", 
-#   "/contact               1 visits", 
-#   "/help_page/1           1 visits" ]
-# 
 module RSlog
+  # Class for format result according to passed 'format_string'
+  #
+  # result is array of formatted strings
+  # e.g
+  # [ "/about                 1 visits",
+  #   "/about/2               1 visits",
+  #   "/home                  1 visits",
+  #   "/contact               1 visits",
+  #   "/help_page/1           1 visits" ]
+  #
   class Presenter
-    attr_reader  :title, :format_string, :suffix
-    attr_accessor :source
-    
+    LEFT_UP_CORNER =    "\u250c"
+    RIGHT_UP_CORNER =   "\u2510"
+    LEFT_DOWN_CORNER =  "\u2514"
+    RIGHT_DOWN_CORNER = "\u2518"
+    VERTICAL_BORDER =   "\u2502"
+    HORIZONTAL_BORDER = "\u2500"
+    VERTICAL_LEFT_BORDER = "\u251C"
+    VERTICAL_RIGHT_BORDER = "\u2524"
+
     def initialize(source, conf)
       @source = source
-      @title            = conf.fetch(:title)         { 'Stat Pages' }
-      @format_string    = conf.fetch(:format_string) { "%-20s %5.2f" }
-      @suffix           = conf.fetch(:suffix)        { 'visits' }
+      @col_size    = conf.fetch(:col_size, 20)
+      @title       = conf.fetch(:title, 'Stat Pages')
+      @formatter   = conf.fetch(:formatter, "%-#{@col_size}s")
+      @columns     = conf.fetch(:columns, @source&.first&.size || 1)
+      @head_titles = conf.fetch(:head_titles, Array.new(@columns, 'title'))
     end
-    
+
     def present
-      puts title
-      puts _formatted
+      puts @title
+      puts _top_border
+      puts VERTICAL_BORDER + format(@formatter * @columns, *@head_titles) + VERTICAL_BORDER
+      puts _middle_border
+      puts _formatted_data
+      puts _bottom_border
       puts
     end
-    
+
     private
-    
-    def _formatted
-      source.map do |row| 
-        "#{format(format_string, *row)} #{suffix}"
-      end      
+
+    def _top_border
+      LEFT_UP_CORNER + _horisontal_line + RIGHT_UP_CORNER
+    end
+
+    def _middle_border
+      VERTICAL_LEFT_BORDER + _horisontal_line + VERTICAL_RIGHT_BORDER
+    end
+
+    def _bottom_border
+      LEFT_DOWN_CORNER + _horisontal_line + RIGHT_DOWN_CORNER
+    end
+
+    def _horisontal_line
+      HORIZONTAL_BORDER * @col_size * @columns
+    end
+
+    def _formatted_data
+      @source.map do |row|
+        row = row.map(&:to_s)
+        VERTICAL_BORDER + format(@formatter * @columns, *row).to_s + VERTICAL_BORDER
+      end
     end
   end
 end

data/lib/rslog/validator.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-# Class to validate if we have valid data in lines, for example well formatted IPs
-# 
-# Checks if IPs are comply with regex
-# Output message "Valid IPs"/"Invalid IPs"
-#
 module RSlog
+  # Class to validate if we have valid data in lines, for example well formatted IPs
+  #
+  # Checks if IPs are comply with regex
+  # Output message "Valid IPs"/"Invalid IPs"
+  #
   module Validator
     TEMPLATES = {
       # IP address regex, source https://regexr.com/38odc
@@ -23,8 +23,6 @@ module RSlog
       puts
     end
 
-    private
-
     def self.valid?(source)
       return :valid if source.all? TEMPLATES[:ip]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rslog
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Andrey Eremeev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-01 00:00:00.000000000 Z
+date: 2021-06-03 00:00:00.000000000 Z
 dependencies: []
 description: Ruby script to get overall Statistic for weblog logs!
 email: a.eremeev@outlook.com