Refactor / cleanup & bump to 5.0.0

intrigueio · Mar 13, 2021 · 171adf8 · 171adf8
1 parent db22274
commit 171adf8
Show file tree

Hide file tree

Showing 20 changed files with 727 additions and 588 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    intrigue-ident (4.2.7)
+    intrigue-ident (5.0.0)
       dnsruby
       mongo
       murmurhash3

diff --git a/lib/dns/check_factory.rb b/lib/dns/check_factory.rb
@@ -1,23 +1,23 @@
 module Intrigue
-  module Ident
-    module Dns
-      class CheckFactory
+module Ident
+module Dns
+class CheckFactory
 
-        #
-        # Register a new handler
-        #
-        def self.register(klass)
-          @checks = [] unless @checks
-          @checks << klass if klass
-        end
+  #
+  # Register a new handler
+  #
+  def self.register(klass)
+    @checks = [] unless @checks
+    @checks << klass if klass
+  end
 
-        #
-        # Provide the full list of checks
-        #
-        def self.checks
-          @checks
-        end
-      end
-    end
+  #
+  # Provide the full list of checks
+  #
+  def self.checks
+    @checks
   end
 end
+end
+end
+end
diff --git a/lib/elastic_search/check_factory.rb b/lib/elastic_search/check_factory.rb
@@ -1,23 +1,23 @@
 module Intrigue
-  module Ident
-    module ElasticSearch
-      class CheckFactory
+module Ident
+module ElasticSearch
+  class CheckFactory
 
-        #
-        # Register a new handler
-        #
-        def self.register(klass)
-          @checks = [] unless @checks
-          @checks << klass if klass
-        end
+    #
+    # Register a new handler
+    #
+    def self.register(klass)
+      @checks = [] unless @checks
+      @checks << klass if klass
+    end
 
-        #
-        # Provide the full list of checks
-        #
-        def self.checks
-          @checks
-        end
-      end
+    #
+    # Provide the full list of checks
+    #
+    def self.checks
+      @checks || []
     end
   end
 end
+end
+end
diff --git a/lib/ftp/check_factory.rb b/lib/ftp/check_factory.rb
@@ -3,20 +3,20 @@ module Ident
 module Ftp
 class CheckFactory
 
-    #
-    # Register a new handler
-    #
-    def self.register(klass)
-      @checks = [] unless @checks
-      @checks << klass if klass
-    end
+  #
+  # Register a new handler
+  #
+  def self.register(klass)
+    @checks = [] unless @checks
+    @checks << klass if klass
+  end
 
-    #
-    # Provide the full list of checks
-    #
-    def self.checks
-      @checks
-    end
+  #
+  # Provide the full list of checks
+  #
+  def self.checks
+    @checks
+  end
 
 end
 end

diff --git a/lib/http/check_factory.rb b/lib/http/check_factory.rb
@@ -3,61 +3,61 @@ module Ident
 module Http
 class CheckFactory
 
-    #
-    # Register a new handler
-    #
-    def self.register(klass)
-      @checks = [] unless @checks
-      @checks << klass if klass
-    end
+  #
+  # Register a new handler
+  #
+  def self.register(klass)
+    @checks = [] unless @checks
+    @checks << klass if klass
+  end
 
-    #
-    # Provide the full list of checks
-    #
-    def self.checks
-      @checks
-    end
+  #
+  # Provide the full list of checks
+  #
+  def self.checks
+    @checks
+  end
 
-    #
-    # Provide the full list of checks
-    #
-    def self.generate_initial_checks(url)
-      @checks.map{ |x| x.new.generate_checks("#{url}") }.flatten.compact.select{|x| 
-        x[:require_product] == nil && x[:require_vendor] == nil && x[:require_vendor_product] == nil }
-    end
+  #
+  # Provide the full list of checks
+  #
+  def self.generate_initial_checks(url)
+    @checks.map{ |x| x.new.generate_checks("#{url}") }.flatten.compact.select{|x|
+      x[:require_product] == nil && x[:require_vendor] == nil && x[:require_vendor_product] == nil }
+  end
 
-    #
-    # Provide checks given a vendor
-    #
-    def self.generate_checks_for_vendor(url,vendor)
-      @checks.map{ |x| x.new.generate_checks("#{url}") }.flatten.compact.select{|x| 
-        x[:require_vendor] == "#{vendor}" }
-    end
-
-    #
-    # Provide checks givene a product
-    #
-    def self.generate_checks_for_product(url,product)
-      @checks.map{ |x| x.new.generate_checks("#{url}") }.flatten.compact.select{|x| 
-        x[:require_product] == "#{product}" }
-    end
+  #
+  # Provide checks given a vendor
+  #
+  def self.generate_checks_for_vendor(url,vendor)
+    @checks.map{ |x| x.new.generate_checks("#{url}") }.flatten.compact.select{|x|
+      x[:require_vendor] == "#{vendor}" }
+  end
 
+  #
+  # Provide checks givene a product
+  #
+  def self.generate_checks_for_product(url,product)
+    @checks.map{ |x| x.new.generate_checks("#{url}") }.flatten.compact.select{|x|
+      x[:require_product] == "#{product}" }
+  end
 
-    #
-    # Provide checks givene a vendor product
-    #
-    def self.generate_checks_for_vendor_product(url, vendor, product)
-      @checks.map{ |x| x.new.generate_checks("#{url}") }.flatten.compact.select{|x| 
-        x[:require_vendor_product] == "#{vendor}_#{product}".downcase.gsub(" ","_") }
-    end
 
+  #
+  # Provide checks givene a vendor product
+  #
+  def self.generate_checks_for_vendor_product(url, vendor, product)
+    @checks.map{ |x| x.new.generate_checks("#{url}") }.flatten.compact.select{|x|
+      x[:require_vendor_product] == "#{vendor}_#{product}".downcase.gsub(" ","_") }
+  end
 
-    #
-    # Provide the full list of checks
-    #
-    def self.configuration_checks
-      @checks.map{ |x| x.new.generate_checks("") }.flatten.compact.select{|x| x[:type] == "content" }
-    end
+
+  #
+  # Provide the full list of checks
+  #
+  def self.configuration_checks
+    @checks.map{ |x| x.new.generate_checks("") }.flatten.compact.select{|x| x[:type] == "content" }
+  end
 
 
 end