Update repo to follow thoughtbot guide for whitespace in blocks

lib/factory_girl/attribute_assigner.rb

@@ -90,7 +90,7 @@ module FactoryGirl
 
     def alias_names_to_ignore
       @attribute_list.non_ignored.map do |attribute|
-        override_names.map {|override| attribute.name if attribute.alias_for?(override) && attribute.name != override && !ignored_attribute_names.include?(override) }
+        override_names.map { |override| attribute.name if attribute.alias_for?(override) && attribute.name != override && !ignored_attribute_names.include?(override) }
       end.flatten.compact
     end
   end

lib/factory_girl/attribute_list.rb

@@ -36,7 +36,7 @@ module FactoryGirl
     end
 
     def apply_attributes(attributes_to_apply)
-      attributes_to_apply.each {|attribute| add_attribute(attribute) }
+      attributes_to_apply.each { |attribute| add_attribute(attribute) }
     end
 
     private

lib/factory_girl/callbacks_observer.rb

@@ -15,7 +15,7 @@ module FactoryGirl
     private
 
     def callbacks_by_name(name)
-      @callbacks.select {|callback| callback.name == name }
+      @callbacks.select { |callback| callback.name == name }
     end
   end
 end

lib/factory_girl/configuration.rb

@@ -11,7 +11,7 @@ module FactoryGirl
       @callback_names = Set.new
       @definition     = Definition.new
 
-      to_create {|instance| instance.save! }
+      to_create { |instance| instance.save! }
       initialize_with { new }
     end
 

lib/factory_girl/declaration_list.rb

@@ -35,11 +35,11 @@ module FactoryGirl
     private
 
     def delete_declaration(declaration)
-      @declarations.delete_if {|decl| decl.name == declaration.name }
+      @declarations.delete_if { |decl| decl.name == declaration.name }
     end
 
     def to_attributes
-      @declarations.inject([]) {|result, declaration| result += declaration.to_attributes }
+      @declarations.inject([]) { |result, declaration| result += declaration.to_attributes }
     end
 
     def overridable?

lib/factory_girl/definition.rb

@@ -47,8 +47,8 @@ module FactoryGirl
         declarations.attributes
 
         defined_traits.each do |defined_trait|
-          base_traits.each       {|bt| bt.define_trait defined_trait }
-          additional_traits.each {|bt| bt.define_trait defined_trait }
+          base_traits.each       { |bt| bt.define_trait defined_trait }
+          additional_traits.each { |bt| bt.define_trait defined_trait }
         end
 
         @compiled = true
@@ -85,11 +85,11 @@ module FactoryGirl
     end
 
     def before(*names, &block)
-      callback(*names.map {|name| "before_#{name}" }, &block)
+      callback(*names.map { |name| "before_#{name}" }, &block)
     end
 
     def after(*names, &block)
-      callback(*names.map {|name| "after_#{name}" }, &block)
+      callback(*names.map { |name| "after_#{name}" }, &block)
     end
 
     def callback(*names, &block)
@@ -114,7 +114,7 @@ module FactoryGirl
     end
 
     def trait_for(name)
-      defined_traits.detect {|trait| trait.name == name }
+      defined_traits.detect { |trait| trait.name == name }
     end
 
     def initialize_copy(source)

lib/factory_girl/factory.rb

@@ -43,7 +43,7 @@ module FactoryGirl
     end
 
     def human_names
-      names.map {|name| name.to_s.humanize.downcase }
+      names.map { |name| name.to_s.humanize.downcase }
     end
 
     def associations
@@ -82,7 +82,7 @@ module FactoryGirl
     def compile
       unless @compiled
         parent.compile
-        parent.defined_traits.each {|trait| define_trait(trait) }
+        parent.defined_traits.each { |trait| define_trait(trait) }
         @definition.compile
         build_hierarchy
         @compiled = true

lib/factory_girl/find_definitions.rb

@@ -10,7 +10,7 @@ module FactoryGirl
   self.definition_file_paths = %w(factories test/factories spec/factories)
 
   def self.find_definitions
-    absolute_definition_file_paths = definition_file_paths.map {|path| File.expand_path(path) }
+    absolute_definition_file_paths = definition_file_paths.map { |path| File.expand_path(path) }
 
     absolute_definition_file_paths.uniq.each do |path|
       load("#{path}.rb") if File.exists?("#{path}.rb")

spec/acceptance/callbacks_spec.rb

@@ -82,8 +82,8 @@ describe "callbacks using syntax methods without referencing FactoryGirl explici
 
       factory :user do
         after(:stub)   { generate(:sequence_3) }
-        after(:build)  {|user| user.first_name = generate(:sequence_1) }
-        after(:create) {|user, evaluator| user.last_name = generate(:sequence_2) }
+        after(:build)  { |user| user.first_name = generate(:sequence_1) }
+        after(:create) { |user, evaluator| user.last_name = generate(:sequence_2) }
       end
     end
   end
@@ -149,8 +149,8 @@ describe "custom callbacks" do
         first_name "John"
         last_name  "Doe"
 
-        before(:custom) {|instance| instance.first_name = "Overridden First" }
-        after(:custom)  {|instance| instance.last_name  = "Overridden Last" }
+        before(:custom) { |instance| instance.first_name = "Overridden First" }
+        after(:custom)  { |instance| instance.last_name  = "Overridden Last" }
         callback(:totally_custom) do |instance|
           instance.first_name = "Totally"
           instance.last_name  = "Custom"

spec/acceptance/global_to_create_spec.rb

@@ -6,10 +6,10 @@ describe 'global to_create' do
     define_model('Post', name: :string)
 
     FactoryGirl.define do
-      to_create {|instance| instance.name = 'persisted!' }
+      to_create { |instance| instance.name = 'persisted!' }
 
       trait :override_to_create do
-        to_create {|instance| instance.name = 'override' }
+        to_create { |instance| instance.name = 'override' }
       end
 
       factory :user do
@@ -75,7 +75,7 @@ describe 'global skip_create' do
       skip_create
 
       trait :override_to_create do
-        to_create {|instance| instance.name = 'override' }
+        to_create { |instance| instance.name = 'override' }
       end
 
       factory :user do

spec/acceptance/initialize_with_spec.rb

@@ -160,7 +160,7 @@ describe "initialize_with doesn't duplicate assignment on attributes accessed fr
     end
 
     FactoryGirl.define do
-      sequence(:email) {|n| "person#{n}@example.com" }
+      sequence(:email) { |n| "person#{n}@example.com" }
 
       factory :user do
         email
@@ -192,7 +192,7 @@ describe "initialize_with has access to all attributes for construction" do
     end
 
     FactoryGirl.define do
-      sequence(:email) {|n| "person#{n}@example.com" }
+      sequence(:email) { |n| "person#{n}@example.com" }
 
       factory :user do
         ignore do

spec/acceptance/keyed_by_class_spec.rb

@@ -9,7 +9,7 @@ describe 'finding factories keyed by class instead of symbol' do
     FactoryGirl.define do
       factory :user do
         name 'John Doe'
-        sequence(:email) {|n| "person#{n}@example.com" }
+        sequence(:email) { |n| "person#{n}@example.com" }
       end
     end
   end

spec/acceptance/modify_factories_spec.rb

@@ -7,7 +7,7 @@ describe "modifying factories" do
     define_model('User', name: :string, admin: :boolean, email: :string, login: :string)
 
     FactoryGirl.define do
-      sequence(:email) {|n| "user#{n}@example.com" }
+      sequence(:email) { |n| "user#{n}@example.com" }
 
       factory :user do
         email

spec/acceptance/nested_attributes_spec.rb

@@ -17,7 +17,7 @@ describe "association assignment from nested attributes" do
       end
 
       factory :comment do
-        sequence(:body) {|n| "Body #{n}" }
+        sequence(:body) { |n| "Body #{n}" }
       end
     end
   end

spec/acceptance/parent_spec.rb

@@ -78,7 +78,7 @@ describe "nested factories with different parents" do
         end
 
         factory :uppercase_male_user, parent: :male_user do
-          after(:build) {|user| user.name = user.name.upcase }
+          after(:build) { |user| user.name = user.name.upcase }
         end
       end
     end

spec/acceptance/sequence_context_spec.rb

@@ -14,7 +14,7 @@ describe 'sequences are evaluated in the correct context' do
   it 'builds a sequence calling sprintf correctly' do
     FactoryGirl.define do
       factory :sequence_with_sprintf, class: User do
-        sequence(:id) {|n| sprintf("foo%d", n) }
+        sequence(:id) { |n| sprintf("foo%d", n) }
       end
     end
 
@@ -24,7 +24,7 @@ describe 'sequences are evaluated in the correct context' do
   it 'invokes the correct method on the instance' do
     FactoryGirl.define do
       factory :sequence_with_public_method, class: User do
-        sequence(:id) {|n| public_method(:awesome).call }
+        sequence(:id) { |n| public_method(:awesome).call }
       end
     end
 
@@ -34,7 +34,7 @@ describe 'sequences are evaluated in the correct context' do
   it 'invokes a method with no arguments on the instance' do
     FactoryGirl.define do
       factory :sequence_with_frozen, class: User do
-        sequence(:id) {|n| frozen? }
+        sequence(:id) { |n| frozen? }
       end
     end
 
@@ -44,7 +44,7 @@ describe 'sequences are evaluated in the correct context' do
   it 'allows direct reference of a method in a sequence' do
     FactoryGirl.define do
       factory :sequence_referencing_attribute_directly, class: User do
-        sequence(:id) {|n| "#{awesome}#{n}" }
+        sequence(:id) { |n| "#{awesome}#{n}" }
       end
     end
     expect(FactoryGirl.build(:sequence_referencing_attribute_directly).id).to eq 'aw yeah1'

spec/acceptance/sequence_spec.rb

@@ -33,7 +33,7 @@ describe "sequences" do
 
   it "generates aliases for the sequence that reference the same block" do
     FactoryGirl.define do
-      sequence(:size, aliases: [:count, :length]) {|n| "called-#{n}" }
+      sequence(:size, aliases: [:count, :length]) { |n| "called-#{n}" }
     end
 
     first_value  = generate(:size)
@@ -47,7 +47,7 @@ describe "sequences" do
 
   it "generates aliases for the sequence that reference the same block and retains value" do
     FactoryGirl.define do
-      sequence(:size, "a", aliases: [:count, :length]) {|n| "called-#{n}" }
+      sequence(:size, "a", aliases: [:count, :length]) { |n| "called-#{n}" }
     end
 
     first_value  = generate(:size)

spec/acceptance/syntax_methods_within_dynamic_attributes_spec.rb

@@ -12,7 +12,7 @@ describe "syntax methods within dynamic attributes" do
     define_model("User", email: :string)
 
     FactoryGirl.define do
-      sequence(:email_address) {|n| "person-#{n}@example.com" }
+      sequence(:email_address) { |n| "person-#{n}@example.com" }
 
       factory :user do
         email { generate(:email_address) }
@@ -42,7 +42,7 @@ describe "syntax methods within dynamic attributes" do
   it 'allows syntax methods to be used when the block has an arity of 1' do
     FactoryGirl.define do
       factory :post_using_block_with_variable, parent: :post do
-        user {|_| build(:user) }
+        user { |_| build(:user) }
       end
     end
 

spec/acceptance/traits_spec.rb

@@ -187,11 +187,11 @@ describe "traits with callbacks" do
         name "John"
 
         trait :great do
-          after(:create) {|user| user.name.upcase! }
+          after(:create) { |user| user.name.upcase! }
         end
 
         trait :awesome do
-          after(:create) {|user| user.name = "awesome" }
+          after(:create) { |user| user.name = "awesome" }
         end
 
         factory :caps_user, traits: [:great]
@@ -232,7 +232,7 @@ describe "traits added via strategy" do
         end
 
         trait :great do
-          after(:create) {|user| user.name.upcase! }
+          after(:create) { |user| user.name.upcase! }
         end
       end
     end
@@ -427,11 +427,11 @@ describe "traits with to_create" do
     FactoryGirl.define do
       factory :user do
         trait :with_to_create do
-          to_create {|instance| instance.name = "to_create" }
+          to_create { |instance| instance.name = "to_create" }
         end
 
         factory :sub_user do
-          to_create {|instance| instance.name = "sub" }
+          to_create { |instance| instance.name = "sub" }
 
           factory :child_user
         end
@@ -444,7 +444,7 @@ describe "traits with to_create" do
 
         factory :sub_user_with_trait_and_override do
           with_to_create
-          to_create {|instance| instance.name = "sub with trait and override" }
+          to_create { |instance| instance.name = "sub with trait and override" }
 
           factory :child_user_with_trait_and_override
         end
@@ -479,7 +479,7 @@ describe "traits with to_create" do
   it "gives additional traits higher priority than base traits and factory definition" do
     FactoryGirl.define do
       trait :overridden do
-        to_create {|instance| instance.name = "completely overridden" }
+        to_create { |instance| instance.name = "completely overridden" }
       end
     end
 
@@ -588,7 +588,7 @@ describe "nested implicit traits" do
       FactoryGirl.define do
         trait :female do
           gender "female"
-          to_create {|instance| instance.gender = instance.gender.upcase }
+          to_create { |instance| instance.gender = instance.gender.upcase }
         end
 
         trait :jane_doe do
@@ -597,7 +597,7 @@ describe "nested implicit traits" do
 
         trait :admin do
           role "admin"
-          after(:build) {|instance| instance.role = instance.role.upcase }
+          after(:build) { |instance| instance.role = instance.role.upcase }
         end
 
         trait :female_admin do
@@ -619,7 +619,7 @@ describe "nested implicit traits" do
         factory :user do
           trait :female do
             gender "female"
-            to_create {|instance| instance.gender = instance.gender.upcase }
+            to_create { |instance| instance.gender = instance.gender.upcase }
           end
 
           trait :jane_doe do
@@ -628,7 +628,7 @@ describe "nested implicit traits" do
 
           trait :admin do
             role "admin"
-            after(:build) {|instance| instance.role = instance.role.upcase }
+            after(:build) { |instance| instance.role = instance.role.upcase }
           end
 
           trait :female_admin do
@@ -653,7 +653,7 @@ describe "implicit traits containing callbacks" do
         value 0
 
         trait :trait_with_callback do
-          after(:build) {|user| user.value += 1 }
+          after(:build) { |user| user.value += 1 }
         end
 
         factory :user_with_trait_with_callback do

spec/acceptance/transient_attributes_spec.rb

@@ -5,7 +5,7 @@ describe "transient attributes" do
     define_model("User", name: :string, email: :string)
 
     FactoryGirl.define do
-      sequence(:name) {|n| "John #{n}" }
+      sequence(:name) { |n| "John #{n}" }
 
       factory :user do
         ignore do

spec/factory_girl/attribute/dynamic_spec.rb

@@ -38,7 +38,7 @@ describe FactoryGirl::Attribute::Dynamic do
   end
 
   context "with a block returning a sequence" do
-    let(:block) { -> { FactoryGirl.register_sequence(FactoryGirl::Sequence.new(:email, 1) {|n| "foo#{n}" }) } }
+    let(:block) { -> { FactoryGirl.register_sequence(FactoryGirl::Sequence.new(:email, 1) { |n| "foo#{n}" }) } }
 
     it "raises a sequence abuse error" do
       expect { subject.to_proc.call }.to raise_error(FactoryGirl::SequenceAbuseError)

spec/factory_girl/definition_proxy_spec.rb

@@ -100,7 +100,7 @@ describe FactoryGirl::DefinitionProxy, "#sequence" do
   end
 
   it "creates a new sequence with a block" do
-    sequence_block = Proc.new {|n| "user+#{n}@example.com" }
+    sequence_block = Proc.new { |n| "user+#{n}@example.com" }
     proxy.sequence(:great, 1, &sequence_block)
     expect(FactoryGirl::Sequence).to have_received(:new).with(:great, 1, &sequence_block)
   end

spec/factory_girl/sequence_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe FactoryGirl::Sequence do
   describe "a basic sequence" do
     let(:name) { :test }
-    subject    { FactoryGirl::Sequence.new(name) {|n| "=#{n}" } }
+    subject    { FactoryGirl::Sequence.new(name) { |n| "=#{n}" } }
 
     its(:name)  { should eq name }
     its(:names) { should eq [name] }
@@ -16,7 +16,7 @@ describe FactoryGirl::Sequence do
   end
 
   describe "a custom sequence" do
-    subject    { FactoryGirl::Sequence.new(:name, "A") {|n| "=#{n}" } }
+    subject    { FactoryGirl::Sequence.new(:name, "A") { |n| "=#{n}" } }
     its(:next) { should eq "=A" }
 
     describe "when incrementing" do
@@ -67,7 +67,7 @@ describe FactoryGirl::Sequence do
   end
 
   describe "iterating over items in an enumerator" do
-    subject { FactoryGirl::Sequence.new(:name, %w[foo bar].to_enum) {|n| "=#{n}" } }
+    subject { FactoryGirl::Sequence.new(:name, %w[foo bar].to_enum) { |n| "=#{n}" } }
 
     it "navigates to the next items until no items remain" do
       expect(subject.next).to eq "=foo"
@@ -77,7 +77,7 @@ describe FactoryGirl::Sequence do
   end
 
   describe "a custom sequence and scope" do
-    subject { FactoryGirl::Sequence.new(:name, 'A') {|n| "=#{n}#{foo}" } }
+    subject { FactoryGirl::Sequence.new(:name, 'A') { |n| "=#{n}#{foo}" } }
     let(:scope) { stub('scope', foo: 'attribute') }
 
     it 'increments within the correct scope' do