rslog 0.0.8 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 327a6ca58c14f9e3a6353be6b4ef8103b42b59d7d31b426d525dde7e3bb114cd
-  data.tar.gz: f24b4b26f9018bf44888fe48d1608c5de8df866a6072f551d39a27b79c4715cf
+  metadata.gz: a458692b87d66b9b3b9159e9263172dc27b8d07a9df51a9fc336da6ff36c9388
+  data.tar.gz: d5ecb7b45c9534739a6e7c42c03cde7a468bd634b13659a837c9750647763120
 SHA512:
-  metadata.gz: a76b136d798fefbc27b1d34943fa5325872b79c1b2b0851c96bc90b2899c1208ad3cd6f103b13b998cb78ee34f47f551309a0f23c6792156a70a11d81f56d4a6
-  data.tar.gz: fa19a42467be47c2923cc8ac2cee2300881fef2a81994ea1f76f13c5ffaa8750045f9268a334f100f0d26c0d349c40694d563c6963997517f4c6f6d3366a8c1d
+  metadata.gz: 5e92c43c6e11b59e096a78e750007bd3a607c6742e1332231fb92e4ba6a7156836300f91cef763637e95ecadca52df671e76ad6963b45ec3bf744ef64a55d4f0
+  data.tar.gz: f77065e38bb39f59fdd2b82e4ada8dc25313891075e4927fa0176ab931b846d036a56507edb94cdbf90c9958ed7e05282c63f9a933906a1bd617438c91d40384

data/lib/rslog.rb

@@ -2,18 +2,20 @@
 # 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/validator'
 require_relative 'rslog/data_parser'
+require_relative 'rslog/decorators'
 require_relative 'rslog/presenter'
-require_relative 'rslog/opts'
 
 # For development
 # require 'pry'
 
 class RSlog
-  VERSION = '0.0.8'
+  VERSION = '0.0.14'
 
   def self.run
     Container.new.process_all

data/lib/rslog/container.rb

@@ -1,7 +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

data/lib/rslog/data_parser.rb

@@ -2,26 +2,21 @@
 
 require_relative 'tools/array'
 require_relative 'tools/hash'
-require_relative 'validator'
 
 # Class to parse data from given array
 #
-class DataParser
+class DataParser < Worker
   # type = :count (default) -> just count in groups
   # type = :uniq -> uniq entries in groups
-  def initialize(container)
-    @container = container
-  end
-
   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(' ') }
+    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

@@ -0,0 +1,24 @@
+# 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,15 +1,8 @@
 # frozen_string_literal: true
 
-require_relative 'container'
-
 # Class for extracting data from file
 #
-class Extractor
-  def initialize(container)
-    @container = container
-    @file_name = container.file_name
-  end
-
+class Extractor < Worker
   def execute
     check
     self
@@ -17,14 +10,18 @@ class Extractor
 
   private
 
+  def file_name
+    container.file_name
+  end
+
   def check
-    if File.zero?(@file_name)
-      @container.add_message 'Empty file'
+    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'
+      container.data = File.open(file_name, 'r').to_a
+      container.add_message 'Data in place'
     end
   rescue StandardError => e
-    @container.add_error e
+    container.add_error e
   end
 end

data/lib/rslog/input_parser.rb

@@ -5,15 +5,10 @@ require_relative 'opts'
 
 # Class to parse input filenames and args
 #
-class InputParser
+class InputParser < Worker
   include Opts
 
-  def initialize(container)
-    @container = container
-  end
-
   def execute
-    @opts = Opts.create_opts
     handle_opts
     handle_args
     self
@@ -21,16 +16,14 @@ class InputParser
 
   private
 
-  attr_accessor :opts
-
   def handle_opts
-    @opts.parse!(into: @container.options)
+    Opts.create_opts.parse!(into: container.options)
   rescue OptionParser::InvalidOption => e
-    @container.add_error 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?
+    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

@@ -7,7 +7,6 @@ module Opts
     descr:  ['-v', '--version', 'Show version and exit'],
     action: proc do
       puts "#{File.basename($PROGRAM_NAME)}: #{RSlog::VERSION}"
-      exit
     end
   }.freeze
 
@@ -15,15 +14,32 @@ module Opts
     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) }
+      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/presenter.rb

@@ -5,47 +5,23 @@ require_relative 'tools/array'
 
 # Class to present result in needed format
 #
-class Presenter
-  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
+class Presenter < Worker
+  include Decorators
 
-  def initialize(container)
-    @container = container
-  end
+  attr_accessor :type
 
   def execute(type, formatter)
     @type = type
-    @container.messages << send("format_as_#{formatter}")
+    container.add_message send("format_as_#{formatter}")
     self
   end
 
   private
 
-  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),
+      Decorators.send("#{type}_title"),
+      container.result.to_multiline_string(Decorators.send("#{type}_suffix")),
       separator
     ].join("\n")
   end

data/lib/rslog/validator.rb

@@ -4,7 +4,7 @@ require_relative 'tools/array'
 
 # Class to validate if we have valid data in lines, for example well formatted IPs
 #
-class Validator
+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/
@@ -15,19 +15,15 @@ class Validator
     invalid: proc { |validator| "Some #{validator.upcase}s are NOT valid" }
   }.freeze
 
-  def initialize(container)
-    @container = container
-  end
-
   def execute
-    @container.add_message MESSAGES[validate].call(@container.validator)
+    container.add_message MESSAGES[validate].call(container.validator)
     self
   end
 
   private
 
   def validate
-    return :valid if @container.data.all? TEMPLATES[@container.validator]
+    return :valid if container.data.all? TEMPLATES[container.validator]
 
     :invalid
   end

data/lib/rslog/worker.rb

@@ -0,0 +1,15 @@
+# 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rslog
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.14
 platform: ruby
 authors:
 - Andrey Eremeev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-10 00:00:00.000000000 Z
+date: 2021-03-12 00:00:00.000000000 Z
 dependencies: []
 description: Ruby script to get overall Statistic for weblog logs!
 email: a.eremeev@outlook.com
@@ -21,6 +21,7 @@ files:
 - 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
@@ -28,6 +29,7 @@ files:
 - 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