kronk 1.7.8 → 1.8.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kronk
 version: !ruby/object:Gem::Version
-  version: 1.7.8
+  version: 1.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-10 00:00:00.000000000 Z
+date: 2012-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2152119260 !ruby/object:Gem::Requirement
+  requirement: &70357826961820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *2152119260
+  version_requirements: *70357826961820
 - !ruby/object:Gem::Dependency
   name: cookiejar
-  requirement: &2152118280 !ruby/object:Gem::Requirement
+  requirement: &70357826961200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152118280
+  version_requirements: *70357826961200
 - !ruby/object:Gem::Dependency
   name: plist
-  requirement: &2152090240 !ruby/object:Gem::Requirement
+  requirement: &70357826960660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *2152090240
+  version_requirements: *70357826960660
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2152088080 !ruby/object:Gem::Requirement
+  requirement: &70357826960080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.4'
   type: :development
   prerelease: false
-  version_requirements: *2152088080
+  version_requirements: *70357826960080
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2152085080 !ruby/object:Gem::Requirement
+  requirement: &70357826959520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,21 +65,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *2152085080
-- !ruby/object:Gem::Dependency
-  name: em-http-request
-  requirement: &2152143020 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *2152143020
+  version_requirements: *70357826959520
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &2152140980 !ruby/object:Gem::Requirement
+  requirement: &70357826958980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +76,7 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *2152140980
+  version_requirements: *70357826958980
 description: ! 'Kronk runs diffs against data from live and cached http responses.
 
   Kronk was made possible by the sponsoring of AT&T Interactive.'
@@ -109,10 +98,6 @@ files:
 - Rakefile
 - bin/kronk
 - lib/kronk.rb
-- lib/kronk/async.rb
-- lib/kronk/async/em_ext.rb
-- lib/kronk/async/request.rb
-- lib/kronk/async/response.rb
 - lib/kronk/cmd.rb
 - lib/kronk/constants.rb
 - lib/kronk/core_ext.rb
@@ -121,6 +106,8 @@ files:
 - lib/kronk/diff/ascii_format.rb
 - lib/kronk/diff/color_format.rb
 - lib/kronk/diff/output.rb
+- lib/kronk/http.rb
+- lib/kronk/buffered_io.rb
 - lib/kronk/path.rb
 - lib/kronk/path/matcher.rb
 - lib/kronk/path/match.rb
@@ -128,10 +115,10 @@ files:
 - lib/kronk/player.rb
 - lib/kronk/player/benchmark.rb
 - lib/kronk/player/input_reader.rb
-- lib/kronk/player/output.rb
 - lib/kronk/player/request_parser.rb
 - lib/kronk/player/suite.rb
 - lib/kronk/player/stream.rb
+- lib/kronk/player/tsv.rb
 - lib/kronk/plist_parser.rb
 - lib/kronk/queue_runner.rb
 - lib/kronk/request.rb
@@ -142,6 +129,8 @@ files:
 - lib/kronk/xml_parser.rb
 - lib/kronk/yaml_parser.rb
 - script/kronk_completion
+- test/mocks/200_gzip.txt
+- test/mocks/200_inflate.txt
 - test/mocks/200_response.json
 - test/mocks/200_response.plist
 - test/mocks/200_response.txt
@@ -192,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: kronk
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Kronk runs diffs against data from live and cached http responses

data/lib/kronk/async.rb

@@ -1,118 +0,0 @@
-require 'kronk'
-require 'kronk/async/em_ext'
-require 'kronk/async/request'
-require 'kronk/async/response'
-
-class Kronk
-
-  ##
-  # Returns an EM::MultiRequest instance from a url, file, or IO pair.
-  # Calls the given block with a Kronk::Diff object on completion or error.
-  # Assigns @response, @responses, @diff. Must be called from an EM loop.
-  #
-  #   kronk.compare_async uri1, uri2 do |diff, err|
-  #     # handle diff, responses, or error
-  #   end
-
-  def compare_async uri1, uri2
-    multi = EM::MultiRequest.new
-
-    str1 = str2 = ""
-    res1 = res2 = nil
-    err1 = err2 = nil
-
-    conn1 = request_async uri1 do |res, err|
-      err1 = err and next if err
-      res1 = res
-      str1 = res.stringify
-    end
-
-    conn2 = request_async uri2 do |res, err|
-      err2 = err and next if err
-      res2 = res
-      str2 = res.stringify
-    end
-
-    multi.add :left,  conn1
-    multi.add :right, conn2
-
-    multi.callback do
-      next yield(nil, (err1 || err2)) if err1 || err2
-
-      @responses = [res1, res2]
-      @response  = res2
-
-      opts = {:labels => [res1.uri, res2.uri]}.merge @options
-      @diff = Diff.new str1, str2, opts
-
-      yield @diff
-    end
-
-    multi
-
-  rescue => e
-    yield nil, e
-  end
-
-
-  ##
-  # Returns an EventMachine Connection instance from a url, file, or IO.
-  # Calls the given block with a Kronk::Response object on completion or error.
-  # Assigns @response, @responses, @diff. Must be called from an EM loop.
-  #
-  #   kronk.request_async uri do |resp, err|
-  #     # handle response or error
-  #   end
-
-  def request_async uri
-    options = Kronk.config[:no_uri_options] ? @options : options_for_uri(uri)
-
-    rdir = options[:follow_redirects]
-
-    handler = Proc.new do |resp, err|
-      next yield(resp, err) if err
-
-      resp.parser         = options[:parser] if options[:parser]
-      resp.stringify_opts = options
-
-      if resp.redirect? && (rdir == true || Fixnum === rdir && rdir > 0)
-        Cmd.verbose "Following redirect to #{resp.location}"
-
-        rdir = rdir - 1 if Fixnum === rdir
-        opts = options_for_uri resp.location
-        resp.follow_redirect_async(opts, &handler)
-
-      else
-        @responses = [resp]
-        @response  = resp
-        @diff      = nil
-
-        yield resp if block_given?
-
-        resp
-      end
-    end
-
-    if IO === uri
-      Cmd.verbose "Reading IO #{uri}"
-      Response.from_async_io(uri, &handler)
-
-    elsif StringIO === uri
-      Cmd.verbose "Reading IO #{uri}"
-      handler.call Response.new(uri)
-
-    elsif File.file? uri.to_s
-      Cmd.verbose "Reading file:  #{uri}\n"
-      handler.call Response.read_file(uri)
-
-    else
-      req = Request.new uri, options
-      Cmd.verbose "Retrieving URL:  #{req.uri}\n"
-      conn = req.retrieve_async(&handler)
-      conn.callback{ Kronk.history << uri }
-    end
-
-  rescue => e
-    yield nil, e
-  end
-end

data/lib/kronk/async/em_ext.rb

@@ -1,34 +0,0 @@
-require 'em-http-request'
-
-module EventMachine
-  class HttpClient
-    attr_accessor :raw_response
-
-    alias em_parse_response_header parse_response_header
-
-    def parse_response_header header, version, status
-      out = em_parse_response_header header, version, status
-
-      rheader = @response_header
-
-      @raw_response = "HTTP/#{rheader.http_version} "
-      @raw_response << "#{rheader.status} #{rheader.http_reason}\r\n"
-
-      header.each do |key, val|
-        @raw_response << "#{key}: #{val}\r\n"
-      end
-
-      @raw_response << "\r\n"
-
-      out
-    end
-
-
-    alias em_on_decoded_body_data on_decoded_body_data
-
-    def on_decoded_body_data data
-      @raw_response << data
-      em_on_decoded_body_data data
-    end
-  end
-end

data/lib/kronk/async/request.rb

@@ -1,73 +0,0 @@
-class Kronk
-  class Request
-
-    class EMError < Kronk::Exception; end
-
-    ##
-    # Retrieve this requests' response asynchronously with em-http-request.
-    # Returns a EM::HttpConnection instance.
-    #
-    # Passing a block will yield a Kronk::Response instance and/or
-    # an Exception instance if an error was caught.
-    #
-    #   req  = Request.new "example.com"
-    #   em_req = req.retrieve_async do |kronk_response, err|
-    #     # do something with Kronk::Response instance here
-    #   end
-    #
-    #   em_req.callback { ... }
-    #   em_req.error    { ... }
-
-    def retrieve_async &block
-      header_opts = @headers.dup
-
-      if @auth && !@auth.empty?
-        header_opts['Authorization'] ||= []
-        header_opts['Authorization'][0] = @auth[:username] if @auth[:username]
-        header_opts['Authorization'][1] = @auth[:password] if @auth[:password]
-      end
-
-      conn = async_http
-
-      start_time = Time.now
-      req  = conn.setup_request @http_method,
-                :head => header_opts, :body => @body, &block
-
-      req.callback do |resp|
-        elapsed_time   = Time.now - start_time
-        @response      = Response.new resp.raw_response, nil, self
-        @response.time = elapsed_time
-        yield @response, nil
-      end if block_given?
-
-      req.errback do |c|
-        err = c.error ?
-              EMError.new(c.error) :
-              Kronk::NotFoundError.new("#{@uri} could not be found")
-
-        yield nil, err
-      end
-
-      req
-    end
-
-
-    ##
-    # Return an EM::HttpRequest instance.
-
-    def async_http
-      unless @proxy.empty?
-        proxy_opts = @proxy.dup
-        proxy_opts[:authorization] = [
-          proxy_opts.delete(:username),
-          proxy_opts.delete(:password)
-        ] if proxy_opts[:username] || proxy_opts[:password]
-      end
-
-      EventMachine::HttpRequest.new @uri,
-        :connect_timeout    => @timeout,
-        :inactivity_timeout => @timeout,
-        :proxy              => proxy_opts
-    end
-  end
-end

data/lib/kronk/async/response.rb

@@ -1,70 +0,0 @@
-class Kronk
-  class Response
-
-    class AsyncHandler < EM::Connection
-      attr_accessor :buffer
-
-      def initialize req
-        @buffer   = ""
-        @callback = nil
-        @_req     = req
-        @_res     = nil
-      end
-
-
-      def callback &block
-        @callback = block
-      end
-
-
-      def receive_data str
-        @buffer << str
-      end
-
-
-      def unbind
-        return unless @callback
-
-        @_res = Kronk::Response.new @buffer, nil, @_req
-        err = Kronk::Request::EMError.new "IO read error" if error?
-
-        @callback.call @_res, err
-
-      rescue => e
-        @callback.call @_res, e
-      end
-    end
-
-
-    ##
-    # Response.new with asynchronous IO input.
-    # Returns an EM::Connection subclass (AsyncHandler) instance.
-    #
-    # Passing a block will yield a Kronk::Response instance and/or
-    # an Exception instance if an error was caught.
-    #
-    #   conn = Response.from_async_io do |resp, err|
-    #     # do something with Kronk::Response instance here
-    #   end
-
-    def self.from_async_io io, req=nil, &block
-      conn = EM.attach io, AsyncHandler, req
-      conn.comm_inactivity_timeout = 2
-      conn.callback(&block)
-      conn
-    end
-
-
-    ##
-    # Follow the redirect and return a new Response instance.
-    # Returns nil if not redirect-able.
-    #
-    # Passing a block will yield a Kronk::Response instance and/or
-    # an Exception instance if an error was caught.
-
-    def follow_redirect_async opts={}, &block
-      return if !redirect?
-      Request.new(self.location, opts).retrieve_async(&block)
-    end
-  end
-end