kronk 1.8.6 → 1.8.7

data/History.rdoc

@@ -1,3 +1,17 @@
+=== 1.8.7 / 2012-04-30
+
+* Enhancements:
+
+  * Add support for Kronk request middleware for plugins.
+
+* Bugfixes:
+
+  * Follow browser conventions and redirect 302s like 303s.
+
+  * Fix passing previous request options to redirects.
+
+  * Fix response stringify options with redirects.
+
 === 1.8.6 / 2012-04-23
 
 * Enhancements:

data/lib/kronk.rb

@@ -13,7 +13,7 @@ require 'yaml'
 class Kronk
 
   # This gem's version.
-  VERSION = '1.8.6'
+  VERSION = '1.8.7'
 
   require 'kronk/constants'
   require 'kronk/queue_runner'
@@ -226,6 +226,22 @@ class Kronk
   end
 
 
+  ##
+  # Returns an array of middleware to use around requests.
+
+  def self.middleware
+    @middleware ||= []
+  end
+
+
+  ##
+  # Assign middleware to use.
+
+  def self.use mware
+    self.middleware.unshift mware
+  end
+
+
   ##
   # See Kronk#compare. Short for:
   #   Kronk.new(opts).compare(uri1, uri2)
@@ -278,6 +294,9 @@ class Kronk
     @diff      = nil
     @responses = []
     @response  = nil
+
+    meth = method(:request_explicit)
+    @app = Kronk.middleware.inject(meth){|app, mware| mware.new(app) }
   end
 
 
@@ -319,35 +338,21 @@ class Kronk
 
   def request uri
     options = Kronk.config[:no_uri_options] ? @options : options_for_uri(uri)
+    options.merge!(:uri => uri)
 
-    if IO === uri || StringIO === uri || BufferedIO === uri
-      Cmd.verbose "Reading IO #{uri}"
-      resp = Response.new uri, options
-
-    elsif File.file? uri.to_s
-      Cmd.verbose "Reading file:  #{uri}\n"
-      resp = Response.read_file uri, options
-
-    else
-      req = Request.new uri, options
-      Cmd.verbose "Retrieving URL:  #{req.uri}\n"
-      resp = req.retrieve options
-
-      hist_uri = req.uri.to_s[0..-req.uri.request_uri.length]
-      hist_uri = hist_uri[(req.uri.scheme.length + 3)..-1]
-      Kronk.history << hist_uri
-    end
-
-    resp.parser         = options[:parser] if options[:parser]
-    resp.stringify_opts = options
+    resp = @app.call options
 
     rdir = options[:follow_redirects]
     while resp.redirect? && (rdir == true || rdir.to_s.to_i > 0)
+      uri = resp.location
       Cmd.verbose "Following redirect to #{resp.location}"
       resp = resp.follow_redirect options_for_uri(resp.location)
       rdir = rdir - 1 if Fixnum === rdir
     end
 
+    resp.parser         = options[:parser] if options[:parser]
+    resp.stringify_opts = options
+
     @responses = [resp]
     @response  = resp
     @diff      = nil
@@ -364,6 +369,34 @@ class Kronk
   alias retrieve request
 
 
+  ##
+  # Request without autofilling options.
+
+  def request_explicit opts
+    uri = opts.delete(:uri)
+
+    if IO === uri || StringIO === uri || BufferedIO === uri
+      Cmd.verbose "Reading IO #{uri}"
+      Response.new uri, options
+
+    elsif File.file? uri.to_s
+      Cmd.verbose "Reading file:  #{uri}\n"
+      Response.read_file uri, options
+
+    else
+      req = Request.new uri, options
+      Cmd.verbose "Retrieving URL:  #{req.uri}\n"
+      resp = req.retrieve options
+
+      hist_uri = req.uri.to_s[0..-req.uri.request_uri.length]
+      hist_uri = hist_uri[(req.uri.scheme.length + 3)..-1]
+      Kronk.history << hist_uri
+
+      resp
+    end
+  end
+
+
   ##
   # Returns merged config-defined options for a given uri.
   # Values in cmd_opts take precedence.

data/lib/kronk/request.rb

@@ -198,7 +198,7 @@ class Kronk
           def #{name} uri, opts={}, &block
             opts[:http_method] = "#{name}"
             new(uri, opts).retrieve(&block)
-          end  
+          end
         END
       end
     end

data/lib/kronk/response.rb

@@ -501,13 +501,21 @@ class Kronk
       return if !redirect?
       new_opts = @request ? @request.to_hash : {}
 
-      new_opts[:http_method] = "GET" if @code == "303"
-      new_opts.merge!(opts)
+      if @code == "303" || @code == "302"
+        new_opts[:http_method] = "GET"
+        new_opts.delete(:form)
+        new_opts.delete(:data)
+      end
 
+      new_opts.delete(:headers)
+      new_opts.delete(:host)
       new_opts.delete(:path)
+
       new_opts.delete(:auth) if !opts[:trust_location] &&
         (!@request || self.location.host != self.uri.host)
 
+      new_opts.merge!(opts)
+
       Request.new(self.location, new_opts).retrieve(new_opts, &block)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kronk
 version: !ruby/object:Gem::Version
-  version: 1.8.6
+  version: 1.8.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000 Z
+date: 2012-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json