kronk 1.4.0 → 1.5.0

data/test/test_request_parser.rb

@@ -0,0 +1,31 @@
+require 'test/test_helper'
+
+class TestRequestParser < Test::Unit::TestCase
+
+  def test_start_new
+    assert Kronk::Player::RequestParser.start_new?("/foobar\r\n")
+    assert Kronk::Player::RequestParser.start_new?("GET /foobar\r\n")
+    assert !Kronk::Player::RequestParser.start_new?("http://example.com\r\n")
+    assert !Kronk::Player::RequestParser.start_new?("foobar\r\n")
+  end
+
+
+  def test_parse
+    expected = {:uri_suffix => "/foobar"}
+    assert_equal expected, Kronk::Player::RequestParser.parse("/foobar")
+
+    expected = {:http_method => "GET", :uri_suffix => "/foobar"}
+    assert_equal expected, Kronk::Player::RequestParser.parse("GET /foobar")
+
+    expected.merge! :host => "example.com"
+    raw = "GET /foobar\r\nHost: example.com"
+    assert_equal expected, Kronk::Player::RequestParser.parse(raw)
+
+    expected.merge! :http_method => "POST",
+                    :data        => "foo=bar",
+                    :headers     => {'Accept' => 'json'}
+
+    raw = "POST /foobar\r\nAccept: json\r\nHost: example.com\r\n\r\nfoo=bar"
+    assert_equal expected, Kronk::Player::RequestParser.parse(raw)
+  end
+end

data/test/test_response.rb

@@ -3,24 +3,81 @@ require 'test/test_helper'
 class TestResponse < Test::Unit::TestCase
 
   def setup
-    @html_resp  = Kronk::Request.retrieve_file "test/mocks/200_response.txt"
-    @json_resp  = Kronk::Request.retrieve_file "test/mocks/200_response.json"
-    @plist_resp = Kronk::Request.retrieve_file "test/mocks/200_response.plist"
-    @xml_resp   = Kronk::Request.retrieve_file "test/mocks/200_response.xml"
+    @html_resp  = Kronk::Response.read_file "test/mocks/200_response.txt"
+    @json_resp  = Kronk::Response.read_file "test/mocks/200_response.json"
+    @plist_resp = Kronk::Response.read_file "test/mocks/200_response.plist"
+    @xml_resp   = Kronk::Response.read_file "test/mocks/200_response.xml"
   end
 
 
-  def test_read_new
-    File.open "test/mocks/200_response.txt", "r" do |file|
-      resp = Kronk::Response.read_new file
+  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
+      "".respond_to? :encoding
+    assert_equal "UTF-8",      @json_resp.encoding.to_s.upcase
 
+    png = Kronk::Response.read_file "test/mocks/200_response.png"
+    assert_equal "ASCII-8BIT", png.encoding.to_s
+  end
 
-      expected_header = "#{mock_200_response.split("\r\n\r\n", 2)[0]}\r\n"
 
-      assert Net::HTTPResponse === resp
-      assert_equal mock_200_response, resp.raw
-      assert_equal expected_header, resp.raw_header
-    end
+  def test_bytes
+    png = Kronk::Response.read_file "test/mocks/200_response.png"
+    assert_equal 8469, png.bytes
+    assert_equal png['Content-Length'].to_i, png.bytes
+
+    headless = Kronk::Response.new "foobar"
+    assert_equal "foobar".bytes.count, headless.bytes
+  end
+
+
+  def test_byterate
+    @html_resp.time = 10
+    assert_equal 930.3, @html_resp.byterate
+    @html_resp.time = 100
+    assert_equal 93.03, @html_resp.byterate
+  end
+
+
+  def test_total_bytes
+    assert_equal @html_resp.raw.bytes.count, @html_resp.total_bytes
+  end
+
+
+  def test_cookie
+    assert_nil @html_resp.cookie
+    @html_resp['Cookie'] = "blahblahblah"
+    assert_equal "blahblahblah", @html_resp.cookie
+  end
+
+
+  def test_headless
+    assert Kronk::Response.new("blah blah blah").headless?,
+      "Expected a headless HTTP response"
+
+    assert !Kronk::Response.new("HTTP/1.1 200 OK\r\n\r\nHI").headless?,
+      "Expected full valid HTTP response"
+  end
+
+
+  def test_new_from_one_line_io
+    io   = StringIO.new "just this one line!"
+    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']
+  end
+
+
+  def test_read_file
+    resp = Kronk::Response.read_file "test/mocks/200_response.txt"
+
+    expected_header = "#{mock_200_response.split("\r\n\r\n", 2)[0]}\r\n"
+
+    assert Net::HTTPResponse === resp.instance_variable_get("@_res")
+    assert_equal mock_200_response, resp.raw
+    assert_equal expected_header, resp.raw_header
   end
 
 
@@ -33,8 +90,8 @@ class TestResponse < Test::Unit::TestCase
 
     io = StringIO.new str
 
-    resp = Kronk::Response.read_new StringIO.new(mock_200_response)
-    req, resp, bytes = resp.read_raw_from io
+    resp = Kronk::Response.new mock_200_response
+    req, resp, bytes = resp.send :read_raw_from, io
 
     assert_equal "mock debug request", req
     assert_equal mock_200_response, resp
@@ -269,7 +326,6 @@ class TestResponse < Test::Unit::TestCase
   end
 
 
-
   def test_selective_data_collected_and_ignored
     expected = {"business" => {"id" => "1234"}}
 
@@ -277,4 +333,139 @@ class TestResponse < Test::Unit::TestCase
       @json_resp.selective_data(:only_data => "**/id",
         :ignore_data => "original_request")
   end
+
+
+  def test_redirect?
+    res = Kronk::Response.new mock_301_response
+    assert res.redirect?
+
+    res = Kronk::Response.new mock_302_response
+    assert res.redirect?
+
+    res = Kronk::Response.new mock_200_response
+    assert !res.redirect?
+  end
+
+
+  def test_follow_redirect
+    res1 = Kronk::Response.new mock_301_response
+    assert res1.redirect?
+
+    expect_request "GET", "http://www.google.com/"
+    res2 = res1.follow_redirect
+
+    assert_equal mock_200_response, res2.raw
+  end
+
+
+  def test_force_encoding
+    return unless "".respond_to? :encoding
+
+    res = Kronk::Response.new mock_200_response
+    expected_encoding = Encoding.find "ISO-8859-1"
+
+    assert_equal expected_encoding, res.encoding
+    assert_equal expected_encoding, res.body.encoding
+    assert_equal expected_encoding, res.raw.encoding
+
+    res.force_encoding "utf-8"
+    expected_encoding = Encoding.find "utf-8"
+
+    assert_equal expected_encoding, res.encoding
+    assert_equal expected_encoding, res.body.encoding
+    assert_equal expected_encoding, res.raw.encoding
+  end
+
+
+  def test_stringify_string
+    str = Kronk::Response.read_file("test/mocks/200_response.json").stringify
+    expected = <<-STR
+{
+ "business": {
+  "address": "3845 Rivertown Pkwy SW Ste 500",
+  "city": "Grandville",
+  "description": {
+   "additional_urls": [
+    {
+     "destination": "http://example.com",
+     "url_click": "http://example.com"
+    }
+   ],
+   "general_info": "<p>A Paint Your Own Pottery Studios..</p>",
+   "op_hours": "Fri 1pm-7pm, Sat 10am-6pm, Sun 1pm-4pm, Appointments Available",
+   "payment_text": "DISCOVER, AMEX, VISA, MASTERCARD",
+   "slogan": "<p>Pottery YOU dress up</p>"
+  },
+  "distance": 0.0,
+  "has_detail_page": true,
+  "headings": [
+   "Pottery"
+  ],
+  "id": "1234",
+  "impression_id": "mock_iid",
+  "improvable": true,
+  "latitude": 42.882561,
+  "listing_id": "1234",
+  "listing_type": "free",
+  "longitude": -85.759586,
+  "mappable": true,
+  "name": "Naked Plates",
+  "omit_address": false,
+  "omit_phone": false,
+  "phone": "6168055326",
+  "rateable": true,
+  "rating_count": 0,
+  "red_listing": false,
+  "state": "MI",
+  "website": "http://example.com",
+  "year_established": "1996",
+  "zip": "49418"
+ },
+ "original_request": {
+  "id": "1234"
+ },
+ "request_id": "mock_rid"
+}
+STR
+    assert_equal expected.strip, str
+  end
+
+
+  def test_stringify_raw
+    str = Kronk::Response.
+      read_file("test/mocks/200_response.json").stringify :raw => 1
+
+    expected = File.read("test/mocks/200_response.json").split("\r\n\r\n")[1]
+    assert_equal expected, str
+  end
+
+
+  def test_stringify_struct
+    str = Kronk::Response.read_file("test/mocks/200_response.json").
+            stringify :struct => true
+
+    expected = JSON.parse \
+      File.read("test/mocks/200_response.json").split("\r\n\r\n")[1]
+
+    expected = Kronk::Diff.ordered_data_string expected, true
+
+    assert_equal expected, str
+  end
+
+
+  def test_stringify_missing_parser
+    str = Kronk::Response.read_file("test/mocks/200_response.txt").stringify
+    expected = File.read("test/mocks/200_response.txt").split("\r\n\r\n")[1]
+
+    assert_equal expected, str
+  end
+
+
+  def test_success?
+    resp = Kronk::Response.read_file("test/mocks/200_response.txt")
+    assert resp.success?
+
+    resp = Kronk::Response.read_file("test/mocks/302_response.txt")
+    assert !resp.success?
+  end
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: kronk
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 4
-  - 0
-  version: 1.4.0
+  prerelease: 
+  version: 1.5.0
 platform: ruby
 authors: 
 - Jeremie Castagna
@@ -14,112 +10,74 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-04 00:00:00 -07:00
-default_executable: 
+date: 2011-08-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: plist
+  name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 1
-        - 0
-        version: 3.1.0
+        version: "1.5"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: cookiejar
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        version: "1.5"
+        version: 0.3.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: plist
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
-  type: :runtime
+        version: 3.1.0
+  type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: cookiejar
+  name: nokogiri
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 0
-        version: 0.3.0
-  type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rubyforge
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 4
-        version: 2.0.4
+        version: "1.4"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 10
-        version: 0.9.10
+        version: 0.9.12
   type: :development
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 7
-        - 0
-        version: 2.7.0
+        version: 2.9.1
   type: :development
-  version_requirements: *id007
+  version_requirements: *id006
 description: |-
   Kronk runs diffs against data from live and cached http responses.
   Kronk was made possible by the sponsoring of AT&T Interactive.
@@ -127,7 +85,6 @@ email:
 - yaksnrainbows@gmail.com
 executables: 
 - kronk
-- yzma
 extensions: []
 
 extra_rdoc_files: 
@@ -141,15 +98,22 @@ files:
 - README.rdoc
 - Rakefile
 - bin/kronk
-- bin/yzma
 - lib/kronk.rb
+- lib/kronk/constants.rb
 - lib/kronk/cmd.rb
-- lib/kronk/data_set.rb
+- lib/kronk/data_renderer.rb
 - lib/kronk/diff.rb
 - lib/kronk/diff/ascii_format.rb
 - lib/kronk/diff/color_format.rb
 - lib/kronk/path.rb
 - lib/kronk/path/transaction.rb
+- 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/plist_parser.rb
 - lib/kronk/request.rb
 - lib/kronk/response.rb
@@ -158,9 +122,6 @@ files:
 - lib/kronk/test/core_ext.rb
 - lib/kronk/test/helper_methods.rb
 - lib/kronk/xml_parser.rb
-- lib/yzma.rb
-- lib/yzma/randomizer.rb
-- lib/yzma/report.rb
 - script/kronk_completion
 - test/mocks/200_response.json
 - test/mocks/200_response.plist
@@ -168,19 +129,24 @@ files:
 - test/mocks/200_response.xml
 - test/mocks/301_response.txt
 - test/mocks/302_response.txt
+- test/mocks/cookies.yml
+- test/mocks/get_request.txt
 - test/test_assertions.rb
 - test/test_core_ext.rb
+- test/test_cmd.rb
 - test/test_helper_methods.rb
-- test/test_data_set.rb
 - test/test_diff.rb
 - test/test_helper.rb
+- test/test_input_reader.rb
 - test/test_kronk.rb
 - test/test_path.rb
+- test/test_player.rb
 - test/test_request.rb
+- test/test_request_parser.rb
 - test/test_response.rb
 - test/test_transaction.rb
 - test/test_xml_parser.rb
-has_rdoc: true
+- .gemtest
 homepage: https://github.com/yaksnrainbows/kronk
 licenses: []
 
@@ -195,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 855220484149539505
+      hash: 4569364273501075801
       segments: 
       - 0
       version: "0"
@@ -204,26 +170,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: kronk
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Kronk runs diffs against data from live and cached http responses
 test_files: 
 - test/test_assertions.rb
+- test/test_cmd.rb
 - test/test_core_ext.rb
-- test/test_data_set.rb
 - test/test_diff.rb
 - test/test_helper.rb
 - test/test_helper_methods.rb
+- test/test_input_reader.rb
 - test/test_kronk.rb
 - test/test_path.rb
+- test/test_player.rb
 - test/test_request.rb
+- test/test_request_parser.rb
 - test/test_response.rb
 - test/test_transaction.rb
 - test/test_xml_parser.rb