From eba5fa1983ae8eddf41a8346c64c84d04920af96 Mon Sep 17 00:00:00 2001
From: Pavel Lobashov <shockwavenn@gmail.com>
Date: Sat, 21 Mar 2015 11:19:43 +0300
Subject: [PATCH] fix rubocop Style/EmptyLinesAroundAccessModifier cop

---
 .rubocop_rubyzip.yml         | 5 -----
 lib/zip/entry_set.rb         | 2 ++
 lib/zip/extra_field/ntfs.rb  | 1 +
 samples/example_recursive.rb | 2 ++
 test/deflater_test.rb        | 1 +
 test/file_test.rb            | 1 +
 test/local_entry_test.rb     | 1 +
 test/settings_test.rb        | 1 +
 8 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.rubocop_rubyzip.yml b/.rubocop_rubyzip.yml
index 307ab44..9fb8f37 100644
--- a/.rubocop_rubyzip.yml
+++ b/.rubocop_rubyzip.yml
@@ -110,11 +110,6 @@ Style/ElseAlignment:
 Style/EmptyElse:
   Enabled: false
 
-# Offense count: 8
-# Cop supports --auto-correct.
-Style/EmptyLinesAroundAccessModifier:
-  Enabled: false
-
 # Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
diff --git a/lib/zip/entry_set.rb b/lib/zip/entry_set.rb
index b0882eb..860b9dc 100755
--- a/lib/zip/entry_set.rb
+++ b/lib/zip/entry_set.rb
@@ -72,11 +72,13 @@ module Zip
     end
 
     protected
+
     def sorted_entries
       ::Zip.sort_entries ? Hash[@entry_set.sort] : @entry_set
     end
 
     private
+
     def to_key(entry)
       entry.to_s.chomp('/')
     end
diff --git a/lib/zip/extra_field/ntfs.rb b/lib/zip/extra_field/ntfs.rb
index 3c769cf..63f4a0d 100644
--- a/lib/zip/extra_field/ntfs.rb
+++ b/lib/zip/extra_field/ntfs.rb
@@ -65,6 +65,7 @@ module Zip
     end
 
     private
+
     def parse_tags(content)
       return {} if content.nil?
       tags = {}
diff --git a/samples/example_recursive.rb b/samples/example_recursive.rb
index 276a9f4..fb5d183 100644
--- a/samples/example_recursive.rb
+++ b/samples/example_recursive.rb
@@ -28,7 +28,9 @@ class ZipFileGenerator
   end
 
   # A helper method to make the recursion work.
+
   private
+
   def writeEntries(entries, path, io)
 
     entries.each do |e|
diff --git a/test/deflater_test.rb b/test/deflater_test.rb
index deb8d9e..8210326 100644
--- a/test/deflater_test.rb
+++ b/test/deflater_test.rb
@@ -35,6 +35,7 @@ class DeflaterTest < MiniTest::Test
   end
 
   private
+
   def load_file(fileName)
     txt = nil
     File.open(fileName, "rb") { |f| txt = f.read }
diff --git a/test/file_test.rb b/test/file_test.rb
index f07863c..efe3ce2 100644
--- a/test/file_test.rb
+++ b/test/file_test.rb
@@ -519,6 +519,7 @@ class ZipFileTest < MiniTest::Test
   end
 
   private
+
   def assert_contains(zf, entryName, filename = entryName)
     assert(zf.entries.detect { |e| e.name == entryName } != nil, "entry #{entryName} not in #{zf.entries.join(', ')} in zip file #{zf}")
     assert_entryContents(zf, entryName, filename) if File.exist?(filename)
diff --git a/test/local_entry_test.rb b/test/local_entry_test.rb
index b526cc3..e802ee5 100644
--- a/test/local_entry_test.rb
+++ b/test/local_entry_test.rb
@@ -126,6 +126,7 @@ class ZipLocalEntryTest < MiniTest::Test
   end
 
   private
+
   def compare_local_entry_headers(entry1, entry2)
     assert_equal(entry1.compressed_size, entry2.compressed_size)
     assert_equal(entry1.crc, entry2.crc)
diff --git a/test/settings_test.rb b/test/settings_test.rb
index 52ee22d..9e7a3d7 100644
--- a/test/settings_test.rb
+++ b/test/settings_test.rb
@@ -83,6 +83,7 @@ class ZipSettingsTest < MiniTest::Test
   end
 
   private
+
   def assert_contains(zf, entryName, filename = entryName)
     assert(zf.entries.detect { |e| e.name == entryName } != nil, "entry #{entryName} not in #{zf.entries.join(', ')} in zip file #{zf}")
     assert_entryContents(zf, entryName, filename) if File.exist?(filename)