From c0ced77fb12ecb39bfd680f842fead31cd349831 Mon Sep 17 00:00:00 2001
From: Paul Duncan <pabs@pablotron.org>
Date: Wed, 10 Aug 2016 11:56:25 -0400
Subject: remove Reader

---
 spec/zip_spec.cr | 12 ++++++++----
 src/zip.cr       | 52 ++++++++++------------------------------------------
 2 files changed, 18 insertions(+), 46 deletions(-)

diff --git a/spec/zip_spec.cr b/spec/zip_spec.cr
index 7e66518..c80aabe 100644
--- a/spec/zip_spec.cr
+++ b/spec/zip_spec.cr
@@ -9,9 +9,11 @@ describe Zip do
   it "works" do
     Zip::VERSION.should eq(Zip::VERSION)
   end
-end
 
-describe Zip::Writer do
+  ###############
+  # write tests #
+  ###############
+
   it "creates an empty archive" do
     Zip.write(File.join(TEST_DIR, "test-empty.zip")) do |zip|
       # do nothing
@@ -53,9 +55,11 @@ describe Zip::Writer do
       zip.add_file("test.cr", TEST_FILE_PATH)
     end
   end
-end
 
-describe Zip::Reader do
+  ##############
+  # read tests #
+  ##############
+
   it "reads an archive" do
     Zip.read(File.join(TEST_DIR, "test-string.zip")) do |zip|
       zip.entries.each do |e|
diff --git a/src/zip.cr b/src/zip.cr
index 9c05569..8e7ddb4 100644
--- a/src/zip.cr
+++ b/src/zip.cr
@@ -1,6 +1,9 @@
 require "./zip/*"
 require "zlib"
 
+# https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT
+# http://www.onicos.com/staff/iz/formats/zip.html
+#
 #
 # TODO:
 # [x] date/time
@@ -1242,63 +1245,28 @@ module Zip
     end
   end
 
-  class Reader
-    getter? :closed, :sync_close
-    getter :zip
-
-    def initialize(
-      @io         : Source,
-      @pos        : UInt32 = 0_u32,
-      @sync_close : Bool = false,
-    )
-      @closed = false
-      @zip = Archive.new(@io)
-    end
-
-    private def assert_open
-      raise Error.new("already closed") if closed?
-    end
-
-    def close
-      assert_open
-
-      @io.close if @sync_close
-      @closed = true
-    end
-  end
-
   def self.read(
     io          : IO,
-    pos         : UInt32 = 0_u32,
-    sync_close  : Bool = false,
     &cb         : Archive -> \
-  )
-    begin
-      r = Reader.new(Source.new(io), pos, sync_close)
-      cb.call(r.zip)
-    ensure
-      if r
-        r.close unless r.closed?
-      end
-    end
-
-    nil
+  ) : Void
+    r = Archive.new(Source.new(io))
+    cb.call(r)
   end
 
   def self.read(
     slice : Bytes,
     &cb   : Archive -> \
-  )
+  ) : Void
     src = Source.new(MemoryIO.new(slice, false))
-    read(src, 0_u32, false, &cb)
+    read(src, &cb)
   end
 
   def self.read(
     path : String,
     &cb  : Archive -> \
-  )
+  ) : Void
     File.open(path, "rb") do |io|
-      read(io, 0_u32, true, &cb)
+      read(io, &cb)
     end
   end
 end
-- 
cgit v1.2.3