rslog 0.0.3 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c4b16055dfb7a8c71c14c11be24fc7a20aece0d88e375234eca519d820d6ae4
-  data.tar.gz: fefd301fd11a12e10f4e6467ff405fe0e76d3fb3ed2f7c1649f8ea4e175ae4d4
+  metadata.gz: 327a6ca58c14f9e3a6353be6b4ef8103b42b59d7d31b426d525dde7e3bb114cd
+  data.tar.gz: f24b4b26f9018bf44888fe48d1608c5de8df866a6072f551d39a27b79c4715cf
 SHA512:
-  metadata.gz: 93028f931c8f3125c5685f14b45b322dc201086da4e44c0ae1bf5dbe9735a4f283693928f9a9d90390c2aac355fb7ef21212e1a66df02dd8832f11e6192964e8
-  data.tar.gz: 70a9005d4eabc8dcaf7da8da56cd321594e1a8ae7b4de5af645418bc7445bb6f5a7a4134f4e702682edc9fc92224a2ce043339ff98bb74abcfcbea2c7e4adad8
+  metadata.gz: a76b136d798fefbc27b1d34943fa5325872b79c1b2b0851c96bc90b2899c1208ad3cd6f103b13b998cb78ee34f47f551309a0f23c6792156a70a11d81f56d4a6
+  data.tar.gz: fa19a42467be47c2923cc8ac2cee2300881fef2a81994ea1f76f13c5ffaa8750045f9268a334f100f0d26c0d349c40694d563c6963997517f4c6f6d3366a8c1d

data/lib/rslog.rb

@@ -7,12 +7,13 @@ require_relative 'rslog/extractor'
 require_relative 'rslog/validator'
 require_relative 'rslog/data_parser'
 require_relative 'rslog/presenter'
+require_relative 'rslog/opts'
 
 # For development
 # require 'pry'
 
 class RSlog
-  VERSION = '0.0.3'
+  VERSION = '0.0.8'
 
   def self.run
     Container.new.process_all

data/lib/rslog/container.rb

@@ -1,5 +1,7 @@
 # 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
@@ -24,6 +26,14 @@ class Container
     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")

data/lib/rslog/data_parser.rb

@@ -4,8 +4,8 @@ require_relative 'tools/array'
 require_relative 'tools/hash'
 require_relative 'validator'
 
-require 'pry'
-
+# Class to parse data from given array
+#
 class DataParser
   # type = :count (default) -> just count in groups
   # type = :uniq -> uniq entries in groups
@@ -17,11 +17,11 @@ class DataParser
     @container.result =
       @container.data
                 .group_by_index(0)
-                .count_by_groups(type)
+                .send("count_by_groups_#{type}")
                 .to_a
                 .sort_by { |item| item[1] }
                 .reverse
-                .map { |i| i.map(&:to_s).join(' ') }
+                .map { |elem_arr| elem_arr.map(&:to_s).join(' ') }
     self
   end
 end

data/lib/rslog/extractor.rb

@@ -2,9 +2,12 @@
 
 require_relative 'container'
 
+# Class for extracting data from file
+#
 class Extractor
   def initialize(container)
     @container = container
+    @file_name = container.file_name
   end
 
   def execute
@@ -15,13 +18,13 @@ class Extractor
   private
 
   def check
-    if File.zero?(@container.file_name)
-      @container.messages << 'Empty file'
+    if File.zero?(@file_name)
+      @container.add_message 'Empty file'
     else
-      @container.data = File.open(@container.file_name, 'r').to_a
-      @container.messages << 'Data in place'
+      @container.data = File.open(@file_name, 'r').to_a
+      @container.add_message 'Data in place'
     end
   rescue StandardError => e
-    @container.errors << e
+    @container.add_error e
   end
 end

data/lib/rslog/input_parser.rb

@@ -1,35 +1,19 @@
 # frozen_string_literal: true
 
 require 'optparse'
+require_relative 'opts'
 
+# Class to parse input filenames and args
+#
 class InputParser
-  OPTS = {
-    version: {
-      descr:  ['-v', '--version', 'Show version and exit'],
-      action: proc do
-        puts "#{File.basename($PROGRAM_NAME)}: #{RSlog::VERSION}"
-        exit
-      end
-    },
-    help:    {
-      descr:  ['-h', '--help', 'Prints this message and exit'],
-      action: proc do |opts|
-        puts opts
-        exit
-      end
-    }
-  }.freeze
+  include Opts
 
   def initialize(container)
     @container = container
-    @argv = container.argv
-    @file_name = container.file_name
-    @options = container.options
-    @errors = container.errors
   end
 
   def execute
-    create_opts
+    @opts = Opts.create_opts
     handle_opts
     handle_args
     self
@@ -39,26 +23,14 @@ class InputParser
 
   attr_accessor :opts
 
-  def create_opts
-    @opts = OptionParser.new do |opts|
-      opts.banner = "Usage: #{File.basename($PROGRAM_NAME)} FILENAME"
-      opts.on(*OPTS[:version][:descr]) do
-        OPTS[:version][:action].call
-      end
-      opts.on(*OPTS[:help][:descr]) do
-        OPTS[:help][:action].call(opts)
-      end
-    end
-  end
-
   def handle_opts
     @opts.parse!(into: @container.options)
   rescue OptionParser::InvalidOption => e
-    @container.errors << e
+    @container.add_error e
   end
 
   def handle_args
     @container.file_name = ARGV.select { |str| str =~ /.\.log|.\.txt/ }[0] || ''
-    @container.errors << 'No file_name provided' if @container.file_name.empty?
+    @container.add_error 'No file_name provided' if @container.file_name.empty?
   end
 end

data/lib/rslog/opts.rb

@@ -0,0 +1,29 @@
+# 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/presenter.rb

@@ -3,6 +3,8 @@
 require_relative 'tools/hash'
 require_relative 'tools/array'
 
+# Class to present result in needed format
+#
 class Presenter
   DECORATORS = {
     all:  {
@@ -21,21 +23,31 @@ class Presenter
   end
 
   def execute(type, formatter)
-    @container.messages << format_as(type, formatter)
+    @type = type
+    @container.messages << send("format_as_#{formatter}")
     self
   end
 
   private
 
-  def format_as(type, formatter)
-    case formatter
-    when :text
-      [
-        DECORATORS[type][:title],
-        @container.result.to_multiline_string(DECORATORS[type][:suffix]),
-        separator
-      ].join("\n")
-    end
+  def title
+    decorator[:title]
+  end
+
+  def suffix
+    decorator[:suffix]
+  end
+
+  def decorator
+    DECORATORS[@type]
+  end
+
+  def format_as_text
+    [
+      title,
+      @container.result.to_multiline_string(suffix),
+      separator
+    ].join("\n")
   end
 
   def separator

data/lib/rslog/tools/array.rb

@@ -1,15 +1,13 @@
 # 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 = '')
-    arr = []
-    each do |item|
-      arr << "#{item} #{suffix}"
-    end
-    arr.join("\n")
+    map { |item| "#{item} #{suffix}" }.join("\n")
   end
 end

data/lib/rslog/tools/hash.rb

@@ -2,12 +2,21 @@
 
 require 'set'
 
+# Monkey patch for a Hash class to make counts
+#
 class Hash
-  def count_by_groups(type = :all)
+  def count_by_groups_all
     res = {}
     each do |group_key, arr|
-      res[group_key] = arr.size          if type == :all
-      res[group_key] = Set.new(arr).size if type == :uniq
+      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

data/lib/rslog/validator.rb

@@ -2,6 +2,8 @@
 
 require_relative 'tools/array'
 
+# Class to validate if we have valid data in lines, for example well formatted IPs
+#
 class Validator
   TEMPLATES = {
     # IP address regex, source https://regexr.com/38odc
@@ -18,7 +20,7 @@ class Validator
   end
 
   def execute
-    @container.messages << MESSAGES[validate].call(@container.validator)
+    @container.add_message MESSAGES[validate].call(@container.validator)
     self
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rslog
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.8
 platform: ruby
 authors:
 - Andrey Eremeev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-09 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies: []
 description: Ruby script to get overall Statistic for weblog logs!
 email: a.eremeev@outlook.com
@@ -23,6 +23,7 @@ files:
 - lib/rslog/data_parser.rb
 - lib/rslog/extractor.rb
 - lib/rslog/input_parser.rb
+- lib/rslog/opts.rb
 - lib/rslog/presenter.rb
 - lib/rslog/tools/array.rb
 - lib/rslog/tools/hash.rb