rslog 0.0.12 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 843ae99c81000576196f8fb4b3cb3be0a6a529b430f02d4f205b58e9def8f61c
-  data.tar.gz: 0e642e1dbb538480f037e7ed33b2129b99d31441ea5c44a51a45289f2fbe4e7e
+  metadata.gz: a458692b87d66b9b3b9159e9263172dc27b8d07a9df51a9fc336da6ff36c9388
+  data.tar.gz: d5ecb7b45c9534739a6e7c42c03cde7a468bd634b13659a837c9750647763120
 SHA512:
-  metadata.gz: ccce9aef8ab69e63c8162116aceb13500bd4e5cff99b318958313ab0897250e55b476cc467178ed70ff69b98d847f9593ee9f2f9d1e616403cf8e1ceb5e3ab35
-  data.tar.gz: 3065582ca9c1d32999faa78fc9675af66a83599222e39689b56875656cb69a715703a62e20f1910df622b776a8e6d18e730317398d2b7fd12f873739a53e9a5e
+  metadata.gz: 5e92c43c6e11b59e096a78e750007bd3a607c6742e1332231fb92e4ba6a7156836300f91cef763637e95ecadca52df671e76ad6963b45ec3bf744ef64a55d4f0
+  data.tar.gz: f77065e38bb39f59fdd2b82e4ada8dc25313891075e4927fa0176ab931b846d036a56507edb94cdbf90c9958ed7e05282c63f9a933906a1bd617438c91d40384

data/lib/rslog.rb

@@ -3,18 +3,19 @@
 
 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.12'
+  VERSION = '0.0.14'
 
   def self.run
     Container.new.process_all

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/opts.rb

@@ -19,19 +19,27 @@ module Opts
 
   def self.create_opts
     OptionParser.new do |opts|
-      opts.banner = "Usage: #{File.basename($PROGRAM_NAME)} FILENAME"
+      banner(opts)
       help(opts)
-      opts.on(*Opts::HELP[:descr]) do
-        Opts::HELP[:action].call(opts)
-        exit
-      end
+      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

@@ -6,17 +6,9 @@ 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
+  include Decorators
+
+  attr_accessor :type
 
   def execute(type, formatter)
     @type = type
@@ -26,22 +18,10 @@ class Presenter < Worker
 
   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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rslog
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  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