u-attributes 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4ffcf4806ec9d80d37275acd60cae7b17e631eb1
-  data.tar.gz: 097f3021f4926e30f1fae6f013546e720cdde813
+SHA256:
+  metadata.gz: 724654639b33deda5424bc5e0ac320ff1a79c34aa1aed860aa9aa18ac77830be
+  data.tar.gz: 44c63295b620dd096b08aefe3b6d62604a09d857ff1541f74829f0df59076937
 SHA512:
-  metadata.gz: 13d1ef7f388acad2924444ffc0895efe77f4dda23cbbe7bccb1043fb438bc5489d2da02b9497f79f5e60a0d9c6734a1df53e34be7411eaeebde66fbd94168d78
-  data.tar.gz: 18adb33e86569aa4f0a0b6bb0c0f390bab59b895d71c79076f2e6ba158f1733b0f8df64a2926a34fe90deed491150fbe2f3553761593a70eebe4a32715505d33
+  metadata.gz: c9ad9a87ec9c9999f311e8f655c6ac186928718ea24fffd017173c78b2611c8879d7ae2f4011f835505f1cf73decb47a9e1b7566c134b5534fe4214606b7c00b
+  data.tar.gz: 9eec234c824538f536e2cd329034ca4954c9770b78c8f144da0b0e87ee84fc1979e7345e9d06e48936805d1bf3ec870c3ef74e693793938c2edd83fb73655da4

data/Gemfile.lock

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

data/README.md

@@ -58,6 +58,28 @@ puts person.age  # 21
 #
 # person.name = 'Rodrigo'
 # NoMethodError (undefined method `name=' for #<Person:0x0000... @name="John Doe", @age=21>)
+
+####################
+# self.attributes= #
+####################
+
+# This protected method is added to make easier the assignment in a constructor.
+
+class Person
+  include Micro::Attributes
+
+  attribute :name
+  attribute :age
+
+  def initialize(options)
+    self.attributes = options
+  end
+end
+
+person = Person.new('name' => 'John', age: 20)
+
+puts person.name # John
+puts person.age  # 20
 ```
 
 ### How to define multiple attributes?
@@ -71,8 +93,8 @@ class Person
 
   attributes :name, :age
 
-  def initialize(name, age)
-    @name, @age = name, age
+  def initialize(options)
+    self.attributes = options
   end
 end
 
@@ -125,6 +147,7 @@ puts other_person.equal?(person) # false
 #########################################################
 # Inheritance will preserve the parent class attributes #
 #########################################################
+
 class Subclass < Person
   attribute :foo
 end

data/lib/micro/attributes.rb

@@ -11,17 +11,13 @@ module Micro
       base.class_eval do
         private_class_method :__attribute
         private_class_method :__attributes
-        private_class_method :__attributes_defaults
+        private_class_method :__attribute_data
+        private_class_method :__attributes_data
       end
 
       def base.inherited(subclass)
         self.attributes_data({}) do |data|
-          values = data.each_with_object(a: [], h: {}) do |(k, v), m|
-            v.nil? ? m[:a] << k : m[:h][k] = v
-          end
-
-          subclass.attributes(values[:a])
-          subclass.attributes(values[:h])
+          data.each { |k, v| subclass.attribute(v.nil? ? k : {k => v}) }
         end
       end
     end
@@ -33,7 +29,6 @@ module Micro
 
           base.class_eval(<<-RUBY)
             def initialize(arg)
-              raise ArgumentError, 'argument must be a Hash' unless arg.is_a?(Hash)
               self.attributes = arg
             end
 
@@ -53,8 +48,10 @@ module Micro
       self.class.attribute?(name)
     end
 
-    def attributes=(params)
-      self.class.attributes_data(params) do |data|
+    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
@@ -64,9 +61,9 @@ module Micro
     def attributes
       state =
         self.class.attributes.each_with_object({}) do |name, memo|
-          iv_name = "@#{name}"
-          is_defined = instance_variable_defined?(iv_name)
-          memo[name] = instance_variable_get(iv_name) if is_defined
+          if instance_variable_defined?(iv_name = "@#{name}")
+            memo[name] = instance_variable_get(iv_name)
+          end
         end
 
       self.class.attributes_data(state) { |data| data }

data/lib/micro/attributes/macros.rb

@@ -3,10 +3,6 @@
 module Micro
   module Attributes
     module Macros
-      def __attributes_defaults
-        @__attributes_defaults ||= {}
-      end
-
       def __attributes
         @__attributes ||= Set.new
       end
@@ -24,13 +20,18 @@ module Micro
         return true
       end
 
+      def __attributes_data
+        @__attributes_data ||= {}
+      end
+
+      def __attribute_data(name, value)
+        __attributes_data[name] = value if __attribute(name)
+      end
+
       def attribute(arg)
-        return __attribute(arg.to_s) unless arg.is_a?(Hash)
+        return __attribute_data(arg.to_s, nil) unless arg.is_a?(Hash)
 
-        arg.each do |key, value|
-          name = key.to_s
-          __attributes_defaults[name] = value if __attribute(name)
-        end
+        arg.each { |key, value| __attribute_data(key.to_s, value) }
       end
 
       def attributes(*args)
@@ -40,17 +41,10 @@ module Micro
       end
 
       def attributes_data(arg)
-        normalized_params = arg.keys.each_with_object({}) do |key, memo|
-          memo[key.to_s] = arg[key]
-        end
-
-        undefineds = (self.attributes - normalized_params.keys)
-        nil_params =
-          undefineds.each_with_object({}) { |name, memo| memo[name] = nil }
+        normalized_arg =
+          arg.keys.each_with_object({}) { |key, memo| memo[key.to_s] = arg[key] }
 
-        yield(
-          nil_params.merge!(__attributes_defaults).merge!(normalized_params)
-        )
+        yield(__attributes_data.merge(normalized_arg))
       end
     end
   end

data/lib/micro/attributes/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: u-attributes
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Rodrigo Serradura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-03 00:00:00.000000000 Z
+date: 2019-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,8 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Define read-only attributes