nethttputils 0.2.2.0 → 0.2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca4a5b681f2630f07305d6d9c6df59eea09e4bbf
-  data.tar.gz: 90f8e4f7d626205f0f9673b4eb2069e6bcde7df8
+  metadata.gz: bec88b8ff9beeae7cc18250b6a2d955aa6d7845b
+  data.tar.gz: 820c5f45fbd937fd89912eb30c35c264f98923df
 SHA512:
-  metadata.gz: 6bbc62b4643d52eb8d78cd2ea83eea72888fcff29695c176f368774fa0e8fd1858bf0478c7be6ce99580223f659eef5813c3102bb11578eb6469b4b7f746b838
-  data.tar.gz: f7690fbcf2ea1ac772e768429411b4b061ccf8d8dc02ed9382ab6798a3ba8ff8be554dfbee41c3adb449a6bf3e1f8cbf4d8c79787b0e214684fd161549bedfbb
+  metadata.gz: d5d9ab8603996adc703bb812d85fea42e359167736be39eecdd1aecc71d8c1667662672b8cb22ce7ff66384b655415aa342b4b0b0f005d3a5a7e09359074df88
+  data.tar.gz: 6ebc04827c686dfc8e15f9cdb14758ef5604a45e252e2472da070603dacb779a92f2ff11d5869b6b1d7bd64f9d4bb049b66dd69ddbbdc5bf91730e9a87877814

data/.travis.yml

@@ -19,4 +19,3 @@ matrix:
   allow_failures:
   # something with `NetHTTPUtils.request_data("http://localhost:8000/?1=2&3=4", form: {1=>3})` test
   - rvm: jruby-head
-    os: linux

data/lib/nethttputils.rb

@@ -35,9 +35,10 @@ module NetHTTPUtils
         url
       rescue URI::InvalidURIError
         URI.escape url
-      end
+      end unless uri.is_a? URI::HTTP
+
 
-      logger.warn "Warning: query params included `url` are discarded because `:form` isn't empty" if uri.query && !form.empty?
+      logger.warn "Warning: query params included in `url` argument are discarded because `:form` isn't empty" if uri.query && !form.empty?
       # we can't just merge because URI fails to parse such queries as "/?1"
 
       uri.query = URI.encode_www_form form if :GET == (mtd = mtd.upcase) && !form.empty?
@@ -54,12 +55,17 @@ module NetHTTPUtils
           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?
-          request.set_form_data form if !form.empty? && mtd == :POST
-          if mtd == :POST || mtd == :PATCH
-            request["Content-Type"] = case type
-              when :form ; "application/x-www-form-urlencoded;charset=UTF-8"
-              when :json ; request.body = JSON.dump form     # yes this overwrites form data set few lines higher
-                           "application/json"
+          # pp Object.instance_method(:method).bind(request).call(:set_form).source_location
+          if (mtd == :POST || mtd == :PATCH) && !form.empty?
+            case type
+              when :form ; if form.any?{ |k, v| v.respond_to? :to_path }
+                             request.set_form form, "multipart/form-data"
+                           else
+                             request.set_form_data form
+                             request.content_type = "application/x-www-form-urlencoded;charset=UTF-8"
+                           end
+              when :json ; request.body = JSON.dump form
+                           request.content_type = "application/json"
               else       ; raise "unknown content-type '#{type}'"
             end
           end

data/nethttputils.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "nethttputils"
-  spec.version      = "0.2.2.0"
+  spec.version      = "0.2.3.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.2.0
+  version: 0.2.3.0
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-07 00:00:00.000000000 Z
+date: 2018-05-17 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 --