kronk 1.8.7 → 1.9.0

data/test/test_player.rb

@@ -384,8 +384,13 @@ class TestPlayer < Test::Unit::TestCase
     req1 = Kronk::Request.new "example.com"
     req2 = Kronk::Request.new "beta-example.com"
 
-    Kronk::Request.expects(:new).returns req2
-    Kronk::Request.expects(:new).returns req1
+    Kronk::Request.expects(:new).
+      with("example.com", :uri_suffix => '/test', :include_headers => true).
+      returns req1
+
+    Kronk::Request.expects(:new).
+      with("beta-example.com", :uri_suffix => '/test', :include_headers => true).
+      returns req2
 
     req1.expects(:retrieve).returns resp1
     req2.expects(:retrieve).returns resp2

data/test/test_request.rb

@@ -77,7 +77,7 @@ class TestRequest < Test::Unit::TestCase
   def test_retrieve_post
     expect_request "POST", "http://example.com/request/path?foo=bar",
       :data    => {'test' => 'thing'},
-      :headers => {'X-THING' => 'thing', 'Content-Length' => '10'}
+      :headers => {'X-THING' => 'thing'}
 
     resp = Kronk::Request.new("http://example.com/request/path?foo=bar",
             :data => 'test=thing', :headers => {'X-THING' => 'thing'},
@@ -154,11 +154,11 @@ class TestRequest < Test::Unit::TestCase
     req = Kronk::Request.new "foo.com"
     req.headers['Transfer-Encoding'] = "chunked"
     req.body = {:foo => :bar}
+    req = req.http_request
 
     assert_equal "foo=bar", req.body
-    assert_equal nil, req.headers['Transfer-Encoding']
-    assert_equal "application/x-www-form-urlencoded",
-                 req.headers['Content-Type']
+    assert_equal 'chunked', req['Transfer-Encoding']
+    assert_equal "application/x-www-form-urlencoded", req['Content-Type']
   end
 
 
@@ -166,23 +166,37 @@ class TestRequest < Test::Unit::TestCase
     req = Kronk::Request.new "foo.com", :form => "blah"
     req.headers['Transfer-Encoding'] = "chunked"
     req.body = "foo=bar"
+    req = req.http_request
 
     assert_equal "foo=bar", req.body
-    assert_equal nil, req.headers['Transfer-Encoding']
-    assert_equal '7', req.headers['Content-Length']
-    assert_equal "application/x-www-form-urlencoded",
-                 req.headers['Content-Type']
+    assert_equal 'chunked', req['Transfer-Encoding']
+    assert_equal '7', req['Content-Length']
+    assert_equal "application/x-www-form-urlencoded", req['Content-Type']
   end
 
 
   def test_body_string_io
     req = Kronk::Request.new "foo.com"
     req.body = str_io = StringIO.new("foo=bar")
+    req = req.http_request
 
-    assert_equal str_io,               req.body
-    assert_equal nil,                  req.headers['Transfer-Encoding']
-    assert_equal 'application/binary', req.headers['Content-Type']
-    assert_equal '7',                  req.headers['Content-Length']
+    assert_equal str_io,               req.body_stream
+    assert_equal nil,                  req['Transfer-Encoding']
+    assert_equal 'application/binary', req['Content-Type']
+    assert_equal '7',                  req['Content-Length']
+  end
+
+
+  def test_body_nil
+    req = Kronk::Request.new "foo.com"
+    req.body = nil
+    req = req.http_request
+
+    assert_equal nil, req.body_stream
+    assert_equal "",  req.body
+    assert_equal nil, req['Transfer-Encoding']
+    assert_equal nil, req['Content-Type']
+    assert_equal '0', req['Content-Length']
   end
 
 
@@ -190,23 +204,25 @@ class TestRequest < Test::Unit::TestCase
     req = Kronk::Request.new "foo.com"
     io, = IO.pipe
     req.body = io
+    req = req.http_request
 
-    assert_equal io,                   req.body
-    assert_equal 'chunked',            req.headers['Transfer-Encoding']
-    assert_equal 'application/binary', req.headers['Content-Type']
-    assert_equal nil,                  req.headers['Content-Length']
+    assert_equal io,                   req.body_stream
+    assert_equal 'chunked',            req['Transfer-Encoding']
+    assert_equal 'application/binary', req['Content-Type']
+    assert_equal nil,                  req['Content-Length']
   end
 
 
   def test_body_file_io
-    io  = File.open 'TODO.rdoc', 'r'
+    io  = File.open 'Manifest.txt', 'r'
     req = Kronk::Request.new "foo.com"
     req.body = io
+    req = req.http_request
 
-    assert_equal io,                   req.body
-    assert_equal nil,                  req.headers['Transfer-Encoding']
-    assert_equal 'application/rdoc',   req.headers['Content-Type']
-    assert_equal io.size.to_s,         req.headers['Content-Length']
+    assert_equal io,           req.body_stream
+    assert_equal nil,          req['Transfer-Encoding']
+    assert_equal 'text/plain', req['Content-Type']
+    assert_equal io.size.to_s, req['Content-Length']
 
   ensure
     io.close
@@ -217,10 +233,11 @@ class TestRequest < Test::Unit::TestCase
     req = Kronk::Request.new "foo.com"
     req.headers['Transfer-Encoding'] = "chunked"
     req.body = 12345
+    req = req.http_request
 
-    assert_equal "12345", req.body
-    assert_equal nil,     req.headers['Transfer-Encoding']
-    assert_equal nil,     req.headers['Content-Type']
+    assert_equal "12345",   req.body
+    assert_equal "chunked", req['Transfer-Encoding']
+    assert_equal nil,       req['Content-Type']
   end
 
 
@@ -392,9 +409,7 @@ class TestRequest < Test::Unit::TestCase
 
 
   def test_retrieve_ssl
-    expect_request "GET", "https://example.com" do |http, req, resp|
-      req.expects(:use_ssl=).with true
-    end
+    expect_request "GET", "https://example.com", :ssl => true
 
     resp = Kronk::Request.new("https://example.com").retrieve
 
@@ -479,10 +494,7 @@ class TestRequest < Test::Unit::TestCase
       :password => "smith"
     }
 
-    expect_request "GET", "http://example.com"
-
-    Kronk::HTTP.expects(:Proxy).with("proxy.com", 8080, "john", "smith").
-      returns Kronk::HTTP
+    expect_request "GET", "http://example.com", :proxy => proxy
 
     Kronk::Request.new("http://example.com", :proxy => proxy).retrieve
   end
@@ -491,22 +503,16 @@ class TestRequest < Test::Unit::TestCase
   def test_retrieve_proxy_string
     proxy = "proxy.com:8888"
 
-    expect_request "GET", "http://example.com"
-
-    Kronk::HTTP.expects(:Proxy).with("proxy.com", "8888", nil, nil).
-      returns Kronk::HTTP
+    expect_request "GET", "http://example.com",
+      :proxy => {:host => 'proxy.com', :port => "8888"}
 
     Kronk::Request.new("http://example.com", :proxy => proxy).retrieve
   end
 
 
-  def test_proxy_nil
-    assert_equal Kronk::HTTP, Kronk::Request.new("host.com").http_proxy(nil)
-  end
-
-
   def test_proxy_string
-    proxy_class = Kronk::Request.new("host.com").http_proxy("myproxy.com:80")
+    proxy_class = Kronk::Request.new("host.com", :proxy => "myproxy.com:80").
+                    connection.class
 
     assert_equal "myproxy.com",
       proxy_class.instance_variable_get("@proxy_address")
@@ -519,7 +525,8 @@ class TestRequest < Test::Unit::TestCase
 
 
   def test_proxy_no_port
-    proxy_class = Kronk::Request.new("host.com").http_proxy("myproxy.com")
+    proxy_class = Kronk::Request.new("host.com", :proxy => "myproxy.com").
+                    connection.class
 
     assert_equal "myproxy.com",
       proxy_class.instance_variable_get("@proxy_address")
@@ -538,7 +545,7 @@ class TestRequest < Test::Unit::TestCase
                         :username => "john",
                         :password => "smith" }
 
-    proxy_class = req.http_proxy req.proxy[:host], req.proxy
+    proxy_class = req.connection.class
 
     assert_equal "myproxy.com",
       proxy_class.instance_variable_get("@proxy_address")
@@ -582,4 +589,114 @@ class TestRequest < Test::Unit::TestCase
     assert_equal "some/path", req.path
     assert_equal "vanilla kronk", req['User-Agent']
   end
+
+
+  def test_multipart_hash
+    file1 = File.open("test/mocks/200_gzip.txt", "rb")
+    file2 = File.open("test/mocks/200_response.json", "rb")
+    File.stubs(:open).with("test/mocks/200_gzip.txt", "rb").returns file1
+    File.stubs(:open).with("test/mocks/200_response.json", "rb").returns file2
+
+    req = Kronk::Request.new "host.com",
+            :form => {:foo => ["bar"]},
+            :form_upload => {:foo => ["test/mocks/200_gzip.txt"],
+              :bar => "test/mocks/200_response.json"}
+
+    assert_equal Kronk::Multipart, req.body.class
+    assert_equal 3, req.body.parts.length
+
+    expected = [{"content-disposition"=>"form-data; name=\"foo[]\""}, "bar"]
+    assert req.body.parts.include?(expected),
+      "Request body should include foo[]=bar"
+
+    expected = [{
+      'content-disposition' =>
+        "form-data; name=\"foo[]\"; filename=\"#{File.basename file1.path}\"",
+      'Content-Type'        => "text/plain",
+      'Content-Transfer-Encoding' => 'binary'
+    }, file1]
+    assert req.body.parts.include?(expected),
+      "Request body should include foo[]=#{file1.inspect}"
+
+    expected = [{
+      'content-disposition' =>
+        "form-data; name=\"bar\"; filename=\"#{File.basename file2.path}\"",
+      'Content-Type'        => "application/json",
+      'Content-Transfer-Encoding' => 'binary'
+    }, file2]
+    assert req.body.parts.include?(expected),
+      "Request body should include bar=#{file2.inspect}"
+
+  ensure
+    file1.close
+    file2.close
+  end
+
+
+  def test_multipart_string
+    file1 = File.open("test/mocks/200_gzip.txt", "rb")
+    file2 = File.open("test/mocks/200_response.json", "rb")
+    File.stubs(:open).with("test/mocks/200_gzip.txt", "rb").returns file1
+    File.stubs(:open).with("test/mocks/200_response.json", "rb").returns file2
+
+    req = Kronk::Request.new "host.com",
+            :form        => "foo[]=bar",
+            :form_upload =>
+              "foo[]=test/mocks/200_gzip.txt&bar=test/mocks/200_response.json"
+
+    assert_equal Kronk::Multipart, req.body.class
+    assert_equal 3, req.body.parts.length
+
+    expected = [{"content-disposition"=>"form-data; name=\"foo[]\""}, "bar"]
+    assert req.body.parts.include?(expected),
+      "Request body should include foo[]=bar"
+
+    expected = [{
+      'content-disposition' =>
+        "form-data; name=\"foo[]\"; filename=\"#{File.basename file1.path}\"",
+      'Content-Type'        => "text/plain",
+      'Content-Transfer-Encoding' => 'binary'
+    }, file1]
+    assert req.body.parts.include?(expected),
+      "Request body should include foo[]=#{file1.inspect}"
+
+    expected = [{
+      'content-disposition' =>
+        "form-data; name=\"bar\"; filename=\"#{File.basename file2.path}\"",
+      'Content-Type'        => "application/json",
+      'Content-Transfer-Encoding' => 'binary'
+    }, file2]
+    assert req.body.parts.include?(expected),
+      "Request body should include bar=#{file2.inspect}"
+
+  ensure
+    file1.close
+    file2.close
+  end
+
+
+  def test_http_request_multipart
+    file1 = File.open("test/mocks/200_gzip.txt", "rb")
+    file2 = File.open("test/mocks/200_response.json", "rb")
+    File.stubs(:open).with("test/mocks/200_gzip.txt", "rb").returns file1
+    File.stubs(:open).with("test/mocks/200_response.json", "rb").returns file2
+
+    req = Kronk::Request.new "host.com",
+            :form        => "foo[]=bar",
+            :form_upload =>
+              "foo[]=test/mocks/200_gzip.txt&bar=test/mocks/200_response.json"
+
+    hreq = req.http_request
+    assert_equal Kronk::MultipartIO, hreq.body_stream.class
+    assert_equal req.body.to_io.size.to_s, hreq['Content-Length']
+    assert_equal 5, hreq.body_stream.parts.length
+    assert hreq.body_stream.parts.include?(file1),
+      "HTTPRequest body stream should include #{file1.inspect}"
+    assert hreq.body_stream.parts.include?(file2),
+      "HTTPRequest body stream should include #{file2.inspect}"
+
+  ensure
+    file1.close
+    file2.close
+  end
 end

data/test/test_response.rb

@@ -11,6 +11,38 @@ class TestResponse < Test::Unit::TestCase
   end
 
 
+  def test_ext
+    assert_equal "html",  @html_resp.ext
+    assert_equal "json",  @json_resp.ext
+    assert_equal "plist", @plist_resp.ext
+    assert_equal "xml",   @xml_resp.ext
+  end
+
+
+  def test_ext_file
+    yml = Kronk::Response.
+        read_file("test/mocks/cookies.yml", :allow_headless => true)
+
+    assert_equal "text/x-yaml; charset=ASCII-8BIT", yml.headers['content-type']
+    assert_equal "yaml", yml.ext
+
+    yml.headers.delete('content-type')
+    assert_equal "yml", yml.ext
+  end
+
+
+  def test_ext_default
+    bin = Kronk::Response.
+        read_file("bin/kronk", :allow_headless => true)
+
+    assert_equal "text/plain; charset=ASCII-8BIT", bin.headers['content-type']
+    assert_equal "txt", bin.ext
+
+    bin.headers.delete('content-type')
+    assert_equal "txt", bin.ext
+  end
+
+
   def test_init_encoding
     assert_equal "ISO-8859-1", @html_resp.encoding.to_s
     assert_equal "ISO-8859-1", @html_resp.body.encoding.to_s if
@@ -259,8 +291,8 @@ class TestResponse < Test::Unit::TestCase
     resp = Kronk::Response.new io
 
     assert_equal "just this one line!", resp.body
-    enc = "".encoding rescue "UTF-8"
-    assert_equal "text/html; charset=#{enc}", resp['Content-Type']
+    enc = "".encoding rescue "ASCII-8BIT"
+    assert_equal "text/plain; charset=#{enc}", resp['Content-Type']
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kronk
 version: !ruby/object:Gem::Version
-  version: 1.8.7
+  version: 1.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000 Z
+date: 2012-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -59,6 +59,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.18.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.18.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -149,7 +165,7 @@ description: ! 'Kronk is a command line swiss-army-knife for HTTP services.
   your HTTP applications.
 
 
-  Kronk was made possible by the sponsoring of AT&T Interactive.'
+  Kronk was made possible by the sponsoring of YP.com.'
 email:
 - yaksnrainbows@gmail.com
 executables:
@@ -168,6 +184,7 @@ files:
 - Rakefile
 - bin/kronk
 - lib/kronk.rb
+- lib/kronk/buffered_io.rb
 - lib/kronk/cmd.rb
 - lib/kronk/constants.rb
 - lib/kronk/data_string.rb
@@ -176,9 +193,11 @@ files:
 - lib/kronk/diff/color_format.rb
 - lib/kronk/diff/output.rb
 - lib/kronk/http.rb
-- lib/kronk/buffered_io.rb
+- lib/kronk/multipart.rb
+- lib/kronk/multipart_io.rb
 - lib/kronk/player.rb
 - lib/kronk/player/benchmark.rb
+- lib/kronk/player/download.rb
 - lib/kronk/player/input_reader.rb
 - lib/kronk/player/request_parser.rb
 - lib/kronk/player/suite.rb
@@ -212,6 +231,8 @@ files:
 - test/test_helper_methods.rb
 - test/test_input_reader.rb
 - test/test_kronk.rb
+- test/test_multipart.rb
+- test/test_multipart_io.rb
 - test/test_player.rb
 - test/test_request.rb
 - test/test_request_parser.rb
@@ -254,6 +275,8 @@ test_files:
 - test/test_helper_methods.rb
 - test/test_input_reader.rb
 - test/test_kronk.rb
+- test/test_multipart.rb
+- test/test_multipart_io.rb
 - test/test_player.rb
 - test/test_request.rb
 - test/test_request_parser.rb