TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Never mind on allowing blank

Browse Source 
More hassle than its worth. Just account for the fact that rich text can be blank instead, but continue to create the record.
This commit is contained in:
David Heinemeier Hansson 2018-09-12 15:51:06 -07:00
parent 3431c0b3ee
commit 531d7dd584
6 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/action_text/rich_text.rb
View File

@ -6,10 +6,8 @@ class ActionText::RichText < ActiveRecord::Base
belongs_to :record, polymorphic: true, touch: true
has_many_attached :embeds
validate { errors.add(:body, "is missing") if body.blank? }
before_save do
self.embeds = body.attachments.map(&:attachable)
self.embeds = body.attachments.map(&:attachable) if body.present?
end
def to_s

2
db/migrate/201805281641_create_action_text_tables.rb
View File

@ -2,7 +2,7 @@ class CreateActionTextTables < ActiveRecord::Migration[5.2]
def change
create_table :action_text_rich_texts do |t|
t.string :name, null: false
t.text :body, limit: 16777215, null: false
t.text :body, limit: 16777215
t.references :record, null: false, polymorphic: true, index: false
t.datetime :created_at, null: false

13
lib/action_text/attribute.rb
View File

@ -37,19 +37,8 @@ def #{name}=(body)
scope :"with_rich_text_#{name}", -> { includes("rich_text_#{name}") }
scope :"with_rich_text_#{name}_and_embeds", -> { includes("rich_text_#{name}": { embeds_attachments: :blob }) }
before_save do
# If there's no body set, we need to reset the rich text record such that it is not autosaved.
public_send("#{name}=", nil) if public_send(name).body.blank?
end
after_save do
rich_text = public_send(name)
if rich_text.changed? && rich_text.body.present?
rich_text.save
elsif rich_text.persisted? && rich_text.body.blank?
rich_text.destroy
end
public_send(name).save if public_send(name).changed?
end
end
end

2
test/dummy/db/migrate/2018052816_create_action_text_tables.rb
View File

@ -2,7 +2,7 @@ class CreateActionTextTables < ActiveRecord::Migration[5.2]
def change
create_table :action_text_rich_texts do |t|
t.string :name, null: false
t.text :body, limit: 16777215, null: false
t.text :body, limit: 16777215
t.references :record, null: false, polymorphic: true, index: false
t.datetime :created_at, null: false

2
test/dummy/db/schema.rb
View File

@ -14,7 +14,7 @@
create_table "action_text_rich_texts", force: :cascade do |t|
t.string "name", null: false
t.text "body", limit: 16777215, null: false
t.text "body", limit: 16777215
t.string "record_type", null: false
t.integer "record_id", null: false
t.datetime "created_at", null: false

10
test/unit/content_test.rb
View File

@ -7,19 +7,11 @@ class ContentTest < ActiveSupport::TestCase
assert_equal "Hello world", message.content.body.to_plain_text
end
test "creating a model with rich text content will not create a rich text record" do
test "without content" do
message = Message.create!(subject: "Greetings")
assert message.content.body.nil?
end
test "removing content removes the rich text record" do
message = Message.create!(subject: "Greetings", content: "<h1>Hello world</h1>")
assert_difference -> { ActionText::RichText.all.count }, -1 do
message.update!(content: "")
end
end
test "embed extraction" do
blob = create_file_blob(filename: "racecar.jpg", content_type: "image/jpg")
message = Message.create!(subject: "Greetings", content: ActionText::Content.new("Hello world").append_attachables(blob))