@@ -32,7 +32,7 @@ module Machinist attributes = {} lathe.assigned_attributes.each_pair do |attribute, value| association = lathe.object.class.reflect_on_association(attribute) - if association && association.macro == :belongs_to + if association && association.macro == :belongs_to && !value.nil? attributes[association.primary_key_name.to_sym] = value.id else attributes[attribute] = value lib/machinist/active_record.rb @@ -1,5 +1,6 @@ require File.dirname(__FILE__) + '/spec_helper' require 'machinist/active_record' +require 'active_support/whiny_nil' module MachinistActiveRecordSpecs @@ -131,6 +132,16 @@ module MachinistActiveRecordSpecs comment[:post].should be_nil comment[:post_id].should_not be_nil end + + describe "on a belongs_to association" do + it "should allow explicitly setting the association to nil" do + Comment.blueprint { post } + Comment.blueprint(:no_post) { post { nil } } + lambda { + @comment = Comment.plan(:no_post) + }.should_not raise_error + end + end describe "on a has_many association" do before do spec/active_record_spec.rb abddd6b36b2f2d764d27660b0c02c62eb7e0aa65 Kevin Bullock kbullock@ringworld.org http://github.com/notahat/machinist/commit/a98739d88e7fb97ab5afdf5ca83004dabc0ce3cb a98739d88e7fb97ab5afdf5ca83004dabc0ce3cb 2009-10-31T22:36:56-07:00 2009-10-15T08:19:59-07:00 allow setting belongs_to id to nil, even if nil is whiny 04524f1fc919577e482c8f6f179724d163022ed7 Pete Yandell pete@notahat.com