nethttputils 0.3.2.6 → 0.3.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba824c7599a1d7d935dfd5c9bcc01c991201211e
-  data.tar.gz: f6a5d7a00cc2a7f167562721b43ffa5df8ad0130
+  metadata.gz: 5ef478ad663a8500e057309f2fcb9bb3587a2525
+  data.tar.gz: 82ccf697e5a37a3d7a46a216ece1e1d5a0498e8f
 SHA512:
-  metadata.gz: e973a3584da011dc3ef82c376d72dee3b665fae76660efd6c4e0bb7c9133b3aa146083ed96f9df81492134b98893e32fed797728dac0ac0e222d456573aabc2c
-  data.tar.gz: b4faeeaf94da3a2c7bc614a16682aa7f8cf17c5ba1eb20eecf31f3d588d03d43eaaaf90dc9ef73dc089807a67a5572d97139efaf430f1289171ad6a80bdc3811
+  metadata.gz: 0eddfd6fee3905ebd37c9863f0ce420befdb5ee19b4ec2414a05b5be808606032abd3e4bff0ce701a4b8fcb5584e9bbf2b3af8e9e660198bcf668bf296dab860
+  data.tar.gz: 1efd44dfd6afb4b1bbe3657f51a5dde2535715c4576b5126e48e827836848d2b263f7264094a5307da61031d860c80c04060779b2d16351690659d88cc83f84a

data/lib/nethttputils.rb

@@ -201,10 +201,17 @@ module NetHTTPUtils
               end
             end
 
+            # TODO: use WEBrick::Cookie
+            old_cookies = cookies.dup
             response.to_hash.fetch("set-cookie", []).each do |c|
-              k, v = c.split(?=)
-              logger.debug "set-cookie: #{k}=#{v[/[^;]+/]}"
-              cookies.store k, v[/[^;]+/]
+              fail "bad cookie? #{c.inspect}" unless /\A([^\s=]+)=([^\s=]+)\z/.match c.split(/\s*;\s*/).first
+              logger.debug "set-cookie: #{$1}=#{$2}"
+              old_cookies.delete $1
+              cookies.store $1, $2
+            end
+            old_cookies.each do |k, v|
+              logger.debug "faking an old cookie into new response: #{k}=#{v}"
+              response.add_field "Set-Cookie", "#{k}=#{v}"
             end
             case response.code
             when /\A30\d\z/
@@ -267,7 +274,6 @@ module NetHTTPUtils
             end
           end
           response = do_request.call prepare_request[uri]
-          cookies.each{ |k, v| response.add_field "Set-Cookie", "#{k}=#{v};" }
           logger.debug "< header: #{response.to_hash}"
           (response.body || "").tap{ |r| r.instance_variable_set :@last_response, response }
     end
@@ -342,6 +348,25 @@ if $0 == __FILE__
   require "json"
   Thread.abort_on_exception = true
 
+  server = WEBrick::HTTPServer.new Port: 8000
+  server.mount_proc "/1" do |req, res|
+    next unless "GET" == req.request_method
+    res.cookies.push WEBrick::Cookie.new("1", "2")
+    res.cookies.push WEBrick::Cookie.new("3", "4")
+    res.cookies.push WEBrick::Cookie.new("1", "5")
+    res.status = 300
+    res["location"] = "/2"
+  end
+  server.mount_proc "/2" do |req, res|
+    res.cookies.push WEBrick::Cookie.new("3", "6")
+    res.cookies.push WEBrick::Cookie.new("4", "7")
+  end
+  t = Thread.new{ server.start }
+  fail unless %w{ 3=6 4=7 1=5 } == p(NetHTTPUtils.request_data("http://localhost:8000/1").
+    instance_variable_get(:@last_response).to_hash.fetch("set-cookie"))
+  server.shutdown
+  t.join
+
   [
     [WEBrick::HTTPStatus::NotFound, 404],
     [WEBrick::HTTPStatus::BadRequest],
@@ -360,6 +385,7 @@ if $0 == __FILE__
       fail unless 404 == e.code
     end
     server.shutdown
+    t.join
   end
 
   server = WEBrick::HTTPServer.new Port: 8000
@@ -380,12 +406,12 @@ if $0 == __FILE__
   NetHTTPUtils.request_data("http://localhost:8000/")
   fail stack.inspect unless stack == %w{ HEAD GET }
   server.shutdown
+  t.join
 
   # TODO: test that HEAD method request goes through redirects
   # TODO: test for `NetHTTPUtils.request_data "...", :head
   # TODO: request the HEAD only if mtd == :GET
 
-  t.join  # Address already in use - bind(2) for [::]:8000 (Errno::EADDRINUSE)
   server = WEBrick::HTTPServer.new Port: 8000
   server.mount_proc ?/ do |req, res|
     # pp req.dup.tap{ |_| _.instance_variable_set "@config", nil }
@@ -432,7 +458,6 @@ if $0 == __FILE__
     end
   end
   %w{
-    http://minus.com/lkP3hgRJd9npi
     http://www.cutehalloweencostumeideas.org/wp-content/uploads/2017/10/Niagara-Falls_04.jpg
   }.each do |url|
     begin

data/nethttputils.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "nethttputils"
-  spec.version      = "0.3.2.6"
+  spec.version      = "0.3.2.7"
   spec.summary      = "this tool is like a pet that I adopted young and now I depend on, sorry"
   spec.description = <<-EOF
     Back in 2015 I was a guy automating things at my job and two scripts had a common need --

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nethttputils
 version: !ruby/object:Gem::Version
-  version: 0.3.2.6
+  version: 0.3.2.7
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-24 00:00:00.000000000 Z
+date: 2019-05-18 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Back in 2015 I was a guy automating things at my job and two scripts had a common need --