add full iteration interface to ProgressWrapper (#299)

src/ProgressMeter.jl

@@ -744,8 +744,14 @@ struct ProgressWrapper{T}
     meter::Progress
 end
 
+Base.IteratorSize(wrap::ProgressWrapper) = Base.IteratorSize(wrap.obj)
+Base.axes(wrap::ProgressWrapper, dim...) = Base.axes(wrap.obj, dim...)
+Base.size(wrap::ProgressWrapper, dim...) = Base.size(wrap.obj, dim...)
 Base.length(wrap::ProgressWrapper) = Base.length(wrap.obj)
 
+Base.IteratorEltype(wrap::ProgressWrapper) = Base.IteratorEltype(wrap.obj)
+Base.eltype(wrap::ProgressWrapper) = Base.eltype(wrap.obj)
+
 function Base.iterate(wrap::ProgressWrapper, state...)
     ir = iterate(wrap.obj, state...)
 
@@ -755,7 +761,7 @@ function Base.iterate(wrap::ProgressWrapper, state...)
         next!(wrap.meter)
     end
 
-    ir
+    return ir
 end
 
 """

test/core.jl

@@ -58,3 +58,16 @@ prog.check_iterations = 999
 t = time()
 prog.tlast = t
 @test ProgressMeter.calc_check_iterations(prog, t) == 999
+
+# Test ProgressWrapper
+A = rand(3,5,7,11)
+prog = Progress(length(A))
+wrap = ProgressMeter.ProgressWrapper(A, prog)
+
+@test Base.IteratorSize(wrap) == Base.IteratorSize(A)
+@test Base.IteratorEltype(wrap) == Base.IteratorEltype(A)
+@test axes(wrap) == axes(A)
+@test size(wrap) == size(A)
+@test length(wrap) == length(A)
+@test eltype(wrap) == eltype(A)
+@test collect(wrap) == collect(A)

test/test.jl

@@ -122,10 +122,15 @@ function testfunc7a(n, dt, tsleep)
     @test s == [z for z in 1:n, y in 1:n]
 end
 
+function testfunc7b(A, dt, tsleep)
+    s = ProgressMeter.@showprogress dt=dt desc="Calculating..." [(sleep(tsleep); z) for z in A]
+    @test s == A
+end
+
 println("Testing @showprogress macro on comprehension")
 testfunc7(25, 0.1, 0.1)
 testfunc7a(5, 0.1, 0.1)
-
+testfunc7b(rand(3,4), 0.1, 0.1) #290
 
 function testfunc8(n, dt, tsleep)
     ProgressMeter.@showprogress dt=dt for i in 1:n
@@ -161,10 +166,15 @@ function testfunc9a(n, dt, tsleep)
     @test s == [z for z in 1:n, y in 1:n]
 end
 
+function testfunc9b(A, dt, tsleep)
+    s = ProgressMeter.@showprogress dt=dt desc="Calculating..." Float64[(sleep(tsleep); z) for z in A]
+    @test s == Float64[A;]
+end
+
 println("Testing @showprogress macro on typed comprehension")
 testfunc9(100, 0.1, 0.01)
 testfunc9a(10, 0.1, 0.01)
-
+testfunc9b(rand(Float32,3,4), 0.1, 0.01) #290
 
 function testfunc10(n, k, dt, tsleep)
     p = ProgressMeter.Progress(n; dt=dt)