rslog 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52bf0a8fd868cb749fcd759adfb7782a5cba4b148f15f6f52b913147dd6fa95d
-  data.tar.gz: a15d5b6d9ad034f6ffd962e47757ed7f3878c25aee4bace3d5d27bbe79d033b3
+  metadata.gz: eb99fc992d911ae7e46723f3ceac4083d1b29dae2838cd7f20b4ce60e54074d4
+  data.tar.gz: 314c33d8074c6b58d467d25da39d977cf9eb8bec352ee3ccb563eb1ec9ef2793
 SHA512:
-  metadata.gz: 916951619a9a3949fe6c4b5d3d2f9f684d3eaf7107d5cba15162d5402009a24187a61baea8ce0dab153c2315a06045956e49bf25eb2b9aec6b1b85871f198788
-  data.tar.gz: 071e2abb7278a4a84aaa2cec1154a5e63c83971746d5cdacd7b32127d5c36225e43f772b22ccff342a73f24d4d4d185743e971d2c9903f5ae2d7f86031594433
+  metadata.gz: f2be9106c18ab79fc4db32a72d724135841f343cb275fbafb7c1f8d2415bb899815a43b30a18bcba6051b1b5a7b996be2a8f50ac0b637214e77e6d4134ca57aa
+  data.tar.gz: 909c144ab0773bb1a295be24521fcd4e0085f50d654cfe4da45e5054dcbd55687a0748e5a6f3c421d76990cb6998c84e670aef071518529d850e49172d3070fe

data/lib/rslog.rb

@@ -5,11 +5,12 @@ require_relative 'rslog/args_handler'
 require_relative 'rslog/validator'
 require_relative 'rslog/data_processing'
 require_relative 'rslog/parser'
+require_relative 'rslog/decorator'
 require_relative 'rslog/presenter'
 require 'set'
 
 module RSlog
-  VERSION = '0.0.17'
+  VERSION = '0.0.18'
 
   # Module to hold main process
   #

data/lib/rslog/parser.rb

@@ -1,16 +1,11 @@
 # frozen_string_literal: true
 
-require 'forwardable'
-
 module RSlog
   # Class to parse data
   #
   class Parser
     attr_reader :data_processing
 
-    extend Forwardable
-    def_delegators :@data_processing, :extract, :group, :calculate, :order
-
     def initialize(data_processing)
       @data_processing = data_processing
     end

data/lib/rslog/presenter.rb

@@ -12,15 +12,6 @@ module RSlog
   #   "/help_page/1           1 visits" ]
   #
   class Presenter
-    LEFT_UP_CORNER =    "\u250c"
-    RIGHT_UP_CORNER =   "\u2510"
-    LEFT_DOWN_CORNER =  "\u2514"
-    RIGHT_DOWN_CORNER = "\u2518"
-    VERTICAL_BORDER =   "\u2502"
-    HORIZONTAL_BORDER = "\u2500"
-    VERTICAL_LEFT_BORDER = "\u251C"
-    VERTICAL_RIGHT_BORDER = "\u2524"
-
     def initialize(source, conf)
       @source = source
       @col_size    = conf.fetch(:col_size, 20)
@@ -28,12 +19,13 @@ module RSlog
       @formatter   = conf.fetch(:formatter, "%-#{@col_size}s")
       @columns     = conf.fetch(:columns, @source&.first&.size || 1)
       @head_titles = conf.fetch(:head_titles, Array.new(@columns, 'title'))
+      @decorator   = conf.fetch(:decorator, RSlog::Decorator.new(:utf))
     end
 
     def present
       puts @title
       puts _top_border
-      puts VERTICAL_BORDER + format(@formatter * @columns, *@head_titles) + VERTICAL_BORDER
+      puts @decorator.vertical_border + _formatted_head_titles + @decorator.vertical_border
       puts _middle_border
       puts _formatted_data
       puts _bottom_border
@@ -43,25 +35,31 @@ module RSlog
     private
 
     def _top_border
-      LEFT_UP_CORNER + _horisontal_line + RIGHT_UP_CORNER
+      @decorator.left_up_corner + _horisontal_line + @decorator.right_up_corner
     end
 
     def _middle_border
-      VERTICAL_LEFT_BORDER + _horisontal_line + VERTICAL_RIGHT_BORDER
+      @decorator.vertical_left_border + _horisontal_line + @decorator.vertical_right_border
     end
 
     def _bottom_border
-      LEFT_DOWN_CORNER + _horisontal_line + RIGHT_DOWN_CORNER
+      @decorator.left_down_corner + _horisontal_line + @decorator.right_down_corner
     end
 
     def _horisontal_line
-      HORIZONTAL_BORDER * @col_size * @columns
+      @decorator.horizontal_border * @col_size * @columns
+    end
+
+    def _formatted_head_titles
+      format(@formatter * @columns, *@head_titles)
     end
 
     def _formatted_data
       @source.map do |row|
         row = row.map(&:to_s)
-        VERTICAL_BORDER + format(@formatter * @columns, *row).to_s + VERTICAL_BORDER
+        @decorator.vertical_border +
+          format(@formatter * @columns, *row).to_s +
+          @decorator.vertical_border
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rslog
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Andrey Eremeev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-03 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies: []
 description: Ruby script to get overall Statistic for weblog logs!
 email: a.eremeev@outlook.com