ethon 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fabe1040444c048c297b35b8785962b405cf22b
-  data.tar.gz: 024c7e7ed7c3ef61dbbae1375b25626e1e5bbdf4
+  metadata.gz: b5b8550d86c3b12a213c5f44bc47575cc155b57f
+  data.tar.gz: 9c23490c1d3184612dea6e1e88a293a7444f65a6
 SHA512:
-  metadata.gz: 9e5e32e36f44d8f909d5d90e5a337959ced86643e16792e346fac504e6c53e34b548fae11a5f8334ac36b9594cbdeacc6c9fa2014a6ed73ed3e57a89a19e2801
-  data.tar.gz: f350cc872574938c24a4080dde53bd6fc97dbc78b30399bac1a9b5e68702f64920bc722ed53fa77dca41a4a3298b53955e151e1d19826be0d7a9a75c1733a316
+  metadata.gz: 8dfc9939d7232e54526cd3aebcda6a8c058d0620efcd50204e6e9d9b19c40484a4ee117a1b64761f5bdefd130ea0842a169dc5ddb108f6b73ddb325748db5e74
+  data.tar.gz: 4abc8b70ff4da5bce7edf2e7ea75c22bab080ea68f211618bc350bad55ab8df1ad7e1dd8f304dcdb85a21499b524f7ff40d064e7a42ad7175b1b787f7e0a576a

data/.travis.yml

@@ -24,3 +24,4 @@ matrix:
   allow_failures:
     - rvm: ree
     - rvm: ruby-head
+    - rvm: jruby-head

data/CHANGELOG.md

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

data/Gemfile

@@ -11,7 +11,13 @@ group :development, :test do
   gem "rspec", "~> 3.4"
 
   gem "sinatra"
-  gem "json"
+
+  if Gem.ruby_version < Gem::Version.new("2.0.0")
+    gem "json", "< 2"
+  else
+    gem "json"
+  end
+
   gem "mime-types", "~> 1.18"
 
   unless ENV["CI"]

data/README.md

@@ -90,7 +90,3 @@ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
 OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
-
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/typhoeus/ethon/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
-

data/lib/ethon/curls/infos.rb

@@ -104,6 +104,8 @@ module Ethon
       #
       # @return [ String ] The info.
       def get_info_string(option, handle)
+        string_ptr = ::FFI::MemoryPointer.new(:pointer)
+
         if easy_getinfo(handle, option, string_ptr) == :ok
           ptr=string_ptr.read_pointer
           ptr.null? ? nil : ptr.read_string
@@ -120,6 +122,8 @@ module Ethon
       #
       # @return [ Integer ] The info.
       def get_info_long(option, handle)
+        long_ptr = ::FFI::MemoryPointer.new(:long)
+
         if easy_getinfo(handle, option, long_ptr) == :ok
           long_ptr.read_long
         end
@@ -135,40 +139,12 @@ module Ethon
       #
       # @return [ Float ] The info.
       def get_info_double(option, handle)
+        double_ptr = ::FFI::MemoryPointer.new(:double)
+
         if easy_getinfo(handle, option, double_ptr) == :ok
           double_ptr.read_double
         end
       end
-
-      # Return a string pointer.
-      #
-      # @example Return a string pointer.
-      #   Curl.string_ptr
-      #
-      # @return [ ::FFI::Pointer ] The string pointer.
-      def string_ptr
-        @string_ptr ||= ::FFI::MemoryPointer.new(:pointer)
-      end
-
-      # Return a long pointer.
-      #
-      # @example Return a long pointer.
-      #   Curl.long_ptr
-      #
-      # @return [ ::FFI::Pointer ] The long pointer.
-      def long_ptr
-        @long_ptr ||= ::FFI::MemoryPointer.new(:long)
-      end
-
-      # Return a double pointer.
-      #
-      # @example Return a double pointer.
-      #   Curl.double_ptr
-      #
-      # @return [ ::FFI::Pointer ] The double pointer.
-      def double_ptr
-        @double_ptr ||= ::FFI::MemoryPointer.new(:double)
-      end
     end
   end
 end

data/lib/ethon/curls/options.rb

@@ -41,8 +41,9 @@ module Ethon
             opthash[option][:opts][value]
           when String
             opthash[option][:opts][value.to_sym]
-          end
-          value = value.to_i
+          else
+            value
+          end.to_i
         when :bitmask
           return if value.nil?
           func=:long
@@ -51,8 +52,9 @@ module Ethon
             opthash[option][:opts][value]
           when Array
             value.inject(0) { |res,v| res|opthash[option][:opts][v] }
-          end
-          value = value.to_i
+          else
+            value
+          end.to_i
         when :string
           func=:string
           value=value.to_s unless value.nil?
@@ -408,6 +410,8 @@ module Ethon
       option :easy, :resolve, :curl_slist, 203
       option :easy, :dns_servers, :string, 211
       option :easy, :accepttimeout_ms, :int, 212
+      option :easy, :unix_socket_path, :string, 231
+      option_alias :easy, :unix_socket_path, :unix_socket
       ## SSL and SECURITY OPTIONS
       option :easy, :sslcert, :string, 25
       option :easy, :sslcerttype, :string, 86

data/lib/ethon/easy/callbacks.rb

@@ -35,15 +35,12 @@ module Ethon
       #
       # @return [ Proc ] The callback.
       def body_write_callback
-        @body_write_callback ||= proc {|stream, size, num, object|
-          unless @headers_called
-            @headers_called = true
-            headers
-          end
+        @body_write_callback ||= proc do |stream, size, num, object|
+          headers
           result = body(chunk = stream.read_string(size * num))
           @response_body << chunk if result == :unyielded
-          result != :abort ? size*num : -1
-        }
+          result != :abort ? size * num : -1
+        end
       end
 
       # Returns the header write callback.

data/lib/ethon/easy/operations.rb

@@ -27,7 +27,7 @@ module Ethon
       # @return [ Integer ] The return code.
       def perform
         @return_code = Curl.easy_perform(handle)
-        if Ethon.logger.level.zero?
+        if Ethon.logger.debug?
           Ethon.logger.debug { "ETHON: performed #{log_inspect}" }
         end
         complete

data/lib/ethon/easy/response_callbacks.rb

@@ -39,6 +39,8 @@ module Ethon
       # @example Execute on_headers.
       #   request.headers
       def headers
+        return if @headers_called
+        @headers_called = true
         if defined?(@on_headers) and not @on_headers.nil?
           @on_headers.each{ |callback| callback.call(self) }
         end
@@ -61,6 +63,7 @@ module Ethon
       # @example Execute on_completes.
       #   request.complete
       def complete
+        headers unless @response_headers.empty?
         if defined?(@on_complete) and not @on_complete.nil?
           @on_complete.each{ |callback| callback.call(self) }
         end

data/lib/ethon/version.rb

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

metadata

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