rslog 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 327a6ca58c14f9e3a6353be6b4ef8103b42b59d7d31b426d525dde7e3bb114cd
-  data.tar.gz: f24b4b26f9018bf44888fe48d1608c5de8df866a6072f551d39a27b79c4715cf
+  metadata.gz: 6ce0368ae8830da116ff45bb102f0156e0ff0c320f57ddb0ba133efa019b7460
+  data.tar.gz: b12a734d292403f0dfabe560e22e170ec1f4e72d9a07227f80291d5aeb72c51b
 SHA512:
-  metadata.gz: a76b136d798fefbc27b1d34943fa5325872b79c1b2b0851c96bc90b2899c1208ad3cd6f103b13b998cb78ee34f47f551309a0f23c6792156a70a11d81f56d4a6
-  data.tar.gz: fa19a42467be47c2923cc8ac2cee2300881fef2a81994ea1f76f13c5ffaa8750045f9268a334f100f0d26c0d349c40694d563c6963997517f4c6f6d3366a8c1d
+  metadata.gz: 277bec231152641cbd79ad42f7737f7bccf69e2abb5d804d0a976c42d6a4f353fac5761555e7a662bb7767eb6c7ad7499e2716ea9305e343b2c7b542178a3540
+  data.tar.gz: 8b245fc399ac058b0cad266fd1684cbfa76136d8b2c02e6bc1c088441482758b54e8a5a25d00f2de50ce9889ad42a3ba02ba92ba85594ab1aaa32680e1e59896

data/lib/rslog.rb

@@ -13,7 +13,7 @@ require_relative 'rslog/opts'
 # require 'pry'
 
 class RSlog
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 
   def self.run
     Container.new.process_all

data/lib/rslog/data_parser.rb

@@ -2,17 +2,14 @@
 
 require_relative 'tools/array'
 require_relative 'tools/hash'
+require_relative 'worker'
 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

data/lib/rslog/extractor.rb

@@ -1,16 +1,12 @@
 # frozen_string_literal: true
 
-require_relative 'container'
+require_relative 'worker'
 
 # Class for extracting data from file
 #
-class Extractor
-  def initialize(container)
-    @container = container
-    @file_name = container.file_name
-  end
-
+class Extractor < Worker
   def execute
+    @file_name = @container.file_name
     check
     self
   end

data/lib/rslog/input_parser.rb

@@ -1,19 +1,15 @@
 # frozen_string_literal: true
 
 require 'optparse'
+require_relative 'worker'
 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
@@ -24,7 +20,7 @@ class InputParser
   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
   end

data/lib/rslog/presenter.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
+require_relative 'worker'
 require_relative 'tools/hash'
 require_relative 'tools/array'
 
 # Class to present result in needed format
 #
-class Presenter
+class Presenter < Worker
   DECORATORS = {
     all:  {
       title:
@@ -18,13 +19,9 @@ class Presenter
     }
   }.freeze
 
-  def initialize(container)
-    @container = container
-  end
-
   def execute(type, formatter)
     @type = type
-    @container.messages << send("format_as_#{formatter}")
+    @container.add_message send("format_as_#{formatter}")
     self
   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,10 +15,6 @@ 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)
     self

data/lib/rslog/worker.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# Class to hold worker functionality
+#
+class Worker
+  def initialize(container)
+    @container = container
+  end
+
+  def execute
+    raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rslog
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Andrey Eremeev
@@ -28,6 +28,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