checkability 0.6.1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a02dfee4b2afe386a20062c53ba6961442b50597c0d0edc822f66971155f1431
-  data.tar.gz: 65710661a0c8c127de790089e47866046c23e23e5a0041f864e2f5d0b38dc48e
+  metadata.gz: fa1ae6fc8c72cd3073a9301eb633a23bed7a3912a3e338e54c83aba5fc8f4b08
+  data.tar.gz: 8d1935bd53420a47316e76ce952b18c0b8ca4d96e8ee0193fcce5aea16a159e4
 SHA512:
-  metadata.gz: ce4d8e4626aa47b7a15fa909bb82ca87334cc106f230b4f62015101a4f274e0e3da288f3f65565fe7abf5aaf8798f446e5908447144c13666b8dbf6da14ba106
-  data.tar.gz: f26b6d62f724617b2fcf1b141cad53dccdd760720f3f3205792a34ff5d9604fc72b75a4d2b5519f7a76436ed5a7d8c486158ac066c370a15db523e550697c939
+  metadata.gz: 971c297f7e4d8da9eb73a02bdad49329c0e84024553d3f864e0a91e02aee71fc5f71e0ab3d4ef9b66b6696047237c3c36f7c22d72004bc70fc6dfceb4d4ec125
+  data.tar.gz: 1a22cb5f5f8b25612116f5b302e82b5d914a05aaedfc624c6c635db56fd23d3998b29dc8582f633d78f64f7ef8120d5a87d66052b0c5adba0ec41558174166a6

data/README.md

@@ -12,12 +12,12 @@ How to use my plugin.
 inside of any rails model do
 ```ruby
 class SomeModel
-  acts_as_checkable strategy: proc { |a, b, c| a && (b || c) },
-                    checkers: uk_postcode_checkers
+  extend UKPostcodeCheckersConf
+  acts_as_checkable uk_postcode_checkers_conf
 end
 ```
 where `uk_postcode_checkers` is method which returns hash with configurations  
-https://github.com/azazelo/postcode_checker/blob/master/app/models/concerns/u_k_postcode_checkers.rb  
+https://github.com/azazelo/postcode_checker/blob/master/app/models/concerns/u_k_postcode_checkers_conf.rb  
 then in your controller:  
 ```ruby
 class ChecksController < ApplicationController
@@ -30,7 +30,7 @@ class ChecksController < ApplicationController
     message, alert_class =
       if @check.valid?
         @check.perform_check
-        [@check.messages.join('<br/>'), _alert_class(@check.allowed)]
+        [@check.ch_messages.join('<br/>'), _alert_class(@check.ch_allowed)]
       else
         [@check.errors.full_messages.join('<br/>'), _alert_class(false)]
       end

data/lib/checkability.rb

@@ -9,7 +9,6 @@ require_relative 'checkability/external_api_checker'
 require_relative 'checkability/external_api_connector'
 require_relative 'checkability/validator'
 require_relative 'checkability/acts_as_checkable'
-require_relative 'checkability/chain_of_resp/handler'
-require_relative 'checkability/chain_of_resp/abstract_handler'
+require_relative 'checkability/base_checker'
 
 ActiveRecord::Base.include Checkability::ActsAsCheckable

data/lib/checkability/acts_as_checkable.rb

@@ -12,20 +12,28 @@ module Checkability
 
     class_methods do
       def acts_as_checkable(options = {})
-        raise ArgumentError, "Hash expected, got #{options.class.name}" if !options.is_a?(Hash) && !options.empty?
+        if !options.is_a?(Hash) && !options.empty?
+          raise ArgumentError,
+                "Hash expected, got #{options.class.name}"
+        end
 
-        class_attribute :checkable_conf
+        class_attribute :ch_conf
 
-        self.checkable_conf = options
+        self.ch_conf = options
       end
     end
 
-    attr_accessor :allowed, :messages
+    attr_accessor :ch_allowed, :ch_messages
+
+    def initialize(params)
+      @ch_messages = []
+      @ch_allowed = nil
+      super(params)
+    end
 
     def perform_check
-      _setup
-      self.allowed = Checkability::Checkable.new(self).check(checkable_conf)
-      messages << "#{allowed}::'#{_value}' is #{_allowness}. "
+      Checkability::Checkable.new(self).check(ch_conf)
+      ch_messages << "#{ch_allowed}:::'#{_value}' is #{_allowness}. "
     end
 
     private
@@ -35,16 +43,11 @@ module Checkability
     end
 
     def _attr_name
-      checkable_conf[:attr_name] || :value
-    end
-
-    def _setup
-      self.allowed = nil
-      self.messages = []
+      ch_conf[:attr_name] || :value
     end
 
     def _allowness
-      allowed ? 'ALLOWED' : 'NOT allowed'
+      ch_allowed ? 'ALLOWED' : 'NOT allowed'
     end
   end
 end

data/lib/checkability/base_checker.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require_relative 'checker'
+
+module Checkability
+  # @abstract
+  class BaseChecker < Checker
+    # @return [Handler]
+    attr_reader :stop_process_on_success, :stop_process_on_failure,
+                :success_message, :failure_message
+
+    def initialize(opts = {})
+      @stop_process_on_failure = opts[:stop_process_on_failure] || false
+      @stop_process_on_success = opts[:stop_process_on_success] || false
+      @success_message = opts[:success_message] || 'Success.'
+      @failure_message = opts[:failure_message] || 'Failed.'
+
+      @next_handler = nil
+      post_initialize(opts) # implemented in subclass
+    end
+
+    # subclass should implement
+    def post_initialize(_opts)
+      nil
+    end
+
+    # @param [Handler] handler
+    #
+    # @return [Handler]
+    def next_handler(handler)
+      @next_handler = handler
+
+      handler
+    end
+
+    # @abstract
+    #
+    # @param [String] request
+    #
+    # @return [Boolean, nil]
+    def handle(check_obj)
+      res, mess = result_and_message(check_obj)
+      check_obj.ch_messages << mess
+      check_obj.ch_allowed = res
+
+      return if _stop_here?(res)
+
+      @next_handler&.handle(check_obj) if @next_handler
+    end
+
+    def result_and_message(check_obj = nil)
+      res = result(check_obj)
+
+      str = res ? success_message : failure_message
+      [res, message(res, str)]
+    rescue StandardError => e
+      [false, message(false, e)]
+    end
+
+    # subclass should implement
+    def result(_check_obj)
+      raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
+    end
+
+    # subclass may override
+    def message(res, str)
+      "#{res}:::#{str}"
+    end
+
+    private
+
+    def _stop_here?(res)
+      (res && stop_process_on_success) || (!res && stop_process_on_failure)
+    end
+  end
+end

data/lib/checkability/checkable.rb

@@ -1,50 +1,59 @@
 # frozen_string_literal: true
 
+require 'forwardable'
+
 module Checkability
   # Implements check method to Iterate on chechers
   # Possible to implemet as Iterator in future
   #
   class Checkable
-    attr_reader :checkable
+    attr_accessor :check_obj
+
+    extend Forwardable
+    def_delegators :@check_obj, :ch_messages, :ch_allowed
 
-    def initialize(checkable)
-      @checkable = checkable
-      @checkable.messages = []
+    def initialize(check_obj)
+      @check_obj = check_obj
     end
 
     # As in result handlers should behave like this:
-    # validator    .set_next(storage)
-    # storage      .set_next(api_validator)
-    # api_validator.set_next(api_finder)
-    # api_validator.set_next(nil)
+    # validator    .next_handler(storage)
+    # storage      .next_handler(api_validator)
+    # api_validator.next_handler(api_finder)
+    # api_validator.next_handler(nil)
     #
     # validator.handle(request)
     #
-    def check(opts = {})
-      first_handler_name = opts[:first_handler]
-      _handlers(opts)[first_handler_name].handle(checkable)
+    # ChainOfResponsibilty
+    #
+    def check(handler_confs)
+      first_handler_name = handler_confs.keys.first
+      first_handler = _handlers(handler_confs)[first_handler_name]
+
+      first_handler.handle(check_obj)
     rescue StandardError => e
-      checkable.messages << "false::#{e}: #{opts}."
+      check_obj.ch_messages << "false:::#{e}: #{handler_confs}."
       false
     end
 
     private
 
-    def _handlers(opts)
-      handler_confs = opts[:handler_confs]
-      handlers = {}
-      handler_confs.each do |handler_name, handler_conf|
-        handlers[handler_name] = _make_handler(handler_name, handler_conf)
-      end
-      handlers.each do |handler_name, handler|
-        next_handler_name = handler_confs[handler_name][:next_handler]
-        handler.next_handler(handlers[next_handler_name])
+    def _handlers(handler_confs)
+      handlers = _make_handlers(handler_confs)
+      handlers.each_value.with_index do |handler, i|
+        next_handler_name = handlers.keys[i + 1]
+        handler.next_handler(handlers[next_handler_name]) if handlers[next_handler_name]
       end
+      handlers
+    end
+
+    def _make_handlers(confs)
+      confs.transform_values { |conf| _make_handler(conf) }
     end
 
-    def _make_handler(_name, conf)
-      k = Checkability.const_get conf[:name].to_s.camelize
-      k.new(conf)
+    def _make_handler(conf)
+      Checkability.const_get(conf[:name].to_s.camelize)
+                  .new(conf)
     end
   end
 end

data/lib/checkability/checker.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Checkability
+  # @abstract
+  class Checker
+    # hook method to initialize concreet attributes
+    # @abstract
+    #
+    # @param [Hash]
+    #
+    # @return new object
+    def post_initialize(_opts)
+      raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
+    end
+
+    # @abstract
+    #
+    # @param [Handler] handler
+    def next_handler=(_handler)
+      raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
+    end
+
+    # @abstract
+    #
+    # @param [String] request
+    #
+    # @return [String, nil]
+    def handle(_handler)
+      raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
+    end
+
+    # @abstract
+    #
+    # @param [String] request
+    #
+    # @return Array [ [Boolean, true|false], String, message] ]
+    def result_and_message(_object)
+      raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
+    end
+
+    # @abstract
+    #
+    # @param [Checkable object] request
+    #
+    # @return [Boolean, true|false]
+    def result(_object)
+      raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
+    end
+
+    # @abstract
+    #
+    # @params [Boolean], [String]
+    #
+    # @return [String]
+    def message(_res, _str)
+      raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
+    end
+  end
+end

data/lib/checkability/external_api_checker.rb

@@ -1,58 +1,47 @@
 # frozen_string_literal: true
 
-require 'faraday'
-require 'net/http'
-require 'net/https'
-require 'json'
+require 'forwardable'
 
-# frozen_string_literal: true
-
-require_relative 'chain_of_resp/abstract_handler'
 module Checkability
   # Checks if postcode exists in external API
   #
-  class ExternalApiChecker < ChainOfResp::AbstractHandler
-    attr_reader :path, :path_suffix, :check_method, :connection, :http_verb,
-                :failure_message, :success_message
+  class ExternalApiChecker < BaseChecker
+    attr_reader :path, :path_suffix, :check_method, :connector, :http_verb
+
+    extend Forwardable
+    def_delegators :@connector, :connection
 
     def post_initialize(conf = {})
       @path = conf[:path]
       @http_verb = conf[:http_verb] || :get
       @path_suffix = conf[:path_suffix] || ''
       @check_method = conf[:check_method]
-      @failure_message = conf[:failure_message] || 'Failed.'
-      @success_message = conf[:success_message] || 'Success.'
-      @connection = Checkability::ExternalApiConnector.new(conf)
+      @connector = conf[:connector] ||
+                   Checkability::ExternalApiConnector.new(conf[:path])
+      @resp = nil
     end
 
-    def check_value(checkable)
-      @resp = connection
-              .connect
-              .send(http_verb, "#{checkable.value.delete(' ')}#{path_suffix}")
-      result, message = _result_and_message
-      checkable.messages << message
-      result
-    end
-
-    private
+    def result(check_obj)
+      return false unless resp(check_obj).status == 200
 
-    def _message(str, res)
-      "#{res}::#{path}: #{str}"
+      check_method.call(_parsed(resp(check_obj)))
     end
 
-    def _parsed(resp)
-      JSON.parse(resp.body)
+    def resp(check_obj)
+      @resp ||= connection
+                .send(http_verb,
+                      "#{check_obj.value.delete(' ')}#{path_suffix}")
+      # .get('SE17QD')
     end
 
-    def _result_and_message
-      return [false, _message(@resp.status, false)] unless @resp.status == 200
+    def message(res, str = nil)
+      "#{res}:::#{path}: #{str}"
+    end
 
-      return [true, _message(success_message, true)] if check_method
-                                                        .call(_parsed(@resp))
+    private
 
-      [false, _message(failure_message, false)]
-    rescue StandardError => e
-      [false, _message(e, false)]
+    def _parsed(resp)
+      JSON.parse(resp.body)
     end
   end
 end

data/lib/checkability/external_api_connector.rb

@@ -1,16 +1,18 @@
 # frozen_string_literal: true
 
+require 'faraday'
+
 module Checkability
   # Create connection
   #
   class ExternalApiConnector
     attr_reader :path
 
-    def initialize(conf)
-      @path = conf[:path]
+    def initialize(path)
+      @path = path
     end
 
-    def connect
+    def connection
       Faraday.new(url: path) do |faraday|
         faraday.headers['Content-Type'] = 'application/json'
         faraday.adapter Faraday.default_adapter

data/lib/checkability/storage_checker.rb

@@ -1,33 +1,30 @@
 # frozen_string_literal: true
 
-require_relative 'chain_of_resp/abstract_handler'
+require_relative 'base_checker'
 module Checkability
   # Checks if postcode exists in Storage
   #
-  class StorageChecker < ChainOfResp::AbstractHandler
-    attr_reader :storage_class
+  class StorageChecker < BaseChecker
+    attr_reader :storage_class, :attr_name
 
     def post_initialize(conf = {})
       @storage_class = conf[:storage_class]
+      @attr_name = conf[:attr_name] || :value
     end
 
-    def check_value(checkable)
-      value = checkable.value.upcase
-      result = _present_in_storage(value)
-      checkable.messages << (
-        result ? _message('Found', result) : _message('Not found', result))
-      result
+    def result(checkable)
+      value = _normalize_value(checkable.send(attr_name))
+      storage_class.where(attr_name => value).present?
     end
 
-    def _present_in_storage(value)
-      storage_class.where(value: value)
-                   .or(storage_class.where(value: value.strip))
-                   .or(storage_class.where(value: value.delete(' ')))
-                   .present?
+    def message(res, str = nil)
+      "#{res}:::Allowed #{storage_class}s list: #{str}"
     end
 
-    def _message(str, res)
-      "#{res}::Allowed #{storage_class}s list: #{str}."
+    private
+
+    def _normalize_value(value)
+      value.delete(' ').upcase
     end
   end
 end

data/lib/checkability/validator.rb

@@ -3,27 +3,15 @@
 module Checkability
   # Checks if postcode comply with regex
   #
-  class Validator < ChainOfResp::AbstractHandler
+  class Validator < BaseChecker
     attr_reader :format
 
     def post_initialize(conf = {})
       @format = conf[:format]
     end
 
-    def check_value(checkable)
-      result, message = _result_and_message(checkable)
-      checkable.messages << message
-      result
-    end
-
-    private
-
-    def _result_and_message(checkable)
-      if (checkable.value.delete(' ') =~ format[:regex]).nil?
-        [false, "false::Value is NOT COMPLY with format of #{format[:name]}."]
-      else
-        [true, "true::Value is COMPLY with format of #{format[:name]}."]
-      end
+    def result(checkable)
+      !(checkable.value.delete(' ') =~ format[:regex]).nil?
     end
   end
 end

data/lib/checkability/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Checkability
-  VERSION = '0.6.1'
+  VERSION = '2.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: checkability
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 2.0.1
 platform: ruby
 authors:
 - Andrey Eremeev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-03 00:00:00.000000000 Z
+date: 2021-04-06 00:00:00.000000000 Z
 dependencies: []
 description: Provide Checkers functionality.
 email:
@@ -24,9 +24,9 @@ files:
 - bin/checkability
 - lib/checkability.rb
 - lib/checkability/acts_as_checkable.rb
-- lib/checkability/chain_of_resp/abstract_handler.rb
-- lib/checkability/chain_of_resp/handler.rb
+- lib/checkability/base_checker.rb
 - lib/checkability/checkable.rb
+- lib/checkability/checker.rb
 - lib/checkability/external_api_checker.rb
 - lib/checkability/external_api_connector.rb
 - lib/checkability/railtie.rb

data/lib/checkability/chain_of_resp/abstract_handler.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'handler'
-
-module ChainOfResp
-  # @abstract
-  class AbstractHandler < ChainOfResp::Handler
-    # @return [Handler]
-    attr_reader :stop_process_on_failure, :stop_process_on_success
-    attr_accessor :handler, :result
-
-    def initialize(opts = {})
-      @stop_process_on_failure = opts[:stop_process_on_failure] || false
-      @stop_process_on_success = opts[:stop_process_on_success] || false
-      @next_handler = nil
-      post_initialize(opts) # implemented in subclass
-    end
-
-    # @param [Handler] handler
-    #
-    # @return [Handler]
-    def next_handler(handler)
-      @handler = handler if handler
-
-      handler
-    end
-
-    # @abstract
-    #
-    # @param [String] request
-    #
-    # @return [Boolean, nil]
-    def handle(request)
-      check = check_value(request) # imlemented in subclass
-      return true  if check && stop_process_on_success
-
-      return false if !check && stop_process_on_failure
-
-      handler&.handle(request)
-    end
-  end
-end

data/lib/checkability/chain_of_resp/handler.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module ChainOfResp
-  # @abstract
-  class Handler
-    # @abstract
-    #
-    # @param [Handler] handler
-    def next_handler=(_handler)
-      raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
-    end
-
-    # @abstract
-    #
-    # @param [String] request
-    #
-    # @return [String, nil]
-    def handle(_request)
-      raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
-    end
-
-    # @abstract
-    #
-    # @param [String] request
-    #
-    # @return [Boolean, true|false]
-    def check_value(_request)
-      raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
-    end
-  end
-end