attribeauty 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 812191110b6c7f397737c3a9b1cceab66819c07d549c02c31687b8260342f404
-  data.tar.gz: 2ce7d61531ba7dcb7a896994ef94a2fa970bd821eb62d0901cc2b1df5e70947b
+  metadata.gz: 04be2abe193a7faca2c172bb90713086e2a656bada649e0356ada8a444f54993
+  data.tar.gz: e86ca7fb0fbc2d8e20679be174a98eced95c6facf3d98d2b3d1983961e99a9c8
 SHA512:
-  metadata.gz: dbe0d664e43e995eb4caf66f66fe2a242d2f40b9effda38f511775451c666c82e1596a9116197e5cc84848f0f63ab11f2bb0f537f2214e0d38c6f9b3ddba2e1f
-  data.tar.gz: 66fb433c37a8986c4f5cf3bec0dae55246360fb6f65d82e2e25d1f507b3f4526d5476c99fa7f3e5244d6d255cdb9f429c51e7a7c7c84504e61fe2083e864bf0b
+  metadata.gz: 1fe0d80aca7c85b8a34bf233f8b72133f16b75eea1a1800e8046efe5df1b19612a060662dc4c80bbbcffd0462d8cf2dee229a1c36228bba155dcff1058d814a7
+  data.tar.gz: 42ab8159a2117c43956b84699f7ba9025a156e854e355f389424b810ecdfa90ee83f2fbdbdf71b43b650f723d1310288c18dc0f1e03f0f4765f193a8d58a1cc0

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.3.4] - 2024-06-24
+
+- tiny refactor
+
 ## [0.3.3] - 2024-06-24
 
 - handle nil in types. Big refactor

data/Gemfile.lock

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

data/lib/attribeauty/params.rb

@@ -44,17 +44,13 @@ module Attribeauty
       yield
     end
 
+    # 
     def attribute(name, type = nil, **args, &block)
       value = request_params[name]
-      return if value.nil? && args[:required].nil?
-
-      if block_given?
-        @to_h[name.to_sym] = vals_from_nested(value, &block)
-      else
-        validator = Validator.run(name, value, type, **args)
-        @errors.push(*validator.errors)
-        @to_h[name.to_sym] = validator.value if validator.valid?
-      end
+      return if required?(value, **args)
+      return hash_from_nested(name, value, &block) if block_given?
+
+      value_from_validator(name, value, type, **args)
     end
 
     def inspect
@@ -71,17 +67,28 @@ module Attribeauty
 
     private
 
-    def vals_from_nested(value, &block)
-      if value.is_a?(Array)
-        value.map do |val|
-          params = self.class.with(val).accept(&block)
+    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.reject(&:empty?)
-      else
-        params = self.class.with(value).accept(&block)
-        @errors.push(*params.errors)
-        params.to_h
       end
     end
   end

data/lib/attribeauty/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attribeauty
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  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: