rslog 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a458692b87d66b9b3b9159e9263172dc27b8d07a9df51a9fc336da6ff36c9388
-  data.tar.gz: d5ecb7b45c9534739a6e7c42c03cde7a468bd634b13659a837c9750647763120
+  metadata.gz: e78583883f5087e1ce4e44c7d497ce68f1d7d9b37500bfc8223b4316a7b83853
+  data.tar.gz: 31f56aadc5936705e58b6e1b1f85b6b141d288e5d58acb542c1ef929d0cb2727
 SHA512:
-  metadata.gz: 5e92c43c6e11b59e096a78e750007bd3a607c6742e1332231fb92e4ba6a7156836300f91cef763637e95ecadca52df671e76ad6963b45ec3bf744ef64a55d4f0
-  data.tar.gz: f77065e38bb39f59fdd2b82e4ada8dc25313891075e4927fa0176ab931b846d036a56507edb94cdbf90c9958ed7e05282c63f9a933906a1bd617438c91d40384
+  metadata.gz: 29ebd59a174be7ff7841bf2216b8520752067bddf0a81edfe1f46ad87df25c1f9377bd742ffccd1cb9b2367810ca4bbaf5fe6970e7cb34d2b3c1ddfea480fe4c
+  data.tar.gz: 0adb1f65ce181f65cb3a0415d9145c39c46c282236b4f4f8da8ae765f3f4a8319b3ccb44ef2ec2f2268cdc593c549cf1b3353c315b4e01277c1af13e85c2cb47

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,26 +1,54 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require_relative 'rslog/container'
-require_relative 'rslog/worker'
-require_relative 'rslog/opts'
-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/decorators'
+require_relative 'rslog/parser'
 require_relative 'rslog/presenter'
+require 'set'
 
-# For development
-# require 'pry'
+module RSlog
+  VERSION = '0.0.15'
 
-class RSlog
-  VERSION = '0.0.14'
+  class Main
+    def self.run
+      file_names = RSlog::ArgsHandler.handle(ARGV)
 
-  def self.run
-    Container.new.process_all
+      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
+        
+        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
+      end
+    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 } }
+      ]
+    end
   end
 end
-
-# For development
-# RSlog.run.talk

data/lib/rslog/args_handler.rb

@@ -0,0 +1,19 @@
+# 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
+
+      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?
+
+      file_names
+    end
+  end
+end
+  

data/lib/rslog/parser.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+# Class to hold data and implement processing
+#
+module RSlog
+  class Parser
+    attr_reader :calc, :separator
+    attr_accessor :source, :container
+
+    def initialize(source, conf)
+      @calc      = conf.fetch(:calc)      { proc }
+      @separator = conf.fetch(:separator) { ' ' }
+      @source = source
+    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
+    end
+  end
+end

data/lib/rslog/presenter.rb

@@ -1,32 +1,39 @@
 # frozen_string_literal: true
 
-require_relative 'tools/hash'
-require_relative 'tools/array'
-
-# Class to present result in needed format
+# Class for format result according to passed 'format_string'
 #
-class Presenter < Worker
-  include Decorators
-
-  attr_accessor :type
-
-  def execute(type, formatter)
-    @type = type
-    container.add_message send("format_as_#{formatter}")
-    self
-  end
-
-  private
-
-  def format_as_text
-    [
-      Decorators.send("#{type}_title"),
-      container.result.to_multiline_string(Decorators.send("#{type}_suffix")),
-      separator
-    ].join("\n")
-  end
-
-  def separator
-    '-----------------------------'
+# 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 Presenter
+    attr_reader  :title, :format_string, :suffix
+    attr_accessor :source
+    
+    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' }
+    end
+    
+    def present
+      puts title
+      puts _formatted
+      puts
+    end
+    
+    private
+    
+    def _formatted
+      source.map do |row| 
+        "#{format(format_string, *row)} #{suffix}"
+      end      
+    end
   end
 end

data/lib/rslog/validator.rb

@@ -1,30 +1,34 @@
 # frozen_string_literal: true
 
-require_relative 'tools/array'
-
 # 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"
 #
-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
+module RSlog
+  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
 
-  MESSAGES = {
-    valid:   proc { |validator| "All #{validator.upcase}s are valid" },
-    invalid: proc { |validator| "Some #{validator.upcase}s are NOT valid" }
-  }.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
 
-  def execute
-    container.add_message MESSAGES[validate].call(container.validator)
-    self
-  end
+    def self.execute(source)
+      puts
+      puts MESSAGES[valid?(source)].call(:ip)
+      puts
+    end
 
-  private
+    private
 
-  def validate
-    return :valid if container.data.all? TEMPLATES[container.validator]
+    def self.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.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Andrey Eremeev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-12 00:00:00.000000000 Z
+date: 2021-06-01 00:00:00.000000000 Z
 dependencies: []
 description: Ruby script to get overall Statistic for weblog logs!
 email: a.eremeev@outlook.com
@@ -19,17 +19,10 @@ extra_rdoc_files: []
 files:
 - bin/rslog
 - lib/rslog.rb
-- lib/rslog/container.rb
-- lib/rslog/data_parser.rb
-- lib/rslog/decorators.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/decorators.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-# Class to present result in needed format
-#
-module Decorators
-  def self.all_title
-    'List of webpages with most page views ordered from most views to less'
-  end
-  def self.all_suffix
-    'visits'
-  end
-
-  def self.uniq_title
-    'List list of webpages with most unique page views also ordered'
-  end
-  
-  def self.uniq_suffix
-    'unique views'
-  end
-
-  def self.separator
-    '-----------------------------'
-  end
-end

data/lib/rslog/extractor.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-# Class for extracting data from file
-#
-class Extractor < Worker
-  def execute
-    check
-    self
-  end
-
-  private
-
-  def file_name
-    container.file_name
-  end
-
-  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,29 +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
-
-  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,45 +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}"
-    end
-  }.freeze
-
-  HELP = {
-    descr:  ['-h', '--help', 'Prints this message and exit'],
-    action: proc do |opts|
-      puts opts
-    end
-  }.freeze
-
-  def self.create_opts
-    OptionParser.new do |opts|
-      banner(opts)
-      help(opts)
-      version(opts)
-    end
-  end
-
-  def self.banner(opts)
-    opts.banner = "Usage: #{File.basename($PROGRAM_NAME)} FILENAME"
-  end
-
-  def self.help(opts)
-    opts.on(*Opts::VERSION[:descr]) do
-      Opts::VERSION[:action].call
-      exit
-    end
-  end
-
-  def self.version(opts)
-    opts.on(*Opts::HELP[:descr]) do
-      Opts::HELP[:action].call(opts)
-      exit
-    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,15 +0,0 @@
-# frozen_string_literal: true
-
-# Class to hold worker functionality
-#
-class Worker
-  attr_reader :container
-
-  def initialize(container)
-    @container = container
-  end
-
-  def execute
-    raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
-  end
-end