attribeauty 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b78499787a41322da17eca60e3a8af5c5d55b081aaefc6eb8bef788e60368c78
-  data.tar.gz: e660efa7ce1508a9d322256b7a3e598bce5e1e8a778dc7da2a39fa58166cfe20
+  metadata.gz: 6815673fc0f4d65774d12f0dff065883a9243bb8495c3379f2adc293cbc2f988
+  data.tar.gz: 5201b83d32ada2367130f5c7de336c012b8c157a4aa9331db1acca883407d4df
 SHA512:
-  metadata.gz: 06471cfb5f5f3f76dcc9bf09545a7c976577b893c08562aa2ecea98f42a3a13c0be5df26ca00e187f81eccaf33728ae41cf5b90226df9c29f113faa550865b21
-  data.tar.gz: 3ec534f72b7977af852f649489a7b8265d5a055171f0130c25e8887e796368bd1998a40c747bfdd7bff413c5acc184c46fc331f14b4b091ded2fc9785503f141
+  metadata.gz: dd30d11344376e152a20d8723c977b1434db36111be25ccfda3bbad20206da75d28d4c7c02cf71c05f15a0912ebbcf3102c5a07bc8ae19031629e281d850ee21
+  data.tar.gz: f063c90c743d67436000eb357b6b3868a92f790bff1c80c8638e7ba849b9d7a452416970053329106d06b648efe8143c51dc56a5e2953ae960b67217662cde19

data/.rubocop.yml

@@ -24,11 +24,17 @@ Metrics/AbcSize:
 Metrics/ClassLength:
   Enabled: false
 
+Metrics/MethodLength:
+  Enabled: false
+
 Metrics/PerceivedComplexity:
   Enabled: false
 
 Metrics/CyclomaticComplexity:
   Enabled: false
 
-Naming::BlockForwarding:
+Naming/BlockForwarding:
+  Enabled: false
+
+Naming/MemoizedInstanceVariableName:
   Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.4.3] - 2024-06-25
+
+- allow certain values with `allow` option
+
 ## [0.4.2] - 2024-06-25
 
 - getting and setting vals in params

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    attribeauty (0.4.2)
+    attribeauty (0.4.3)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -192,6 +192,7 @@ end
 ```
 
 what if you want to require all attributes? If you pass the `required: true` or `exclude_if: :nil?` with the `accept`, it will be applied to all attributes. 
+You can also exclude a value from this by useing the `allows` option.
 
 ```
 class MyController
@@ -219,7 +220,7 @@ class MyController
         attribute :email do
           attribute :address, :string
           attribute :valid, :boolean
-          attribute :ip_address, :string
+          attribute :ip_address, :string, allows: :nil?
         end
       end
     end

data/lib/attribeauty/params.rb

@@ -49,7 +49,6 @@ module Attribeauty
       yield
     end
 
-    # 
     def attribute(name, type = nil, **args, &block)
       value = request_params[name]
       return hash_from_nested(name, value, &block) if block_given?
@@ -79,7 +78,7 @@ module Attribeauty
     end
 
     def hash_from_nested(name, value, &block)
-      result = 
+      result =
         if value.is_a?(Array)
           value.map do |val|
             params = self.class.with(val).accept(**default_args, &block)
@@ -90,7 +89,7 @@ module Attribeauty
           params = self.class.with(value).accept(**default_args, &block)
           @errors.push(*params.errors)
           params.to_h
-      end
+        end
 
       @to_h[name.to_sym] = result unless result.empty?
     end

data/lib/attribeauty/validator.rb

@@ -6,7 +6,8 @@ module Attribeauty
       new(name, type, original_val, **args).run
     end
 
-    attr_reader :original_val, :errors, :name, :type, :required, :default, :excludes, :value, :valid
+    attr_reader :original_val, :errors, :name, :type, :required,
+                :default, :excludes, :value, :valid, :allows
 
     def initialize(name, original_val, type = nil, **args)
       @name = name
@@ -15,6 +16,7 @@ module Attribeauty
       @default = args[:default]
       args.delete_if { |key, value| key == :required && value == false }
       @required = args[:required]
+      @allows = args[:allow]
       @excludes = args[:exclude_if]
 
       @valid = true
@@ -22,10 +24,11 @@ module Attribeauty
     end
 
     def run
+      handle_allows
       handle_missing_original_val!
       handle_missing_required!
-      handle_missing_type
 
+      handle_missing_type
       set_default
       cast_value
       handle_excludes
@@ -45,10 +48,17 @@ module Attribeauty
 
     private
 
+    def handle_allows
+      return if allows.nil?
+
+      @required = false if allows_array.include?(:nil?)
+      @excludes = excludes_array - allows_array
+    end
+
     def handle_missing_original_val!
-      return unless !required? && original_val.nil?
+      return unless exclude_nil?
 
-      @valid = false 
+      @valid = false
       raise ValueInvalidError
     end
 
@@ -78,7 +88,21 @@ module Attribeauty
     def handle_excludes
       return if excludes.nil? || !valid?
 
-      @valid = ![*excludes].flatten.any? { |exclude| value.public_send(exclude) }
+      @valid = excludes_array.none? { |exclude| value.public_send(exclude) }
+    end
+
+    def exclude_nil?
+      return false if allows_array.include?(:nil?)
+
+      !required? && original_val.nil?
+    end
+
+    def allows_array
+      [*allows].flatten.compact
+    end
+
+    def excludes_array
+      [*excludes].flatten
     end
   end
 end

data/lib/attribeauty/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Attribeauty
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attribeauty
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Toby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-25 00:00:00.000000000 Z
+date: 2024-06-26 00:00:00.000000000 Z
 dependencies: []
 description: There are so many of these, I just needed this one.
 email: