@@ -31,19 +31,20 @@ module Fixjour end } - record.class.reflect_on_all_associations(:has_one).each(&transfer_singular_ids) - record.class.reflect_on_all_associations(:belongs_to).each(&transfer_singular_ids) - transfer_plural_ids = proc { |reflection| - if associated = record.send(reflection.name) + associated = record.send(reflection.name) + if associated.length > 0 associated.each { |rec| rec.new_record? && rec.save! } - key = reflection.options[:foreign_key] || reflection.name.to_s + '_id' - valid_attributes[key.to_s + 's'] = associated.map(&:id) + key = (reflection.options[:foreign_key] || reflection.name).to_s + key.gsub!(/_ids?$/, '') + valid_attributes[key.singularize + '_ids'] = associated.map(&:id) valid_attributes.delete(reflection.name) end } - record.class.reflect_on_all_associations(:has_many).each(&transfer_plural_ids) + builder.klass.reflect_on_all_associations(:has_one).each(&transfer_singular_ids) + builder.klass.reflect_on_all_associations(:belongs_to).each(&transfer_singular_ids) + builder.klass.reflect_on_all_associations(:has_many).each(&transfer_plural_ids) valid_attributes.stringify_keys! valid_attributes.make_indifferent! lib/fixjour/definitions.rb @@ -289,7 +289,11 @@ describe Fixjour do describe "plural association ids" do it "sets appropriate foreign keys" do valid_bar_attributes[:people].should be_nil - valid_bar_attributes[:people_ids].should_not be_empty + valid_bar_attributes[:person_ids].should_not be_empty + end + + it "leaves out blank keys" do + valid_bar_attributes.should_not have_key('foo_ids') end end spec/fixjour_spec.rb @@ -1,3 +1,4 @@ +require 'cgi' require 'spec' require 'faker' require 'rr' @@ -11,6 +12,12 @@ end require File.dirname(__FILE__) + '/../lib/fixjour' +def pre(*args) + args.each { |arg| + puts '<pre>' + CGI.escapeHTML(arg.is_a?(String) ? arg : arg.inspect) + '</pre>' + } +end + Spec::Runner.configure do |c| c.mock_with(:rr) end @@ -36,6 +43,7 @@ build_model(:bars) do string :name has_many :people + has_many :foos end build_model(:bazzs) do spec/spec_helper.rb 87966d32db7fdf97c74574da9fccc2ee23943149 Pat Nakajima patnakajima@gmail.com http://github.com/nakajima/fixjour/commit/fa5ed2ed8136660ddb89a2ac9d1fbb80fcdf5261 fa5ed2ed8136660ddb89a2ac9d1fbb80fcdf5261 2009-06-25T18:11:36-07:00 2009-06-25T18:11:36-07:00 Fixed association key names 95772d7faeafffc26f39d9afe4adf05b91e36270 Pat Nakajima patnakajima@gmail.com