creatable 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c329dfc34d0517b100f5f53dcd1d56997ff21ded
-  data.tar.gz: 332be29fed1620fbb6cfea7fd6b6fce9904b6ffd
+  metadata.gz: e6b42abcff609998d39ef809a52187796c820a88
+  data.tar.gz: fa805820fcee26be7b4febe18422cf47f33c0140
 SHA512:
-  metadata.gz: 6e112941a632494e7c0ea34bff9e0b56751726d75fa4ecbb1a6f74efc31908a0efb168067784713cd53558de8602a836c845709f456d70f8b53a5ff84daa49ca
-  data.tar.gz: e65394e04cfe7df279f5c4d583615fd5fbf81c86291b84171566ee3abe241408b1120d912eeb746c8e009e2e83cfeff5728181787d86dc0ee12cbdc8fc730bc9
+  metadata.gz: f64fc80434e4a78a55b934b44d3d321c16315a3ddf5a8a592884d191a70592a271097f5b9e86e769d9fb4e98f58bc0bf7996c2fd9485f987189025fe50fd58bf
+  data.tar.gz: 8b77d760f5e4cad59d6f78ebecaccfc7883ce6bb6069447370d07d044544df7b0400d8981ec54a41a01017df788a6a1b65e61cf7042819ceb1e8f7f10cdf08e9

data/lib/creatable/class_methods.rb

@@ -15,7 +15,7 @@ module Creatable
     # @raise [ArgumentError] if name is not supplied
     # @raise [ArgumentError] if the type is not accessor, reader, or writer
     # @return [Void]
-    def attribute(name: nil, type: 'accessor', kind_of: nil)
+    def attribute(name: nil, type: 'accessor', kind_of: nil, &block)
       raise ArgumentError, 'name is a required parameter' unless name
       raise ArgumentError, "type must be of type: 'accessor', 'reader', or 'writer'" unless ['accessor', 'reader', 'writer'].include? type
 
@@ -30,11 +30,9 @@ module Creatable
         end
       end
 
-      if attributes.map { |e| e[:name] }.include? name
-        attributes.delete_if { |e| e[:name] == name }
-      end
+      attributes.delete_if { |e| e[:name] == name } if attributes.map { |e| e[:name] }.include? name
 
-      attributes.push(name: name, type: type, kind_of: kind_of)
+      attributes.push(name: name, type: type, kind_of: kind_of, block: block)
       nil
     end
 
@@ -43,13 +41,20 @@ module Creatable
     # @return [Object] Newly created object
     def create(args = {})
       object = new
-      names = attributes.map { |e| e[:name].to_sym }
-      args.each do |k, v|
-        object.instance_variable_set "@#{k}".to_sym, v if names.include? k.to_sym
-      end
+      # names = attributes.map { |e| e[:name].to_sym }
+
+      attributes.each do |a|
+        value = args[a[:name].to_sym]
+        next unless value
 
-      yield(object) if block_given?
+        if a[:block]
+          a[:block].call object
+        else
+          object.instance_variable_set "@#{a[:name]}".to_sym, value
+        end
+      end
 
+      yield object if block_given?
       object
     end
 

data/lib/creatable/version.rb

@@ -1,3 +1,3 @@
 module Creatable
-  VERSION = '2.1.1'.freeze # VERSION
+  VERSION = '2.2.0'.freeze # VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: creatable
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Ernie Brodeur
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-15 00:00:00.000000000 Z
+date: 2018-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump