u-attributes 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6458bbe7cd9f3f3ce857b69273aec70bf9697594c4f2ee0ca898c441d0d7f1f
-  data.tar.gz: f71576f85de2c6a03ea50401a6b2e791ed79ec393d061c5653e52076bcaee23a
+  metadata.gz: 63911d6718fe30f139ee9acfb5b4a4577a71c3e01222087a17a4d0f349b31935
+  data.tar.gz: 8a3a4266c67d1e8eade0d742cf2d057c0bafb2f2e25c26c768f73cea4d40aa97
 SHA512:
-  metadata.gz: c26e67d45e58f7b381e4b1a250a1d284eb05dc6455baae21cecff5ca54b5de864360c2d4f889ecab318d3b5d406ee39a1011608a1e3983dddf0106f5d849c10e
-  data.tar.gz: 9ff97e16e741127e9311ce0baf74deac64a24bc9d964e5f32f17d3a03e27fcbc32ded8efa3ce367caaec2032adc5327ea13bb341e7be3c8939f542283cd7725c
+  metadata.gz: 927eb73d0b9cfce21e9d8abe11ab899296a6f45721d7821ea175e0bc58d144015ba22e488f1bdb6be563821a8b4e25a1082eba4c103ceedbed556ded654ab721
+  data.tar.gz: 85bf3683290458bfb863b215fe5eca4e57e041bb2dd167e1908a629c9081d9c8417584b847b9a775d46658f8069c5d960484a9c7a2be7ffb462eac1104f4b4ca

data/Gemfile.lock

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

data/README.md

@@ -68,7 +68,7 @@ puts person.age  # 21
 class Person
   include Micro::Attributes
 
-  attribute :name
+  attribute :name, 'John Doe' # .attribute() accepts a second arg as its default value
   attribute :age
 
   def initialize(options)
@@ -76,9 +76,9 @@ class Person
   end
 end
 
-person = Person.new('name' => 'John', age: 20)
+person = Person.new(age: 20)
 
-puts person.name # John
+puts person.name # John Doe
 puts person.age  # 20
 
 #--------------#
@@ -87,14 +87,14 @@ puts person.age  # 20
 #
 # Use the #attribute() method with a valid attribute name to get its value
 
-puts person.attribute(:name) # John
+puts person.attribute(:name) # John Doe
 puts person.attribute('age') # 20
 puts person.attribute('foo') # nil
 
 #
 # If you pass a block, it will be executed only if the attribute is valid.
 
-person.attribute(:name) { |value| puts value } # John
+person.attribute(:name) { |value| puts value } # John Doe
 person.attribute('age') { |value| puts value } # 20
 person.attribute('foo') { |value| puts value } # !! Nothing happened, because of the attribute not exists.
 
@@ -117,16 +117,16 @@ person.attribute!('foo') { |value| puts value } # NameError (undefined attribute
 class Person
   include Micro::Attributes
 
-  attributes :name, :age
+  attributes :age, name: 'John Doe' # Use a hash to define attributes with default values
 
   def initialize(options)
     self.attributes = options
   end
 end
 
-person = Person.new('Serradura', 32)
+person = Person.new(age: 32)
 
-puts person.name # Serradura
+puts person.name # 'John Doe'
 puts person.age  # 32
 ```
 
@@ -137,10 +137,7 @@ A: Use `Micro::Attributes.to_initialize`
 class Person
   include Micro::Attributes.to_initialize
 
-  attributes :age, name: 'John Doe' # Use a hash to define a default value
-
-  # attribute name: 'John Doe'
-  # attribute :age
+  attributes :age, name: 'John Doe'
 end
 
 person = Person.new(age: 18)
@@ -200,7 +197,7 @@ puts instance.respond_to?(:foo) # true
 # The methods above allow redefining the attributes default data
 
 class AnotherSubclass < Person
-  attribute! name: 'Alfa'
+  attribute! :name, 'Alfa'
 end
 
 alfa_person = AnotherSubclass.new({})

data/lib/micro/attributes.rb

@@ -11,18 +11,13 @@ module Micro
       base.extend(::Micro::Attributes.const_get(:Macros))
 
       base.class_eval do
-        private_class_method :__attribute
-        private_class_method :__attributes
-        private_class_method :__attribute_data
-        private_class_method :__attribute_data!
-        private_class_method :__attributes_data
+        private_class_method :__attributes_data, :__attributes
+        private_class_method :__attributes_def, :__attributes_set
+        private_class_method :__attribute_reader, :__attribute_set
       end
 
       def base.inherited(subclass)
-        self.attributes_data({}).each do |name, value|
-          subclass.attribute(value.nil? ? name : {name => value})
-        end
-
+        subclass.attributes(self.attributes_data({}))
         subclass.extend ::Micro::Attributes.const_get('Macros::ForSubclasses')
       end
     end

data/lib/micro/attributes/attributes_utils.rb

@@ -10,6 +10,12 @@ module Micro
 
         raise ArgumentError, ARGUMENT_ERROR_MSG
       end
+
+      def self.stringify_hash_keys!(arg)
+        hash_argument!(arg).each_with_object({}) do |(key, val), memo|
+          memo[key.to_s] = val
+        end
+      end
     end
   end
 end

data/lib/micro/attributes/macros.rb

@@ -3,59 +3,59 @@
 module Micro
   module Attributes
     module Macros
-      def __attributes
-        @__attributes ||= Set.new
+      def __attributes_data
+        @__attributes_data ||= {}
       end
 
-      def attribute?(name)
-        __attributes.member?(name.to_s)
+      def __attributes
+        @__attributes ||= Set.new
       end
 
-      def __attribute(name)
+      def __attribute_reader(name)
         __attributes.add(name)
         attr_reader(name)
       end
 
-      def __attributes_data
-        @__attributes_data ||= {}
+      def __attribute_set(key, value, can_overwrite)
+        name = key.to_s
+        has_attribute = attribute?(name)
+        __attribute_reader(name) unless has_attribute
+        __attributes_data[name] = value if can_overwrite || !has_attribute
       end
 
-      def __attribute_data(name, value, allow_to_override)
-        has_attribute = attribute?(name)
-        __attribute(name) unless has_attribute
-        __attributes_data[name] = value if allow_to_override || !has_attribute
+      def __attributes_def(arg, can_overwrite)
+        return __attribute_set(arg, nil, can_overwrite) unless arg.is_a?(::Hash)
+        arg.each { |key, val| __attribute_set(key, val, can_overwrite) }
       end
 
-      def __attribute_data!(arg, allow_to_override:)
-        return __attribute_data(arg.to_s, nil, allow_to_override) unless arg.is_a?(Hash)
+      def __attributes_set(args, can_overwrite)
+        args.flatten.each { |arg| __attributes_def(arg, can_overwrite) }
+      end
 
-        arg.each { |key, value| __attribute_data(key.to_s, value, allow_to_override) }
+      def attribute?(name)
+        __attributes.member?(name.to_s)
       end
 
-      def attribute(arg)
-        __attribute_data!(arg, allow_to_override: false)
+      def attribute(name, value=nil)
+        __attribute_set(name, value, false)
       end
 
       def attributes(*args)
         return __attributes.to_a if args.empty?
-
-        args.flatten.each { |arg| attribute(arg) }
+        __attributes_set(args, can_overwrite: false)
       end
 
       def attributes_data(arg)
-        __attributes_data.merge(
-          AttributesUtils.hash_argument!(arg)
-                         .each_with_object({}) { |(key, val), memo| memo[key.to_s] = val }
-        )
+        __attributes_data.merge(AttributesUtils.stringify_hash_keys!(arg))
       end
 
       module ForSubclasses
-        def attribute!(arg)
-          __attribute_data!(arg, allow_to_override: true)
+        def attribute!(name, value=nil)
+          __attribute_set(name, value, true)
         end
 
         def attributes!(*args)
-          return args.flatten.each { |arg| attribute!(arg) } unless args.empty?
+          return __attributes_set(args, can_overwrite: true) unless args.empty?
           raise ArgumentError, 'wrong number of arguments (given 0, expected 1 or more)'
         end
       end

data/lib/micro/attributes/version.rb

@@ -2,6 +2,6 @@
 
 module Micro
   module Attributes
-    VERSION = "0.8.0"
+    VERSION = "0.9.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: u-attributes
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Rodrigo Serradura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-07 00:00:00.000000000 Z
+date: 2019-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake