kronk 1.6.1 → 1.6.2

data/History.rdoc

@@ -1,3 +1,11 @@
+=== 1.6.2 / 2011-09-12
+
+* Bugfixes
+
+  * Handling of stream output with Diff#formatted is nil.
+
+  * Re-enabled support for response uri options.
+
 === 1.6.1 / 2011-09-12
 
 * Enhancements:

data/TODO.rdoc

@@ -1,5 +1,18 @@
 = TODO
 
+== Path
+
+* Support move and map for path transactions.
+
+== Player
+
+* Read full URIs for player input but strip off the protocol and host.
+
+* When using player and no host is given, support reading a full URI for
+  player input.
+
+== Done
+
 * Support data diffing for arrays (including data struct).
 
 * Allow for showing diffed sections of a diff only.

data/lib/kronk.rb

@@ -14,7 +14,7 @@ require 'yaml'
 class Kronk
 
   # This gem's version.
-  VERSION = '1.6.1'
+  VERSION = '1.6.2'
 
   require 'kronk/constants'
   require 'kronk/player'
@@ -68,6 +68,8 @@ class Kronk
   # Find a fully qualified ruby namespace/constant.
 
   def self.find_const name_or_file, case_insensitive=false
+    return name_or_file unless String === name_or_file
+
     if name_or_file =~ /[^:]:([^:]+)$/
       req_file = $1
       i        = $1.length + 2
@@ -240,8 +242,8 @@ class Kronk
   # :proxy:: Hash/String - http proxy to use; defaults to nil
   # :only_data:: String/Array - extracts the data from given data paths
   # :ignore_data:: String/Array - defines which data points to exclude
-  # :keep_indicies:: Boolean - indicies of modified arrays display as hashes.
-  # :with_headers:: Boolean/String/Array - defines which headers to include
+  # :keep_indicies:: Boolean - indicies of modified arrays display as hashes
+  # :show_headers:: Boolean/String/Array - which headers to show in output
   # :parser:: Object/String - the parser to use for the body; default nil
   # :raw:: Boolean - run diff on raw strings
 
@@ -266,12 +268,12 @@ class Kronk
 
     t1 = Thread.new do
           res1 = retrieve uri1
-          str1 = res1.stringify @options
+          str1 = res1.stringify
          end
 
     t2 = Thread.new do
           res2 = retrieve uri2
-          str2 = res2.stringify @options
+          str2 = res2.stringify
          end
 
     t1.join
@@ -306,6 +308,9 @@ class Kronk
       Kronk.history << uri
     end
 
+    resp.parser         = options[:parser] if options[:parser]
+    resp.stringify_opts = options
+
     max_rdir = options[:follow_redirects]
     while resp.redirect? && (max_rdir == true || max_rdir.to_s.to_i > 0)
       Cmd.verbose "Following redirect..."
@@ -373,9 +378,11 @@ class Kronk
           end
 
         # Response headers - Boolean, String, or Array
-        when :with_headers
-          next if out_opts[key] == true || out_opts[key] && val == true
-          out_opts[key] = [*out_opts[key]] | [*val]
+        when :show_headers
+          next if out_opts.has_key?(key) &&
+                  (out_opts[key].class != Array || val == true || val == false)
+          out_opts[key] = (val == true || val == false) ? val :
+                                      [*out_opts[key]] | [*val]
 
         # String or Array
         when :only_data, :ignore_data

data/lib/kronk/cmd.rb

@@ -57,7 +57,7 @@ class Kronk
         :player       => {},
         :proxy        => {},
         :uris         => [],
-        :with_headers => false
+        :show_headers => false
       }
 
       options = parse_data_path_args options, argv
@@ -139,13 +139,13 @@ Parse and run diffs against data from live and cached http responses.
 
         opt.on('-i', '--include [HEADER1,HEADER2]', Array,
                'Include all or given headers in response') do |value|
-          options[:with_headers] ||= []
+          options[:show_headers] ||= []
 
           if value
-            options[:with_headers].concat value if
-              Array === options[:with_headers]
+            options[:show_headers].concat value if
+              Array === options[:show_headers]
           else
-            options[:with_headers] = true
+            options[:show_headers] = true
           end
 
           options[:no_body] = false
@@ -154,13 +154,13 @@ Parse and run diffs against data from live and cached http responses.
 
         opt.on('-I', '--head [HEADER1,HEADER2]', Array,
                'Use all or given headers only in the response') do |value|
-          options[:with_headers] ||= []
+          options[:show_headers] ||= []
 
           if value
-            options[:with_headers].concat value if
-              Array === options[:with_headers]
+            options[:show_headers].concat value if
+              Array === options[:show_headers]
           else
-            options[:with_headers] = true
+            options[:show_headers] = true
           end
 
           options[:no_body] = true

data/lib/kronk/player/stream.rb

@@ -29,9 +29,11 @@ class Kronk
           kronk.diff.formatted
 
         elsif kronk.response
-          kronk.response.stringify kronk.options
+          kronk.response.stringify
         end
 
+      return unless output
+
       output = "#{output.length}\r\n#{output}\r\n"
 
       mutex.synchronize do

data/lib/kronk/player/suite.rb

@@ -27,7 +27,7 @@ class Kronk
         elsif kronk.response
           begin
             # Make sure response is parsable
-            kronk.response.stringify kronk.options
+            kronk.response.stringify
           rescue => e
             error e, kronk, mutex
             return

data/lib/kronk/response.rb

@@ -37,10 +37,10 @@ class Kronk
     end
 
 
-    attr_accessor :body, :bytes, :byterate, :code, :headers, :parser,
-                  :raw, :request, :uri
+    attr_accessor :body, :bytes, :byterate, :code, :headers,
+                  :raw, :stringify_opts, :request, :uri
 
-    attr_reader :encoding, :time
+    attr_reader :encoding, :parser, :time
 
     alias to_hash headers
     alias to_s raw
@@ -89,6 +89,8 @@ class Kronk
       @uri = URI.parse io.path if File === io
 
       @byterate = 0
+
+      @stringify_opts = {}
     end
 
 
@@ -155,14 +157,14 @@ class Kronk
 
       return @parsed_body if @parsed_body && !parser
 
+      parser ||= @parser
+
       begin
         parser = Kronk.parser_for(parser) || Kronk.find_const(parser)
       rescue NameError
         raise InvalidParser, "No such parser: #{parser}"
       end if String === parser
 
-      parser ||= @parser
-
       raise MissingParser,
         "No parser for Content-Type: #{@_res['Content-Type']}" unless parser
 
@@ -203,6 +205,16 @@ class Kronk
     end
 
 
+    ##
+    # Assign the parser.
+
+    def parser= parser
+      @parser = Kronk.parser_for(parser) || Kronk.find_const(parser)
+    rescue NameError
+      raise InvalidParser, "No such parser: #{parser}"
+    end
+
+
     ##
     # Returns the header portion of the raw http response.
 
@@ -245,13 +257,13 @@ class Kronk
     # Returns the raw response with selective headers and/or the body of
     # the response. Supports the following options:
     # :no_body:: Bool - Don't return the body; default nil
-    # :with_headers:: Bool/String/Array - Return headers; default nil
+    # :show_headers:: Bool/String/Array - Return headers; default nil
 
     def selective_string options={}
       str = @body unless options[:no_body]
 
-      if options[:with_headers]
-        header = raw_header(options[:with_headers])
+      if options[:show_headers]
+        header = raw_header(options[:show_headers])
         str = [header, str].compact.join "\r\n"
       end
 
@@ -263,7 +275,7 @@ class Kronk
     # Returns the parsed response with selective headers and/or the body of
     # the response. Supports the following options:
     # :no_body:: Bool - Don't return the body; default nil
-    # :with_headers:: Bool/String/Array - Return headers; default nil
+    # :show_headers:: Bool/String/Array - Return headers; default nil
     # :parser:: Object - The parser to use for the body; default nil
     # :ignore_data:: String/Array - Removes the data from given data paths
     # :only_data:: String/Array - Extracts the data from given data paths
@@ -275,8 +287,8 @@ class Kronk
         data = parsed_body options[:parser]
       end
 
-      if options[:with_headers]
-        header_data = parsed_header(options[:with_headers])
+      if options[:show_headers]
+        header_data = parsed_header(options[:show_headers])
         data &&= [header_data, data]
         data ||= header_data
       end
@@ -298,9 +310,11 @@ class Kronk
     # :ignore_data:: String/Array - defines which data points to exclude
     # :raw:: Boolean - Force using the unparsed raw response
     # :keep_indicies:: Boolean - indicies of modified arrays display as hashes.
-    # :with_headers:: Boolean/String/Array - defines which headers to include
+    # :show_headers:: Boolean/String/Array - defines which headers to include
 
     def stringify options={}
+      options = options.empty? ? @stringify_opts : merge_stringify_opts(options)
+
       if !options[:raw] && (options[:parser] || @parser || options[:no_body])
         data = selective_data options
         Diff.ordered_data_string data, options[:struct]
@@ -314,6 +328,30 @@ class Kronk
     end
 
 
+    def merge_stringify_opts options # :nodoc:
+      options = options.dup
+      @stringify_opts.each do |key, val|
+        case key
+        # Response headers - Boolean, String, or Array
+        when :show_headers
+          next if options.has_key?(key) &&
+                  (options[key].class != Array || val == true || val == false)
+
+          options[key] = (val == true || val == false) ? val :
+                                      [*options[key]] | [*val]
+
+        # String or Array
+        when :only_data, :ignore_data
+          options[key] = [*options[key]] | [*val]
+
+        else
+          options[key] = val if options[key].nil?
+        end
+      end
+      options
+    end
+
+
     ##
     # Check if this is a 2XX response.
 

data/lib/kronk/test/assertions.rb

@@ -83,8 +83,8 @@ class Kronk
       # Supports all options of Kronk.compare.
 
       def assert_equal_responses uri1, uri2, options={}
-        resp1 = Kronk.retrieve(uri1, options).stringify options
-        resp2 = Kronk.retrieve(uri2, options).stringify options
+        resp1 = Kronk.retrieve(uri1, options).stringify
+        resp2 = Kronk.retrieve(uri2, options).stringify
 
         assert_equal resp1, resp2
       end

data/test/test_cmd.rb

@@ -201,19 +201,19 @@ class TestCmd < Test::Unit::TestCase
 
   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 %w{FOO BAR TWO PART}, opts[:show_headers]
     assert_equal false, opts[:no_body]
 
     opts = Kronk::Cmd.parse_args %w{uri -I}
-    assert_equal true, opts[:with_headers]
+    assert_equal true, opts[:show_headers]
     assert_equal true, opts[:no_body]
 
     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 %w{FOO BAR TWO PART}, opts[:show_headers]
     assert_equal true, opts[:no_body]
 
     opts = Kronk::Cmd.parse_args %w{uri -i}
-    assert_equal true, opts[:with_headers]
+    assert_equal true, opts[:show_headers]
     assert_equal false, opts[:no_body]
   end
 

data/test/test_kronk.rb

@@ -313,31 +313,31 @@ class TestKronk < Test::Unit::TestCase
   end
 
 
-  def test_options_for_uri_with_headers
+  def test_options_for_uri_show_headers
     with_uri_options do
       %w{withhdrs withstrhdrs withtruehdrs}.each do |type|
-        opts = Kronk.new(:with_headers => true).
+        opts = Kronk.new(:show_headers => true).
                 options_for_uri "http://#{type}.com"
 
-        assert_equal true, opts[:with_headers]
+        assert_equal true, opts[:show_headers]
       end
     end
   end
 
 
-  def test_options_for_uri_with_headers_arr
+  def test_options_for_uri_show_headers_arr
     with_uri_options do
       %w{withhdrs withstrhdrs}.each do |type|
-        opts = Kronk.new(:with_headers => %w{hdr2 hdr3}).
+        opts = Kronk.new(:show_headers => %w{hdr2 hdr3}).
                 options_for_uri "http://#{type}.com"
 
-        assert_equal %w{hdr1 hdr2 hdr3}.sort, opts[:with_headers].sort
+        assert_equal %w{hdr1 hdr2 hdr3}.sort, opts[:show_headers].sort
       end
 
-      opts = Kronk.new(:with_headers => %w{hdr2 hdr3}).
+      opts = Kronk.new(:show_headers => %w{hdr2 hdr3}).
               options_for_uri "http://withtruehdrs.com"
 
-      assert_equal %w{hdr2 hdr3}, opts[:with_headers]
+      assert_equal %w{hdr2 hdr3}, opts[:show_headers]
     end
   end
 
@@ -362,19 +362,19 @@ class TestKronk < Test::Unit::TestCase
   def test_compare_raw
     diff = Kronk.compare "test/mocks/200_response.json",
                          "test/mocks/200_response.xml",
-                         :with_headers => true,
+                         :show_headers => true,
                          :raw => true
 
     resp1 = Kronk.retrieve "test/mocks/200_response.json",
-                             :with_headers => true,
+                             :show_headers => true,
                              :raw => true
 
     resp2 = Kronk.retrieve "test/mocks/200_response.xml",
-                             :with_headers => true,
+                             :show_headers => true,
                              :raw => true
 
-    exp_diff = Kronk::Diff.new resp1.selective_string(:with_headers => true),
-                               resp2.selective_string(:with_headers => true),
+    exp_diff = Kronk::Diff.new resp1.selective_string(:show_headers => true),
+                               resp2.selective_string(:show_headers => true),
                                :labels => [
                                  "test/mocks/200_response.json",
                                  "test/mocks/200_response.xml"
@@ -444,17 +444,17 @@ class TestKronk < Test::Unit::TestCase
   def test_compare_data
     diff = Kronk.compare "test/mocks/200_response.json",
                          "test/mocks/200_response.xml",
-                         :with_headers => true
+                         :show_headers => true
 
     resp1 = Kronk.retrieve "test/mocks/200_response.json",
-                             :with_headers => true
+                             :show_headers => true
 
     resp2 = Kronk.retrieve "test/mocks/200_response.xml",
-                             :with_headers => true
+                             :show_headers => true
 
     exp_diff = Kronk::Diff.new_from_data \
-                  resp1.selective_data(:with_headers => true),
-                  resp2.selective_data(:with_headers => true),
+                  resp1.selective_data(:show_headers => true),
+                  resp2.selective_data(:show_headers => true),
                   :labels => [
                     "test/mocks/200_response.json",
                     "test/mocks/200_response.xml"
@@ -523,7 +523,7 @@ class TestKronk < Test::Unit::TestCase
 
 
   def test_compare_data_inst
-    kronk = Kronk.new :with_headers => true
+    kronk = Kronk.new :show_headers => true
     diff  = kronk.compare "test/mocks/200_response.json",
                           "test/mocks/200_response.xml"
 
@@ -545,8 +545,8 @@ class TestKronk < Test::Unit::TestCase
     assert_equal nil,           kronk.diff
 
     exp_diff = Kronk::Diff.new_from_data \
-                  resp2.selective_data(:with_headers => true),
-                  resp1.selective_data(:with_headers => true),
+                  resp2.selective_data(:show_headers => true),
+                  resp1.selective_data(:show_headers => true),
                   :labels => [
                     "test/mocks/200_response.json",
                     "test/mocks/200_response.xml"
@@ -618,13 +618,13 @@ class TestKronk < Test::Unit::TestCase
         :proxy => "someproxy.com"
       },
       'withhdrs'    => {
-        :with_headers => %w{hdr1 hdr2 hdr3}
+        :show_headers => %w{hdr1 hdr2 hdr3}
       },
       'withstrhdrs' => {
-        :with_headers => "hdr1"
+        :show_headers => "hdr1"
       },
       'withtruehdrs' => {
-        :with_headers => true
+        :show_headers => true
       },
       'focus_data'   => {
         :only_data      => %w{path1 path2},

data/test/test_response.rb

@@ -208,7 +208,7 @@ class TestResponse < Test::Unit::TestCase
 
     assert_equal "#{@json_resp.raw.split("\r\n\r\n")[0]}\r\n",
                  @json_resp.selective_string(:no_body => true,
-                  :with_headers => true)
+                  :show_headers => true)
   end
 
 
@@ -217,7 +217,7 @@ class TestResponse < Test::Unit::TestCase
 
     expected = "Content-Type: application/json; charset=utf-8\r\n\r\n#{body}"
     assert_equal expected,
-                 @json_resp.selective_string(:with_headers => "Content-Type")
+                 @json_resp.selective_string(:show_headers => "Content-Type")
   end
 
 
@@ -227,12 +227,12 @@ class TestResponse < Test::Unit::TestCase
     expected = "Date: Fri, 03 Dec 2010 21:49:00 GMT\r\nContent-Type: application/json; charset=utf-8\r\n\r\n#{body}"
     assert_equal expected,
                  @json_resp.selective_string(
-                    :with_headers => ["Content-Type", "Date"])
+                    :show_headers => ["Content-Type", "Date"])
 
     expected = "Date: Fri, 03 Dec 2010 21:49:00 GMT\r\nContent-Type: application/json; charset=utf-8\r\n"
     assert_equal expected,
                  @json_resp.selective_string(:no_body => true,
-                    :with_headers => ["Content-Type", "Date"])
+                    :show_headers => ["Content-Type", "Date"])
   end
 
 
@@ -246,7 +246,7 @@ class TestResponse < Test::Unit::TestCase
 
     assert_equal "#{@json_resp.raw.split("\r\n\r\n")[0]}\r\n",
                  @json_resp.selective_string(:no_body => true,
-                  :with_headers => true)
+                  :show_headers => true)
   end
 
 
@@ -265,7 +265,7 @@ class TestResponse < Test::Unit::TestCase
       [{'content-type' => 'application/json; charset=utf-8'}, body]
 
     assert_equal expected,
-                 @json_resp.selective_data(:with_headers => "Content-Type")
+                 @json_resp.selective_data(:show_headers => "Content-Type")
   end
 
 
@@ -278,7 +278,7 @@ class TestResponse < Test::Unit::TestCase
 
     assert_equal expected,
                  @json_resp.selective_data(
-                    :with_headers => ["Content-Type", "Date"])
+                    :show_headers => ["Content-Type", "Date"])
   end
 
 
@@ -291,7 +291,7 @@ class TestResponse < Test::Unit::TestCase
 
     assert_equal expected,
                  @json_resp.selective_data(:no_body => true,
-                    :with_headers => ["Content-Type", "Date"])
+                    :show_headers => ["Content-Type", "Date"])
   end
 
 

metadata

@@ -2,7 +2,7 @@
 name: kronk
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors: 
 - Jeremie Castagna
@@ -169,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2162238022894922072
+      hash: -3702389185383603132
       segments: 
       - 0
       version: "0"