faker_maker 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c59c0553af51e24cdb8c40eaf37fb1913546c17ab47df37a1a52b5c16ffe9ee
-  data.tar.gz: 2035e5c27455309c20e0ecdf500917720612bacd3abc32ad573f45a9568676c6
+  metadata.gz: c2ec69f6145d624d4c97304fc347e0968000490eed3330bd6821757d8e91709b
+  data.tar.gz: c0def7a4f1f467c0c0a5cf7cba89eac31673ee9d9a75cbd21bc781bf1e3049bc
 SHA512:
-  metadata.gz: f83f89e5d405e335a0df45027f721e8b650635eef537dc79e068fcb6841a452abe6a1ca9e13db74b22e8805adfa870bf4c066ff5096d7a84edf84c5ff5e62199
-  data.tar.gz: 054545cad0cd1e0023eb3306bcbfbcd0b054b7a8b6734c192d1090d5f4d8b5aee6288872a51b7df6cb6b67746652111c40b0da9b35c68c97a319b10f68441010
+  metadata.gz: 89c0415112f57426f32515643829fde4191a3017b8934154fca010d5447302b56f0b5ab6f9467257646d22c5a9c40e4983f805c77502fdcd87a93f420c4bb28f
+  data.tar.gz: d2cf75a2cc0cc2d038df826d4ebfc53e192c62547e9167bae13894c179c8e20c7068fc9f4503cfb704cd116e70a844e82db9b93d57b82111681eedd617d63b42

data/lib/faker_maker/attribute.rb

@@ -6,7 +6,7 @@ module FakerMaker
     def initialize( name, block = nil, options = {} )
       assert_valid_options options
       @name = name
-      @block = block
+      @block = block || proc { nil }
       @cardinality = options[:has] || 1
       @translation = options[:json]
       @array = options[:array] == true 

data/lib/faker_maker/factory.rb

@@ -1,3 +1,4 @@
+# rubocop:disable Metrics/ClassLength
 module FakerMaker
   # Factories construct instances of a fake
   class Factory
@@ -26,6 +27,7 @@ module FakerMaker
 
     def build( attributes = {} )
       instance = instantiate
+      assert_only_known_attributes_for_override( attributes )
       populate_instance instance, attributes
       yield instance if block_given?
       instance
@@ -61,23 +63,27 @@ module FakerMaker
       @json_key_map
     end
 
+    def attribute_names( collection = [] )
+      collection |= FakerMaker[parent].attribute_names( collection ) if parent?
+      collection | attributes.map( &:name )
+    end
+
     protected 
 
-    def populate_instance( instance, attr_override_values )
-      assert_only_known_attributes_for_override( attr_override_values )
-    
+    def populate_instance( instance, attr_override_values )    
       FakerMaker[parent].populate_instance instance, attr_override_values if parent?
-      @attributes.each do |attr|       
+      @attributes.each do |attr|
         value = value_for_attribute( instance, attr, attr_override_values )
         instance.send "#{attr.name}=", value
       end
       instance.instance_variable_set( :@fm_factory, self )
     end
-
+    
+    
     private
     
     def assert_only_known_attributes_for_override( attr_override_values )
-      unknown_attrs = attr_override_values.keys - @attributes.map( &:name )
+      unknown_attrs = attr_override_values.keys - attribute_names
       issue = "Can't build an instance of '#{class_name}' " \
               "setting '#{unknown_attrs.join( ', ' )}', no such attribute(s)"
       raise FakerMaker::NoSuchAttributeError, issue unless unknown_attrs.empty?
@@ -119,3 +125,4 @@ module FakerMaker
     end
   end
 end
+# rubocop:enable Metrics/ClassLength

data/lib/faker_maker/version.rb

@@ -1,3 +1,3 @@
 module FakerMaker
-  VERSION = '1.1.1'.freeze
+  VERSION = '1.1.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faker_maker
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Nigel Brookes-Thomas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-08 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport