attribeauty 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16789f41e6c0cfea21c44f2f71fc3fd0c9664791ed8d1c97648834be86db6e92
-  data.tar.gz: e8c5ac4397043090870ffeacc5f4b1ae0565f0b7e85237a47254a41e31258032
+  metadata.gz: 04be2abe193a7faca2c172bb90713086e2a656bada649e0356ada8a444f54993
+  data.tar.gz: e86ca7fb0fbc2d8e20679be174a98eced95c6facf3d98d2b3d1983961e99a9c8
 SHA512:
-  metadata.gz: 06c7ca8c0f104cc00ac9854fd4d5c31c043daf65c4d993c32da3dc0472ce4be296ebc2640e2b8b759fb6d99ba07d54e4a8b3c251c183da2048b22eb7da23af78
-  data.tar.gz: 13eb48b958c5cfd1da319a33326449e86683b90f9c89631964c4397d9447334a025b7b3647c87f40ad8c11465c51af7f73e32319ad0c9e344757d823f58e19a8
+  metadata.gz: 1fe0d80aca7c85b8a34bf233f8b72133f16b75eea1a1800e8046efe5df1b19612a060662dc4c80bbbcffd0462d8cf2dee229a1c36228bba155dcff1058d814a7
+  data.tar.gz: 42ab8159a2117c43956b84699f7ba9025a156e854e355f389424b810ecdfa90ee83f2fbdbdf71b43b650f723d1310288c18dc0f1e03f0f4765f193a8d58a1cc0

data/.rubocop.yml

@@ -29,3 +29,6 @@ Metrics/PerceivedComplexity:
 
 Metrics/CyclomaticComplexity:
   Enabled: false
+
+Naming::BlockForwarding:
+  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## [0.3.4] - 2024-06-24
+
+- tiny refactor
+
+## [0.3.3] - 2024-06-24
+
+- handle nil in types. Big refactor
+
 ## [0.3.2] - 2024-06-24
 
 - added accept! method to raise error if "required's" are missing

data/Gemfile.lock

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

data/lib/attribeauty/params.rb

@@ -44,31 +44,14 @@ module Attribeauty
       yield
     end
 
-    # rubocop:disable Naming::BlockForwarding
+    # 
     def attribute(name, type = nil, **args, &block)
       value = request_params[name]
-      return if value.nil? && args[:required].nil?
-
-      if block_given?
-        @to_h[name] =
-          if value.is_a?(Array)
-            value.map do |val|
-              params = self.class.with(val).accept(&block)
-              @errors.push(*params.errors)
-              params
-            end.reject(&:empty?)
-          else
-            params = self.class.with(value).accept(&block)
-            @errors.push(*params.errors)
-            params
-          end
-      else
-        validator = Validator.run(name, type, value, **args)
-        @to_h[name.to_sym] = validator.value if validator.valid?
-        @errors.push(*validator.errors)
-      end
+      return if required?(value, **args)
+      return hash_from_nested(name, value, &block) if block_given?
+
+      value_from_validator(name, value, type, **args)
     end
-    # rubocop:enable Naming::BlockForwarding
 
     def inspect
       to_h.inspect
@@ -81,5 +64,32 @@ module Attribeauty
     def strict?
       strict
     end
+
+    private
+
+    def required?(value, **args)
+      value.nil? && args[:required].nil?
+    end
+
+    def value_from_validator(name, value, type, **args)
+      validator = Validator.run(name, value, type, **args)
+      @errors.push(*validator.errors)
+      @to_h[name.to_sym] = validator.value if validator.valid?
+    end
+
+    def hash_from_nested(name, value, &block)
+      @to_h[name.to_sym] = 
+        if value.is_a?(Array)
+          value.map do |val|
+            params = self.class.with(val).accept(&block)
+            @errors.push(*params.errors)
+            params.to_h
+          end.reject(&:empty?)
+        else
+          params = self.class.with(value).accept(&block)
+          @errors.push(*params.errors)
+          params.to_h
+      end
+    end
   end
 end

data/lib/attribeauty/types/boolean.rb

@@ -16,6 +16,8 @@ module Attribeauty
       ].to_set.freeze
 
       def cast(value)
+        return false if value.nil?
+
         !FALSE_VALUES.include?(value)
       end
     end

data/lib/attribeauty/types/float.rb

@@ -5,6 +5,8 @@ module Attribeauty
     # custom float type
     class Float
       def cast(value)
+        return if value.nil?
+
         Float(value)
       end
     end

data/lib/attribeauty/types/integer.rb

@@ -5,6 +5,8 @@ module Attribeauty
     # custom integer type
     class Integer
       def cast(value)
+        return if value.nil?
+
         Integer(value)
       end
     end

data/lib/attribeauty/types/string.rb

@@ -5,6 +5,8 @@ module Attribeauty
     # custom string type
     class String
       def cast(value)
+        return if value.nil?
+
         String(value)
       end
     end

data/lib/attribeauty/types/time.rb

@@ -5,6 +5,8 @@ module Attribeauty
     # custom Time type
     class Time
       def cast(value)
+        return if value.nil?
+
         case value
         when Time
           value

data/lib/attribeauty/validator.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "forwardable"
-
 module Attribeauty
   class Validator
     ALLOWS_HASH = {
@@ -9,55 +7,82 @@ module Attribeauty
       allow_empty: :empty?
     }.freeze
 
-    def self.run(name, type, original_value, **args)
-      new(name, type, original_value, **args).run
+    def self.run(name, type, original_val, **args)
+      new(name, type, original_val, **args).run
     end
 
-    attr_reader :original_value, :errors, :name, :type, :required, :default, :predicate, :value
+    attr_reader :original_val, :errors, :name, :type, :required, :default, :allows, :value, :valid
 
-    def initialize(name, type, original_value, **args)
+    def initialize(name, original_val, type = nil, **args)
       @name = name
       @type = type
-      @original_value = original_value
-      @errors = []
+      @original_val = original_val
       @default = args[:default]
-      @required = args[:required] if [true, false].include?(args[:required])
-      allows = args.slice(*allows_array)
-      return if allows.empty?
+      @required = args[:required] if args[:required] == true
+      @allows = args.slice(*allows_array).delete_if { |_key, value| value == true }
 
-      predicate_array = allows.first
-      predicate_array[0] = :"#{ALLOWS_HASH[predicate_array[0]]}"
-      @predicate = predicate_array
+      @valid = true
+      @errors = []
     end
 
     def run
-      @original_value = default if original_value.nil? && !default.nil?
-      @value = TypeCaster.run(original_value, type)
+      if type.nil?
+        @value = original_val
+      else
+        set_default
+        cast_value
+        handle_missing_required
+        handle_predicates
+      end
 
       self
     end
 
     def valid?
-      if required? && original_value.nil?
-        errors << "#{name} required"
-        return false
-      end
-      return true if predicate.nil?
+      valid
+    end
 
-      method, bool = predicate
-      return true if bool
+    private
 
-      !value.public_send(method)
+    def set_default
+      return unless original_val.nil? && !default.nil?
+
+      @original_val = default
     end
 
-    private
+    def cast_value
+      @value = TypeCaster.run(original_val, type)
+    end
+
+    # only returning errors if required is missing, not if nil?, or :empty?
+    def handle_missing_required
+      return unless required? && original_val.nil?
+
+      errors << "#{name} required"
+      @valid = false
+    end
+
+    def handle_predicates
+      return if predicate.nil? || !valid?
 
-    def set_args; end
+      @valid = !value.public_send(predicate)
+    end
 
     def allows_array
       ALLOWS_HASH.keys
     end
 
+    # convert allow_nil -> :nil? or allow_empty -> :empty?
+    # this will be used to public_send
+    # NOTE: only one will be checked, if you pass both:
+    # allow_nil and allow_empty, one will be ignored
+    def predicate
+      return if allows.empty?
+
+      key = allows.keys.first
+      ALLOWS_HASH[key]
+    end
+
     def required?
       required
     end

data/lib/attribeauty/version.rb

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

metadata

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