nethttputils 0.2.4.2 → 0.2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 627f4578fd2379b3e4781a55a5531ae6e3be21c8
-  data.tar.gz: 9223bdf1313f2d9b44636db775c7142d8544be16
+  metadata.gz: 7bbc2695cb20cfc4890ebbac97ed54ed93cfe7d3
+  data.tar.gz: bf55a158b9052a138a7c3f576e8a8b03f05790fa
 SHA512:
-  metadata.gz: 10b2e6f4dc815161ff679e76f518a6217027638710376c09e6fa0c6db975f8480daff3166e9a775782a13ade622b2cfe4b8ec494df82d8a5c75696a9f0a07809
-  data.tar.gz: f3d8f5a374bffd2df400ec4ea675186773a0f70ac33d4f11afd4b4618a296d5bf2ea1834ca63f4a4ec6f42155b5fe14d2f36c3e1fe51e095dffba4ae7cee2152
+  metadata.gz: a827b0b0fcea495ae07a172989cdf1081242f9b8a7a68957de380d2854e2f7f1a0ff645fe5e1f7982b328b759bea29ae1c817c292e5491df51ef46dad1bd3fa3
+  data.tar.gz: a64a7e7de953f7eb3fb719eeea5df12e9d69a245c2a824b8837c013b404029d23f077a16fbb8cf5d865ec6402dab825af600741b5fff71874fa3771443d654ac

data/lib/nethttputils.rb

@@ -45,7 +45,7 @@ module NetHTTPUtils
 
       uri.query = URI.encode_www_form form if :GET == (mtd = mtd.upcase) && !form.empty?
       cookies = {}
-      prepare_request = lambda do |uri|
+      prepare_request = lambda do |uri, mtd = :GET, form = {}|
         case mtd.upcase
           when :GET    ; Net::HTTP::Get
           when :POST   ; Net::HTTP::Post
@@ -56,7 +56,6 @@ module NetHTTPUtils
         end.new(uri).tap do |request| # somehow Get eats even raw url, not URI object
           patch_request.call uri, form, request if patch_request
           request.basic_auth *auth if auth
-          request["cookie"] = [*request["cookie"], cookies.map{ |k, v| "#{k}=#{v}" }].join "; " unless cookies.empty?
           # pp Object.instance_method(:method).bind(request).call(:set_form).source_location
           if (mtd == :POST || mtd == :PATCH) && !form.empty?
             case type
@@ -72,6 +71,7 @@ module NetHTTPUtils
             end
           end
           header.each{ |k, v| request[k.to_s] = v }
+          request["cookie"] = [*request["cookie"], cookies.map{ |k, v| "#{k}=#{v}" }].join "; " unless cookies.empty?
 
           logger.info "> #{request.class} #{uri.host} #{request.path}"
           next unless logger.debug?
@@ -191,7 +191,12 @@ module NetHTTPUtils
           end
         end
 
-        response.to_hash.fetch("set-cookie", []).each{ |c| k, v = c.split(?=); cookies[k] = v[/[^;]+/] }
+        response.to_hash.fetch("set-cookie", []).each do |c|
+          k, v = c.split(?=)
+          logger.debug "set-cookie: #{k}=#{v[/[^;]+/]}"
+          cookies.store k, v[/[^;]+/]
+        end
+        logger.debug "< header: #{response.to_hash}"
         case response.code
         when /\A3\d\d\z/
           logger.info "redirect: #{response["location"]}"
@@ -236,7 +241,6 @@ module NetHTTPUtils
           } from #{
             [__FILE__, caller.map{ |i| i[/(?<=:)\d+/] }].join ?:
           }"
-          logger.debug "< header: #{response.to_hash}"
           logger.debug "< body: #{
             response.body.tap do |body|
               body.replace remove_tags body if body[/<html[> ]/]
@@ -245,7 +249,7 @@ module NetHTTPUtils
           response
         end
       end
-      do_request[prepare_request[uri]].tap do |response|
+      do_request[prepare_request[uri, mtd, form]].tap do |response|
         cookies.each{ |k, v| response.add_field "Set-Cookie", "#{k}=#{v};" }
         logger.debug "< header: #{response.to_hash}"
       end
@@ -263,6 +267,7 @@ module NetHTTPUtils
         response.body
       end.tap do |string|
         string.instance_variable_set :@uri_path, response.uri.path
+        string.instance_variable_set :@header, response.to_hash
       end
     # ensure
     #   response.instance_variable_get("@nethttputils_close").call if response

data/nethttputils.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "nethttputils"
-  spec.version      = "0.2.4.2"
+  spec.version      = "0.2.5.0"
   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.2.4.2
+  version: 0.2.5.0
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-29 00:00:00.000000000 Z
+date: 2018-10-24 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 --
@@ -51,7 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: this tool is like a pet that I adopted young and now I depend on, sorry