be_valid 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abbbdea456536973df02299690f700bab640ac727c65fd257048e6427a20964c
-  data.tar.gz: 43bbbba7ed6a4ef05ca0a0f0a713108f17dc3aa97a4a981e6a65b1022015136b
+  metadata.gz: 321b08decb577f0a5e7ceded71bf6c05829cd877a28f2b377f606e2f56cf6e61
+  data.tar.gz: c68cb42238a0480b4c2768b159fe7dca5bb690004f43027df728bdeca71b0f23
 SHA512:
-  metadata.gz: 6389b8bf085014beb16d64fc0a559d945ebbef1f2e8d2f78900323c5650a69ba66abef5cc74158fd1093424031c1aefc3b915cb32b63036e2461219b4a36ac49
-  data.tar.gz: e59092fc516be70996b024c886fb21562298d1022582b42b689fa27cf8ef1b20d3439856584a518687c36bb6d8deabbbc09d7d9e8185a11a06e7647c26893e07
+  metadata.gz: f085944be0b2681549ef91f534d2fb3a888d95be819f5bbd2e7143ac8d03817322229d5bbd1f8b46705dfe11c447006049f10c60fd301b7b4a6fa76f64c62e1e
+  data.tar.gz: c9f38ad043a959f56386d785b747197e0e6936867532a315348b47227858615040e8a0c3c20c7dca654f8292c815257f868d0eea9fd829072330219169f18f0b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    be_valid (0.1.0)
+    be_valid (0.1.4)
 
 GEM
   remote: https://rubygems.org/

data/be_valid.gemspec

@@ -7,7 +7,6 @@ Gem::Specification.new do |spec|
   spec.name          = "be_valid"
   spec.version       = BeValid::VERSION
   spec.authors       = ["John Stewart (johnsinco)"]
-  spec.email         = ["johnstewartco@outlook.com"]
 
   spec.summary       = %q{Custom Ruby on Rails Validation library supporting 'conditional' validation}
   spec.description   = %q{Provides more advanced and flexible 'if then then that' style conditional validation. Validate fields based on the values of other fields in your model.}
@@ -24,6 +23,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 2.3'
+
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"

data/lib/be_valid.rb

@@ -1,9 +1,9 @@
 require 'be_valid/be_valid'
 
 begin
-  require 'validators/must_be_validator'
   require 'validators/date_validator'
+  require 'validators/must_be_validator'
 rescue 
-  'unable to loan be_valid validator'
+  'unable to load be_valid validator'
   nil
 end

data/lib/be_valid/version.rb

@@ -1,3 +1,3 @@
 module BeValid
-  VERSION = "0.1.0"
+  VERSION = "0.1.5"
 end

data/lib/validators/must_be_validator.rb

@@ -1,97 +1,109 @@
-class MustBeValidator < ActiveModel::EachValidator
-  MATCHERS = {
-    equal_to: :==,
-    greater_than: :>,
-    greater_or_equal_to: :>=,
-    less_than: :<,
-    less_or_equal_to: :<=,
-    not_equal_to: :!=,
-    matching: :=~,
-    # one_of: :in?
-  }.freeze
+require 'active_record'
 
-  MESSAGE_PREFIX = "must be"
-  ERRORS_METHOD = :errors
+module ActiveModel
+  module Validations
+    class MustBeValidator < EachValidator
+      MATCHERS = {
+        equal_to: :==,
+        greater_than: :>,
+        greater_or_equal_to: :>=,
+        less_than: :<,
+        less_or_equal_to: :<=,
+        not_equal_to: :!=,
+        matching: :=~,
+        # one_of: :in?
+      }.freeze
 
-  def validate_each(record, attribute, value) 
-    raise "must_be_validator requires at least one comparison operator for attribute." unless options.slice(MATCHERS.keys + [:blank, :present])
+      MESSAGE_PREFIX = "must be"
+      ERRORS_METHOD = :errors
 
-    original_value = record.read_attribute_before_type_cast( attribute )
+      def validate_each(record, attribute, value) 
+        raise "must_be_validator requires at least one comparison operator for attribute." unless options.slice(MATCHERS.keys + [:blank, :present])
 
-    message = self.class::MESSAGE_PREFIX.dup
+        original_value = record.read_attribute_before_type_cast( attribute )
 
-    return if options[:blank] && value.blank?
-    message << " blank" if options[:blank]
+        message = self.class::MESSAGE_PREFIX.dup
 
-    return if options[:present] && value.present?
-    message << " present" if options[:present]
+        return if options[:blank] && value.blank?
+        message << " blank" if options[:blank]
 
-    return if options[:one_of] && options[:one_of].include?(value)
-    message = ": '#{value}' is not a valid value" if options[:one_of]
+        return if options[:present] && value.present?
+        message << " present" if options[:present]
 
-    return if options[:not_any_of] && !(options[:not_any_of].include?(value))
-    message = ": '#{value}' is not a valid value" if options[:not_any_of]
+        return if options[:one_of] && Array(options[:one_of]).flatten.include?(value)
+        message = ": '#{value}' is not a valid value" if options[:one_of]
 
-    return if options[:only_from] && (options[:only_from] & Array(value) == Array(value))
-    message = ": #{Array(value).join(",").gsub('"', '\'')} is not a valid value" if options[:only_from]
+        return if options[:not_any_of] && !(options[:not_any_of].include?(value))
+        message = ": '#{value}' is not a valid value" if options[:not_any_of]
 
-    # handle before and after date comparisons using date validator
-    if options[:before] 
-      before_resp = DateValidator.new(options.merge(attributes: attributes)).validate_before_option(record, attribute, value, original_value)
-      return if before_resp == true
-      message = before_resp
-    end
-    if options[:after] 
-      after_resp = DateValidator.new(options.merge(attributes: attributes)).validate_after_option(record, attribute, value, original_value)
-      return if after_resp == true
-      message = after_resp
-    end
+        return if options[:only_from] && (options[:only_from] & Array(value) == Array(value))
+        message = ": #{Array(value).join(",").gsub('"', '\'')} is not a valid value" if options[:only_from]
 
-    options.slice(*MATCHERS.keys).each do |key, operand|
-      operand_msg = operand.is_a?(Regexp) ? operand.inspect : operand.to_s
-      operand = record.send(operand) if operand.is_a? Symbol
-      return if operand.nil?
-      return if value&.send(MATCHERS[key], operand)
-      return if key == :not_equal_to && value != operand
-      message << " #{key.to_s.humanize(capitalize: false)} #{operand_msg}"
-    end
+        # handle before and after date comparisons using date validator
+        if options[:before] 
+          before_resp = DateValidator.new(options.merge(attributes: attributes)).validate_before_option(record, attribute, value, original_value)
+          return if before_resp == true
+          message = before_resp
+        end
+        if options[:after] 
+          after_resp = DateValidator.new(options.merge(attributes: attributes)).validate_after_option(record, attribute, value, original_value)
+          return if after_resp == true
+          message = after_resp
+        end
 
-    if options[:when].present?
-      # check if conditions to validate satisfied
-      conditions = options[:when]
-      raise "Invalid :when option provided to must_be, must be a Hash or method" unless (conditions.is_a? Hash || conditions.is_a?(Method))
-      # add error message with predicate info
-      message << " when "
-      condition_errors = []
-      conditions.each do |field, values|
-        case values
-        when Regexp
-          return if !values.match?(record[field])
-          condition_errors << "#{field} = #{record[field]}"
-        when Array
-          return if !values.include?(record[field])
-          condition_errors << "#{field} = #{record[field]}"
-        when Symbol
-          return if !record.send(field)&.send(values)
-          condition_errors << "#{field} is #{values.to_s.gsub('?', '')}"
-        else
-          return if values != record[field]
-          condition_errors << "#{field} = #{record[field]}"
+        options.slice(*MATCHERS.keys).each do |key, operand|
+          operand_msg = operand.is_a?(Regexp) ? operand.inspect : operand.to_s
+          operand = record.send(operand) if operand.is_a? Symbol
+          return if operand.nil?
+          return if value&.send(MATCHERS[key], operand)
+          return if key == :not_equal_to && value != operand
+          message << " #{key.to_s.humanize(capitalize: false)} #{operand_msg}"
         end
-      end
-      message << condition_errors.join(' and ')
-    end
 
-    if options[:one_of] && options.fetch(:show_values, true)
-      message << ". Valid values: #{options[:one_of].join(', ')}"
-    end
-    if options[:only_from] && options.fetch(:show_values, true)
-      message << ". Valid values: #{options[:only_from].join(', ')}"
-    end
-    if options[:not_any_of] && options.fetch(:show_values, true)
-      message << ". Invalid values: #{options[:not_any_of].join(', ')}"
-    end
+        if options[:when].present?
+          # check if conditions to validate satisfied
+          conditions = options[:when]
+          raise "Invalid :when option provided to must_be, must be a Hash or method" unless (conditions.is_a? Hash || conditions.is_a?(Method))
+          # add error message with predicate info
+          message << " when "
+          condition_errors = []
+          conditions.each do |field, values|
+            case values
+            when Regexp
+              return if !values.match?(record[field])
+              condition_errors << "#{field} = #{record[field]}"
+            when Array
+              return if !values.flatten.include?(record[field])
+              condition_errors << "#{field} = #{record[field]}"
+            when :blank
+              return unless record.send(field).blank?
+              condition_errors << "#{field} is #{values.to_s.gsub('?', '')}"
+            when :present
+              return unless record.send(field).present?
+              condition_errors << "#{field} is #{values.to_s.gsub('?', '')}"
+            when Symbol
+              return if !record.send(field)&.send(values)
+              condition_errors << "#{field} is #{values.to_s.gsub('?', '')}"
+            else
+              return if values != record[field]
+              condition_errors << "#{field} = #{record[field]}"
+            end
+          end
+          message << condition_errors.join(' and ')
+        end
+
+        if options[:one_of] && options.fetch(:show_values, true)
+          message << ". Valid values: #{options[:one_of].join(', ')}"
+        end
+        if options[:only_from] && options.fetch(:show_values, true)
+          message << ". Valid values: #{options[:only_from].join(', ')}"
+        end
+        if options[:not_any_of] && options.fetch(:show_values, true)
+          message << ". Invalid values: #{options[:not_any_of].join(', ')}"
+        end
 
-    record.send(self.class::ERRORS_METHOD).add(attribute, (options[:message] || "#{message}."), rule_name: options[:rule_name])
+        record.send(self.class::ERRORS_METHOD).add(attribute, (options[:message] || "#{message}."), rule_name: options[:rule_name])
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: be_valid
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.5
 platform: ruby
 authors:
 - John Stewart (johnsinco)
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-19 00:00:00.000000000 Z
+date: 2021-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,7 +83,6 @@ dependencies:
 description: Provides more advanced and flexible 'if then then that' style conditional
   validation. Validate fields based on the values of other fields in your model.
 email:
-- johnstewartco@outlook.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -114,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="