rslog 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '089ce1f53d07365d2cd5a8a132d3f016fd971aec94fb5e1d7d097b83c378d16b'
-  data.tar.gz: 690f6b582c62d555192f003bb9bf48f47c05c73e6144663fc5271ef263a8a6e2
+  metadata.gz: 52bf0a8fd868cb749fcd759adfb7782a5cba4b148f15f6f52b913147dd6fa95d
+  data.tar.gz: a15d5b6d9ad034f6ffd962e47757ed7f3878c25aee4bace3d5d27bbe79d033b3
 SHA512:
-  metadata.gz: 2607d6b3ba40a13ecba89d214d0ef3d92d8d7b28b3b0dedf96942b01ea939efd287797ad4fe56e99c6986eac2dcbe53feca954abe41b69f14633ed9a79249f82
-  data.tar.gz: f68723a370022e15d2df26516b60725cad3b20d60a3c59bc3d7c2fc55f4146d874cbd123b1900896f7cc5eeab9dbff3af027241a3e8d57fc1f41c734283c25c8
+  metadata.gz: 916951619a9a3949fe6c4b5d3d2f9f684d3eaf7107d5cba15162d5402009a24187a61baea8ce0dab153c2315a06045956e49bf25eb2b9aec6b1b85871f198788
+  data.tar.gz: 071e2abb7278a4a84aaa2cec1154a5e63c83971746d5cdacd7b32127d5c36225e43f772b22ccff342a73f24d4d4d185743e971d2c9903f5ae2d7f86031594433

data/lib/rslog.rb

@@ -3,44 +3,41 @@
 
 require_relative 'rslog/args_handler'
 require_relative 'rslog/validator'
+require_relative 'rslog/data_processing'
 require_relative 'rslog/parser'
 require_relative 'rslog/presenter'
 require 'set'
 
 module RSlog
-  VERSION = '0.0.16'
+  VERSION = '0.0.17'
 
   # Module to hold main process
   #
   module Main
+    extend RSlog::ArgsHandler
+    extend RSlog::Validator
+
     def self.run
-      file_names.each do |file_name|
+      file_names_from_args(ARGV).each do |file_name|
         puts "Statistics for file #{file_name}"
 
         lines = IO.readlines(file_name)
 
-        RSlog::Validator.execute(lines)
+        validate(lines)
 
-        process(config_sets, lines)
+        _process(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
+    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.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
+    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],

data/lib/rslog/args_handler.rb

@@ -5,22 +5,28 @@ module RSlog
   #
   # returns Array of file names
   #
-  class ArgsHandler
-    attr_reader :args, :options
+  module ArgsHandler
+    #    attr_reader :args, :options
+    #
+    #    def initialize(args)
+    #      @args = args
+    #      @options = @args.select { |el| el =~ /^-/ }
+    #    end
 
-    def initialize(args)
+    def file_names_from_args(args)
       @args = args
       @options = @args.select { |el| el =~ /^-/ }
-    end
-
-    def handle
-      if options.any? || args.empty?
+      if @options.any? || @args.empty?
         _handle_options
         return []
       end
 
       # file_names array
-      args - options
+      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
@@ -30,7 +36,7 @@ module RSlog
     end
 
     def _show_help
-      if options.delete('-h') || args.empty?
+      if @options.delete('-h') || @args.empty?
         puts _help_message
         return true
       end

data/lib/rslog/parser.rb

@@ -1,54 +1,8 @@
 # frozen_string_literal: true
 
-module RSlog
-  # Class to hold data_processing methods
-  #
-  class DataProcessing
-    attr_reader :result
+require 'forwardable'
 
-    def initialize(source, conf)
-      @calc      = conf.fetch(:calc)      { proc }
-      @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'
+module RSlog
   # Class to parse data
   #
   class Parser
@@ -57,11 +11,11 @@ module RSlog
     extend Forwardable
     def_delegators :@data_processing, :extract, :group, :calculate, :order
 
-    def initialize(source, conf)
-      @data_processing = DataProcessing.new(source, conf)
+    def initialize(data_processing)
+      @data_processing = data_processing
     end
 
-    def execute
+    def parse
       data_processing.extract.group.calculate.order.result
     end
   end

data/lib/rslog/validator.rb

@@ -17,13 +17,15 @@ module RSlog
       invalid: proc { |validator_name| "Some #{validator_name.upcase}s are NOT valid" }
     }.freeze
 
-    def self.execute(source)
+    def validate(source)
       puts
-      puts MESSAGES[valid?(source)].call(:ip)
+      puts MESSAGES[_valid?(source)].call(:ip)
       puts
     end
 
-    def self.valid?(source)
+    private
+
+    def _valid?(source)
       return :valid if source.all? TEMPLATES[:ip]
 
       :invalid

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rslog
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Andrey Eremeev