Commit a7afaf35 by Chris Ross

Modify the model annontator so that if the schema is already in the

model file, it will be replaced into the same location. If it didn't previously exist, it'll be placed according to the "position", as before.
parent 9c68c8c9
...@@ -126,11 +126,12 @@ module AnnotateModels ...@@ -126,11 +126,12 @@ module AnnotateModels
if old_header == new_header if old_header == new_header
false false
else else
# Remove old schema info # Replace the old schema info with the new schema info
old_content.sub!(/^# #{COMPAT_PREFIX}.*?\n(#.*\n)*\n/, '') new_content = old_content.sub(/^# #{COMPAT_PREFIX}.*?\n(#.*\n)*\n/, info_block)
# But, if there *was* no old schema info, we simply need to insert it
# Write it back if new_content == old_content
new_content = options[:position] == 'before' ? (info_block + old_content) : (old_content + "\n" + info_block) new_content = options[:position] == 'before' ? (info_block + old_content) : (old_content + "\n" + info_block)
end
File.open(file_name, "wb") { |f| f.puts new_content } File.open(file_name, "wb") { |f| f.puts new_content }
true true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment