faker_maker 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fee4b085d7597c65882a322c750393492922c22653b66bb5c4b2e2da064c85be
-  data.tar.gz: ad9fa43a58aefcba71b1beaa0a2a53ebbf200644b01f9cfd568f234d665d1631
+  metadata.gz: b168e0875afcb5acfddf49f5ffc2732392983b343c9d161e8b773abbb36308e5
+  data.tar.gz: f2be17a2fa07b32f41e53034a6512eac0a6b7e4268d39b0e66ad2fa8fb57adb0
 SHA512:
-  metadata.gz: 14dd70aa6b4cdac5402e1603073bd018dbd699b23181ef8294c8ea5ec3b759d8e6dc6fffcccec30f66e3b34d764c975e6c899b8703027f94ffbdf4b4e53ae2f5
-  data.tar.gz: '083a7808d7c4c8d8830b1c02595192f9f72aef08880918d9667e7f63e8d5749f42878f239f24443aa4c680b7f5d6cce8f39b1992be1c50bde782f9b02f4a71ca'
+  metadata.gz: 0b4671f26ee492a62a27a9520b6f1331978c4145568730c98a5a905569b3cc350031c11229102418648ed4be01a020325f339e6ccd4f886cdbe92026a9c38dd0
+  data.tar.gz: 814c3bbe801dae701a28d638a946508c1b025223fbaff899d0c40b6f777d207b383ba1ea58dc1b5daba03bdcea3de29eef323784d60e4d792d08c25f9a5530ac

data/.coveralls.yml

@@ -0,0 +1 @@
+repo_token: K7czIqoKhrE9BRBk1ubEToyJkLgTk0frJ

data/README.md

@@ -59,6 +59,18 @@ FakerMaker.factory :response do
 end
 ```
 
+Blocks are executed in the context of their instance. This means you can refer to variables already defined:
+
+```ruby
+FakerMaker.factory :user, class: 'EmailUser' do 
+  title {'Ms'}
+  name {'Patsy Stone'}
+  formal_name {"#{title} #{name}"}
+  email {'patsy@fabulous.co.uk'}
+  admin {false}
+end
+```
+
 ### Inheritance
 
 FakerMaker can exploit the Ruby class hierarchy to provide additional specialisation or to override some behaviours:
@@ -128,6 +140,8 @@ FakerMaker.factory :basket do
 end
 ```
 
+### JSON field names
+
 ### Building instances
 
 Instances are Plain Ol' Ruby Objects and the attributes are attached with getters and setters with their values assigned to the value return from their block at build time. 
@@ -172,7 +186,7 @@ As a convenience, you can request a JSON representation directly:
 result = FakerMaker[:basket].to_json
 ```
 
-As another convenience, `FakerMaker` is also assign to the variable `FM` to it is possible to write just:
+As another convenience, `FakerMaker` is also assigned to the variable `FM` to it is possible to write just:
 
 ```ruby
 result = FM[:basket].build

data/faker_maker.gemspec

@@ -48,4 +48,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec',     '~> 3.8'
   spec.add_development_dependency 'rubocop',   '~> 0.68'
   spec.add_development_dependency 'simplecov', '~> 0.16'
+  spec.add_development_dependency 'coveralls', '~> 0.8'
 end

data/lib/faker_maker/factory.rb

@@ -64,11 +64,11 @@ module FakerMaker
     protected 
 
     def populate_instance( instance, attr_override_values )
-      assert_only_know_attributes_for_override( attr_override_values )
+      assert_only_known_attributes_for_override( attr_override_values )
     
-      FakerMaker[parent].populate_instance instance if parent?
+      FakerMaker[parent].populate_instance instance, attr_override_values if parent?
       @attributes.each do |attr|       
-        value = value_for_attribute( attr, attr_override_values )
+        value = value_for_attribute( instance, attr, attr_override_values )
         instance.send "#{attr.name}=", value
       end
       instance.instance_variable_set( :@fm_factory, self )
@@ -76,7 +76,7 @@ module FakerMaker
 
     private
     
-    def assert_only_know_attributes_for_override( attr_override_values )
+    def assert_only_known_attributes_for_override( attr_override_values )
       unknown_attrs = attr_override_values.keys - @attributes.map( &:name )
       issue = "Can't build an instance of '#{class_name}' " \
               "setting '#{unknown_attrs.join( ', ' )}', no such attribute(s)"
@@ -87,13 +87,13 @@ module FakerMaker
       !attr_override_values[attr.name].nil?
     end
     
-    def value_for_attribute( attr, attr_override_values )
+    def value_for_attribute( instance, attr, attr_override_values )
       if attribute_hash_overridden_value?( attr, attr_override_values )
         attr_override_values[attr.name]
       elsif attr.array?
         [].tap { |a| attr.cardinality.times { a << attr.block.call } }
       else
-        attr.block.call
+        instance.instance_eval(&attr.block)
       end
     end
 

data/lib/faker_maker/version.rb

@@ -1,3 +1,3 @@
 module FakerMaker
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faker_maker
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Nigel Brookes-Thomas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-10 00:00:00.000000000 Z
+date: 2019-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -128,6 +128,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.16'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 description: FakerMaker is a simple fixture generator with a concise and straightforward
   syntax.
 email:
@@ -137,6 +151,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".coveralls.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"