lib/io_streams/bzip2/reader.rb in iostreams-0.20.3 vs lib/io_streams/bzip2/reader.rb in iostreams-1.0.0.beta

@@ -1,29 +1,17 @@
 module IOStreams
   module Bzip2
-    class Reader
-      # Read from a Bzip2 file or stream, decompressing the contents as it is read
-      def self.open(file_name_or_io, **args, &block)
+    class Reader < IOStreams::Reader
+      # Read from a Bzip2 stream, decompressing the contents as it is read
+      def self.stream(input_stream, **_args)
+        Utils.load_dependency('rbzip2', 'Bzip2') unless defined?(RBzip2)
+
         begin
-          require 'rbzip2' unless defined?(RBzip2)
-        rescue LoadError => e
-          raise(LoadError, "Please install the 'rbzip2' gem for Bzip2 streaming support. #{e.message}")
+          io = RBzip2.default_adapter::Decompressor.new(input_stream)
+          yield io
+        ensure
+          io&.close
         end
-
-        if IOStreams.reader_stream?(file_name_or_io)
-          begin
-            io = RBzip2.default_adapter::Decompressor.new(file_name_or_io)
-            block.call(io)
-          ensure
-            io.close if io && (io.respond_to?(:closed?) && !io.closed?)
-          end
-        else
-          ::File.open(file_name_or_io, 'rb') do |file|
-            io = RBzip2.default_adapter::Decompressor.new(file)
-            block.call(io)
-          end
-        end
-
       end
     end
   end
 end