@@ -2,6 +2,7 @@ class PartType < ActiveRecord::Base has_many :template_parts validates_presence_of :name - validates_inclusion_of :field_type, :in => %w{text_area text_field radio_button hidden predefined} + validates_uniqueness_of :name + validates_inclusion_of :field_type, :in => %w{text_area text_field check_box radio_button hidden predefined} end app/models/part_type.rb @@ -1,14 +1,23 @@ class CreateDefaultPartTypes < ActiveRecord::Migration - def self.up + def self.defaults [ {:name => "One-line", :field_type => "text_field", :field_class => "text"}, {:name => "Plain textarea", :field_type => "text_area", :field_class => "textarea"}, {:name => "Boolean", :field_type => "check_box"}, {:name => "Predefined", :field_type => "predefined"} - ].each {|a| PartType.create(a) } + ] + end + + def self.up + self.defaults.each do |a| + PartType.create(a) + end end - + def self.down - PartType.destroy_all + self.defaults.each do |a| + pt = PartType.find_by_name(a[:name]) + pt.destroy unless pt.nil? + end end -end \ No newline at end of file +end db/migrate/009_create_default_part_types.rb @@ -4,20 +4,25 @@ describe PartType do before :each do @part_type = PartType.new :name => "Test type", :field_type => 'text_area' end - + it "should require a name" do @part_type.name = nil @part_type.should_not be_valid @part_type.should have(1).error_on(:name) end - + it "should require a valid field type" do @part_type.field_type = 'foobar' @part_type.should_not be_valid @part_type.should have(1).error_on(:field_type) end - + it "should be valid with correct parameters" do @part_type.should be_valid end -end \ No newline at end of file + + it "should not allow creation of a new part type with a duplicate name" do + @new_part_type = PartType.create :name => @part_type.name + @new_part_type.id.should be_nil + end +end spec/models/part_type_spec.rb 04d2ede76e99eb6e28038c888a30c3e4f186af49 Andrew vonderLuft avonderluft@avlux.net http://github.com/seancribbs/radiant-templates-extension/commit/624d43ddc31e4c04e6f28feec5a10d79bc83125f 624d43ddc31e4c04e6f28feec5a10d79bc83125f 2009-04-30T11:27:28-07:00 2009-04-30T11:27:28-07:00 require template part type name to be unique; fix migrations so that duplicate part types are not created, and only default part types are removed with rollback; update model spec to test for invalidity of duplicate names. f36edc23d72f3c74c235f0a52db46b1696546d06 Andrew vonderLuft avonderluft@avlux.net