Merge pull request #116 from Mik-die/optional_ending_lines

Remove excessive newline when annotation is put after code

Author: ctran

lib/annotate/annotate_models.rb

@@ -5,7 +5,7 @@ module AnnotateModels
   PREFIX           = "== Schema Information"
   PREFIX_MD        = "## Schema Information"
   END_MARK         = "== Schema Information End"
-  PATTERN          = /^\n?# (?:#{COMPAT_PREFIX}|#{COMPAT_PREFIX_MD}).*?\n(#.*\n)*\n/
+  PATTERN          = /^\n?# (?:#{COMPAT_PREFIX}|#{COMPAT_PREFIX_MD}).*?\n(#.*\n)*\n*/
 
   # File.join for windows reverse bar compat?
   # I dont use windows, can`t test
@@ -164,9 +164,9 @@ def get_schema_info(klass, header, options = {})
       if options[:format_rdoc]
         info << "#--\n"
         info << "# #{END_MARK}\n"
-        info << "#++\n\n"
+        info << "#++\n"
       else
-        info << "#\n\n"
+        info << "#\n"
       end
     end
 
@@ -208,7 +208,7 @@ def annotate_one_file(file_name, info_block, position, options={})
         return false if(old_content =~ /# -\*- SkipSchemaAnnotations.*\n/)
 
         # Ignore the Schema version line because it changes with each migration
-        header_pattern = /(^# Table name:.*?\n(#.*[\r]?\n)*[\r]?\n)/
+        header_pattern = /(^# Table name:.*?\n(#.*[\r]?\n)*[\r]?)/
         old_header = old_content.match(header_pattern).to_s
         new_header = info_block.match(header_pattern).to_s
 
@@ -242,7 +242,7 @@ def annotate_one_file(file_name, info_block, position, options={})
 
           new_content = options[position].to_s == 'after' ?
             (encoding_header + (old_content.rstrip + "\n\n" + info_block)) :
-            (encoding_header + info_block + old_content)
+            (encoding_header + info_block + "\n" + old_content)
 
           File.open(file_name, "wb") { |f| f.puts new_content }
           return true

spec/annotate/annotate_models_spec.rb

@@ -51,7 +51,6 @@ def mock_column(name, type, options={})
 #  id   :integer          not null, primary key
 #  name :string(50)       not null
 #
-
 EOS
   end
 
@@ -69,7 +68,6 @@ def mock_column(name, type, options={})
 #  id   :integer          not null
 #  name :string(50)       not null
 #
-
 EOS
   end
 
@@ -89,7 +87,6 @@ def mock_column(name, type, options={})
 #  b_id :integer          not null
 #  name :string(50)       not null
 #
-
 EOS
   end
   it "should get schema info with enum type " do
@@ -125,7 +122,6 @@ def mock_column(name, type, options={})
 #--
 # #{AnnotateModels::END_MARK}
 #++
-
 EOS
   end
 
@@ -195,7 +191,7 @@ class FooWithMacro < ActiveRecord::Base
       EOS
       check_class_name 'foo_with_macro.rb', 'FooWithMacro'
     end
-    
+
     it "should not care about known macros" do
       create('foo_with_known_macro.rb', <<-EOS)
         class FooWithKnownMacro < ActiveRecord::Base
@@ -365,12 +361,12 @@ def annotate_one_file options = {}
 
     it "should annotate the file before the model if position == 'before'" do
       annotate_one_file :position => "before"
-      File.read(@model_file_name).should == "#{@schema_info}#{@file_content}"
+      File.read(@model_file_name).should == "#{@schema_info}\n#{@file_content}"
     end
 
     it "should annotate before if given :position => :before" do
       annotate_one_file :position => :before
-      File.read(@model_file_name).should == "#{@schema_info}#{@file_content}"
+      File.read(@model_file_name).should == "#{@schema_info}\n#{@file_content}"
     end
 
     it "should annotate after if given :position => :after" do
@@ -402,7 +398,7 @@ class Foo::User < ActiveRecord::Base
                                        ])
       schema_info = AnnotateModels.get_schema_info(klass, "== Schema Info")
       AnnotateModels.annotate_one_file(model_file_name, schema_info, :position => :before)
-      File.read(model_file_name).should == "#{schema_info}#{file_content}"
+      File.read(model_file_name).should == "#{schema_info}\n#{file_content}"
     end
 
     describe "if a file can't be annotated" do