ethon 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5b8550d86c3b12a213c5f44bc47575cc155b57f
-  data.tar.gz: 9c23490c1d3184612dea6e1e88a293a7444f65a6
+  metadata.gz: 612df63c107484c065be684be2f9d9c0b228a371
+  data.tar.gz: 906f70fe6d048a0b3e8022ad24d704996c18bb90
 SHA512:
-  metadata.gz: 8dfc9939d7232e54526cd3aebcda6a8c058d0620efcd50204e6e9d9b19c40484a4ee117a1b64761f5bdefd130ea0842a169dc5ddb108f6b73ddb325748db5e74
-  data.tar.gz: 4abc8b70ff4da5bce7edf2e7ea75c22bab080ea68f211618bc350bad55ab8df1ad7e1dd8f304dcdb85a21499b524f7ff40d064e7a42ad7175b1b787f7e0a576a
+  metadata.gz: 614883cb82bd35ffe340e9e2b9d091726d8345d8b293b2a4efbfaed7244b181c2657543dcc4824af8e2fc347b32029b2e84ac9069edc6c0e58d92191eda97dd9
+  data.tar.gz: 6bb002290d0e5ca932f2f90a79eb05d96942582fdff2cb6f86febfdfc932b8e6e48437716017cfd8e6e014a7fe765ec1f4259239023e461c211fbd823c109dcd

data/.travis.yml

@@ -18,7 +18,6 @@ rvm:
   - jruby-18mode
   - jruby-19mode
   - jruby-head
-  - rbx-2
 
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -2,7 +2,11 @@
 
 ## Master
 
-[Full Changelog](https://github.com/typhoeus/ethon/compare/v0.9.1...master)
+[Full Changelog](https://github.com/typhoeus/ethon/compare/v0.10.0...master)
+
+## 0.10.0
+
+[Full Changelog](https://github.com/typhoeus/ethon/compare/v0.9.1...v0.10.0)
 
 ## 0.9.1
 

data/lib/ethon/curls/options.rb

@@ -335,7 +335,7 @@ module Ethon
       option :easy, :cookiesession, :bool, 96
       option :easy, :cookielist, :string, 135
       option :easy, :httpget, :bool, 80
-      option :easy, :http_version, :enum, 84, [:none, :httpv1_0, :httpv1_1]
+      option :easy, :http_version, :enum, 84, [:none, :httpv1_0, :httpv1_1, :httpv2_0]
       option :easy, :ignore_content_length, :bool, 136
       option :easy, :http_content_decoding, :bool, 158
       option :easy, :http_transfer_decoding, :bool, 157

data/lib/ethon/easy/form.rb

@@ -82,8 +82,8 @@ module Ethon
           Curl.formadd(first, last,
                        :form_option, :copyname, :pointer, name,
                        :form_option, :namelength, :long, name.bytesize,
-                       :form_option, :copycontents, :pointer, content,
-                       :form_option, :contentslength, :long, content ? content.bytesize : 0,
+                       :form_option, :copycontents, :pointer, content.to_s,
+                       :form_option, :contentslength, :long, content ? content.to_s.bytesize : 0,
                        :form_option, :end
                       )
         end

data/lib/ethon/easy/header.rb

@@ -4,6 +4,8 @@ module Ethon
     #
     # @api private
     module Header
+      EMPTY_STRING_VALUE = "".freeze
+
       # Return headers, return empty hash if none.
       #
       # @example Return the headers.
@@ -53,7 +55,11 @@ module Ethon
       #
       # @return [ String ] The composed header.
       def compose_header(key, value)
-        Util.escape_zero_byte("#{key}: #{value}")
+        if(value == EMPTY_STRING_VALUE)
+          Util.escape_zero_byte("#{key};")
+        else
+          Util.escape_zero_byte("#{key}: #{value}")
+        end
       end
     end
   end

data/lib/ethon/version.rb

@@ -1,5 +1,5 @@
 module Ethon
 
   # Ethon version.
-  VERSION = '0.9.1'
+  VERSION = '0.10.0'
 end

data/spec/ethon/easy/form_spec.rb

@@ -72,5 +72,23 @@ describe Ethon::Easy::Form do
         form.materialize
       end
     end
+
+    context "when query_pairs contains file and string values" do
+      let(:pairs) { [['a', ["file", "type", "path/file"]], ['b', '1']] }
+
+      it "adds file to form" do
+        expect(Ethon::Curl).to receive(:formadd).twice
+        form.materialize
+      end
+    end
+
+    context "when query_pairs contains file, string and int values" do
+      let(:pairs) { [['a', ["file", "type", "path/file"]], ['b', '1'], ['c', 1]] }
+
+      it "adds file to form" do
+        expect(Ethon::Curl).to receive(:formadd).exactly(3).times
+        form.materialize
+      end
+    end
   end
 end

data/spec/ethon/easy/header_spec.rb

@@ -46,6 +46,36 @@ describe Ethon::Easy::Header do
           expect(easy.response_body).to include('"HTTP_USER_AGENT":"Ethon"')
         end
       end
+
+      context "when header value is empty string" do
+        let(:headers) { { 'User-Agent' => "" } }
+
+        if(Ethon::Curl.version_info[:version] >= "7.23.0")
+          it "sends header with empty value" do
+            expect(easy.response_body).to include('"HTTP_USER_AGENT":""')
+          end
+        else
+          it "does not send header (curl < 7.23.0 does not support empty values)" do
+            expect(easy.response_body).to_not include('"HTTP_USER_AGENT"')
+          end
+        end
+      end
+
+      context "when header value is nil" do
+        let(:headers) { { 'User-Agent' => nil } }
+
+        it "does not send header" do
+          expect(easy.response_body).to_not include('"HTTP_USER_AGENT"')
+        end
+      end
+
+      context "when header value is integer" do
+        let(:headers) { { 'User-Agent' => 0 } }
+
+        it "sends as string" do
+          expect(easy.response_body).to include('"HTTP_USER_AGENT":"0"')
+        end
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ethon
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Hans Hasselberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi