kronk 1.5.4 → 1.6.0

data/lib/kronk/player/benchmark.rb

@@ -118,7 +118,7 @@ class Kronk
           end
         end
 
-        perc_list.each{|i| @percentages[i] ||= self.slowest }
+        perc_list.each{|l| @percentages[l] ||= self.slowest }
         @percentages[100] = self.slowest
         @percentages
       end
@@ -252,6 +252,7 @@ end
 
 if Float.instance_method(:round).arity == 0
 class Float
+  undef round
   def round ndigits=0
     num, dec = self.to_s.split(".")
     num = "#{num}.#{dec[0,ndigits]}".sub(/\.$/, "")

data/lib/kronk/player/suite.rb

@@ -25,6 +25,14 @@ class Kronk
           [status, time, text]
 
         elsif kronk.response
+          begin
+            # Make sure response is parsable
+            kronk.response.stringify kronk.options
+          rescue => e
+            error e, kronk, mutex
+            return
+          end if kronk.response.success?
+
           status = "F"             if !kronk.response.success?
           text   = resp_text kronk if status == "F"
           [status, kronk.response.time, text]

data/lib/kronk/response.rb

@@ -28,8 +28,6 @@ class Kronk
     # Read http response from a file and return a HTTPResponse instance.
 
     def self.read_file path
-      Kronk::Cmd.verbose "Reading file:  #{path}\n"
-
       file     = File.open(path, "rb")
       resp     = new file
       resp.uri = path
@@ -60,7 +58,8 @@ class Kronk
         @_res, debug_io = request_from_io(io)
       end
 
-      @headers  = @_res.to_hash
+      @headers  = @_res.to_hash.dup
+      @headers.keys.each{|h| @headers[h] = @headers[h].join(", ")}
 
       @encoding = "utf-8" unless @_res["Content-Type"]
       c_type = [*@headers["content-type"]].find{|ct| ct =~ ENCODING_MATCHER}
@@ -182,7 +181,7 @@ class Kronk
     # Returns the parsed header hash.
 
     def parsed_header include_headers=true
-      headers = @_res.to_hash.dup
+      headers = @headers.dup
 
       case include_headers
       when nil, false
@@ -277,7 +276,9 @@ class Kronk
       end
 
       if options[:with_headers]
-        data = [parsed_header(options[:with_headers]), data].compact
+        header_data = parsed_header(options[:with_headers])
+        data &&= [header_data, data]
+        data ||= header_data
       end
 
       Path::Transaction.run data, options do |t|
@@ -300,7 +301,7 @@ class Kronk
     # :with_headers:: Boolean/String/Array - defines which headers to include
 
     def stringify options={}
-      if !options[:raw] && (options[:parser] || @parser)
+      if !options[:raw] && (options[:parser] || @parser || options[:no_body])
         data = selective_data options
         Diff.ordered_data_string data, options[:struct]
       else

data/test/test_cmd.rb

@@ -145,6 +145,25 @@ class TestCmd < Test::Unit::TestCase
   end
 
 
+  def test_parse_args_context
+    with_config do
+      opts = Kronk::Cmd.parse_args %w{uri --context}
+      assert_equal 3, opts[:context]
+      assert_equal nil, Kronk.config[:context]
+
+      Kronk.config[:context] = 4
+      opts = Kronk::Cmd.parse_args %w{uri --context}
+      assert_equal 4, opts[:context]
+
+      opts = Kronk::Cmd.parse_args %w{uri --context 5}
+      assert_equal 5, opts[:context]
+
+      opts = Kronk::Cmd.parse_args %w{uri --full}
+      assert_equal false, opts[:context]
+    end
+  end
+
+
   def test_parse_args_completion
     with_config Hash.new do
       file = File.join(File.dirname(__FILE__), "../script/kronk_completion")
@@ -168,18 +187,19 @@ class TestCmd < Test::Unit::TestCase
 
   def test_parse_args_kronk_configs
     with_config Hash.new do
-      Kronk::Cmd.parse_args %w{uri -q -l --no-opts -V -t 1234 --ruby}
+      Kronk::Cmd.parse_args %w{uri -q -l --no-opts -V -t 1234 --ruby --paths}
       assert Kronk.config[:brief]
       assert Kronk.config[:show_lines]
       assert Kronk.config[:no_uri_options]
       assert Kronk.config[:verbose]
+      assert Kronk.config[:render_paths]
       assert_equal 'ruby', Kronk.config[:render_lang]
       assert_equal 1234, Kronk.config[:timeout]
     end
   end
 
 
-  def test_parse_args_headers
+  def test_parse_args_http_headers
     opts = Kronk::Cmd.parse_args %w{uri -i FOO -i BAR -iTWO,PART}
     assert_equal %w{FOO BAR TWO PART}, opts[:with_headers]
     assert_equal false, opts[:no_body]
@@ -380,25 +400,26 @@ class TestCmd < Test::Unit::TestCase
 
 
   def test_run_compare
-    Kronk.expects(:load_config)
-    expect_compare_output mock_200_response
-
     file = File.join(File.dirname(__FILE__), "mocks/200_response.txt")
     file = File.expand_path file
 
+    Kronk.expects(:load_config)
+    expect_compare_output mock_200_response, :labels => [file, file]
+
     Kronk::Cmd.run [file, file]
   end
 
 
   def test_run_compare_diff
-    Kronk.expects(:load_config)
-    expect_compare_output mock_200_response, mock_302_response
-
     file1 = File.join(File.dirname(__FILE__), "mocks/200_response.txt")
     file2 = File.join(File.dirname(__FILE__), "mocks/302_response.txt")
     file1 = File.expand_path file1
     file2 = File.expand_path file2
 
+    Kronk.expects(:load_config)
+    expect_compare_output mock_200_response, mock_302_response,
+      :labels => [file1, file2]
+
     assert_exit 1 do
       Kronk::Cmd.run [file1, file2]
     end

data/test/test_data_string.rb

@@ -0,0 +1,58 @@
+require 'test/test_helper'
+
+class TestDataString < Test::Unit::TestCase
+
+  def setup
+    @dstr = Kronk::DataString.new "foobar", "data0"
+  end
+
+
+  def test_new
+    expected_meta = ["data0"] * @dstr.length
+    assert_equal expected_meta, @dstr.meta
+  end
+
+
+  def test_append
+    @dstr.append "\nthingz", "data1"
+    expected_meta = (["data0"] * 6) + (["data1"] * 7)
+    assert_equal expected_meta, @dstr.meta
+  end
+
+
+  def test_insert
+    @dstr << "\nthingz"
+    expected_meta = ["data0"] * 13
+    assert_equal expected_meta, @dstr.meta
+  end
+
+
+  def test_select
+    @dstr.append "\nthingz", "data1"
+    new_dstr      = @dstr[4..9]
+    expected_meta = (["data0"] * 2) + (["data1"] * 4)
+    assert_equal expected_meta, new_dstr.meta
+  end
+
+
+  def test_split
+    @dstr.append "\nthingz", "data1"
+    arr = @dstr.split
+
+    expected = ["data0"] * 6
+    assert_equal expected, arr.first.meta
+
+    expected = ["data1"] * 6
+    assert_equal expected, arr.last.meta
+  end
+
+
+  def test_split_chars
+    @dstr.append "\nthingz", "data1"
+    arr = @dstr.split ''
+
+    arr.each_with_index do |dstr, i|
+      assert_equal [@dstr.meta[i]], dstr.meta
+    end
+  end
+end

data/test/test_diff.rb

@@ -174,12 +174,10 @@ STR
                   Kronk::Diff.ordered_data_string(mock_data, true)
   end
 
-
-  def test_ordered_data_string_ruby
-    with_config :render_lang => 'ruby' do
-      expected = <<STR
+  def test_ordered_data_string_json
+    expected = <<STR
 {
- "acks" => [
+ "acks": [
   [
    56,
    78
@@ -189,7 +187,7 @@ STR
    "34"
   ]
  ],
- "root" => [
+ "root": [
   [
    "B1",
    "B2"
@@ -207,11 +205,11 @@ STR
    ]
   ],
   {
-   :tests => [
+   ":tests": [
     "D3a",
     "D3b"
    ],
-   "test" => [
+   "test": [
     [
      "D1a\\nContent goes here",
      "D1b"
@@ -220,13 +218,13 @@ STR
    ]
   }
  ],
- "subs" => [
+ "subs": [
   "a",
   "b"
  ],
- "tests" => {
-  :foo => :bar,
-  "test" => [
+ "tests": {
+  ":foo": ":bar",
+  "test": [
    [
     1,
     2
@@ -235,6 +233,40 @@ STR
   ]
  }
 }
+STR
+
+    assert_equal expected.strip, Kronk::Diff.ordered_data_string(mock_data)
+  end
+
+
+  def test_ordered_data_string_ruby_paths
+    with_config :render_lang => 'ruby', :render_paths => true do
+      expected = <<STR
+{
+ "/acks/0/0" => 56,
+ "/acks/0/1" => 78,
+ "/acks/1/0" => "12",
+ "/acks/1/1" => "34",
+ "/root/0/0" => "B1",
+ "/root/0/1" => "B2",
+ "/root/1/0" => "A1",
+ "/root/1/1" => "A2",
+ "/root/2/0" => "C1",
+ "/root/2/1" => "C2",
+ "/root/2/2/0" => "C3a",
+ "/root/2/2/1" => "C3b",
+ "/root/3/test/0/0" => "D1a\\nContent goes here",
+ "/root/3/test/0/1" => "D1b",
+ "/root/3/test/1" => "D2",
+ "/root/3/tests/0" => "D3a",
+ "/root/3/tests/1" => "D3b",
+ "/subs/0" => "a",
+ "/subs/1" => "b",
+ "/tests/foo" => :bar,
+ "/tests/test/0/0" => 1,
+ "/tests/test/0/1" => 2,
+ "/tests/test/1" => 2.123
+}
 STR
 
       assert_equal expected.strip, Kronk::Diff.ordered_data_string(mock_data)
@@ -481,30 +513,43 @@ STR
 
 
   def test_formatted_lines
-    output = @diff.formatted :show_lines => true
+    @diff.output.show_lines = true
+    output = @diff.formatted
     assert_equal diff_302_301_str_lines, output
   end
 
 
   def test_formatted_color
-    assert_equal diff_302_301_color,
-      @diff.formatted(:formatter => Kronk::Diff::ColorFormat)
+    @diff.output.format = Kronk::Diff::ColorFormat
 
-    @diff.formatter = Kronk::Diff::ColorFormat
-    assert_equal diff_302_301_color, @diff.formatted
+    assert_equal diff_302_301_color,
+      @diff.formatted
   end
 
 
   def test_formatted_join_char
     expected = diff_302_301_str.gsub(/\n/, "\r\n")
-    assert_equal expected,
-      @diff.formatted(
-        :formatter => Kronk::Diff::AsciiFormat,
-        :join_char => "\r\n")
+    @diff.output.format  = Kronk::Diff::AsciiFormat
+    @diff.output.join_ch = "\r\n"
+
+    assert_equal expected, @diff.formatted
   end
 
 
-  class CustomFormat
+  def test_formatted_context
+    resp1 = Kronk::Response.read_file "test/mocks/200_response_diff.json"
+    resp2 = Kronk::Response.read_file "test/mocks/200_response.json"
+    @diff = Kronk::Diff.new resp1.stringify, resp2.stringify
+
+    @diff.output.format  = Kronk::Diff::ColorFormat
+    @diff.output.context = 3
+    @diff.output.labels  = [resp1.uri, resp2.uri]
+
+    assert_equal diff_json_color, @diff.formatted
+  end
+
+
+  class CustomFormat < Kronk::Diff::AsciiFormat
     def self.added str
       ">>>301>>> #{str}"
     end
@@ -519,9 +564,10 @@ STR
   end
 
   def test_formatted_custom
-    str_diff = @diff.formatted :formatter => CustomFormat
-    expected = diff_302_301_str.gsub(/^\+/, ">>>301>>>")
-    expected = expected.gsub(/^\-/, "<<<302<<<")
+    @diff.output.format = CustomFormat
+    str_diff = @diff.formatted
+    expected = diff_302_301_str.gsub(/^\+ /, ">>>301>>> ")
+    expected = expected.gsub(/^\- /, "<<<302<<< ")
     expected = expected.gsub(/^\s\s/, "")
 
     assert_equal expected, str_diff
@@ -529,6 +575,55 @@ STR
 
   private
 
+  def diff_json_color
+    (<<-STR
+\e[1;33m--- test/mocks/200_response_diff.json
++++ test/mocks/200_response.json\e[0m
+\e[1;35m@@ -6,7 +6,7 @@\e[0m business/description
+     "additional_urls": [
+      {
+       "destination": "http://example.com",
+\e[1;31m-      "url_click": "http://google.com"\e[0m
+\e[1;32m+      "url_click": "http://example.com"\e[0m
+      }
+     ],
+     "general_info": "<p>A Paint Your Own Pottery Studios..</p>",
+\e[1;35m@@ -15,11 +15,12 @@\e[0m business/description
+     "slogan": "<p>Pottery YOU dress up</p>"
+    },
+    "distance": 0.0,
+\e[1;31m-   "has_detail_page": false,\e[0m
+\e[1;32m+   "has_detail_page": true,\e[0m
+    "headings": [
+     "Pottery"
+    ],
+\e[1;31m-   "id": 1234,\e[0m
+\e[1;32m+   "id": "1234",\e[0m
+\e[1;32m+   "impression_id": "mock_iid",\e[0m
+    "improvable": true,
+    "latitude": 42.882561,
+    "listing_id": "1234",
+\e[1;35m@@ -34,12 +35,12 @@\e[0m business
+    "rating_count": 0,
+    "red_listing": false,
+    "state": "MI",
+\e[1;31m-   "website": "http://google.com",\e[0m
+\e[1;32m+   "website": "http://example.com",\e[0m
+    "year_established": "1996",
+    "zip": "49418"
+   },
+\e[1;31m-  "original": {\e[0m
+\e[1;32m+  "original_request": {\e[0m
+    "id": "1234"
+   },
+\e[1;31m-  "request_id": "foobar"\e[0m
+\e[1;32m+  "request_id": "mock_rid"\e[0m
+  }
+    STR
+    ).strip
+  end
+
+
   def diff_302_301
     [[["HTTP/1.1 302 Found", "Location: http://igoogle.com/"],
       ["HTTP/1.1 301 Moved Permanently", "Location: http://www.google.com/"]],
@@ -570,6 +665,8 @@ STR
 
   def diff_302_301_str
     str = <<STR
+--- left
++++ right
 - HTTP/1.1 302 Found
 - Location: http://igoogle.com/
 + HTTP/1.1 301 Moved Permanently
@@ -599,6 +696,8 @@ STR
 
   def diff_302_301_str_lines
     str = <<STR
+--- left
++++ right
  1|   - HTTP/1.1 302 Found
  2|   - Location: http://igoogle.com/
   | 1 + HTTP/1.1 301 Moved Permanently
@@ -629,27 +728,29 @@ STR
 
   def diff_302_301_color
     str = <<STR
-\033[31m- HTTP/1.1 302 Found\033[0m
-\033[31m- Location: http://igoogle.com/\033[0m
-\033[32m+ HTTP/1.1 301 Moved Permanently\033[0m
-\033[32m+ Location: http://www.google.com/\033[0m
+\e[1;33m--- left
++++ right\033[0m
+\033[1;31m- HTTP/1.1 302 Found\033[0m
+\033[1;31m- Location: http://igoogle.com/\033[0m
+\033[1;32m+ HTTP/1.1 301 Moved Permanently\033[0m
+\033[1;32m+ Location: http://www.google.com/\033[0m
   Content-Type: text/html; charset=UTF-8
   Date: Fri, 26 Nov 2010 16:14:45 GMT
   Expires: Sun, 26 Dec 2010 16:14:45 GMT
   Cache-Control: public, max-age=2592000
   Server: gws
-\033[31m- Content-Length: 260\033[0m
-\033[32m+ Content-Length: 219\033[0m
+\033[1;31m- Content-Length: 260\033[0m
+\033[1;32m+ Content-Length: 219\033[0m
   X-XSS-Protection: 1; mode=block
   
   <HTML><HEAD><meta http-equiv="content-type" content="text/html;charset=utf-8">
-\033[31m- <TITLE>302 Found</TITLE></HEAD><BODY>\033[0m
-\033[31m- <H1>302 Found</H1>\033[0m
-\033[32m+ <TITLE>301 Moved</TITLE></HEAD><BODY>\033[0m
-\033[32m+ <H1>301 Moved</H1>\033[0m
+\033[1;31m- <TITLE>302 Found</TITLE></HEAD><BODY>\033[0m
+\033[1;31m- <H1>302 Found</H1>\033[0m
+\033[1;32m+ <TITLE>301 Moved</TITLE></HEAD><BODY>\033[0m
+\033[1;32m+ <H1>301 Moved</H1>\033[0m
   The document has moved
   <A HREF="http://www.google.com/">here</A>.
-\033[31m- <A HREF="http://igoogle.com/">here</A>.\033[0m
+\033[1;31m- <A HREF="http://igoogle.com/">here</A>.\033[0m
   </BODY></HTML>
 STR
     str.strip