kronk 1.8.3 → 1.8.4

data/History.rdoc

@@ -1,4 +1,14 @@
-=== 1.8.2 / 2012-02-15
+=== 1.8.4 / 2012-03-20
+
+* Enhancements:
+
+  * Allow setting a fallback host when retrieving mixed full and partial URLs.
+
+* Bugfixes:
+
+  * Fix redirect issue in player.
+
+=== 1.8.3 / 2012-02-15
 
 * Bugfixes:
 

data/lib/kronk.rb

@@ -12,7 +12,7 @@ require 'yaml'
 class Kronk
 
   # This gem's version.
-  VERSION = '1.8.3'
+  VERSION = '1.8.4'
 
   require 'kronk/constants'
   require 'kronk/queue_runner'

data/lib/kronk/cmd.rb

@@ -204,8 +204,8 @@ Parse and run diffs against data from live and cached http responses.
         end
 
 
-        opt.on('-i', '--include [HEADER1,HEADER2]', Array,
-               'Include all or given headers in response') do |value|
+        opt.on('-I', '--head [HEADER1,HEADER2]', Array,
+               'Use all or given headers only in the response') do |value|
           options[:show_headers] ||= []
 
           if value
@@ -215,12 +215,12 @@ Parse and run diffs against data from live and cached http responses.
             options[:show_headers] = true
           end
 
-          options[:no_body] = false
+          options[:no_body] = true
         end
 
 
-        opt.on('-I', '--head [HEADER1,HEADER2]', Array,
-               'Use all or given headers only in the response') do |value|
+        opt.on('-i', '--include [HEADER1,HEADER2]', Array,
+               'Include all or given headers in response') do |value|
           options[:show_headers] ||= []
 
           if value
@@ -230,7 +230,7 @@ Parse and run diffs against data from live and cached http responses.
             options[:show_headers] = true
           end
 
-          options[:no_body] = true
+          options[:no_body] = false
         end
 
 
@@ -394,6 +394,12 @@ Parse and run diffs against data from live and cached http responses.
         end
 
 
+        opt.on('--default-host STR', String,
+               'Default host to use if missing') do |value|
+          Kronk.config[:default_host] = value
+        end
+
+
         opt.on('-F', '--form STR', String,
                'Set request body with form headers; overrides -d') do |value|
           options[:form] = value

data/lib/kronk/request.rb

@@ -47,13 +47,18 @@ class Kronk
     # path and options.
 
     def self.build_uri uri, opts={}
-      uri  ||= opts[:host] || Kronk.config[:default_host]
-      suffix = opts[:uri_suffix]
+      uri ||= opts[:host]
 
-      uri = "http://#{uri}"   unless uri.to_s =~ %r{^(\w+://|/)}
-      uri = "#{uri}#{suffix}" if suffix
-      uri = URI.parse uri     unless URI === uri
-      uri = URI.parse(Kronk.config[:default_host]) + uri unless uri.host
+      uri = "#{uri}#{opts[:path]}#{opts[:uri_suffix]}"
+      uri = "http://#{uri}" unless uri.to_s =~ %r{^(\w+://|/)}
+
+      uri = URI.parse uri unless URI === uri
+
+      unless uri.host
+        host = Kronk.config[:default_host]
+        host = "http://#{host}" unless host.to_s =~ %r{^\w+://}
+        uri  = URI.parse(host) + uri
+      end
 
       if opts[:query]
         query = build_query opts[:query]
@@ -94,7 +99,7 @@ class Kronk
       lines.shift.strip =~ REQUEST_LINE_MATCHER
       opts.merge! :http_method => $1,
                   :host        => $2,
-                  :uri_suffix  => ($3 || $4)
+                  :path        => ($3 || $4)
 
       lines.each_with_index do |line, i|
         case line
@@ -114,7 +119,7 @@ class Kronk
       opts[:data] = lines[body_start..-1].join("\n") if body_start
 
       opts.delete(:host)        if !opts[:host]
-      opts.delete(:uri_suffix)  if !opts[:uri_suffix]
+      opts.delete(:path)        if !opts[:path]
       opts.delete(:headers)     if opts[:headers].empty?
       opts.delete(:http_method) if !opts[:http_method]
       opts.delete(:data)        if opts[:data] && opts[:data].strip.empty?
@@ -451,7 +456,7 @@ class Kronk
     def to_hash
       hash = {
         :host        => "#{@uri.scheme}://#{@uri.host}:#{@uri.port}",
-        :uri_suffix  => @uri.request_uri,
+        :path        => @uri.request_uri,
         :user_agent  => self.user_agent,
         :timeout     => @timeout,
         :http_method => self.http_method,

data/lib/kronk/response.rb

@@ -500,8 +500,11 @@ class Kronk
     def follow_redirect opts={}, &block
       return if !redirect?
       new_opts = @request ? @request.to_hash : {}
+
       new_opts[:http_method] = "GET" if @code == "303"
       new_opts.merge!(opts)
+
+      new_opts.delete(:path)
       new_opts.delete(:auth) if !opts[:trust_location] &&
         (!@request || self.location.host != self.uri.host)
 

data/test/test_input_reader.rb

@@ -25,7 +25,7 @@ class TestInputReader < Test::Unit::TestCase
   def test_get_next
     (1..3).each do |num|
       expected = {
-        :uri_suffix  => "/path#{num}"
+        :path  => "/path#{num}"
       }
       assert_equal expected, @input.get_next
     end
@@ -43,7 +43,7 @@ class TestInputReader < Test::Unit::TestCase
         "Authorization" => "Basic Ym9iOmZvb2Jhcg=="
       },
       :http_method => "GET",
-      :uri_suffix  => "/path",
+      :path        => "/path",
       :host        => "example.com:80",
     }
 
@@ -65,7 +65,7 @@ class TestInputReader < Test::Unit::TestCase
         "Authorization" => "Basic Ym9iOmZvb2Jhcg=="
       },
       :http_method => "GET",
-      :uri_suffix  => "/path",
+      :path        => "/path",
       :host        => "example.com:80",
     }
 

data/test/test_player.rb

@@ -162,21 +162,21 @@ class TestPlayer < Test::Unit::TestCase
     @player.input.io.rewind
     @player.input.io.close_write
 
-    @player.queue.concat [{:uri_suffix => "/req1"}, {:uri_suffix => "/req2"}]
+    @player.queue.concat [{:path => "/req1"}, {:path => "/req2"}]
 
     part1 = (1..2).map{|n| "/req#{n}"}
     part2 = (3..5).map{|n| "/req#{n}"}
 
     part1.each do |path|
       mock_requests "example.com", "beta-example.com",
-        :uri_suffix => path,
-        :query      => "foo=bar"
+        :path  => path,
+        :query => "foo=bar"
     end
 
     part2.each do |path|
       mock_requests "example.com", "beta-example.com",
-        :uri_suffix  => path,
-        :query       => "foo=bar"
+        :path  => path,
+        :query => "foo=bar"
     end
 
     @player.compare "example.com", "beta-example.com", :query => "foo=bar"

data/test/test_request.rb

@@ -42,10 +42,10 @@ class TestRequest < Test::Unit::TestCase
 
 
   def test_parse_to_hash
-    expected = {:uri_suffix => "/foobar"}
+    expected = {:path => "/foobar"}
     assert_equal expected, Kronk::Request.parse_to_hash("/foobar")
 
-    expected = {:http_method => "GET", :uri_suffix => "/foobar"}
+    expected = {:http_method => "GET", :path => "/foobar"}
     assert_equal expected, Kronk::Request.parse_to_hash("GET /foobar")
 
     expected.merge! :host => "example.com"
@@ -62,7 +62,7 @@ class TestRequest < Test::Unit::TestCase
 
 
   def test_parse_to_hash_url
-    expected = {:host => "http://example.com", :uri_suffix => "/foobar?foo=bar"}
+    expected = {:host => "http://example.com", :path => "/foobar?foo=bar"}
     assert_equal expected,
       Kronk::Request.parse_to_hash("http://example.com/foobar?foo=bar")
   end
@@ -130,6 +130,15 @@ class TestRequest < Test::Unit::TestCase
   end
 
 
+  def test_build_path
+    uri = Kronk::Request.build_uri "http://example.com/",
+             :path       => "/path",
+             :uri_suffix => "/to/resource"
+
+    assert_equal "http://example.com//path/to/resource", uri.to_s
+  end
+
+
   def test_build_uri_from_uri
     query = {'a' => '1', 'b' => '2'}
     uri   = Kronk::Request.build_uri URI.parse("http://example.com/path"),

data/test/test_request_parser.rb

@@ -17,10 +17,10 @@ class TestRequestParser < Test::Unit::TestCase
 
 
   def test_parse
-    expected = {:uri_suffix => "/foobar"}
+    expected = {:path => "/foobar"}
     assert_equal expected, Kronk::Player::RequestParser.parse("/foobar")
 
-    expected = {:http_method => "GET", :uri_suffix => "/foobar"}
+    expected = {:http_method => "GET", :path => "/foobar"}
     assert_equal expected, Kronk::Player::RequestParser.parse("GET /foobar")
 
     expected.merge! :host => "example.com"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kronk
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-15 00:00:00.000000000 Z
+date: 2012-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70142332427460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70142332427460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: cookiejar
-  requirement: &70142335036320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70142335036320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: plist
-  requirement: &70142335035900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *70142335035900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70142335035480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: '1.4'
   type: :development
   prerelease: false
-  version_requirements: *70142335035480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70142335035060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,18 +85,44 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *70142335035060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.12
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70142335034640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *70142335034640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.13'
 description: ! 'Kronk runs diffs against data from live and cached http responses.
 
   Kronk was made possible by the sponsoring of AT&T Interactive.'
@@ -173,6 +219,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3368818525968030457
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -181,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: kronk
-rubygems_version: 1.8.11
+rubygems_version: 1.8.18
 signing_key: 
 specification_version: 3
 summary: Kronk runs diffs against data from live and cached http responses