rslog 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb99fc992d911ae7e46723f3ceac4083d1b29dae2838cd7f20b4ce60e54074d4
-  data.tar.gz: 314c33d8074c6b58d467d25da39d977cf9eb8bec352ee3ccb563eb1ec9ef2793
+  metadata.gz: 565f890daf1b4081d160be0695bdb10c6522d4477f293e629fd960de9dd6e6eb
+  data.tar.gz: b30cfe363b91deea197373d561e09529594062e659cf319230cc9f3c76e3b0dd
 SHA512:
-  metadata.gz: f2be9106c18ab79fc4db32a72d724135841f343cb275fbafb7c1f8d2415bb899815a43b30a18bcba6051b1b5a7b996be2a8f50ac0b637214e77e6d4134ca57aa
-  data.tar.gz: 909c144ab0773bb1a295be24521fcd4e0085f50d654cfe4da45e5054dcbd55687a0748e5a6f3c421d76990cb6998c84e670aef071518529d850e49172d3070fe
+  metadata.gz: e2eae3d47dc76857e1dcd3cfc3541b9d9fed3b10ab1340783b744761b61436f550efb67adb6d01ba06ff1c478805b7754bcf08e5a0ee7cf860ce8b5fcb96bfaf
+  data.tar.gz: f2f5a2a8396d3a2b529c8684c77b015d9196ee2f278b18a5c0ebed510141b5b93cd2dd1889a001a9f67c0f480ac259dbfd99e5f737c6b8e1367f617c2d0f5b7e

data/lib/rslog.rb

@@ -10,7 +10,7 @@ require_relative 'rslog/presenter'
 require 'set'
 
 module RSlog
-  VERSION = '0.0.18'
+  VERSION = '0.0.19'
 
   # Module to hold main process
   #
@@ -31,10 +31,11 @@ module RSlog
     end
 
     def self._process(lines)
+      decorator = RSlog::Decorator.new(:utf)
       _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
+        RSlog::Presenter.new(parsed_data, conf, decorator).present
       end
     end
 
@@ -46,7 +47,7 @@ module RSlog
        { title:       'List of webpages with most unique page views also ordered:',
          #          head_titles:     %w[Url Unique\ views Average],
          head_titles: %w[Url Unique\ views],
-         calc:        proc { |visits| Set.new(visits).size } }]
+         calc:        proc { |visits| Set.new(visits).size } } ]
     end
   end
 end

data/lib/rslog/data_processing.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module RSlog
+  # Class to hold data_processing methods
+  #
+  class DataProcessing
+    attr_reader :result
+
+    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
+end

data/lib/rslog/decorator.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'yaml'
+
+module RSlog
+  # Class for load borders for table
+  #
+  class Decorator
+    FILE_PATH = 'lib/rslog/decorators.yml'
+
+    attr_reader :decorators
+
+    def initialize(coding = :utf)
+      @coding = String(coding)
+      @decorators = YAML.load_file(FILE_PATH)[@coding]
+      @decorators.each do |name, value|
+        instance_variable_set("@#{name}", value)
+        Decorator.attr_reader name.to_sym
+      end
+    end
+  end
+end

data/lib/rslog/decorators.yml

@@ -0,0 +1,21 @@
+---
+utf:
+  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"
+
+str:
+  left_up_corner:        "+"
+  right_up_corner:       "+"
+  left_down_corner:      "+"
+  right_down_corner:     "+"
+  vertical_border:       "|"
+  horizontal_border:     "-"
+  vertical_left_border:  "+"
+  vertical_right_border: "+"
+  

data/lib/rslog/presenter.rb

@@ -12,14 +12,14 @@ module RSlog
   #   "/help_page/1           1 visits" ]
   #
   class Presenter
-    def initialize(source, conf)
+    def initialize(source, conf, decorator)
       @source = source
       @col_size    = conf.fetch(:col_size, 20)
       @title       = conf.fetch(:title, 'Stat Pages')
       @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))
+      @decorator   = decorator || _default_decorator
     end
 
     def present
@@ -33,6 +33,10 @@ module RSlog
     end
 
     private
+    
+    def _default_decorator
+      RSlog::Decorator.new(:utf)      
+    end
 
     def _top_border
       @decorator.left_up_corner + _horisontal_line + @decorator.right_up_corner

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rslog
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Andrey Eremeev
@@ -20,6 +20,9 @@ files:
 - bin/rslog
 - lib/rslog.rb
 - lib/rslog/args_handler.rb
+- lib/rslog/data_processing.rb
+- lib/rslog/decorator.rb
+- lib/rslog/decorators.yml
 - lib/rslog/parser.rb
 - lib/rslog/presenter.rb
 - lib/rslog/validator.rb