Merge pull request #272 from kamilbielawski/develop

Remove new line before annotation wrapper closing statement

Author: ctran

lib/annotate/annotate_models.rb

@@ -292,7 +292,7 @@ def annotate_one_file(file_name, info_block, position, options={})
           end
 
           wrapper_open = options[:wrapper_open] ? "# #{options[:wrapper_open]}\n" : ""
-          wrapper_close = options[:wrapper_close] ? "\n# #{options[:wrapper_close]}" : ""
+          wrapper_close = options[:wrapper_close] ? "# #{options[:wrapper_close]}\n" : ""
           wrapped_info_block = "#{wrapper_open}#{info_block}#{wrapper_close}"
           # if there *was* no old schema info (no substitution happened) or :force was passed,
           # we simply need to insert it in correct position

spec/annotate/annotate_models_spec.rb

@@ -552,7 +552,7 @@ def encoding_comments_list_each
 
     it 'should wrap annotation if wrapper is specified' do
       annotate_one_file :wrapper_open => 'START', :wrapper_close => 'END'
-      expect(File.read(@model_file_name)).to eq("# START\n#{@schema_info}\n# END\n#{@file_content}")
+      expect(File.read(@model_file_name)).to eq("# START\n#{@schema_info}# END\n\n#{@file_content}")
     end
 
     describe "with existing annotation => :before" do