u-attributes 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7939bac74159eb5cd1e4307a80805ee0712fe5233148f550bd40c3ed99773d5d
-  data.tar.gz: ac33edcb92e41acf77e823d61e22c2b2b6abe3b4c74036dfbf82d741ee208724
+  metadata.gz: 31b9f3d0195fc8b0f865279a79a54bd9beb8b0644d3f1b4371b6aa4163264024
+  data.tar.gz: '048e8c549d655980eee398e8ae445a7eb6900143f98c8e04449d5e2c82f0c9e6'
 SHA512:
-  metadata.gz: '0796ae31ef53f91844d02950c00f52fe263794d13af076b5814292bd63e73ff36939f5141888f9c0db9f7c5ff7e3a739be11d1b04e89b8e76ee0eff21068ab05'
-  data.tar.gz: 16423f86a33677355c35c4aa5184d2356739a16d2506faf94cc45c50b033139c81ff11c261d9e7383228bd500d583caafd1596e89d411c2d21238c540dc63608
+  metadata.gz: 3a776e02b0708d566156ce8adc7d0ad5813a7c752f8f19615eeea734b46ee34995d69a8cab263ed1e1ffbba64140eee4a630ff18fdcb6cf54cd5fb0a404d6fe8
+  data.tar.gz: 4e7869905c50b2f0ea288f404900c3c2b645ca3c8cad6404c2d8aa8913a0ad87874b43288c8f408e1a23252d9ab114fa8664a6a21914f71c2ffbf4ee04bb3d68

data/README.md

@@ -75,7 +75,7 @@ gem 'u-attributes'
 
 | u-attributes   | branch  | ruby     |  activemodel  |
 | -------------- | ------- | -------- | ------------- |
-| 2.1.1          | main    | >= 2.2.0 | >= 3.2, < 6.1 |
+| 2.2.0          | main    | >= 2.2.0 | >= 3.2, < 6.1 |
 | 1.2.0          | v1.x    | >= 2.2.0 | >= 3.2, < 6.1 |
 
 > **Note**: The activemodel is an optional dependency, this module [can be enabled](#activemodelvalidation-extension) to validate the attributes.
@@ -320,10 +320,9 @@ class Person
 end
 ```
 
-There are 3 different strategies to define default values.
+There are two different strategies to define default values.
 1. Pass a regular object, like in the previous example.
 2. Pass a `proc`/`lambda`, and if it has an argument you will receive the attribute value to do something before assign it.
-3. Pass a **callable**, that is, a `class`, `module` or `instance` which responds to the `call` method. The behavior will be like the previous item (`proc`/`lambda`).
 
 ```ruby
 class Person

data/lib/micro/attributes.rb

@@ -70,7 +70,7 @@ module Micro
     protected
 
       def attributes=(arg)
-        hash = Utils.stringify_hash_keys(arg)
+        hash = Utils::Hashes.stringify_keys(arg)
 
         __attributes_missing!(hash)
 
@@ -79,16 +79,8 @@ module Micro
 
     private
 
-      ExtractAttribute = -> (other, key) {
-        return Utils::HashAccess.(other, key) if other.respond_to?(:[])
-
-        other.public_send(key) if other.respond_to?(key)
-      }
-
       def extract_attributes_from(other)
-        defined_attributes.each_with_object({}) do |key, memo|
-          memo[key] = ExtractAttribute.(other, key)
-        end
+        Utils::ExtractAttribute.from(other, keys: defined_attributes)
       end
 
       def __attributes
@@ -96,10 +88,8 @@ module Micro
       end
 
       FetchValueToAssign = -> (value, default) do
-        if default.respond_to?(:call)
-          callable = default.is_a?(Proc) ? default : default.method(:call)
-
-          callable.arity > 0 ? callable.call(value) : callable.call
+        if default.is_a?(Proc)
+          default.arity > 0 ? default.call(value) : default.call
         else
           value.nil? ? default : value
         end

data/lib/micro/attributes/features/activemodel_validations.rb

@@ -18,7 +18,7 @@ module Micro::Attributes
           validate, validates = options.values_at(:validate, :validates)
 
           self.validate(validate) if validate
-          self.validates(attr_name, validates) if validates
+          self.validates(attr_name, validates.dup) if validates
         end
       end
 

data/lib/micro/attributes/macros.rb

@@ -72,9 +72,13 @@ module Micro
         return __attributes.to_a if args.empty?
 
         args.flatten!
+
+        options =
+          args.size > 1 && args.last.is_a?(::Hash) ? args.pop : Kind::Empty::HASH
+
         args.each do |arg|
           if arg.is_a?(String) || arg.is_a?(Symbol)
-            __attribute_assign(arg, false, Kind::Empty::HASH)
+            __attribute_assign(arg, false, options)
           else
             raise Kind::Error.new('String/Symbol'.freeze, arg)
           end

data/lib/micro/attributes/utils.rb

@@ -1,25 +1,36 @@
 # frozen_string_literal: true
 
-module Micro
-  module Attributes
-    module Utils
-      def self.stringify_hash_keys(arg)
+module Micro::Attributes
+  module Utils
+    module Hashes
+      def self.stringify_keys(arg)
         hash = Kind::Of.(::Hash, arg)
 
         return hash if hash.empty?
+        return hash.transform_keys(&:to_s) if hash.respond_to?(:transform_keys)
 
-        if hash.respond_to?(:transform_keys)
-          hash.transform_keys { |key| key.to_s }
-        else
-          hash.each_with_object({}) { |(key, val), memo| memo[key.to_s] = val }
-        end
+        hash.each_with_object({}) { |(key, val), memo| memo[key.to_s] = val }
       end
 
-      HashAccess = -> (hash, key) {
-        return hash[key.to_s] unless hash[key.to_s].nil?
+      def self.get(hash, key)
+        value = hash[key.to_s]
+
+        value.nil? ? hash[key.to_sym] : value
+      end
+    end
+
+    module ExtractAttribute
+      def self.call(object, key:)
+        return object.public_send(key) if object.respond_to?(key)
 
-        hash[key.to_sym]
-      }
+        Hashes.get(object, key) if object.respond_to?(:[])
+      end
+
+      def self.from(object, keys:)
+        Kind::Of.(::Array, keys).each_with_object({}) do |key, memo|
+          memo[key] = call(object, key: key)
+        end
+      end
     end
   end
 end

data/lib/micro/attributes/version.rb

@@ -2,6 +2,6 @@
 
 module Micro
   module Attributes
-    VERSION = '2.1.1'.freeze
+    VERSION = '2.2.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: u-attributes
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Rodrigo Serradura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-28 00:00:00.000000000 Z
+date: 2020-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kind