rslog 0.0.11 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe6bdea7b2a57784e35b11b4ba26542288101df7e3ca4c6a0341663a584d66ae
-  data.tar.gz: 5063db15e2245369243465af2038ee4f12d582a2ae3a6009510250a011a22dea
+  metadata.gz: 52bf0a8fd868cb749fcd759adfb7782a5cba4b148f15f6f52b913147dd6fa95d
+  data.tar.gz: a15d5b6d9ad034f6ffd962e47757ed7f3878c25aee4bace3d5d27bbe79d033b3
 SHA512:
-  metadata.gz: 1d1bcdec66de44c7a554ecb3d4a9ba73190055c87293b0a257886b129462012fcd89961b4712ed0fccd2672c0fad5bb975d923532109066fdb168b8a9437965d
-  data.tar.gz: 6277a462d27f2d771aa5b017a676409398c960b773728e5dfd8efc1e6bd03a7816fde053839a2f9129b84ab43589618bedb936c3266aa92cefb6fa7393faea2d
+  metadata.gz: 916951619a9a3949fe6c4b5d3d2f9f684d3eaf7107d5cba15162d5402009a24187a61baea8ce0dab153c2315a06045956e49bf25eb2b9aec6b1b85871f198788
+  data.tar.gz: 071e2abb7278a4a84aaa2cec1154a5e63c83971746d5cdacd7b32127d5c36225e43f772b22ccff342a73f24d4d4d185743e971d2c9903f5ae2d7f86031594433

data/bin/rslog

@@ -2,4 +2,4 @@
 # frozen_string_literal: true
 
 require_relative '../lib/rslog'
-RSlog.run
+RSlog::Main.run

data/lib/rslog.rb

@@ -1,25 +1,51 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require_relative 'rslog/container'
-require_relative 'rslog/worker'
-require_relative 'rslog/input_parser'
-require_relative 'rslog/extractor'
+require_relative 'rslog/args_handler'
 require_relative 'rslog/validator'
-require_relative 'rslog/data_parser'
+require_relative 'rslog/data_processing'
+require_relative 'rslog/parser'
 require_relative 'rslog/presenter'
-require_relative 'rslog/opts'
+require 'set'
 
-# For development
-# require 'pry'
+module RSlog
+  VERSION = '0.0.17'
 
-class RSlog
-  VERSION = '0.0.11'
+  # Module to hold main process
+  #
+  module Main
+    extend RSlog::ArgsHandler
+    extend RSlog::Validator
 
-  def self.run
-    Container.new.process_all
+    def self.run
+      file_names_from_args(ARGV).each do |file_name|
+        puts "Statistics for file #{file_name}"
+
+        lines = IO.readlines(file_name)
+
+        validate(lines)
+
+        _process(lines)
+      end
+    end
+
+    def self._process(lines)
+      _config_sets.each do |conf|
+        data_processing = RSlog::DataProcessing.new(lines, conf)
+        parsed_data = RSlog::Parser.new(data_processing).parse
+        RSlog::Presenter.new(parsed_data, conf).present
+      end
+    end
+
+    def self._config_sets
+      [{ 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
-
-# For development
-# RSlog.run.talk

data/lib/rslog/args_handler.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+module RSlog
+  # Class to parse options and arguments
+  #
+  # returns Array of file names
+  #
+  module ArgsHandler
+    #    attr_reader :args, :options
+    #
+    #    def initialize(args)
+    #      @args = args
+    #      @options = @args.select { |el| el =~ /^-/ }
+    #    end
+
+    def file_names_from_args(args)
+      @args = args
+      @options = @args.select { |el| el =~ /^-/ }
+      if @options.any? || @args.empty?
+        _handle_options
+        return []
+      end
+
+      # file_names array
+      file_names = @args - @options
+      return file_names if file_names.all? { |file_name| File.file?(file_name) }
+
+      puts 'There is no file names given. Check input.'
+      []
+    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
+
+    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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'forwardable'
+
+module RSlog
+  # Class to parse data
+  #
+  class Parser
+    attr_reader :data_processing
+
+    extend Forwardable
+    def_delegators :@data_processing, :extract, :group, :calculate, :order
+
+    def initialize(data_processing)
+      @data_processing = data_processing
+    end
+
+    def parse
+      data_processing.extract.group.calculate.order.result
+    end
+  end
+end

data/lib/rslog/presenter.rb

@@ -1,52 +1,68 @@
 # frozen_string_literal: true
 
-require_relative 'tools/hash'
-require_relative 'tools/array'
-
-# Class to present result in needed format
-#
-class Presenter < Worker
-  DECORATORS = {
-    all:  {
-      title:
-              'List of webpages with most page views ordered from most views to less',
-      suffix: 'visits'
-    },
-    uniq: {
-      title:  'List list of webpages with most unique page views also ordered',
-      suffix: 'unique views'
-    }
-  }.freeze
-
-  def execute(type, formatter)
-    @type = type
-    @container.add_message send("format_as_#{formatter}")
-    self
-  end
+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
+    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"
 
-  private
+    def initialize(source, conf)
+      @source = source
+      @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 title
-    decorator[:title]
-  end
+    def present
+      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
 
-  def suffix
-    decorator[:suffix]
-  end
+    private
 
-  def decorator
-    DECORATORS[@type]
-  end
+    def _top_border
+      LEFT_UP_CORNER + _horisontal_line + RIGHT_UP_CORNER
+    end
 
-  def format_as_text
-    [
-      title,
-      @container.result.to_multiline_string(suffix),
-      separator
-    ].join("\n")
-  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 separator
-    '-----------------------------'
+    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,30 +1,34 @@
 # frozen_string_literal: true
 
-require_relative 'tools/array'
+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
+      ip: /\b(?:(?:2(?:[0-4][0-9]|5[0-5])|[0-1]?[0-9]?[0-9])\.){3}(?:(?:2([0-4][0-9]|5[0-5])|[0-1]?[0-9]?[0-9]))\b/
+    }.freeze
 
-# Class to validate if we have valid data in lines, for example well formatted IPs
-#
-class Validator < Worker
-  TEMPLATES = {
-    # IP address regex, source https://regexr.com/38odc
-    ip: /\b(?:(?:2(?:[0-4][0-9]|5[0-5])|[0-1]?[0-9]?[0-9])\.){3}(?:(?:2([0-4][0-9]|5[0-5])|[0-1]?[0-9]?[0-9]))\b/
-  }.freeze
+    MESSAGES = {
+      valid:   proc { |validator_name| "All #{validator_name.upcase}s are valid" },
+      invalid: proc { |validator_name| "Some #{validator_name.upcase}s are NOT valid" }
+    }.freeze
 
-  MESSAGES = {
-    valid:   proc { |validator| "All #{validator.upcase}s are valid" },
-    invalid: proc { |validator| "Some #{validator.upcase}s are NOT valid" }
-  }.freeze
+    def validate(source)
+      puts
+      puts MESSAGES[_valid?(source)].call(:ip)
+      puts
+    end
 
-  def execute
-    @container.add_message MESSAGES[validate].call(@container.validator)
-    self
-  end
-
-  private
+    private
 
-  def validate
-    return :valid if @container.data.all? TEMPLATES[@container.validator]
+    def _valid?(source)
+      return :valid if source.all? TEMPLATES[:ip]
 
-    :invalid
+      :invalid
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rslog
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.17
 platform: ruby
 authors:
 - Andrey Eremeev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-10 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
@@ -19,16 +19,10 @@ extra_rdoc_files: []
 files:
 - bin/rslog
 - lib/rslog.rb
-- lib/rslog/container.rb
-- lib/rslog/data_parser.rb
-- lib/rslog/extractor.rb
-- lib/rslog/input_parser.rb
-- lib/rslog/opts.rb
+- lib/rslog/args_handler.rb
+- lib/rslog/parser.rb
 - lib/rslog/presenter.rb
-- lib/rslog/tools/array.rb
-- lib/rslog/tools/hash.rb
 - lib/rslog/validator.rb
-- lib/rslog/worker.rb
 homepage: https://rubygems.org/gems/rslog
 licenses:
 - MIT

data/lib/rslog/container.rb

@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-# Class to hold data and implement processing
-#
-class Container
-  attr_accessor(*%i[
-                  argv file_name messages errors data options validator types result
-                ])
-
-  def initialize
-    @errors = []
-    @messages = []
-    @validator = :ip
-    @types = %i[all uniq]
-  end
-
-  def file_name?
-    !file_name.empty? && no_errors?
-  end
-
-  def data?
-    messages.include?('Data in place') && no_errors?
-  end
-
-  def no_errors?
-    errors.empty?
-  end
-
-  def add_message(str)
-    messages << str
-  end
-
-  def add_error(str)
-    errors << str
-  end
-
-  def talk
-    puts messages.join("\n")
-    puts errors.join("\n")
-    self
-  end
-
-  def process_all
-    InputParser.new(self).execute
-    Extractor.new(self).execute if file_name?
-    validate_parse_present if data?
-    talk
-    self
-  end
-
-  def validate_parse_present
-    Validator.new(self).execute
-    types.each do |type|
-      DataParser.new(self).execute(type)
-      Presenter.new(self).execute(type, :text)
-    end
-  end
-end

data/lib/rslog/data_parser.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'tools/array'
-require_relative 'tools/hash'
-
-# Class to parse data from given array
-#
-class DataParser < Worker
-  # type = :count (default) -> just count in groups
-  # type = :uniq -> uniq entries in groups
-  def execute(type)
-    @container.result =
-      @container.data
-                .group_by_index(0)
-                .send("count_by_groups_#{type}")
-                .to_a
-                .sort_by { |item| item[1] }
-                .reverse
-                .map { |elem_arr| elem_arr.map(&:to_s).join(' ') }
-    self
-  end
-end

data/lib/rslog/extractor.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-# Class for extracting data from file
-#
-class Extractor < Worker
-  def execute
-    @file_name = @container.file_name
-    check
-    self
-  end
-
-  private
-
-  def check
-    if File.zero?(@file_name)
-      @container.add_message 'Empty file'
-    else
-      @container.data = File.open(@file_name, 'r').to_a
-      @container.add_message 'Data in place'
-    end
-  rescue StandardError => e
-    @container.add_error e
-  end
-end

data/lib/rslog/input_parser.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-require 'optparse'
-require_relative 'opts'
-
-# Class to parse input filenames and args
-#
-class InputParser < Worker
-  include Opts
-
-  def execute
-    handle_opts
-    handle_args
-    self
-  end
-
-  private
-
-  attr_accessor :opts
-
-  def handle_opts
-    Opts.create_opts.parse!(into: @container.options)
-  rescue OptionParser::InvalidOption => e
-    @container.add_error e
-  end
-
-  def handle_args
-    @container.file_name = ARGV.select { |str| str =~ /.\.log|.\.txt/ }[0] || ''
-    @container.add_error 'No file_name provided' if @container.file_name.empty?
-  end
-end

data/lib/rslog/opts.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-# Service module to give opts
-#
-module Opts
-  VERSION = {
-    descr:  ['-v', '--version', 'Show version and exit'],
-    action: proc do
-      puts "#{File.basename($PROGRAM_NAME)}: #{RSlog::VERSION}"
-      exit
-    end
-  }.freeze
-
-  HELP = {
-    descr:  ['-h', '--help', 'Prints this message and exit'],
-    action: proc do |opts|
-      puts opts
-      exit
-    end
-  }.freeze
-
-  def self.create_opts
-    OptionParser.new do |opts|
-      opts.banner = "Usage: #{File.basename($PROGRAM_NAME)} FILENAME"
-      opts.on(*Opts::VERSION[:descr]) { Opts::VERSION[:action].call }
-      opts.on(*Opts::HELP[:descr]) { Opts::HELP[:action].call(opts) }
-    end
-  end
-end

data/lib/rslog/tools/array.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-# Monkey patch for Array class
-#
-class Array
-  def group_by_index(index = 0)
-    group_by { |str| str.split(' ')[index] }
-  end
-
-  def to_multiline_string(suffix = '')
-    map { |item| "#{item} #{suffix}" }.join("\n")
-  end
-end

data/lib/rslog/tools/hash.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'set'
-
-# Monkey patch for a Hash class to make counts
-#
-class Hash
-  def count_by_groups_all
-    res = {}
-    each do |group_key, arr|
-      res[group_key] = arr.size
-    end
-    res
-  end
-
-  def count_by_groups_uniq
-    res = {}
-    each do |group_key, arr|
-      res[group_key] = Set.new(arr).size
-    end
-    res
-  end
-end

data/lib/rslog/worker.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-# Class to hold worker functionality
-#
-class Worker
-  def initialize(container)
-    @container = container
-  end
-
-  def execute
-    raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
-  end
-end