mechanize-progressbar 0.1.0 → 0.2.0

data/README.rdoc.ja

@@ -0,0 +1,155 @@
+= mechanize-progressbar
+
+Mechanize-Progressbar は Mechanize で get や click したときにテキストの進捗バーを表示します（ProgressBar gem 使用）。
+サーバからファイルを取得するときのみ有効です。GET や POST の送信進行状況を表示させることはできません。
+
+== できること
+script:
+    require 'mechanize'
+    require 'mechanize/progressbar'
+    agent = Mechanize.new
+    agent.progressbar{ agent.get(large_file) }
+
+$stderr output:
+    http://host/large_file.zip
+    15% |ooooooo                        | 135.2KB  21.9KB/s ETA:  00:00:10
+
+== 必要なもの
+
+- Ruby 1.8.6 か 1.8.7、1.9.1、1.9.2。jruby では未テスト
+- 最近の Rubygems
+- gem ライブラリ Mechanize (1.0.0 と 2.0 に対応)
+- gem ライブラリ ProgressBar
+
+== USAGE
+
+Mechanize#progressbar のブロック内でファイルを get してください。
+
+    require 'mechanize'
+    require 'mechanize/progressbar'
+    agent = Mechanize.new
+    agent.progressbar{ agent.get(large_file) }
+
+リンクをクリックしても動作します。
+
+    agent = Mechanize.new
+    agent.get(some_page)
+    agent.progressbar do
+      agent.page.link_with(:text => 'download here').click
+    end
+
+ProgressBar の設定を変更したい場合は、キーワード風引数で指定します。
+ProgressBar で以下のように設定するはずだった場合は、
+
+    pbar = ProgressBar.new(@title, @total, @out)
+    pbar.format = @format
+    pbar.format_arguments = @format_arguments
+
+次のように引数に書くことになります。
+今のところ設定は保存されず、ブロックを作成するたびに引数を指定する必要があります。
+
+    agent = Mechanize.new
+    agent.progressbar(
+      :title => @title,
+      :total => @total,
+      :out => @out,
+      :format => @format,
+      :format_arguments => @format_arguments
+    ){ agent.get(large_file) }
+
+=== {:title => @title}
+
+タイトルを指定します。デフォルトの 2行表示では1行目に、1行表示モード（:single）では左端に表示されます。
+ProgressBar 側の制限で、1行表示モードでは半角15文字までしか表示されません。
+1行モード時には ProgressBar#initialize の第 1引数に渡されます。ProgressBar のマニュアルを参照してください。
+
+=== {:total => @total}
+
+最終的なバイト数を指定します。
+ProgressBar#initialize の第 2引数に渡されます。ProgressBar のマニュアルを参照してください。
+デフォルトではレスポンスヘッダの Content-Length を利用しています。
+
+=== {:out => @out}
+
+出力先の IO オブジェクトを指定します。デフォルトでは $stderr です。
+ProgressBar#initialize の第 3引数に渡されます。ProgressBar のマニュアルを参照してください。
+
+=== {:format => @format}
+
+ProgressBar のフォーマットを指定しますその1です。
+ProgressBar#format= のマニュアルを参照してください。
+
+=== {:format_arguments => @format_arguments}
+
+ProgressBar のフォーマットを指定しますその2です。
+ProgressBar#format_arguments= のマニュアルを参照してください。
+
+=== {:reversed => true/false}
+
+ProgressBar の代わりに ReversedProgressBar を使用します。
+バーの増加表示方向が逆になります。
+
+=== {:file_transfer_mode => true/false}
+
+ProgressBar をファイル転送用の表示にします。デフォルトで true です。
+ProgressBar#file_transfer_mode= のマニュアルを参照してください。
+
+=== {:single => true/false}
+
+1行モードの可否を設定します。デフォルトでは false で、2行表示になっています。
+
+Mechanize-Progressbar は取得する URL を適当に表示してからプログレスバーを表示しますが、
+
+script:
+    agent.progressbar{ agent.get(large_file) }
+output:
+    http://uri.host/large_file.zip
+    15% |ooooo                           | 135.2KB  21.9KB/s ETA:  00:00:10
+
+この部分が2行になってるのが嫌だという場合は、引数に (:single => true) を指定します。
+1行モードだと、ProgressBar gem の本来の表示になります。
+
+script:
+    agent.progressbar(:single => true){ agent.get(large_file) }
+output:
+    uri.host:   15% |ooo                 | 135.2KB  21.9KB/s ETA:  00:00:10
+
+=== {:suppress_logger => true/false}
+
+Mechanize に Logger が設定されていて、その出力先が ProgressBar と同じだった場合（デフォルトでは$stderr）、
+"Read 1234 bytes" というような逐次のデータ取得表示は自動で抑制されます。
+
+script:
+    agent.log = Logger.new($stderr)
+    agent.progressbar{ agent.get(large_file) }
+output:
+    http://uri.host/large_file.zip
+    100% |ooooooooooooooooooooooooooooooo| 1024.0KB  21.9KB/s Time:  00:00:20
+    D, [...] DEBUG -- : Read 102400 bytes
+
+最終的なファイルサイズのみ表示されています。
+これを出力先が異なっても行ないたいという場合は、(:suppress_logger => true) としてください。
+Logger の出力に逐次表示が含まれなくなります（あまり使い出がないとは思うのですが）。
+
+(:suppress_logger => false) とすると、出力先が被っていた場合はブログレスバーがぐちゃぐちゃになります。
+おすすめできません。
+
+== ファイル取得時のメモリ使用仕様
+
+Mechanize は取得した全ファイルを履歴兼キャッシュとしてスクリプト終了まで保持し続けています（GCの対象にはなりません）。
+100MBのファイルを5個取得したら、使用メモリは最低でも500MBになっています。
+Mechanize の仕様なのでどうにもならないのですが、履歴数を最低の 1にすることで軽減することはできます。
+
+    agent.max_history = 1
+
+== Licence
+
+Mechanize がないと動作しないので、 Mechanize と同様に MIT ライセンスです。
+
+== Author
+
+kitamomonga
+kitamomonga@gmail.com
+
+きたももんががきたん。
+http://d.hatena.ne.jp/kitamomonga/

data/Rakefile

@@ -13,7 +13,7 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   gem.name = "mechanize-progressbar"
   gem.homepage = "http://github.com/kitamomonga/mechanize-progressbar"
-  gem.license = "GPL-2"
+  gem.license = "MIT"
   gem.summary = "Mechanize-Progressbar provides ProgressBar for Mechanize#get and Link#click. requires 'progressbar' gem."
   gem.description = "Mechanize-Progressbar shows ProgressBar when HTTP GET access of Mechanize(Mechanize#get, Page::Link#click, response of Form#submit). It requires 'progressbar' gem. HTTP POST is not supported."
   gem.email = "kitamomonga@gmail.com"
@@ -39,7 +39,13 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
+begin
+  gem 'rdoc'
+  require 'rdoc'
+  require 'rdoc/task'
+rescue LoadError, Gem::LoadError
+  require 'rake/rdoctask'
+end
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/mechanize/progressbar.rb

@@ -1,2 +1,10 @@
 require 'progressbar'
-require 'mechanize/progressbar/mech_progressbar'
+raise LoadError, "require mechanize before mechanize/progressbar" unless defined?(Mechanize)
+
+require 'mechanize/progressbar/api'
+require 'mechanize/progressbar/mechanize_progressbar'
+if Mechanize::VERSION == '1.0.0'
+  require 'mechanize/progressbar/mechanize_1_0'
+else
+  require 'mechanize/progressbar/mechanize_2_0'
+end

data/lib/mechanize/progressbar/api.rb

@@ -0,0 +1,50 @@
+module MechanizeProgressBarAPI
+  ### Usage:
+  ###   require 'mechanize'
+  ###   require 'mechanize/progressbar'
+  ###   agent = Mechanize.new
+  ###   agent.progressbar{ agent.get(large_file) }
+  ###   agent.get(some_page) #=> shows nothing
+  ###   agent.progressbar{ agent.page.link_with(:text => 'download here').click }
+  ###
+  ### If you want to set parameters to ProgressBar object,
+  ###   agent.progressbar(:title => 'large_file', :format_arguments => @fmt) do
+  ###     agent.get(large_file)
+  ###   end
+  ### ProgressBar is gem lib. Please install with 'gem install progressbar' or bundle.
+  ###
+  ### options:
+  ### [:single] enables single line mode, original ProgressBar gem behavior. default is false
+  ### [:title] ProgressBar.new(*title*, total, out), default is empty
+  ### [:total] ProgressBar.new(title, *total*, out), default is 'Content-Length' response header
+  ### [:out] ProgressBar.new(title, total, *out*), default is $stderr
+  ### [:format] ProgressBar.new(*args).format=*format*, default is nil
+  ### [:format_arguments]  ProgressBar.new(*args).format_arguments=*format_arguments*, default is nil
+  ### [:reversed] ReversedProgressBar.new(*args), default is false
+  ### [:file_transfer_mode] enables ProgressBar#file_transfer_mode, default is true
+  ### [:suppress_logger] stops Logger output in socket reading. default true when agent.log output and :out is same
+  def progressbar(mech_or_pbar_opts = self, pbar_opts = {})
+    if mech_or_pbar_opts.kind_of?(Hash) then
+      mech, pbar_opts = self, mech_or_pbar_opts
+    else
+      mech = mech_or_pbar_opts
+    end
+    MechanizeProgressBar.register(mech, pbar_opts)
+    if block_given?
+      begin
+        yield mech
+      rescue Exception, StandardError
+        MechanizeProgressBar.unregister(mech)
+        raise
+      end
+      MechanizeProgressBar.unregister(mech)
+    else
+      MechanizeProgressBar.unregister_next_init(mech)
+    end
+    mech
+  end
+
+  def progressbar_option # :nodoc:
+    @progressbar_option ||= {}
+  end
+end

data/lib/mechanize/progressbar/mechanize_1_0.rb

@@ -0,0 +1,39 @@
+# is for Mechanize 1.0.0 only
+class Mechanize   # has 6 added/modified lines
+  include MechanizeProgressBarAPI # (1of6)a
+  class Chain
+    class ResponseReader
+      def handle(ctx, params)
+        params[:response] = @response
+        body = StringIO.new
+        total = 0
+        mpbar = MechanizeProgressBar.new(params[:agent], params[:request], params[:response]) # (2of6)a
+        @response.read_body { |part|
+          total += part.length
+          body.write(part)
+          # Mechanize.log.debug("Read #{total} bytes") if Mechanize.log
+          Mechanize.log.debug("Read #{total} bytes") if Mechanize.log && !mpbar.suppress_logger? # (3of6)m
+          mpbar.inc(part.length) # (4of6)a
+        }
+        body.rewind
+        mpbar.finish # (5of6)a
+        Mechanize.log.debug("Read #{total} bytes") if Mechanize.log && !mpbar.suppress_logger? # (6of6)a
+        res_klass = Net::HTTPResponse::CODE_TO_OBJ[@response.code.to_s]
+        raise ResponseCodeError.new(@response) unless res_klass
+
+        # Net::HTTP ignores EOFError if Content-length is given, so we emulate it here.
+        unless res_klass <= Net::HTTPRedirection
+          raise EOFError if (!params[:request].is_a?(Net::HTTP::Head)) && @response.content_length() && @response.content_length() != total
+        end
+
+        @response.each_header { |k,v|
+          Mechanize.log.debug("response-header: #{ k } => #{ v }")
+        } if Mechanize.log
+
+        params[:response_body] = body
+        params[:res_klass] = res_klass
+        super
+      end
+    end
+  end
+end

data/lib/mechanize/progressbar/mechanize_2_0.rb

@@ -0,0 +1,44 @@
+class Mechanize
+  include MechanizeProgressBarAPI # (1of7)a
+  class HTTP
+    class Agent
+      def response_read response, request
+        body_io = StringIO.new
+        body_io.set_encoding Encoding::BINARY if body_io.respond_to? :set_encoding
+        total = 0
+        mpbar = MechanizeProgressBar.new(self.context, request, response) # (2of7)a
+
+        begin
+          response.read_body { |part|
+            total += part.length
+            body_io.write(part)
+#           log.debug("Read #{part.length} bytes (#{total} total)") if log
+            log.debug("Read #{part.length} bytes (#{total} total)") if log && !mpbar.suppress_logger? # (3of7)m
+            mpbar.inc(part.length) # (4of7)a
+          }
+        rescue Net::HTTP::Persistent::Error => e
+          body_io.rewind
+          raise Mechanize::ResponseReadError.new(e, response, body_io)
+        ensure # (5of7)a
+          mpbar.finish # (6of7)a
+        end
+
+        body_io.rewind
+        log.debug("Read #{total} bytes total") if log && !mpbar.suppress_logger? # (7of7)a
+
+        raise Mechanize::ResponseCodeError, response if
+          Net::HTTPUnknownResponse === response
+
+        content_length = response.content_length
+
+        unless Net::HTTP::Head === request or Net::HTTPRedirection === response then
+          raise EOFError, "Content-Length (#{content_length}) does not match " \
+          "response body length (#{body_io.length})" if
+            content_length and content_length != body_io.length
+        end
+
+        body_io
+      end
+    end
+  end
+end

data/lib/mechanize/progressbar/mechanize_progressbar.rb

@@ -0,0 +1,89 @@
+class MechanizeProgressBar # :nodoc:
+
+  def self.register(mech, pbar_opts)
+    unregister(mech)
+    mech.progressbar_option.update(pbar_opts)
+
+    reset_reservation = mech.progressbar_option['reserve!']
+    mech.progressbar_option['reset!'] = reset_reservation
+  end
+
+  def self.unregister(mech)
+    mech.progressbar_option.clear
+  end
+
+  def self.unregister_next_init(mech)
+    mech.progressbar_option['reserve!'] = true
+  end
+
+  def initialize(mech, request, response)
+    pbar_opts = mech.progressbar_option
+    self.class.unregister(mech) if pbar_opts['reset!']
+
+    _first_time = pbar_opts.empty?
+    _unusual_response = response.code != '200'
+
+    case
+    when _first_time, _unusual_response
+      @progressbar = nil
+    else
+      @progressbar = progressbar_new(pbar_opts, request, response)
+    end
+
+    if mech.log
+      log_output = mech.log.instance_variable_get(:@logdev).dev
+      pbar_output = @progressbar.instance_variable_get(:@out)
+      @suppress_logger = true if log_output == pbar_output
+    end
+
+    @suppress_logger = pbar_opts[:suppress_logger] if pbar_opts.has_key?(:suppress_logger)
+  end
+
+  def inc(step)
+    @progressbar.inc(step) if @progressbar
+  end
+
+  def finish
+    @progressbar.finish if @progressbar
+  end
+
+  def suppress_logger?
+    @suppress_logger
+  end
+
+  private
+
+  def progressbar_new(pbar_opts, request, response)
+    out = pbar_opts[:out] || pbar_opts[:output] || $stderr
+    if pbar_opts[:single] then
+      title = pbar_opts[:title] || request['Host']
+      format = pbar_opts[:format]
+      format_arguments = pbar_opts[:format_arguments]
+    else
+      title = pbar_opts[:title] || ""
+      format = pbar_opts[:format] || "%3d%% %s %s"
+      format_arguments = pbar_opts[:format_arguments] || [:percentage, :bar, :stat_for_file_transfer]
+      out.print "#{pbar_opts[:title]||uri(request)}\n"
+    end
+    total = pbar_opts[:total] || filesize(response)
+    pbar_class = pbar_opts[:reversed] ? ReversedProgressBar : ProgressBar
+
+    progressbar = pbar_class.new(title, total, out)
+
+    progressbar.file_transfer_mode unless pbar_opts[:file_transfer_mode]
+    progressbar.format = format if format
+    progressbar.format_arguments = format_arguments if format_arguments
+    progressbar
+  end
+
+  def filesize(response)
+    content_length = response['content-length']
+    content_length ? content_length.to_i : 0
+  end
+
+  def uri(request)
+    scheme = request.class.to_s =~ /https/i ? 'https' : 'http'
+    URI.parse("#{scheme}://#{request['Host']}#{request.path}").to_s
+  end
+
+end

data/spec/mechanize/progressbar/mech_progressbar_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '../../../spec_helper')
 
-### NOTE: On MechanizeProgressBarAPI - "accepts agent as agent" spec, we swap $stderr.
+### NOTE: we swap $stderr on MechanizeProgressBarAPI - "accepts agent as agent" spec
 
 describe MechanizeProgressBarAPI do
 
@@ -13,6 +13,7 @@ describe MechanizeProgressBarAPI do
   end
 
   before :each do
+    WebMock.reset!
     WebMock.stub_request(:get, @url).to_return(@headers_and_body)
   end
 
@@ -32,40 +33,55 @@ describe MechanizeProgressBarAPI do
       @agent = Mechanize.new
       @output = StringIO.new
     end
+
     it "accepts Hash as ProgressBar option" do
       @agent.progressbar(:out => @output){@agent.get(@url)}
       progressbar.should work_fine
     end
 
-    it "accepts agent as agent" do
-      o = Object.new
-      o.extend(MechanizeProgressBarAPI)
-      backup = $stderr
-      $stderr = @output
-      o.progressbar(@agent){@agent.get(@url)}
-      $stderr = backup
+    it "with block" do
+      @agent.progressbar(:out => @output){@agent.get(@url)}
       progressbar.should work_fine
     end
 
-    it "accepts (agent, pbar_opt) arguments" do
-      o = Object.new
-      o.extend(MechanizeProgressBarAPI)
-      o.progressbar(@agent, :out => @output){@agent.get(@url)}
-      progressbar.should work_fine
-    end
+    describe "included/extended use" do
+      it "accepts agent as agent" do
+        o = Object.new
+        o.extend(MechanizeProgressBarAPI)
+        backup = $stderr
+        $stderr = @output
+        o.progressbar(@agent){@agent.get(@url)}
+        $stderr = backup
+        progressbar.should work_fine
+      end
 
-    it "with block" do
-      @agent.progressbar(:out => @output){@agent.get(@url)}
-      progressbar.should work_fine
-      @agent.pre_connect_hooks.should be_empty
-      @agent.post_connect_hooks.should be_empty
+      it "accepts (agent, pbar_opt) arguments" do
+        o = Object.new
+        o.extend(MechanizeProgressBarAPI)
+        o.progressbar(@agent, :out => @output){@agent.get(@url)}
+        progressbar.should work_fine
+      end
     end
 
-    it "method chain leaves a proc on post_connect_hooks" do
-      @agent.progressbar(:out => @output).get(@url)
-      progressbar.should work_fine
-      @agent.pre_connect_hooks.should be_empty
-      @agent.post_connect_hooks.should_not be_empty
+    describe "method chain" do
+      it "works fine" do
+        @agent.progressbar(:out => @output).get(@url)
+        progressbar.should work_fine
+      end
+
+      it "options to method chain are reseted next time" do
+        out1 = StringIO.new
+        @agent.progressbar(:out => out1, :title => 'AAAA').get(@url)
+        out1.string.should match(/AAAA/)
+
+        out2 = StringIO.new
+        @agent.progressbar(:out => out2, :title => 'BBBB').get(@url)
+        out2.string.should match(/BBBB/)
+
+        out3 = StringIO.new
+        @agent.progressbar(:out => out3).get(@url)
+        out3.string.should_not match(/BBBB/)
+      end
     end
 
     it "default ProgressBar title is uri.host" do
@@ -102,10 +118,6 @@ describe MechanizeProgressBarAPI do
       progressbar.should match(/999B/)
     end
 
-    it "default ProgressBar out is $stderr" do
-      # TODO:
-    end
-
     it "agent.progressbar(:out => io) changes output to io object" do
       @agent.progressbar(:out => @output){
         lambda{@agent.get(@url)}.should_not raise_error
@@ -130,62 +142,111 @@ describe MechanizeProgressBarAPI do
       progressbar.should be_include(stat)
     end
 
-    it "when HTTP status error occurs in Mechanize, rescue unregister" do
+    it "when Exception occurs before fetching, raise it and show nothing" do
+      WebMock.stub_request(:get, @url).to_timeout
+      if Mechanize::VERSION == '1.0.0'
+        error = Timeout::Error
+        error_message = /execution expired/
+      else
+        error = Net::HTTP::Persistent::Error
+        error_message = /execution expired - Timeout::Error/
+      end
+
+      @agent.progressbar(:output => @output) do
+        lambda{ @agent.get(@url) }.should raise_error(error, error_message)
+      end
+      progressbar.should be_empty
+    end
+
+    ## TODO: it requires a webmock adapter for net-http-persistent
+    # it "when HTTP status error occurs in reading, raise it and show nothing" do
+    #   WebMock.stub_request(:get, @url).to_raise(Errno::ECONNREFUSED)
+    #   lambda{
+    #     @agent.progressbar{ @agent.get(@url)}
+    #   }.should raise_error(Net::HTTP::Persistent::Error) # raises ECONNREFUSED
+    # end
+
+    it "when HTTP status error occurs after fetching, raise it and show nothing" do
       url_404 = 'http://host/404'
       WebMock.stub_request(:get, url_404).to_return(:status => ['404', 'Not Found'])
       lambda{
         @agent.progressbar(:output => @output) do
-          @agent.pre_connect_hooks[0].should be_kind_of(Proc)
           @agent.get(url_404)
         end
       }.should raise_error(Mechanize::ResponseCodeError)
-      @agent.pre_connect_hooks.should be_empty
       progressbar.should be_empty
     end
 
-    it "when Exception occurs in Mechanize, rescue unregister" do
-      WebMock.stub_request(:get, @url).to_timeout
-      @agent.progressbar(:output => @output) do
-        @agent.pre_connect_hooks[0].should be_kind_of(Proc)
-        lambda{@agent.get(@url)}.should raise_error(Timeout::Error)
+    describe "with Logger" do
+
+      before :all do
+        require 'logger'
       end
-      @agent.pre_connect_hooks.should be_empty
-      progressbar.should be_empty
-    end
 
-    it "Mechanize Logger output to $stderr crashes ProgressBar" do
-      require 'logger'
-      out = StringIO.new
-      @agent.log = Logger.new(out)
-      @agent.progressbar(:output => out){@agent.get(@url)}
+      before :each do
+        @out = StringIO.new
+        @agent.log = Logger.new(@out)
+      end
 
-      # matches:
-      ### http://uri.host/uri.path
-      ### D, [(date+time)] DEBUG -- : Read 1000 bytes ETA:  --:--:--
-      ### 100% |ooooooooooooooooooooooooooooooooooooooo|   1000B nnn.nKB/s Time: 00:00:00
-      re = /http:\/\/uri\.host\/uri\.path\s+D, \[.+?\] DEBUG -- : Read 1000 bytes\s+100% |o+|\s+1000B/
-      out.string.should match(re)
-    end
+      def progressbar
+        @out.string
+      end
 
-    it "(:suppress_logger => true) make ProgressBar and Mechanize Logger output independent" do
-      require 'logger'
-      out = StringIO.new
-      @agent.log = Logger.new(out)
-      @agent.progressbar(:output => out, :suppress_logger => true){@agent.get(@url)}
+      it "{:suppress_logger => true} does nothing when no logger" do
+        @agent.log = nil
+        @agent.progressbar(:output => @out, :suppress_logger => false){@agent.get(@url)}
+        progressbar.should work_fine
+        progressbar.should_not match(/Read 1000 bytes/)
+      end
+
+      it "When Logger and ProgressBar have same outputs, Log output is suppressed " do
+        @agent.progressbar(:output => @out){@agent.get(@url)}
+        if Mechanize::VERSION == '1.0.0'
+          re = /^I, \[.+^http:\/\/.+?Time: \d\d:\d\d:\d\d\nD, /m
+          # matches:
+          ### D, [2011-06-29...
+          ### http://uri.host//uri.path...
+          ### ...
+          ### (showing progressbar)
+          ### ...
+          ### ...1000B 195.7KB/s Time: 00:00:00
+          ### D, [2011-06-29...
+          progressbar.should match(re)
+        else
+          re = /^D, \[.+^http:\/\/.+?Time: \d\d:\d\d:\d\d\n\Z/m
+          # matches:
+          ### D, [2011-06-29...
+          ### http://uri.host//uri.path...
+          ### ...
+          ### (showing progressbar)
+          ### ...
+          ### ...1000B 195.7KB/s Time: 00:00:00\n
+          progressbar.should match(re)
+        end
+      end
 
-      # matches:
-      ### request-header: keep-alive => 300\n
-      ### http://uri.host/uri.path
-      before_progressbar = /request-header: (.+?) => (.+?)\s+http:\/\/uri\.host\/uri\.path/
-      out.string.should match(before_progressbar)
+      it "When Logger output is diffrent from ProgressBar one, Mechanize shows Log as usual" do
+        logger_out = StringIO.new
+        @agent.log = Logger.new(logger_out)
+        @agent.progressbar(:output => @out){@agent.get(@url)}
 
-      # matches:
-      ### 100% |ooooooooooooooooooooooooooooooooooooooo|   1000B 151.5KB/s Time: 00:00:00
-      ### D, [(date+time)] DEBUG -- : Read 1000 bytes
-      after_progressbar = /100%\s*\|o+\|\s+1000B (.+?)B\/s Time: \d\d:\d\d:\d\d\s+D, \[.+?\] DEBUG -- : Read 1000 bytes/
-      out.string.should match(after_progressbar)
-    end
+        progressbar.should work_fine
+        progressbar.should_not match(/Read 1000 bytes/)
+        logger_out.string.should match(/Read 1000 bytes/)
+      end
 
+      it "{:suppress_logger => false} crashes ProgressBar output" do
+        @agent.progressbar(:output => @out, :suppress_logger => false){@agent.get(@url)}
+
+        re = /D, \[.+?\] DEBUG -- : Read 1000 bytes \(1000 total\)\r?\n100% \|o+\|\s+1000B/
+
+        # matches:
+        ### D, [(date+time)] DEBUG -- : Read 1000 bytes
+        ### 100% |ooooooooooooooooooooooooooooooooooooooo|   1000B nnn.nKB/s Time: 00:00:00
+        progressbar.should match(re)
+      end
+
+    end
   end
 end