Move the managed and reserved classes to top level.

Much more readable, and had the opportunity to rename the files correctly at the same time.
hainesr · Feb 24, 2024 · ef6bb47 · ef6bb47
1 parent 92f428a
commit ef6bb47
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/lib/zip-container/container.rb b/lib/zip-container/container.rb
@@ -30,9 +30,9 @@
 #
 # Author: Robert Haines
 
-require_relative 'entries/managed'
-require_relative 'entries/reserved'
 require_relative 'errors'
+require_relative 'managed_entries'
+require_relative 'reserved_names'
 
 ##
 module ZipContainer

diff --git a/lib/zip-container/entries/directory.rb → lib/zip-container/managed_directory.rb b/lib/zip-container/entries/directory.rb → lib/zip-container/managed_directory.rb
@@ -30,9 +30,9 @@
 #
 # Author: Robert Haines
 
-require_relative 'entry'
-require_relative 'managed'
-require_relative 'reserved'
+require_relative 'managed_entries'
+require_relative 'managed_entry'
+require_relative 'reserved_names'
 
 ##
 module ZipContainer

diff --git a/lib/zip-container/entries/managed.rb → lib/zip-container/managed_entries.rb b/lib/zip-container/entries/managed.rb → lib/zip-container/managed_entries.rb
@@ -30,10 +30,10 @@
 #
 # Author: Robert Haines
 
-require_relative 'entry'
-require_relative 'file'
-require_relative '../errors'
-require_relative '../util'
+require_relative 'errors'
+require_relative 'managed_entry'
+require_relative 'managed_file'
+require_relative 'util'
 
 ##
 module ZipContainer

diff --git a/lib/zip-container/entries/entry.rb → lib/zip-container/managed_entry.rb b/lib/zip-container/entries/entry.rb → lib/zip-container/managed_entry.rb
@@ -30,7 +30,7 @@
 #
 # Author: Robert Haines
 
-require_relative '../util'
+require_relative 'util'
 
 ##
 module ZipContainer

diff --git a/lib/zip-container/entries/file.rb → lib/zip-container/managed_file.rb b/lib/zip-container/entries/file.rb → lib/zip-container/managed_file.rb
@@ -30,7 +30,7 @@
 #
 # Author: Robert Haines
 
-require_relative 'entry'
+require_relative 'managed_entry'
 
 ##
 module ZipContainer

diff --git a/lib/zip-container/entries/reserved.rb → lib/zip-container/reserved_names.rb b/lib/zip-container/entries/reserved.rb → lib/zip-container/reserved_names.rb
@@ -30,7 +30,7 @@
 #
 # Author: Robert Haines
 
-require_relative '../util'
+require_relative 'util'
 
 ##
 module ZipContainer

diff --git a/test/managed_entries_test.rb b/test/managed_entries_test.rb
@@ -34,10 +34,10 @@
 require_relative 'test_helper'
 
 require 'tmpdir'
-require 'zip-container/file'
 require 'zip-container/dir'
-require 'zip-container/entries/file'
-require 'zip-container/entries/directory'
+require 'zip-container/file'
+require 'zip-container/managed_directory'
+require 'zip-container/managed_file'
 
 # Classes to test managed entries.
 class ManagedZipContainer < ZipContainer::File

diff --git a/test/reserved_names_test.rb b/test/reserved_names_test.rb
@@ -34,8 +34,8 @@
 
 require 'zip-container/errors'
 require 'zip-container/file'
-require 'zip-container/entries/directory'
-require 'zip-container/entries/file'
+require 'zip-container/managed_directory'
+require 'zip-container/managed_file'
 
 # A class to test the overriding of reserved and managed names.
 class NewZipContainer < ZipContainer::File