http.rb 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a0a461fdf56bdea8f5f4b1940f0af469ef67e3fd7bd1319cc33245ff50641bb
-  data.tar.gz: 45e533a1a9cf2934d78cc8b6f29e58e4a73e8d26485a1cef12ad98f4be04b9e7
+  metadata.gz: 275a68b16a13f177b907eb555faa75187ed2e03bb68e6d70902cfc5fc2f089d4
+  data.tar.gz: 5f6b2930739ff00066c4968c0159e179b4f1cf4e419ce8ea4198fe1af2d2a23a
 SHA512:
-  metadata.gz: 73bc96382cf88af02f52f48e36d004e9b1dfee91e658700495f712632d55793f1543e253bdcccca09c6bda7fc71c59d61448818f89b8b8fc1a355becfd5d3ffb
-  data.tar.gz: 814f7dcd3026a55a675c87d311b8e724f843895768c996c4e4c5f3283c38a81f46d03934256fa832835135229a042439655261a649bccec07cb5e8189006a010
+  metadata.gz: f1ae811bfb12e66bf13461d78b64681095c2f5167d154afd2d93a0dadcf703bb45208fb1cd9dcde634dd836e331cc8db60b314951ba2675672deae477f9f76bd
+  data.tar.gz: 21b4a290fe9122f75d64a7d9e3878a3aed962262fdb6e6e434fa61a3b3cd664d2623b8ef36439a45177c120ddfce1693f1a5a7a9f1b76b8a906997e1e6ad85d1

data/CHANGELOG

@@ -1,5 +1,18 @@
 # http/CHANGELOG
 
+## 20261019
+
+1.7.1: Args are joined to a query already in the URI with an ampersand, and an array among them repeats its key.
+
+1. ~ HTTP.request_without_body: the args are joined to the URI's query with '&' where it has one. '?' was added regardless, so HTTP.get('http://example.com/p?x=1', {a: 1}) requested '/p?x=1?a=1'.
+2. ~ Thoran::Hash::XWwwFormUrlencode#x_www_form_urlencode: an array value gives a pair for each element, a nil element left out, so {tags: [1, 2]} is 'tags=1&tags=2', as URI.encode_www_form and Net::HTTP#form_data= have it, rather than 'tags=%5B1%2C+2%5D'.
+3. ~ Thoran/Hash/XWwwFormUrlencode/x_www_form_urlencode.rb: /0.3.0/0.3.1/ in the file's own header.
+4. ~ test/HTTP/request_without_body_test.rb: + args with a query in the URI, and an array among the args, through request_without_body and HTTP.get. All fail against 1.7.0.
+5. + test/Thoran/Hash/XWwwFormUrlencode/x_www_form_urlencode_test.rb: pairs, nil values, arrays, an empty array, a nil element, agreement with URI.encode_www_form, the joiner, and the x_www_form_url_encode alias. The array examples fail against 1.7.0.
+6. ~ README.md: + how args meet a query in the URI and an array, under With arguments only.
+7. ~ HTTP::VERSION: /1.7.0/1.7.1/
+
+
 ## 20261018
 
 1.7.0: lib/HTTP.rb --> lib/http.rb

data/README.md

@@ -41,6 +41,14 @@ HTTP.get('http://example.com')
 HTTP.get('http://example.com', {a: 1, b: 2})
 HTTP.post('http://example.com', {a: 1, b: 2})
 ```
+
+For a method without a body, the args are joined to any query the URI already has, and an array repeats its key:
+
+```ruby
+HTTP.get('http://example.com/search?q=ruby', {tags: [1, 2]})
+# GET /search?q=ruby&tags=1&tags=2
+```
+
 ### With JSON data
 
 ```ruby

data/lib/HTTP/VERSION.rb

@@ -2,5 +2,5 @@
 # HTTP::VERSION
 
 module HTTP
-  VERSION = '1.7.0'
+  VERSION = '1.7.1'
 end

data/lib/HTTP/request_without_body.rb

@@ -11,7 +11,7 @@ module HTTP
     uri = uri.is_a?(URI) ? uri : URI.parse(uri)
     request_uri = uri.request_uri
     unless args.empty?
-      request_uri += '?' + args.x_www_form_urlencode
+      request_uri += (uri.query ? '&' : '?') + args.x_www_form_urlencode
     end
     request_object = Net::HTTP.const_get(method.to_s.capitalize).new(request_uri)
     request(uri, request_object, headers, options, &block)

data/lib/Thoran/Hash/XWwwFormUrlencode/x_www_form_urlencode.rb

@@ -1,13 +1,15 @@
 # Thoran/Hash/XWwwFormUrlencode/x_www_form_urlencode.rb
 # Thoran::Hash::XWwwFormUrlencode#x_www_form_urlencode
 
-# 20260713
-# 0.3.0
+# 20261019
+# 0.3.1
 
 # Changes since 0.2:
 # -/0: (The class name and the snake case name really are consistent now.)
 # 1. /XWwwFormUrlEncode/XWwwFormUrlencode/
 # 2. /url_encode/urlencode/
+# 0/1: An array value repeats its key for each element.
+# 3. ~ x_www_form_urlencode: an array value gives a pair for each of its elements, as URI.encode_www_form does, rather than one pair holding the array's inspect string, '[1, 2]'; a nil element is left out, as a nil value is.
 
 require 'Thoran/String/Urlencode/urlencode'
 
@@ -16,7 +18,12 @@ module Thoran
     module XWwwFormUrlencode
 
       def x_www_form_urlencode(joiner = '&')
-        inject([]){|a,e| a << "#{e.first.to_s.urlencode}=#{e.last.to_s.urlencode}" unless e.last.nil?; a}.join(joiner)
+        inject([]) do |a,(key, value)|
+          (value.is_a?(Array) ? value : [value]).each do |element|
+            a << "#{key.to_s.urlencode}=#{element.to_s.urlencode}" unless element.nil?
+          end
+          a
+        end.join(joiner)
       end
       alias_method :x_www_form_url_encode, :x_www_form_urlencode
 

data/test/HTTP/request_without_body_test.rb

@@ -41,6 +41,54 @@ describe ".request_without_body" do
     end
   end
 
+  describe "with args and a query already in the uri" do
+    let(:uri){'http://example.com/path?x=1'}
+
+    before do
+      stub_request(:get, 'http://example.com/path?x=1&a=1').
+        to_return(status: 200, body: '', headers: {})
+    end
+
+    it "joins the args to the query with an ampersand" do
+      received_arg = nil
+      request_object = Net::HTTP::Get.new('/path?x=1&a=1')
+      Net::HTTP::Get.stub(:new, ->(arg){received_arg = arg; request_object}) do
+        response = HTTP.request_without_body(:get, uri, {a: 1})
+        _(received_arg).must_equal('/path?x=1&a=1')
+        _(response.success?).must_equal(true)
+      end
+    end
+
+    it "is requested so by HTTP.get" do
+      response = HTTP.get(uri, {a: 1})
+      _(response.success?).must_equal(true)
+      assert_requested(:get, 'http://example.com/path?x=1&a=1')
+    end
+  end
+
+  describe "with an array among the args" do
+    before do
+      stub_request(:get, 'http://example.com/path?tags=1&tags=2').
+        to_return(status: 200, body: '', headers: {})
+    end
+
+    it "repeats the key for each element" do
+      received_arg = nil
+      request_object = Net::HTTP::Get.new('/path?tags=1&tags=2')
+      Net::HTTP::Get.stub(:new, ->(arg){received_arg = arg; request_object}) do
+        response = HTTP.request_without_body(:get, uri, {tags: [1, 2]})
+        _(received_arg).must_equal('/path?tags=1&tags=2')
+        _(response.success?).must_equal(true)
+      end
+    end
+
+    it "is requested so by HTTP.get" do
+      response = HTTP.get(uri, {tags: [1, 2]})
+      _(response.success?).must_equal(true)
+      assert_requested(:get, 'http://example.com/path?tags=1&tags=2')
+    end
+  end
+
   describe "delegation from the named method" do
     it "is reached by HTTP.get with the verb prepended" do
       received_args = nil

data/test/Thoran/Hash/XWwwFormUrlencode/x_www_form_urlencode_test.rb

@@ -0,0 +1,42 @@
+# test/Thoran/Hash/XWwwFormUrlencode/x_www_form_urlencode_test.rb
+
+require_relative '../../../helper'
+
+describe Thoran::Hash::XWwwFormUrlencode do
+  describe "#x_www_form_urlencode" do
+    it "joins encoded pairs with an ampersand" do
+      _({a: 1, 'b c' => 'd/e'}.x_www_form_urlencode).must_equal('a=1&b+c=d%2Fe')
+    end
+
+    it "leaves out a nil value" do
+      _({a: 1, b: nil}.x_www_form_urlencode).must_equal('a=1')
+    end
+
+    it "repeats the key for each element of an array" do
+      _({tags: [1, 2], a: 3}.x_www_form_urlencode).must_equal('tags=1&tags=2&a=3')
+    end
+
+    it "leaves out an empty array" do
+      _({tags: [], a: 1}.x_www_form_urlencode).must_equal('a=1')
+    end
+
+    it "leaves out a nil element of an array" do
+      _({tags: [1, nil, 2]}.x_www_form_urlencode).must_equal('tags=1&tags=2')
+    end
+
+    it "encodes as URI.encode_www_form does" do
+      args = {tags: ['x y', 'Ä'], a: '1&2'}
+      _(args.x_www_form_urlencode).must_equal(URI.encode_www_form(args))
+    end
+
+    it "joins with the joiner given" do
+      _({a: 1, tags: [2, 3]}.x_www_form_urlencode(';')).must_equal('a=1;tags=2;tags=3')
+    end
+  end
+
+  describe "#x_www_form_url_encode" do
+    it "is an alias of #x_www_form_urlencode" do
+      _({tags: [1, 2]}.x_www_form_url_encode).must_equal('tags=1&tags=2')
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http.rb
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - thoran
@@ -124,6 +124,7 @@ files:
 - test/HTTP/request_without_body_test.rb
 - test/HTTP/trace_test.rb
 - test/Net/HTTPResponse/StatusPredicates_test.rb
+- test/Thoran/Hash/XWwwFormUrlencode/x_www_form_urlencode_test.rb
 - test/Thoran/String/Urlencode/urlencode_test.rb
 - test/helper.rb
 - test/loading_test.rb
@@ -145,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.22
+rubygems_version: 4.0.23
 specification_version: 4
 summary: HTTP made easy.
 test_files: []