Fix #436 where extra line break is added when using windows CRLF (#490)

lib/annotate/annotate_models.rb

@@ -83,9 +83,9 @@ module AnnotateModels
   class << self
     def annotate_pattern(options = {})
       if options[:wrapper_open]
-        return /(?:^\n?# (?:#{options[:wrapper_open]}).*\n?# (?:#{COMPAT_PREFIX}|#{COMPAT_PREFIX_MD}).*?\n(#.*\n)*\n*)|^\n?# (?:#{COMPAT_PREFIX}|#{COMPAT_PREFIX_MD}).*?\n(#.*\n)*\n*/
+        return /(?:^(\n|\r\n)?# (?:#{options[:wrapper_open]}).*(\n|\r\n)?# (?:#{COMPAT_PREFIX}|#{COMPAT_PREFIX_MD}).*?(\n|\r\n)(#.*(\n|\r\n))*(\n|\r\n)*)|^(\n|\r\n)?# (?:#{COMPAT_PREFIX}|#{COMPAT_PREFIX_MD}).*?(\n|\r\n)(#.*(\n|\r\n))*(\n|\r\n)*/
       end
-      /^\n?# (?:#{COMPAT_PREFIX}|#{COMPAT_PREFIX_MD}).*?\n(#.*\n)*\n*/
+      /^(\n|\r\n)?# (?:#{COMPAT_PREFIX}|#{COMPAT_PREFIX_MD}).*?(\n|\r\n)(#.*(\n|\r\n))*(\n|\r\n)*/
     end
 
     def model_dir

spec/annotate/annotate_models_spec.rb

@@ -1165,6 +1165,28 @@ end
       EOS
     end
 
+    it 'should remove annotate if CRLF is used for line breaks' do
+      path = create 'before.rb', <<-EOS
+# == Schema Information
+#
+# Table name: foo\r\n#
+#  id                  :integer         not null, primary key
+#  created_at          :datetime
+#  updated_at          :datetime
+#
+\r\n
+class Foo < ActiveRecord::Base
+end
+      EOS
+
+      AnnotateModels.remove_annotation_of_file(path)
+
+      expect(content(path)).to eq <<-EOS
+class Foo < ActiveRecord::Base
+end
+      EOS
+    end
+
     it 'should remove after annotate' do
       path = create 'after.rb', <<-EOS
 class Foo < ActiveRecord::Base
@@ -1213,6 +1235,29 @@ end
       EOS
     end
 
+    it 'should remove wrapper if CRLF is used for line breaks' do
+      path = create 'opening_wrapper.rb', <<-EOS
+# wrapper\r\n# == Schema Information
+#
+# Table name: foo
+#
+#  id                  :integer         not null, primary key
+#  created_at          :datetime
+#  updated_at          :datetime
+#
+
+class Foo < ActiveRecord::Base
+end
+      EOS
+
+      AnnotateModels.remove_annotation_of_file(path, wrapper_open: 'wrapper')
+
+      expect(content(path)).to eq <<-EOS
+class Foo < ActiveRecord::Base
+end
+      EOS
+    end
+
     it 'should remove closing wrapper' do
       path = create 'closing_wrapper.rb', <<-EOS
 class Foo < ActiveRecord::Base