Reorder methods in CentralDirectory with private at the end.

lib/zip/central_directory.rb

@@ -29,6 +29,11 @@ def initialize(entries = EntrySet.new, comment = '') #:nodoc:
       @comment   = comment
     end
 
+    def read_from_stream(io)
+      read_eocds(io)
+      read_central_directory_entries(io)
+    end
+
     def write_to_stream(io) #:nodoc:
       cdir_offset = io.tell
       @entry_set.each { |entry| entry.write_c_dir_entry(io) }
@@ -46,6 +51,23 @@ def write_to_stream(io) #:nodoc:
       write_e_o_c_d(io, cdir_offset, cdir_size)
     end
 
+    # Reads the End of Central Directory Record (and the Zip64 equivalent if
+    # needs be) and returns the number of entries in the archive. This is a
+    # convenience method that avoids reading in all of the entry data to get a
+    # very quick entry count.
+    def count_entries(io)
+      read_eocds(io)
+      @size
+    end
+
+    def ==(other) #:nodoc:
+      return false unless other.kind_of?(CentralDirectory)
+
+      @entry_set.entries.sort == other.entries.sort && comment == other.comment
+    end
+
+    private
+
     def write_e_o_c_d(io, offset, cdir_size) #:nodoc:
       tmp = [
         END_OF_CD_SIG,
@@ -61,8 +83,6 @@ def write_e_o_c_d(io, offset, cdir_size) #:nodoc:
       io << @comment
     end
 
-    private :write_e_o_c_d
-
     def write_64_e_o_c_d(io, offset, cdir_size) #:nodoc:
       tmp = [
         ZIP64_END_OF_CD_SIG,
@@ -79,8 +99,6 @@ def write_64_e_o_c_d(io, offset, cdir_size) #:nodoc:
       io << tmp.pack('VQ<vvVVQ<Q<Q<Q<')
     end
 
-    private :write_64_e_o_c_d
-
     def write_64_eocd_locator(io, zip64_eocd_offset)
       tmp = [
         ZIP64_EOCD_LOCATOR_SIG,
@@ -91,8 +109,6 @@ def write_64_eocd_locator(io, zip64_eocd_offset)
       io << tmp.pack('VVQ<V')
     end
 
-    private :write_64_eocd_locator
-
     def unpack_64_e_o_c_d(buffer) #:nodoc:
       _, # ZIP64_END_OF_CD_SIG. We know we have this at this point.
       @size_of_zip64_e_o_c_d,
@@ -192,11 +208,6 @@ def read_local_extra_field(io)
       io.read(e_len)
     end
 
-    def read_from_stream(io) #:nodoc:
-      read_eocds(io)
-      read_central_directory_entries(io)
-    end
-
     def read_eocds(io) #:nodoc:
       base_location, data = eocd_data(io)
 
@@ -238,21 +249,6 @@ def eocd_data(io)
 
       [io.tell, io.read]
     end
-
-    # Reads the End of Central Directory Record (and the Zip64 equivalent if
-    # needs be) and returns the number of entries in the archive. This is a
-    # convenience method that avoids reading in all of the entry data to get a
-    # very quick entry count.
-    def count_entries(io)
-      read_eocds(io)
-      @size
-    end
-
-    def ==(other) #:nodoc:
-      return false unless other.kind_of?(CentralDirectory)
-
-      @entry_set.entries.sort == other.entries.sort && comment == other.comment
-    end
   end
 end