hashy_validator 0.1.3 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 169c5f3bf1fa5deb20aaa9788eb1dc2bef55031a026b6b2d67ee050749edd9a1
-  data.tar.gz: 9a583d90637b4aec761dc5dfe6a133e34c8b62cd11b53d653567e632e0a096f6
+  metadata.gz: 68ad620a19feee19aa4ddb694d131b65bd730e36d1241c68c01a56685921a7df
+  data.tar.gz: f58c1ae578d2792fc6951a183a411a027e8f79c56c73d91d7ff44ca0e449451f
 SHA512:
-  metadata.gz: f8853fec7ff9a3f67432d8ec71e68faf680f964317c6a874a12711a237faa1eeb8e7e55a4eda73c3570eb406975481529efaf9a1a8fea9d2867233f16842f1d2
-  data.tar.gz: a9c9f21c28c9036a943a6599173ac2a524b1ae70ac66dea91c979fe9f923330d58ab3d554e24e67ea3175ce0b9ce1effeba2e366c3616c9e08b0fa6a1be02756
+  metadata.gz: d46e4caa6c10b0bc0b540ec70605946d20994b1de70eb72941999e29438ebff36d6b48aa67ec6d226411712d24a5731b5a7a83aa5eb7a784c3b907c89a62d590
+  data.tar.gz: 075c4f733dd7c482bdef0bb47795035bcec587d14ae85803ed21ae4de5e85327f85e6866925c2204fe84961acaf2059a9a2796544e43de1492773629379914b6

data/CHANGELOG.md

@@ -5,6 +5,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [0.1.6](https://www.github.com/flecto-io/hashy-validator/compare/v0.1.5...v0.1.6) (2024-09-05)
+
+
+### Bug Fixes
+
+* handle nil object and boolean cases ([74deb27](https://www.github.com/flecto-io/hashy-validator/commit/74deb276c08c4ebb85954cb6d1fe098308f914a6))
+
+### [0.1.5](https://www.github.com/flecto-io/hashy-validator/compare/v0.1.4...v0.1.5) (2024-09-05)
+
+
+### Bug Fixes
+
+* add hashy_object ([35e1ccf](https://www.github.com/flecto-io/hashy-validator/commit/35e1ccf1cff9d95df069961c8ac1b3fec6d23645))
+
 ### [0.1.4](https://www.github.com/flecto-io/hashy-validator/compare/v0.1.3...v0.1.4) (2024-08-24)
 
 

data/hashy_validator.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
     spec.add_development_dependency 'simplecov', '0.17.1'
     spec.add_development_dependency 'rubocop', '~> 1.59'
     spec.add_development_dependency 'rubocop-shopify', '~> 2.14'
+    spec.add_development_dependency 'pry', '~> 0.14.1'
 
     if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3")
         spec.add_development_dependency 'minitest', '>= 5.15.0', '< 5.16'

data/lib/hashy_validator/hashy_array_validator.rb

@@ -2,65 +2,42 @@
 
 class HashyArrayValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    instance_value = HashyValueValidator.new(value)
+    instance_value = HashyValueValidator.new(value, options)
+
     unless instance_value.valid?
       record.errors.add(attribute, instance_value.reason)
       return false
     end
 
-    value = instance_value.value
+    unless instance_value.value.is_a?(Array)
+      record.errors.add(attribute, :not_an_array)
+      return false
+    end
 
-    # look for boolean and unique validator entries
-    unique_attrs = {}
-    boolean_attrs = []
-    validations =
-      # force validator keys to be strings
-      options.stringify_keys.map do |val_attr, val|
-        is_multiple = val.is_a?(HashValidator::Validations::Multiple)
-        if (is_multiple && val.validations.include?("boolean")) || (val.is_a?(String) && val == "boolean")
-          boolean_attrs << val_attr
-          [val_attr, val]
-        elsif is_multiple && val.validations.include?("unique")
-          # if unique key present, then remove that entry
-          # (since its not from HashValidator standard) and keep its history
-          unique_attrs[val_attr] ||= []
-          # we have to make a new object to remove the unique entry,
-          # because deleting it directly from the original object
-          # (val) would result into deleting the verification forever
-          new_val = HashValidator::Validations::Multiple.new(val.validations.reject { |v| v == "unique" })
-          # return the value
-          val.validations.blank? ? nil : [val_attr, new_val]
-        elsif val.is_a?(String) && val == "unique"
-          # same as above but substring
-          unique_attrs[val_attr] ||= []
-          nil
-        else
-          [val_attr, val]
-        end
-      end.compact.to_h
+    value = instance_value.value
 
     # force all array entries to have string keys
     # discard keys that do not have validators
-    value = value.map { |e| e.stringify_keys.slice(*validations.keys) }
+    value = value.map { |e| e.stringify_keys.slice(*instance_value.validations.keys) }
 
     # we validate each object in the array
     value.each do |t|
       # if boolean found as any of the validations we force value to boolean - if present
-      boolean_attrs.each do |boolean_attr|
-        t[boolean_attr] = get_boolean_value(t[boolean_attr]) if t.key?(boolean_attr)
+      instance_value.boolean_attrs.each do |boolean_attr|
+        t[boolean_attr] = HashyValueValidator.get_boolean_value(t[boolean_attr]) if t.key?(boolean_attr)
       end
 
       # keep track of unique values and add error if needed
-      unique_attrs.each_key do |unique_attr|
-        if unique_attrs[unique_attr].include?(t[unique_attr])
+      instance_value.unique_attrs.each_key do |unique_attr|
+        if instance_value.unique_attrs[unique_attr].include?(t[unique_attr])
           record.errors.add(attribute, "'#{unique_attr}' not unique")
         else
-          unique_attrs[unique_attr] << t[unique_attr]
+          instance_value.unique_attrs[unique_attr] << t[unique_attr]
         end
       end
 
       # use default hash validator
-      validator = HashValidator.validate(t, validations)
+      validator = HashValidator.validate(t, instance_value.validations)
       unless validator.valid?
         validator.errors.each { |k, v| record.errors.add(attribute, "'#{k}' #{v}") }
       end
@@ -70,13 +47,4 @@ class HashyArrayValidator < ActiveModel::EachValidator
     # we use send write param so we also support attr_accessor attributes
     record.send("#{attribute}=", value)
   end
-
-private
-
-  def get_boolean_value(value)
-    return true if [true, "true"].include?(value)
-    return false if [false, "false"].include?(value)
-
-    nil
-  end
 end

data/lib/hashy_validator/hashy_object_validator.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+class HashyObjectValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    instance_value = HashyValueValidator.new(value, options)
+
+    # Do not validate empty hash
+    return if instance_value.value.blank?
+
+    unless instance_value.valid?
+      record.errors.add(attribute, instance_value.reason)
+      return false
+    end
+
+    if instance_value.value.is_a?(Array)
+      record.errors.add(attribute, :not_an_object)
+      return false
+    end
+
+    # force all array entries to have string keys
+    # discard keys that do not have validators
+    value = instance_value.value.stringify_keys.slice(*instance_value.validations.keys)
+
+    # if boolean found as any of the validations we force value to boolean - if present
+    instance_value.boolean_attrs.each do |boolean_attr|
+      value[boolean_attr] = HashyValueValidator.get_boolean_value(value[boolean_attr]) if value.key?(boolean_attr)
+    end
+
+    # use default hash validator
+    validator = HashValidator.validate(value, instance_value.validations)
+    unless validator.valid?
+      validator.errors.each { |k, v| record.errors.add(attribute, "'#{k}' #{v}") }
+    end
+
+    # update the value even if errors found
+    # we use send write param so we also support attr_accessor attributes
+    record.send("#{attribute}=", value)
+  end
+end

data/lib/hashy_validator/hashy_value_validator.rb

@@ -1,20 +1,30 @@
 # frozen_string_literal: true
 
 class HashyValueValidator
-  def initialize(value)
+  def initialize(value, options = {})
     @value = value.blank? ? [] : value
     @valid = true
     @reason = nil
+    @validations = {}
+    @unique_attrs = {}
+    @boolean_attrs = []
 
     check_parse_value
-    check_is_array
+    define_validations(options)
   end
 
   def valid?
     @valid
   end
 
-  attr_reader :value, :reason
+  attr_reader :value, :reason, :validations, :unique_attrs, :boolean_attrs
+
+  def self.get_boolean_value(value)
+    return true if [true, "true"].include?(value)
+    return false if [false, "false"].include?(value)
+
+    nil
+  end
 
   private
 
@@ -25,10 +35,38 @@ class HashyValueValidator
     @reason = :invalid
   end
 
-  def check_is_array
-    return if @value.is_a?(Array)
+  def define_validations(options)
+    # look for boolean and unique validator entries
+    unique_attrs = {}
+    boolean_attrs = []
+    validations =
+      # force validator keys to be strings
+      options.stringify_keys.map do |val_attr, val|
+        is_multiple = val.is_a?(HashValidator::Validations::Multiple)
+        if (is_multiple && val.validations.include?("boolean")) || (val.is_a?(String) && val == "boolean")
+          boolean_attrs << val_attr
+          [val_attr, val]
+        elsif is_multiple && val.validations.include?("unique")
+          # if unique key present, then remove that entry
+          # (since its not from HashValidator standard) and keep its history
+          unique_attrs[val_attr] ||= []
+          # we have to make a new object to remove the unique entry,
+          # because deleting it directly from the original object
+          # (val) would result into deleting the verification forever
+          new_val = HashValidator::Validations::Multiple.new(val.validations.reject { |v| v == "unique" })
+          # return the value
+          val.validations.blank? ? nil : [val_attr, new_val]
+        elsif val.is_a?(String) && val == "unique"
+          # same as above but substring
+          unique_attrs[val_attr] ||= []
+          nil
+        else
+          [val_attr, val]
+        end
+      end.compact.to_h
 
-    @valid = false
-    @reason = :not_an_array
+    @validations = validations
+    @unique_attrs = unique_attrs
+    @boolean_attrs = boolean_attrs
   end
 end

data/lib/hashy_validator/version.rb

@@ -4,7 +4,7 @@ module HashyValidator
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 3
+    PATCH = 6
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/lib/hashy_validator.rb

@@ -4,3 +4,4 @@ require "active_record"
 require "hash_validator"
 require_relative "hashy_validator/hashy_value_validator"
 require_relative "hashy_validator/hashy_array_validator"
+require_relative "hashy_validator/hashy_object_validator"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hashy_validator
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.6
 platform: ruby
 authors:
 - Flecto Team
@@ -114,6 +114,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.14.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +156,7 @@ files:
 - hashy_validator.gemspec
 - lib/hashy_validator.rb
 - lib/hashy_validator/hashy_array_validator.rb
+- lib/hashy_validator/hashy_object_validator.rb
 - lib/hashy_validator/hashy_value_validator.rb
 - lib/hashy_validator/version.rb
 homepage: