u-attributes 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 724654639b33deda5424bc5e0ac320ff1a79c34aa1aed860aa9aa18ac77830be
-  data.tar.gz: 44c63295b620dd096b08aefe3b6d62604a09d857ff1541f74829f0df59076937
+  metadata.gz: f28992fcd550ab8d700f8d722af72a486c84cdc5cb5d8fd526dd653d0f88ffb9
+  data.tar.gz: 9896e8b25b7abcb11503bd0f11f91ddcb4f0bcfcbbe6a5467928a791da7f8d6f
 SHA512:
-  metadata.gz: c9ad9a87ec9c9999f311e8f655c6ac186928718ea24fffd017173c78b2611c8879d7ae2f4011f835505f1cf73decb47a9e1b7566c134b5534fe4214606b7c00b
-  data.tar.gz: 9eec234c824538f536e2cd329034ca4954c9770b78c8f144da0b0e87ee84fc1979e7345e9d06e48936805d1bf3ec870c3ef74e693793938c2edd83fb73655da4
+  metadata.gz: a77934dec03187c8b45ff2c9e1577472dc7b2a7633cae3edec6c2a9d093acb35262f10e625ffb8ac086d949f41f8a0b1d46f1e57df585b03d0f9b51b72a2ff53
+  data.tar.gz: bd186e19af413b6bf26943fe4b527f285725b947226a65bc11ac35b5909883515e09267a11bbbe812e941d3aebb586c4535d406d0f7c2f6079fa42f1346ea82d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    u-attributes (0.4.0)
+    u-attributes (0.5.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/micro/attributes/macros.rb

@@ -41,10 +41,10 @@ module Micro
       end
 
       def attributes_data(arg)
-        normalized_arg =
-          arg.keys.each_with_object({}) { |key, memo| memo[key.to_s] = arg[key] }
-
-        yield(__attributes_data.merge(normalized_arg))
+        __attributes_data.merge(
+          Utils.hash_argument!(arg)
+               .each_with_object({}) { |(key, val), memo| memo[key.to_s] = val }
+        )
       end
     end
   end

data/lib/micro/attributes/utils.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Micro
+  module Attributes
+    module Utils
+      ARGUMENT_ERROR_MSG = 'argument must be a Hash'
+
+      def self.hash_argument!(arg)
+        return arg if arg.is_a?(Hash)
+
+        raise ArgumentError, ARGUMENT_ERROR_MSG
+      end
+    end
+  end
+end

data/lib/micro/attributes/version.rb

@@ -2,6 +2,6 @@
 
 module Micro
   module Attributes
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

data/lib/micro/attributes.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "micro/attributes/version"
+require "micro/attributes/utils"
 require "micro/attributes/macros"
 
 module Micro
@@ -16,8 +17,8 @@ module Micro
       end
 
       def base.inherited(subclass)
-        self.attributes_data({}) do |data|
-          data.each { |k, v| subclass.attribute(v.nil? ? k : {k => v}) }
+        self.attributes_data({}).each do |name, value|
+          subclass.attribute(value.nil? ? name : {name => value})
         end
       end
     end
@@ -49,12 +50,8 @@ module Micro
     end
 
     def attributes=(arg)
-      raise ArgumentError, 'argument must be a Hash' unless arg.is_a?(Hash)
-
-      self.class.attributes_data(arg) do |data|
-        data.each do |name, value|
-          instance_variable_set("@#{name}", data[name]) if attribute?(name)
-        end
+      self.class.attributes_data(Utils.hash_argument!(arg)).each do |name, value|
+        instance_variable_set("@#{name}", value) if attribute?(name)
       end
     end
 
@@ -66,7 +63,7 @@ module Micro
           end
         end
 
-      self.class.attributes_data(state) { |data| data }
+      self.class.attributes_data(state)
     end
 
     protected :attributes=

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: u-attributes
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Rodrigo Serradura
@@ -58,6 +58,7 @@ files:
 - bin/setup
 - lib/micro/attributes.rb
 - lib/micro/attributes/macros.rb
+- lib/micro/attributes/utils.rb
 - lib/micro/attributes/version.rb
 - lib/u-attributes.rb
 - micro-attributes.gemspec