stepford 0.12.1 → 0.12.2

data/README.md

@@ -1,7 +1,7 @@
 Stepford
 =====
 
-Now getting started with FactoryGirl is even more simple and DRY!
+FactoryGirl = so easy now
 
 Stepford is an automatic required (non-null or presence validated) association resolver and factory generator for [FactoryGirl][factory_girl].
 
@@ -46,13 +46,12 @@ By default autogenerated factories just have required attributes, e.g.:
         price 1.23
         sequence(:isbn)
         sequence(:ean)
-        trait :with_summary do; template 'Test Summary'; end
         updated_at { 2.weeks.ago }
       end
 
     end
 
-But you can have it autogenerate lots of the FactoryGirl bells and whistles:
+But you can have it autogenerate all attributes, associations, and traits:
 
     require 'factory_girl_rails'
 
@@ -70,15 +69,14 @@ But you can have it autogenerate lots of the FactoryGirl bells and whistles:
         price 1.23
         sequence(:isbn)
         sequence(:ean)
+        description 'Test Description'
         trait :with_summary do; template 'Test Summary'; end
         updated_at { 2.weeks.ago }
       end
 
     end
 
-But, everything from author to with_notes may have association interdependency issues unless you hand edit the generated versions.
-
-Stepford's FactoryGirl (and optionally its rspec helper) can help you avoid the heavy lifting.
+However, without modification, if you use the CLI to generate these you could more likely run into association interdependency problems (circular references). To fix those you could hand-edit the factories, or write methods to create more complex structures. Or, to keep it simple, just use the defaults for the factories CLI and then use the deep_* methods in your specs to automatically create dependencies as needed!
 
 ### Setup
 
@@ -104,7 +102,7 @@ Put this in your `test/spec_helper.rb`, `spec/spec_helper.rb`, or some other fil
 
 #### Stepford::FactoryGirl
 
-Stepford::FactoryGirl acts just like FactoryGirl, but it goes through all the null=false associations for foreign keys that aren't primary keys in the factory and/or its presence validated associations and attempts to create/build/build_stub depending on what you called originally, but also lets you pass in an `:with_factory_options` that can contain a hash of factory name symbols to the arguments and block you'd pass to it. You specify the block using a `:blk` option with a proc/lambda (probably a lambda) to use in that method.
+Stepford::FactoryGirl acts just like FactoryGirl, but it goes through all the null=false associations for foreign keys that aren't primary keys in the factory and/or its presence validated associations and attempts to create required association data. Pass in the option `:with_factory_options` with a hash of factory name symbols to the arguments and block you'd pass to it if you want to change only parts of required dependent associations that are created. You specify the block using a `:blk` option with a lambda.
 
 If you don't specify options, it's easy (note: it is even easier with the rspec helper- see below). If Foo requires Bar and Bar requires a list of Foobars and a Barfoo, and you have factories for each of those, you'd only have to do:
 
@@ -115,8 +113,8 @@ and that would create a list of 5 Foos, that each have a Bar, where each Bar has
 But, you might want to specify traits, and certain attributes or associations or a block or different methods to use. That's pretty easy, too. Let's say you only need to tweak bar and foobar on each item, but the rest gets created as it would with just `Stepford::FactoryGirl.create_list`, so if you wanted to create 5 with two traits `:fancy` and `:light` and only build the bar and build bar's foobar as a stub:
 
     Stepford::FactoryGirl.create_list(:foo, 5, :fancy, :light, with_factory_options: {
-      bar: [:build, :bar],
-      foobar: [:build_stubbed, :foobar]
+      bar: [:create_list, :bar],
+      foobar: [:create, :foobar, :some_trait, :some_other_trait, blk: -> {block you would send to foobar.create goes here}]
     }) do
       # any block you would send to FactoryGirl.create_list(:foo) would go here
     end
@@ -323,6 +321,8 @@ ThoughtBot's Josh Clayton provided some suggestions for this, including using me
       post.reload
     end
 
+(Note, the deep_* methods that do this automatically for you, including the reloads.)
+
 or referring to created objects through associations, though he said multiple nestings get tricky:
 
     factory :post do
@@ -343,8 +343,6 @@ or referring to created objects through associations, though he said multiple ne
     comment = FactoryGirl.create(:comment, :authored_by_post_author)
     comment.author == comment.post.author # true
 
-This is the reason we wrote the Stepford's Factory Girl proxy and helper rspec methods (see above). It automatically determines what needs to be set in what order and does create, create_list or build, build_list, etc. automatically.
-
 ### License
 
 Copyright (c) 2012 Gary S. Weaver, released under the [MIT license][lic].

data/lib/stepford/factory_girl.rb

@@ -27,11 +27,8 @@ module Stepford
 
       def handle_factory_girl_method(m, *args, &block)
         
-        #puts "#{'  ' * @@indent}handling Stepford::FactoryGirl.#{m}(#{args.inspect})" if ::Stepford::FactoryGirl.debug?
-
         if args && args.size > 0
           # call Stepford::FactoryGirl.* on any not null associations recursively
-          model_sym = args[0].to_sym
           model_class = args[0].to_s.camelize.constantize
 
           args = args.dup # need local version because we'll be dup'ing the options hash to add things to set prior to create/build
@@ -54,6 +51,9 @@ module Stepford
           orig_options[:nesting_breadcrumbs] = [] unless orig_options[:nesting_breadcrumbs]
           breadcrumbs = orig_options[:nesting_breadcrumbs]
           breadcrumbs << [args[0]]
+
+          orig_options[:to_reload] = [] unless orig_options[:to_reload]
+          to_reload = orig_options[:to_reload]
             
           if ::Stepford::FactoryGirl.debug?
             puts "#{breadcrumbs.join('>')} start. args=#{debugargs(args)}"
@@ -88,16 +88,15 @@ module Stepford
                 blk = method_options.is_a?(Hash) ? method_args_and_options.delete(:blk) : nil
                 begin
                   if blk
-                    #puts "#{'  ' * @@indent}FactoryGirl.__send__(#{method_args_and_options.inspect}, &blk)" if ::Stepford::FactoryGirl.debug?
                     options[assc_sym] = ::FactoryGirl.__send__(*method_args_and_options, &blk)
                   else
-                    #puts "#{'  ' * @@indent}FactoryGirl.__send__(#{method_args_and_options.inspect})" if ::Stepford::FactoryGirl.debug?
                     options[assc_sym] = ::FactoryGirl.__send__(*method_args_and_options)
                   end
+                  to_reload << options[assc_sym]
                 rescue ActiveRecord::RecordInvalid => e
                   puts "#{breadcrumbs.join('>')}: FactoryGirl.__send__(#{method_args_and_options.inspect}): #{e}#{::Stepford::FactoryGirl.debug? ? "\n#{e.backtrace.join("\n")}" : ''}"
                   raise e
-                 end
+                end
               else
                 if reflection.macro == :has_many
                   options[assc_sym] = ::Stepford::FactoryGirl.create_list(clas_sym, 2, orig_options)               
@@ -122,6 +121,7 @@ module Stepford
         if args.last.is_a?(Hash)
           (args.last).delete(:with_factory_options)
           (args.last).delete(:nesting_breadcrumbs)
+          (args.last).delete(:to_reload)
         end
 
         begin
@@ -130,9 +130,21 @@ module Stepford
           puts "#{breadcrumbs.join('>')}: FactoryGirl.#{m}(#{args.inspect}): #{e}#{::Stepford::FactoryGirl.debug? ? "\n#{e.backtrace.join("\n")}" : ''}" if defined?(breadcrumbs)
           raise e
         end
-
+        
         if args.last.is_a?(Hash) && defined?(breadcrumbs) && breadcrumbs.size > 0
+          # still handling association/subassociation
           args.last[:nesting_breadcrumbs] = breadcrumbs
+          args.last[:to_reload] = to_reload
+          orig_options[:to_reload] << result
+        else
+          # ready to return the initially requested instances, so reload children with their parents, in reverse order added
+          orig_options[:to_reload].reverse.each do |i|
+            begin
+              i.reload
+            rescue => e
+              puts "#{i} reload failed: #{e}\n#{e.backtrace.join("\n")}" if ::Stepford::FactoryGirl.debug?
+            end
+          end
         end
 
         result

data/lib/stepford/version.rb

@@ -1,3 +1,3 @@
 module Stepford
-  VERSION = '0.12.1'
+  VERSION = '0.12.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stepford
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
   prerelease: 
 platform: ruby
 authors: