reader.rb in iostreams-1.0.0.beta

- old
+ new
@@ -1,60 +1,52 @@
 require 'open3'
 
 module IOStreams
   module Pgp
-    class Reader
+    class Reader < IOStreams::Reader
       # Passphrase to use to open the private key to decrypt the received file
-      def self.default_passphrase=(default_passphrase)
-        @default_passphrase = default_passphrase
+      class << self
+        attr_writer :default_passphrase
+
+        private
+
+        attr_reader :default_passphrase
+
+        @default_passphrase = nil
       end
 
-      # Read from a PGP / GPG file or stream, decompressing the contents as it is read
-      # file_name_or_io: [String|IO]
+      # Read from a PGP / GPG file , decompressing the contents as it is read.
+      #
+      # file_name: [String]
       #   Name of file to read from
-      #   Or, the IO stream to receive the decrypted contents
+      #
       # passphrase: [String]
       #   Pass phrase for private key to decrypt the file with
-      def self.open(file_name_or_io, passphrase: self.default_passphrase, binary: true, &block)
+      def self.file(file_name, passphrase: self.default_passphrase)
         raise(ArgumentError, 'Missing both passphrase and IOStreams::Pgp::Reader.default_passphrase') unless passphrase
 
-        return read_file(file_name_or_io, passphrase: passphrase, binary: binary, &block) if file_name_or_io.is_a?(String)
-
-        # PGP can only work against a file, not a stream, so create temp file.
-        IOStreams::File::Path.temp_file_name('iostreams_pgp') do |temp_file_name|
-          IOStreams.copy(file_name_or_io, temp_file_name, target_options: {streams: []})
-          read_file(temp_file_name, passphrase: passphrase, binary: binary, &block)
-        end
-      end
-
-      def self.read_file(file_name, passphrase: self.default_passphrase, binary: true)
         loopback = IOStreams::Pgp.pgp_version.to_f >= 2.1 ? '--pinentry-mode loopback' : ''
         command  = "#{IOStreams::Pgp.executable} #{loopback} --batch --no-tty --yes --decrypt --passphrase-fd 0 #{file_name}"
-        IOStreams::Pgp.logger.debug { "IOStreams::Pgp::Reader.open: #{command}" } if IOStreams::Pgp.logger
+        IOStreams::Pgp.logger&.debug { "IOStreams::Pgp::Reader.open: #{command}" }
 
         # Read decrypted contents from stdout
         Open3.popen3(command) do |stdin, stdout, stderr, waith_thr|
           stdin.puts(passphrase) if passphrase
           stdin.close
           result =
             begin
-              stdout.binmode if binary
+              stdout.binmode
               yield(stdout)
             rescue Errno::EPIPE
               # Ignore broken pipe because gpg terminates early due to an error
               raise(Pgp::Failure, "GPG Failed reading from encrypted file: #{file_name}: #{stderr.read.chomp}")
             end
-          raise(Pgp::Failure, "GPG Failed to decrypt file: #{file_name}: #{stderr.read.chomp}") unless waith_thr.value.success?
+          unless waith_thr.value.success?
+            raise(Pgp::Failure, "GPG Failed to decrypt file: #{file_name}: #{stderr.read.chomp}")
+          end
+
           result
         end
-      end
-
-      private
-
-      @default_passphrase = nil
-
-      def self.default_passphrase
-        @default_passphrase
       end
     end
   end
 end