standard_procedure_fabrik 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af004e81e6ae299bb2cbf3d99f2b44a8f133b439292915ac016d1c4d4ca52233
-  data.tar.gz: 958c26fa0b8ab2b15e6bc0c4098cee7cb206f749f6e7ccda97074feca8515b4e
+  metadata.gz: 60c8bb1ad20f4486e99e2ce3e3ef51895d30ddae6d64aa4f66e88dc27462cfe6
+  data.tar.gz: a1e4156f37806ead8bf2212a927192a851749abb16b55aac671ca7a99d42e2ec
 SHA512:
-  metadata.gz: b104ef644aed04238e021d67a0e06c91961d4b68323bba5adc9a5814a429b3304558c0381fff018a3a6c302d2f766dc1e9513a62cd0246a5052a43376cec4073
-  data.tar.gz: 751f1a5ea6ba84141cd82f55ac70c3332fa3e34eddee32a25388e0880b76611334603e6604bbd06d557741998a31cbaa0eb6ce49ec60233d0ddbdbeaf123954c
+  metadata.gz: ad07c2c432fc4f59d1b01df21c8f71c41384bb4d99b53e8d2ad34fa8796724b4f12140fd5a49369a38b0624095272b79b6a15c35091b9adaee988c7a47e63f68
+  data.tar.gz: caca476f05265786a15ccdb16ed280236a0d5177d647ca5e2d18826bb05026442c7c0d4d48fcadc3aa5789b67a7380938ddf53d41199ebcc388b0f6cae1711f9

data/README.md

@@ -48,7 +48,7 @@ So Fabrik allows you to set default attributes; then when you're creating a mode
   with Person do
     first_name { Faker::Name.first_name }
     last_name { Faker::Name.last_name }
-    email { |person| Faker::Internet.email(name: person.first_name.downcase) }
+    email { |person| Faker::Internet.email(name: person.first_name) }
     age 33
   end
 end
@@ -61,6 +61,12 @@ puts @alice.email # => alice@some-domain.com
 puts @alice.age # => 33
 ```
 
+When specifying a default, you can either use a fixed value - for example `age 33`.  
+
+Or you can pass a block and use a dynamic value - for example `last_name { Faker::Name.last_name }`.
+
+If you pass a block, you can also access any attributes that have been generated so far - in this case we are accessing `person.first_name`.  Whilst attributes that were supplied in the call to `create` are generally safe, relying on values that were generated dynamically may not be.  The default value generators _should_ be called in the order of declaration, giving you access to dynamic values declared beforehand - but this is not guaranteed.  It's generally safer to avoid references when generating default values.  
+
 ### Uniqueness
 
 When you've got a database packed with existing data, you don't want your seeds to fail because of a uniqueness constraint.  Or your tests to fail because suddenly they're finding two records when they were only expecting one.

data/checksums/standard_procedure_fabrik-0.2.1.gem.sha512

@@ -0,0 +1 @@
+0809cf506fe2cbf6b519100fb12c6799380f14991374e6cd2508fc33a6a1141e35f70d9e8b5d01a525df1cec660f99dc1e0f65c1e737c4001c482e76ed2f9553

data/lib/fabrik/database.rb

@@ -2,6 +2,7 @@
 
 require "active_support/core_ext/string"
 require "delegate"
+require "ostruct"
 
 module Fabrik
   class Database
@@ -72,7 +73,7 @@ module Fabrik
       @klass = klass
       @default_attributes = {}
       @unique_keys = []
-      instance_eval(&block) if block_given?
+      instance_eval(&block) unless block.nil?
     end
   end
 
@@ -117,7 +118,9 @@ module Fabrik
 
     private def attributes_with_defaults attributes
       attributes_to_generate = default_attributes.keys - attributes.keys
-      attributes_to_generate.each_with_object({}) { |name, generated_attributes| generated_attributes[name] = default_attributes[name].call(@db) }.merge(attributes)
+      attributes_to_generate.each_with_object(OpenStruct.new(**attributes)) do |name, generated_attributes|
+        generated_attributes[name] = default_attributes[name].nil? ? nil : @db.instance_exec(generated_attributes, &default_attributes[name])
+      end.to_h.merge(attributes)
     end
   end
 end

data/lib/fabrik/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fabrik
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: standard_procedure_fabrik
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Rahoul Baruah
@@ -23,6 +23,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.0
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Fixtures, fittings and seeds
 email:
 - rahoulb@echodek.co
@@ -42,6 +56,7 @@ files:
 - checksums/standard_procedure_fabrik-0.1.1.gem.sha512
 - checksums/standard_procedure_fabrik-0.1.2.gem.sha512
 - checksums/standard_procedure_fabrik-0.2.0.gem.sha512
+- checksums/standard_procedure_fabrik-0.2.1.gem.sha512
 - lib/fabrik.rb
 - lib/fabrik/database.rb
 - lib/fabrik/version.rb