Set default formats in the database now that rails handles enums

Because rails now reads the defaults from the database correctly it
no longer works to set them conditionally in after_initialise as they
have already been set.

diff --git a/app/models/diary_comment.rb b/app/models/diary_comment.rb
index 9d29f52b78e9be2a00762df206a3e1824835e0af..5ace3d1580b4d2413613d79af3bcd993d0414573 100644 (file)
--- a/app/models/diary_comment.rb
+++ b/app/models/diary_comment.rb
@@ -5,7 +5,6 @@ class DiaryComment < ActiveRecord::Base
   validates_presence_of :body
   validates_associated :diary_entry
 
-  after_initialize :set_defaults
   after_save :spam_check
 
   def body
@@ -23,10 +22,6 @@ class DiaryComment < ActiveRecord::Base
 
 private
 
-  def set_defaults
-    self.body_format = "markdown" unless self.attribute_present?(:body_format)
-  end
-
   def spam_check
     user.spam_check
   end

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index 58f8710f95d10d8168989e76d449714f57aab2fd..c0fbac546a9f47756c6239ee06fd9ee3cb1bb883 100644 (file)
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -16,7 +16,6 @@ class DiaryEntry < ActiveRecord::Base
                             :greater_than_or_equal_to => -180, :less_than_or_equal_to => 180
   validates_associated :language
 
-  after_initialize :set_defaults
   after_save :spam_check
 
   def body
@@ -25,10 +24,6 @@ class DiaryEntry < ActiveRecord::Base
 
 private
 
-  def set_defaults
-    self.body_format = "markdown" unless self.attribute_present?(:body_format)
-  end
-
   def spam_check
     user.spam_check
   end

diff --git a/app/models/message.rb b/app/models/message.rb
index b51c59f4359d950bd614be043ad2bf79e2174ddb..b05d005b04f95ea1eec343228744d744bc2a8935 100644 (file)
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -9,8 +9,6 @@ class Message < ActiveRecord::Base
   validates_inclusion_of :message_read, :in => [ true, false ]
   validates_as_utf8 :title
 
-  after_initialize :set_defaults
-
   def self.from_mail(mail, from, to)
     if mail.multipart?
       if mail.text_part
@@ -47,10 +45,4 @@ class Message < ActiveRecord::Base
     md5 << body
     md5.hexdigest
   end
-
-private
-
-  def set_defaults
-    self.body_format = "markdown" unless self.attribute_present?(:body_format)
-  end
 end

diff --git a/app/models/redaction.rb b/app/models/redaction.rb
index 43f5b3c7bf70ffb67d8a47d8509c31a9e9fb0a8f..a9bdf5580dc68712d1ffef58c4f4743ca9d5db6d 100644 (file)
--- a/app/models/redaction.rb
+++ b/app/models/redaction.rb
@@ -14,19 +14,9 @@ class Redaction < ActiveRecord::Base
   has_many :old_ways
   has_many :old_relations
 
-  after_initialize :set_defaults
-
   # this method overrides the AR default to provide the rich 
   # text object for the description field.
   def description
     RichText.new(read_attribute(:description_format), read_attribute(:description))
   end
-
-  private
-
-  # set the default format to be markdown, in the absence of
-  # any other setting.
-  def set_defaults
-    self.description_format = "markdown" unless self.attribute_present?(:description_format)
-  end
 end

diff --git a/app/models/user.rb b/app/models/user.rb
index c845d4d0acd47b3064d98a4282bebdfaef4de9b9..7ace4bca47b76a8c6e9369b14cd55ddefc451551 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -243,7 +243,6 @@ private
 
   def set_defaults
     self.creation_time = Time.now.getutc unless self.attribute_present?(:creation_time)
-    self.description_format = "markdown" unless self.attribute_present?(:description_format)
   end
 
   def encrypt_password

diff --git a/app/models/user_block.rb b/app/models/user_block.rb
index cb1a97dcabfafa8ab5c938dfc408a24174fc8a84..d8fa95cb2319f2aeb7d31a9995641ca1a8496231 100644 (file)
--- a/app/models/user_block.rb
+++ b/app/models/user_block.rb
@@ -4,8 +4,6 @@ class UserBlock < ActiveRecord::Base
   belongs_to :user, :class_name => "User", :foreign_key => :user_id
   belongs_to :creator, :class_name => "User", :foreign_key => :creator_id
   belongs_to :revoker, :class_name => "User", :foreign_key => :revoker_id
-  
-  after_initialize :set_defaults
 
   PERIODS = USER_BLOCK_PERIODS
 
@@ -41,12 +39,6 @@ class UserBlock < ActiveRecord::Base
 
 private
 
-  ##
-  # set default values for new records.
-  def set_defaults
-    self.reason_format = "markdown" unless self.attribute_present?(:reason_format)
-  end
-
   ##
   # validate that only moderators are allowed to change the
   # block. this should be caught and dealt with in the controller,

diff --git a/db/migrate/20150110152606_change_default_formats.rb b/db/migrate/20150110152606_change_default_formats.rb
new file mode 100644 (file)
index 0000000..84bc2be
--- /dev/null
+++ b/db/migrate/20150110152606_change_default_formats.rb
@@ -0,0 +1,17 @@
+class ChangeDefaultFormats < ActiveRecord::Migration
+  def up
+    change_column_default :diary_entries, :body_format, "markdown"
+    change_column_default :diary_comments, :body_format, "markdown"
+    change_column_default :messages, :body_format, "markdown"
+    change_column_default :users, :description_format, "markdown"
+    change_column_default :user_blocks, :reason_format, "markdown"
+  end
+
+  def down
+    change_column_default :diary_entries, :body_format, "html"
+    change_column_default :diary_comments, :body_format, "html"
+    change_column_default :messages, :body_format, "html"
+    change_column_default :users, :description_format, "html"
+    change_column_default :user_blocks, :reason_format, "html"
+  end
+end

diff --git a/db/structure.sql b/db/structure.sql
index cfbd368fda38685759cd9ee9bc2cbf21d3a2b986..e54354a038c30c0abf419da1f943f48ffa65cf82 100644 (file)
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -485,7 +485,7 @@ CREATE TABLE diary_comments (
     created_at timestamp without time zone NOT NULL,
     updated_at timestamp without time zone NOT NULL,
     visible boolean DEFAULT true NOT NULL,
-    body_format format_enum DEFAULT 'html'::format_enum NOT NULL
+    body_format format_enum DEFAULT 'markdown'::format_enum NOT NULL
 );
 
 
@@ -523,7 +523,7 @@ CREATE TABLE diary_entries (
     longitude double precision,
     language_code character varying DEFAULT 'en'::character varying NOT NULL,
     visible boolean DEFAULT true NOT NULL,
-    body_format format_enum DEFAULT 'html'::format_enum NOT NULL
+    body_format format_enum DEFAULT 'markdown'::format_enum NOT NULL
 );
 
 
@@ -684,7 +684,7 @@ CREATE TABLE messages (
     to_user_id bigint NOT NULL,
     to_user_visible boolean DEFAULT true NOT NULL,
     from_user_visible boolean DEFAULT true NOT NULL,
-    body_format format_enum DEFAULT 'html'::format_enum NOT NULL
+    body_format format_enum DEFAULT 'markdown'::format_enum NOT NULL
 );
 
 
@@ -983,7 +983,7 @@ CREATE TABLE user_blocks (
     revoker_id bigint,
     created_at timestamp without time zone,
     updated_at timestamp without time zone,
-    reason_format format_enum DEFAULT 'html'::format_enum NOT NULL
+    reason_format format_enum DEFAULT 'markdown'::format_enum NOT NULL
 );
 
 
@@ -1110,7 +1110,7 @@ CREATE TABLE users (
     openid_url character varying,
     preferred_editor character varying,
     terms_seen boolean DEFAULT false NOT NULL,
-    description_format format_enum DEFAULT 'html'::format_enum NOT NULL,
+    description_format format_enum DEFAULT 'markdown'::format_enum NOT NULL,
     image_fingerprint character varying,
     changesets_count integer DEFAULT 0 NOT NULL,
     traces_count integer DEFAULT 0 NOT NULL,
@@ -2541,6 +2541,8 @@ INSERT INTO schema_migrations (version) VALUES ('20140507110937');
 
 INSERT INTO schema_migrations (version) VALUES ('20140519141742');
 
+INSERT INTO schema_migrations (version) VALUES ('20150110152606');
+
 INSERT INTO schema_migrations (version) VALUES ('21');
 
 INSERT INTO schema_migrations (version) VALUES ('22');