Merge remote branch 'origin/master' into restart

lib/annotate/annotate_models.rb

@@ -137,7 +137,7 @@ module AnnotateModels
           false
         else
           # Remove old schema info
-          old_content.sub!(/^# #{COMPAT_PREFIX}.*?\n(#.*\n)*\n/, '')
+          old_content.sub!(/^\n?# #{COMPAT_PREFIX}.*?\n(#.*\n)*\n/, '')
 
           # Write it back
           new_content = options[:position].to_s == 'after' ? (old_content + "\n" + info_block) : (info_block + old_content) 
@@ -152,7 +152,7 @@ module AnnotateModels
       if File.exist?(file_name)
         content = File.read(file_name)
 
-        content.sub!(/^# #{COMPAT_PREFIX}.*?\n(#.*\n)*\n/, '')
+        content.sub!(/^\n?# #{COMPAT_PREFIX}.*?\n(#.*\n)*\n/, '')
 
         File.open(file_name, "wb") { |f| f.puts content }
       end

spec/annotate/annotate_models_spec.rb

@@ -149,4 +149,62 @@ EOF
     end
   end
 
+  describe "#remove_annotation_of_file" do
+    def create(file, body="hi")
+      File.open(@dir + '/' + file, "w") do |f|
+        f.puts(body)
+      end
+    end
+    def content(file)
+      File.read(@dir + '/' + file)
+    end
+
+    before :all do
+      require "tmpdir"
+      @dir = Dir.tmpdir + "/#{Time.now.to_i}" + "/annotate_models"
+      FileUtils.mkdir_p(@dir)
+      create("before.rb", <<-EOS)
+# == Schema Information
+#
+# Table name: foo
+#
+#  id                  :integer         not null, primary key
+#  created_at          :datetime
+#  updated_at          :datetime
+#
+
+class Foo < ActiveRecord::Base
+end
+      EOS
+      create("after.rb", <<-EOS)
+class Foo < ActiveRecord::Base
+end
+
+# == Schema Information
+#
+# Table name: foo
+#
+#  id                  :integer         not null, primary key
+#  created_at          :datetime
+#  updated_at          :datetime
+#
+
+      EOS
+    end
+    it "should remove before annotate" do
+      AnnotateModels.remove_annotation_of_file(@dir + '/' + "before.rb")
+      content("before.rb").should == <<-EOS
+class Foo < ActiveRecord::Base
+end
+      EOS
+    end
+    it "should remove after annotate" do
+      AnnotateModels.remove_annotation_of_file(@dir + '/' + "after.rb")
+      content("after.rb").should == <<-EOS
+class Foo < ActiveRecord::Base
+end
+      EOS
+    end
+  end
+
 end