progressive_io 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b644b242893003aa43e9f2c9ec382abc77ed6f08aef0acf13612fd8c01af6109
-  data.tar.gz: 9ceb2436e366cb6cc823fd1e1600a07d99f7ea3aa07ca299647050b410eab9e7
+  metadata.gz: ea6428465be21d680077d7ed5077c9e8e8f0f72622249e3ccb2f585f38e7d969
+  data.tar.gz: f71c4577f2642efb23c3df42697cc52ce08a7cca603af89825efaf5c760c32b0
 SHA512:
-  metadata.gz: 800ce4c7128151cdf980f61fb50e2aa7c4811f0bad753535ee438fc2925b3d84018a176f633a18d27783af158dc8667b18623261ab8cccc460364b50f5958cae
-  data.tar.gz: 7cf60a1881e77bd39f2bf0dcff6cb9252c72130a24f1daaf2ede3fa62b9c90239a5d2d6a01f9d838b8f4ed79114e8811619c4f8955969a200b1e0e52152e4013
+  metadata.gz: ad62723654f1655d14b3a6b391581b1adcef7dbe27bf9a05901f405703118cb251b1bd4b4639ad3ce81d6099ba031596402ce16b96a54476ecdb2ddfa90cdba0
+  data.tar.gz: c1b87a837cb5f2a10defbf2dd1ec493b90b42db58f717b1aca2dfc6827af134fd223d4ca91e307ece53f0560e843fefc02b077f3cd72db47eed6e286f9a927e9

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.1
+
+* Revert back to using SimpleDelegator - it's just easier.
+
 ## 2.0.0
 
 * Added comprehensive documentation with examples

data/lib/progressive_io.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'delegate'
+
 # A wrapper class that provides progress tracking for IO operations.
 # 
 # This class wraps an IO object and calls a progress block whenever data is read,
@@ -24,9 +26,9 @@
 #   content = progress_io.read
 # 
 # @since 2.0.0
-class ProgressiveIO
+class ProgressiveIO < SimpleDelegator
   # The version of the ProgressiveIO library
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
   
   # @return [Proc, nil] The progress callback block that will be called when data is read
   #   The block receives one parameter: current position
@@ -46,7 +48,7 @@ class ProgressiveIO
   #     puts "Read #{pos} bytes"
   #   end
   def initialize(with_io, &blk)
-    @io = with_io
+    super(with_io)
     @progress_block = blk.to_proc if blk
   end
   
@@ -63,7 +65,7 @@ class ProgressiveIO
   #   end
   def each(sep_string = $/, &blk)
     # Report offset at each call of the iterator
-    @io.each(sep_string) do | line |
+    super(sep_string) do |line|
       yield(line).tap { notify_read }
     end
   end
@@ -81,7 +83,7 @@ class ProgressiveIO
   #   end
   def each_byte(&blk)
     # Report offset at each call of the iterator
-    @io.each_byte { |b| yield(b).tap { notify_read } }
+    super { |b| yield(b).tap { notify_read } }
   end
   
   # Reads a single character from the IO stream.
@@ -89,7 +91,7 @@ class ProgressiveIO
   # @return [String, nil] The next character or nil if at end of stream
   # @see IO#getc
   def getc
-    inner(:getc)
+    super.tap { notify_read }
   end
   
   # Reads a line from the IO stream.
@@ -98,7 +100,7 @@ class ProgressiveIO
   # @return [String, nil] The next line or nil if at end of stream
   # @see IO#gets
   def gets(*args)
-    inner(:gets, *args)
+    super(*args).tap { notify_read }
   end
   
   # Reads data from the IO stream.
@@ -107,7 +109,7 @@ class ProgressiveIO
   # @return [String, nil] The read data or nil if at end of stream
   # @see IO#read
   def read(*a)
-    inner(:read, *a)
+    super(*a).tap { notify_read }
   end
   
   # Reads a specific number of bytes from the IO stream.
@@ -116,7 +118,7 @@ class ProgressiveIO
   # @return [String] The read bytes
   # @see IO#readbytes
   def readbytes(*a)
-    inner(:readbytes, *a)
+    super(*a).tap { notify_read }
   end
   
   # Reads a single character from the IO stream.
@@ -125,7 +127,7 @@ class ProgressiveIO
   # @raise [EOFError] If at end of stream
   # @see IO#readchar
   def readchar
-    inner(:readchar)
+    super.tap { notify_read }
   end
   
   # Reads a line from the IO stream.
@@ -135,7 +137,7 @@ class ProgressiveIO
   # @raise [EOFError] If at end of stream
   # @see IO#readline
   def readline(*a)
-    inner(:readline, *a)
+    super(*a).tap { notify_read }
   end
   
   # Reads all lines from the IO stream.
@@ -144,7 +146,7 @@ class ProgressiveIO
   # @return [Array<String>] Array of lines
   # @see IO#readlines
   def readlines(*a)
-    inner(:readlines, *a)
+    super(*a).tap { notify_read }
   end
   
   # Seeks to a position in the IO stream.
@@ -153,11 +155,11 @@ class ProgressiveIO
   # @return [Integer] The new position
   # @see IO#seek
   def seek(*a)
-    inner(:seek, *a)
+    super(*a)
   end
   
 # def ungetc(*a)
-#   inner(:ungetc, a)
+#   super(*a).tap { notify_read }
 # end 
   
   # Sets the position in the IO stream.
@@ -166,31 +168,16 @@ class ProgressiveIO
   # @return [Integer] The new position
   # @see IO#pos=
   def pos=(p)
-    inner(:pos=, p)
+    super(p).tap { notify_read }
   end
   
   private
     
-    # @return [IO] The wrapped IO object
-    def io
-      @io
-    end
-    
-    # Delegates method calls to the wrapped IO object and calls the progress block.
-    # 
-    # @param m [Symbol] The method name to call
-    # @param args [Array] Arguments to pass to the method
-    # @return [Object] The result of the method call
-    def inner(m, *args)
-      r = @io.respond_to?(:public_send) ? @io.public_send(m, *args) : @io.send(m, *args)
-      r.tap { notify_read }
-    end
-    
     # Calls the progress block with current position.
     # This method is called whenever data is read from the IO stream.
     # 
     # @return [void]
     def notify_read
-      @progress_block.call(@io.pos) if @progress_block
+      @progress_block.call(pos) if @progress_block
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: progressive_io
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Julik Tarkhanov