kronk 1.7.7 → 1.7.8

data/History.rdoc

@@ -1,3 +1,9 @@
+=== 1.7.8 / 2011-11-10
+
+* Enhancements:
+
+  * Status and http version are now a part of the parsed headers output.
+
 === 1.7.7 / 2011-11-08
 
 * Enhancements:

data/lib/kronk.rb

@@ -14,7 +14,7 @@ require 'yaml'
 class Kronk
 
   # This gem's version.
-  VERSION = '1.7.7'
+  VERSION = '1.7.8'
 
   require 'kronk/constants'
   require 'kronk/queue_runner'

data/lib/kronk/cmd.rb

@@ -627,7 +627,7 @@ Parse and run diffs against data from live and cached http responses.
         require 'kronk/async'
         Kronk::Player.async = true
 
-      rescue LoadError => e
+      rescue LoadError
         Kronk::Player.async = false
 
         raise Kronk::Exception, "Async mode requires the em-http-request gem" if

data/lib/kronk/data_string.rb

@@ -213,9 +213,8 @@ class Kronk
     def sort_any arr
       i = 1
       until i >= arr.length
-        j        = i-1
-        val      = arr[i]
-        prev_val = arr[j]
+        j   = i-1
+        val = arr[i]
 
         loop do
           if smaller?(val, arr[j])

data/lib/kronk/diff/output.rb

@@ -126,7 +126,7 @@ class Kronk::Diff
       return ColorFormat if name.to_s =~ /^color(_diff)?$/
       Kronk.find_const name
 
-    rescue NameError => e
+    rescue NameError
       raise Kronk::Exception, "No such formatter: #{name.inspect}"
     end
 

data/lib/kronk/path/transaction.rb

@@ -71,9 +71,7 @@ class Kronk::Path::Transaction
   # pass the :keep_indicies => true option.
 
   def results opts={}
-    new_data  = @data
-    prev_type = nil
-    prev_data = nil
+    new_data = @data
 
     @actions.each do |type, paths|
       new_data = send("transaction_#{type}", new_data, *paths)

data/lib/kronk/response.rb

@@ -59,7 +59,7 @@ class Kronk
 
       @time = 0
 
-      raw_req, raw_resp, bytes = read_raw_from debug_io
+      raw_req, raw_resp, = read_raw_from debug_io
       @raw = try_force_encoding raw_resp
 
       @request = request || raw_req && Request.parse(try_force_encoding raw_req)
@@ -215,6 +215,8 @@ class Kronk
 
     def parsed_header include_headers=true
       out_headers = headers.dup
+      out_headers['status']  = @code
+      out_headers['http-version'] = @_res.http_version
 
       case include_headers
       when nil, false
@@ -223,7 +225,7 @@ class Kronk
       when Array, String
         include_headers = [*include_headers].map{|h| h.to_s.downcase}
 
-        headers.each do |key, value|
+        out_headers.keys.each do |key|
           out_headers.delete key unless
             include_headers.include? key.to_s.downcase
         end

data/test/test_cmd.rb

@@ -432,7 +432,7 @@ class TestCmd < Test::Unit::TestCase
     $stderr.expects(:puts).with "See 'kronk --help' for usage\n\n"
 
     assert_exit 2 do
-      opts = Kronk::Cmd.parse_args %w{}
+      Kronk::Cmd.parse_args %w{}
     end
   end
 

data/test/test_kronk.rb

@@ -217,12 +217,6 @@ class TestKronk < Test::Unit::TestCase
     expected = {:query => data, :data => data}
 
     with_uri_options do
-      new_data = {
-        "add" => "this",
-        "foo" => {'bar2' => 2, 'bar3' => "three"},
-        "key" => "otherval"
-      }
-
       %w{uri_query hash_query}.each do |qtype|
         opts = Kronk.new(:query => data, :data => data).
                 options_for_uri("http://#{qtype}.com")
@@ -408,7 +402,6 @@ class TestKronk < Test::Unit::TestCase
 
   def test_load_cookie_jar_no_file
     Kronk.clear_cookies!
-    mock_cookie_jar = YAML.load_file("test/mocks/cookies.yml")
 
     File.expects(:file?).with(Kronk::DEFAULT_COOKIES_FILE).returns false
     YAML.expects(:load_file).with(Kronk::DEFAULT_COOKIES_FILE).never

data/test/test_request.rb

@@ -159,7 +159,7 @@ class TestRequest < Test::Unit::TestCase
     expect_request "GET", "http://example.com/request/path?foo=bar",
       :headers => {'Cookie' => "mock_cookie", 'User-Agent' => "kronk"}
 
-    resp = Kronk::Request.new("http://example.com/request/path",
+    Kronk::Request.new("http://example.com/request/path",
             :query => "foo=bar", :headers => {'User-Agent' => "kronk"}).retrieve
   end
 
@@ -171,7 +171,7 @@ class TestRequest < Test::Unit::TestCase
     expect_request "GET", "http://example.com/request/path?foo=bar",
       :headers => {'User-Agent' => "kronk"}
 
-    resp = Kronk::Request.new("http://example.com/request/path",
+    Kronk::Request.new("http://example.com/request/path",
             :query => "foo=bar", :headers => {'User-Agent' => "kronk"}).retrieve
   end
 
@@ -185,7 +185,7 @@ class TestRequest < Test::Unit::TestCase
     expect_request "GET", "http://example.com/request/path?foo=bar",
       :headers => {'User-Agent' => "kronk"}
 
-    resp = Kronk::Request.new("http://example.com/request/path",
+    Kronk::Request.new("http://example.com/request/path",
             :query => "foo=bar", :headers => {'User-Agent' => "kronk"},
             :no_cookies => true).retrieve
   end
@@ -203,7 +203,7 @@ class TestRequest < Test::Unit::TestCase
     expect_request "GET", "http://example.com/request/path?foo=bar",
       :headers => {'User-Agent' => "kronk"}
 
-    resp = Kronk::Request.new("http://example.com/request/path",
+    Kronk::Request.new("http://example.com/request/path",
             :query => "foo=bar", :headers => {'User-Agent' => "kronk"}).retrieve
 
     Kronk.config[:use_cookies] = old_config
@@ -222,7 +222,7 @@ class TestRequest < Test::Unit::TestCase
     expect_request "GET", "http://example.com/request/path?foo=bar",
       :headers => {'User-Agent' => "kronk"}
 
-    resp = Kronk::Request.new("http://example.com/request/path",
+    Kronk::Request.new("http://example.com/request/path",
             :query => "foo=bar", :headers => {'User-Agent' => "kronk"},
             :no_cookies => false).retrieve
 
@@ -237,7 +237,7 @@ class TestRequest < Test::Unit::TestCase
     expect_request "GET", "http://example.com/request/path?foo=bar",
       :headers => {'User-Agent' => "kronk"}
 
-    resp = Kronk::Request.new("http://example.com/request/path",
+    Kronk::Request.new("http://example.com/request/path",
             :query => "foo=bar",
             :headers => {'User-Agent' => "kronk", 'Cookie' => "mock_cookie"},
             :no_cookies => true).retrieve
@@ -288,7 +288,7 @@ class TestRequest < Test::Unit::TestCase
       req.expects(:basic_auth).with auth_opts[:username], auth_opts[:password]
     end
 
-    resp = Kronk::Request.new("http://example.com", :auth => auth_opts).retrieve
+    Kronk::Request.new("http://example.com", :auth => auth_opts).retrieve
   end
 
 
@@ -300,7 +300,7 @@ class TestRequest < Test::Unit::TestCase
         never
     end
 
-    resp = Kronk::Request.new("http://example.com", :auth => auth_opts).retrieve
+    Kronk::Request.new("http://example.com", :auth => auth_opts).retrieve
   end
 
 
@@ -309,12 +309,12 @@ class TestRequest < Test::Unit::TestCase
       req.expects(:basic_auth).never
     end
 
-    resp = Kronk::Request.new("http://example.com").retrieve
+    Kronk::Request.new("http://example.com").retrieve
   end
 
 
   def test_retrieve_ssl
-    expr = expect_request "GET", "https://example.com" do |http, req, resp|
+    expect_request "GET", "https://example.com" do |http, req, resp|
       req.expects(:use_ssl=).with true
     end
 
@@ -342,7 +342,7 @@ class TestRequest < Test::Unit::TestCase
         "Kronk/#{Kronk::VERSION} (http://github.com/yaksnrainbows/kronk)"
     }
 
-    resp = Kronk::Request.new("http://example.com").retrieve
+    Kronk::Request.new("http://example.com").retrieve
   end
 
 
@@ -350,7 +350,7 @@ class TestRequest < Test::Unit::TestCase
     expect_request "GET", "http://example.com",
     :headers => {'User-Agent' => "Mozilla/5.0 (compatible; Konqueror/3; Linux)"}
 
-    resp = Kronk::Request.new("http://example.com",
+    Kronk::Request.new("http://example.com",
              :user_agent => 'linux_konqueror').retrieve
   end
 
@@ -359,7 +359,7 @@ class TestRequest < Test::Unit::TestCase
     expect_request "GET", "http://example.com",
     :headers => {'User-Agent' => "custom user agent"}
 
-    resp = Kronk::Request.new("http://example.com",
+    Kronk::Request.new("http://example.com",
              :user_agent => 'custom user agent').retrieve
   end
 
@@ -368,7 +368,7 @@ class TestRequest < Test::Unit::TestCase
     expect_request "GET", "http://example.com",
     :headers => {'User-Agent' => "custom user agent"}
 
-    resp = Kronk::Request.new("http://example.com",
+    Kronk::Request.new("http://example.com",
              :user_agent => 'mac_safari',
              :headers    => {'User-Agent' => "custom user agent"}).retrieve
   end

data/test/test_response.rb

@@ -164,7 +164,11 @@ class TestResponse < Test::Unit::TestCase
 
 
   def test_parsed_header
-    assert_equal @json_resp.to_hash, @json_resp.parsed_header
+    parsed_headers = @json_resp.to_hash.merge(
+                        'http-version' => '1.1',
+                        'status'       => '200')
+
+    assert_equal parsed_headers, @json_resp.parsed_header
 
     assert_equal({'content-type' => "application/json; charset=utf-8"},
                 @json_resp.parsed_header('Content-Type'))
@@ -195,14 +199,12 @@ class TestResponse < Test::Unit::TestCase
 
   def test_selective_string
     body = @json_resp.raw.split("\r\n\r\n")[1]
-
-    assert_equal body,
-                 @json_resp.selective_string
+    assert_equal body, @json_resp.selective_string
   end
 
 
   def test_selective_string_no_body
-    body = @json_resp.raw.split("\r\n\r\n")[1]
+    @json_resp.raw.split("\r\n\r\n")[1]
 
     assert_nil @json_resp.selective_string(:no_body => true)
 
@@ -238,7 +240,7 @@ class TestResponse < Test::Unit::TestCase
 
   def test_selective_data
     body = JSON.parse @json_resp.body
-    head = @json_resp.to_hash
+    @json_resp.to_hash
 
     assert_equal body, @json_resp.selective_data
 
@@ -283,7 +285,6 @@ class TestResponse < Test::Unit::TestCase
 
 
   def test_selective_data_no_body
-    body = JSON.parse @json_resp.body
     expected = {
         'content-type' => 'application/json; charset=utf-8',
         'date'         => "Fri, 03 Dec 2010 21:49:00 GMT"

metadata

@@ -1,109 +1,107 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: kronk
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.7.8
   prerelease: 
-  version: 1.7.7
 platform: ruby
-authors: 
+authors:
 - Jeremie Castagna
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-08 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2152119260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.5"
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: cookiejar
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2152119260
+- !ruby/object:Gem::Dependency
+  name: cookiejar
+  requirement: &2152118280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: plist
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2152118280
+- !ruby/object:Gem::Dependency
+  name: plist
+  requirement: &2152090240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2152090240
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &2152088080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.4"
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2152088080
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &2152085080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.9.12
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: em-http-request
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2152085080
+- !ruby/object:Gem::Dependency
+  name: em-http-request
+  requirement: &2152143020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2152143020
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &2152140980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.12"
+      - !ruby/object:Gem::Version
+        version: '2.12'
   type: :development
-  version_requirements: *id007
-description: |-
-  Kronk runs diffs against data from live and cached http responses.
-  Kronk was made possible by the sponsoring of AT&T Interactive.
-email: 
+  prerelease: false
+  version_requirements: *2152140980
+description: ! 'Kronk runs diffs against data from live and cached http responses.
+
+  Kronk was made possible by the sponsoring of AT&T Interactive.'
+email:
 - yaksnrainbows@gmail.com
-executables: 
+executables:
 - kronk
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - Manifest.txt
 - History.rdoc
 - README.rdoc
 - TODO.rdoc
-files: 
+files:
 - .autotest
 - History.rdoc
 - Manifest.txt
@@ -174,33 +172,31 @@ files:
 - .gemtest
 homepage: https://github.com/yaksnrainbows/kronk
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: kronk
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Kronk runs diffs against data from live and cached http responses
-test_files: 
+test_files:
 - test/test_assertions.rb
 - test/test_cmd.rb
 - test/test_core_ext.rb