handset_detection 4.1.3 → 4.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e01b2d23fe6a9d234765ccae5165b8b467d89ae5
-  data.tar.gz: af9b0715af1f9d4e0691020bf7888846d4567d46
+  metadata.gz: d69c1bd9d9226704ee141f82ad619d200d35c6f2
+  data.tar.gz: 9f436e0577fe7aabd98a27b1fd7d99a9e8e757bc
 SHA512:
-  metadata.gz: 64861180543ac9094257326d7521e1148a0a68c61cd10e91182a6e4d663125bbaf35a94bfd8ef4cb729bef94b46434aa5fe5d7375cc3149fed2fd8172d3c7591
-  data.tar.gz: 44f5408f3fa75e53f783b4dc4c2c7488dfa0d1a5824d7be9ca3b871f75e007e884ac42db0b09b32249bf8a39516acc856a308b76397d6f6497e7d2e055d70625
+  metadata.gz: 278d4c46f66b6ea5e88c3d0602bd0b034353c19995cc440478e9ddc94da4b6589f3908db3bff43e81288ea70943672a7cde98aece39ef7347bdea7564b9e17c1
+  data.tar.gz: 40366162bd92394810d780d535b340739641a3ca1947f86683ff4a112c8899c90ad7e1cf5dc3927761acaee1e8e4f2742c833f5dccab92c1c3e9ecebadad90e8

data/lib/handset_detection/base.rb

@@ -27,7 +27,7 @@
 require 'handset_detection/vendor/blank'
 require 'json'
 require 'digest/md5'
-require 'tcp_timeout'
+require 'handset_detection/vendor/tcp_timeout'
 require 'uri'
 
 DETECTIONV4_STANDARD = 0

data/lib/handset_detection/vendor/tcp_timeout.rb

@@ -0,0 +1,165 @@
+# Modified from the tcp_timeout gem.
+
+require 'socket'
+
+module TCPTimeout
+  VERSION = "0.1.1"
+
+  DELEGATED_METHODS = %w[
+    close closed?
+    getsockopt setsockopt
+    local_address remote_address
+    read_nonblock wrote_nonblock
+    fileno
+  ]
+
+  class SocketTimeout < SocketError; end
+
+  class TCPSocket
+    DELEGATED_METHODS.each do |method|
+      class_eval(<<-EVAL, __FILE__, __LINE__)
+        def #{method}(*args)
+          @socket.__send__(:#{method}, *args)
+        end
+      EVAL
+    end
+
+    def initialize(host, port, opts = {})
+      @connect_timeout = opts[:connect_timeout]
+      @write_timeout = opts[:write_timeout]
+      @read_timeout = opts[:read_timeout]
+
+      family = opts[:family] || Socket::AF_INET
+      address = Socket.getaddrinfo(host, nil, family).first[3]
+      @sockaddr = Socket.pack_sockaddr_in(port, address)
+
+      @socket = Socket.new(family, Socket::SOCK_STREAM, 0)
+      @socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+
+      local_host = opts[:local_host]
+      local_port = opts[:local_port]
+      if local_host || local_port
+        local_host ||= ''
+        local_address = Socket.getaddrinfo(local_host, nil, family).first[3]
+        local_sockaddr = Socket.pack_sockaddr_in(local_port, local_address)
+        @socket.bind(local_sockaddr)
+      end
+
+      connect
+    end
+
+    def connect
+      return @socket.connect(@sockaddr) unless @connect_timeout
+
+      begin
+        @socket.connect_nonblock(@sockaddr)
+      rescue Errno::EINPROGRESS
+        select_timeout(:connect, @connect_timeout)
+        # If there was a failure this will raise an Error
+        begin
+          @socket.connect_nonblock(@sockaddr)
+        rescue Errno::EISCONN
+          # Successfully connected
+        end
+      end
+    end
+
+    def write(data, timeout = nil)
+      timeout ||= @write_timeout
+      return @socket.write(data) unless timeout
+
+      length = data.bytesize
+
+      total_count = 0
+      loop do
+        begin
+          count = @socket.write_nonblock(data)
+        rescue Errno::EWOULDBLOCK, Errno::EAGAIN
+          timeout = select_timeout(:write, timeout)
+          retry
+        end
+
+        total_count += count
+        return total_count if total_count >= length
+        data = data.byteslice(count..-1)
+      end
+    end
+
+    def read(length = nil, *args)
+      raise ArgumentError, 'too many arguments' if args.length > 2
+
+      timeout = (args.length > 1) ? args.pop : @read_timeout
+      return @socket.read(length, *args) unless length > 0 && timeout
+
+      buffer = args.first || ''.force_encoding(Encoding::ASCII_8BIT)
+
+      begin
+        # Drain internal buffers
+        @socket.read_nonblock(length, buffer)
+        return buffer if buffer.bytesize >= length
+      rescue Errno::EWOULDBLOCK, Errno::EAGAIN
+        # Internal buffers were empty
+        buffer.clear
+      rescue EOFError
+        return nil
+      end
+
+      @chunk ||= ''.force_encoding(Encoding::ASCII_8BIT)
+
+      loop do
+        timeout = select_timeout(:read, timeout)
+
+        begin
+          @socket.read_nonblock(length, @chunk)
+        rescue Errno::EWOULDBLOCK, Errno::EAGAIN
+          retry
+        rescue EOFError
+          return buffer.empty? ? nil : buffer
+        end
+        buffer << @chunk
+
+        if length
+          length -= @chunk.bytesize
+          return buffer if length <= 0
+        end
+      end
+    end
+
+    def readpartial(length, *args)
+      raise ArgumentError, 'too many arguments' if args.length > 2
+
+      timeout = (args.length > 1) ? args.pop : @read_timeout
+      return @socket.readpartial(length, *args) unless length > 0 && timeout
+
+      begin
+        @socket.read_nonblock(length, *args)
+      rescue Errno::EWOULDBLOCK, Errno::EAGAIN
+        timeout = select_timeout(:read, timeout)
+        retry
+      end
+    end
+
+    def readbyte
+      readpartial(1).ord
+    end
+
+    private
+
+    def select_timeout(type, timeout)
+      if timeout >= 0
+        if type == :read
+          read_array = [@socket]
+        else
+          write_array = [@socket]
+        end
+
+        start = Time.now
+        if IO.select(read_array, write_array, [@socket], timeout)
+          waited = Time.now - start
+          return timeout - waited
+        end
+      end
+      raise SocketTimeout, "#{type} timeout"
+    end
+  end
+end

metadata

@@ -1,63 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: handset_detection
 version: !ruby/object:Gem::Version
-  version: 4.1.3
+  version: 4.1.4
 platform: ruby
 authors:
 - Handset Detection
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2016-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dalli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.7
-- !ruby/object:Gem::Dependency
-  name: tcp_timeout
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
 description: Use the HandsetDetection.com API from Ruby.
 email: hello@handsetdetection.com
 executables: []
@@ -67,15 +47,16 @@ files:
 - lib/handset_detection.rb
 - lib/handset_detection/base.rb
 - lib/handset_detection/cache.rb
-- lib/handset_detection/device.rb
-- lib/handset_detection/extra.rb
-- lib/handset_detection/hd4.rb
-- lib/handset_detection/store.rb
 - lib/handset_detection/cache/filesystem.rb
 - lib/handset_detection/cache/memcached.rb
 - lib/handset_detection/cache/none.rb
 - lib/handset_detection/cache/rails.rb
+- lib/handset_detection/device.rb
+- lib/handset_detection/extra.rb
+- lib/handset_detection/hd4.rb
+- lib/handset_detection/store.rb
 - lib/handset_detection/vendor/blank.rb
+- lib/handset_detection/vendor/tcp_timeout.rb
 homepage: https://github.com/HandsetDetection/ruby-apikit/
 licenses:
 - MIT
@@ -86,17 +67,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: API kit for HandsetDetection.com