handset_detection 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 171d53310321c9a9aa5173e52adafaf3e50a222e
-  data.tar.gz: 0d30b245f08d3b079dbfc0d3b6f4404a24029283
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    N2YxM2E1MjA2ODNmOTVkODM2ODVkMTY5M2NhNWEzZjUzMTc2ZmM3Mg==
+  data.tar.gz: !binary |-
+    NjNkYTM1ZDAzOGM0NzkwZTcwNTVhMzFmZjBlNDlhYjY4MGU2YmY0ZQ==
 SHA512:
-  metadata.gz: a88fde905056abb3cb011b6e723caa741276133c283a19f9b4c3b79bb35932d4c76b747cd08152de29e17ca9e97776a0b314179a1a0e6d1cb8cd8a375132a385
-  data.tar.gz: e2f4e48c3cb022b17f8f939d6f4d61e5dcbdade57b8e44c553c115b2f17e08f8927b756caa02f23b8af3ebf9885bc60f698dbc8fcddf0debbb3fe7bb60c63e68
+  metadata.gz: !binary |-
+    MjFlZWIwNGRkM2NiOTkwZmYxNGYxM2YxZTlmNDU4ZjZhMWNlZTY0YmMwM2Rj
+    MzgzOWM0MDYxNTkyNjE4OWIxYzg3MzUxMTFhYjM2NTcxOWRhNjc2ZGQyZmI1
+    MGQ2ZTEzNTRiZjFhMjFmYWQ2Y2Q5Yzk4NDE5ZmQ4YmJlODE4YjQ=
+  data.tar.gz: !binary |-
+    YWI1ZTkwYmQyNWIwNmE5NmZlMjhlOWU4MjQwNjg5MmJkYjhiMzA4MTc5ODg2
+    OGY3NTBmMzhjYTAwNGMzZDI5NDcxYTljZDBhMjkzZTI5OGQzNzY4NzUwYzE0
+    MjZjODA3MWQ3MDZjODJmY2VhOTQ2NTU0YTA4ZTJjYzQ4N2RmNzI=

data/lib/handset_detection/base.rb

@@ -27,7 +27,6 @@
 require 'active_support/core_ext/object/blank'
 require 'json'
 require 'digest/md5'
-require 'socket'
 require 'tcp_timeout'
 require 'uri'
 
@@ -36,9 +35,9 @@ DETECTIONV4_GENERIC = 1
 
 class Base
   def initialize
-    @config = {} 
+    @config = {}
     @api_base = '/apiv4/'
-    @detected_rule_key = {} 
+    @detected_rule_key = {}
     @device_ua_filter = /[ _\\#\-,.\/:"']/
     @extra_ua_filter = /[ ]/
     @apikit = 'Ruby 4.0.0'
@@ -46,42 +45,46 @@ class Base
     @logger_port = 80
     @reply = {}
     @tree = {}
-    @detection_config = { 
+    @detection_config = {
       'device-ua-order' => ['x-operamini-phone-ua', 'x-mobile-ua', 'device-stock-ua', 'user-agent', 'agent'],
       'platform-ua-order' => ['x-operamini-phone-ua', 'x-mobile-ua', 'device-stock-ua', 'user-agent', 'agent'],
       'browser-ua-order' => ['user-agent', 'agent', 'device-stock-ua'],
       'app-ua-order' => ['user-agent', 'agent', 'device-stock-ua'],
       'language-ua-order' => ['user-agent', 'agent', 'device-stock-ua'],
-      'device-bi-order' => { 
-        'android' => [ 
-          ['ro.product.brand','ro.product.model'],
-          ['ro.product.manufacturer','ro.product.model'],
-          ['ro-product-brand','ro-product-model'],
-          ['ro-product-manufacturer','ro-product-model'],
+      'device-bi-order' => {
+        'android' => [
+          ['ro.product.brand', 'ro.product.model'],
+          ['ro.product.manufacturer', 'ro.product.model'],
+          ['ro-product-brand', 'ro-product-model'],
+          ['ro-product-manufacturer', 'ro-product-model'],
         ],
-        'ios' => [ 
-          ['utsname.brand','utsname.machine']
+        'ios' => [
+          ['utsname.brand', 'utsname.machine']
         ],
-        'windows phone' => [ 
-          ['devicemanufacturer','devicename']
+        'windows phone' => [
+          ['devicemanufacturer', 'devicename']
         ]
       },
       'platform-bi-order' => {
-        'android' => [ 
-          ['ro.build.id', 'ro.build.version.release'],
-          ['ro-build-id', 'ro-build-version-release'],
+        'android' => [
+          ['hd-platform', 'ro.build.version.release'],
+          ['hd-platform', 'ro-build-version-release'],
+          ['hd-platform', 'ro.build.id'],
+          ['hd-platform', 'ro-build-id'],
         ],
-        'ios' => [ 
-          ['uidevice.systemName','uidevice.systemversion']
+        'ios' => [
+          ['uidevice.systemname', 'uidevice.systemversion'],
+          ['hd-platform', 'uidevice.systemversion']
         ],
-        'windows phone' => [ 
-          ['osname','osversion']
+        'windows phone' => [
+          ['osname', 'osversion'],
+          ['hd-platform', 'osversion']
         ]
       },
       'browser-bi-order' => [],
-      'app-bi-order' => [] 
+      'app-bi-order' => []
     }
-    @detection_languages = { 
+    @detection_languages = {
       'af' => 'Afrikaans',
       'sq' => 'Albanian',
       'ar-dz' => 'Arabic (Algeria)',
@@ -242,15 +245,15 @@ class Base
 
   # Get reply status
   #
-  # +param+ void 
-  # +return+ int error status, 0 is Ok, anything else is probably not Ok 
+  # +param+ void
+  # +return+ int error status, 0 is Ok, anything else is probably not Ok
   #
   def get_status
     @reply['status']
   end
 
   # Get reply message
-  # 
+  #
   # +param+ void
   # +return+ string A message
   #
@@ -274,7 +277,7 @@ class Base
   #
   def set_reply(reply)
     @reply = reply
-  end 
+  end
 
   # Error handling helper. Sets a message and an error code.
   #
@@ -287,8 +290,8 @@ class Base
     @reply['status'] = status
     @reply['message'] = msg
     status == 0
-  end 
-  
+  end
+
   # String cleanse for extras matching.
   #
   # +param+ string str
@@ -310,7 +313,7 @@ class Base
     str = str.gsub(/[^\x20-\x7F]/, '')
     str.strip
   end
-  
+
   # Log function - User defined functions can be supplied in the 'logger' config variable.
   #
   def log(msg)
@@ -319,7 +322,7 @@ class Base
       @config['logger'].call(msg)
     end
   end
-  
+
   # Makes requests to the various web services of Handset Detection.
   #
   # Note : suburl - the url fragment of the web service eg site/detect/${site_id}
@@ -331,19 +334,19 @@ class Base
   # +return+ bool true on success, false otherwise
   #
   def remote(suburl, data, filetype='json', auth_required=true)
-    @reply = {} 
-    @raw_reply = {} 
+    @reply = {}
+    @raw_reply = {}
     set_error 0, ''
 
     if data.blank?
-      data = [] 
+      data = []
     end
 
     url = @api_base + suburl
     attempts = @config['retries'] + 1
     trys = 0
 
-    requestdata = JSON.generate(data) 
+    requestdata = JSON.generate(data)
 
     success = false
     while (trys+=1) < attempts and success == false
@@ -419,10 +422,10 @@ class Base
         'nonce="' + snonce + '", ' +
         'uri="' + uri.path + '", ' +
         'qop=' + qop + ', ' +
-        'nc=' + nc + ', ' + 
+        'nc=' + nc + ', ' +
         'cnonce="' + cnonce + '", ' +
         'response="' + response + '", ' +
-        'opaque="' + realm + '"' + 
+        'opaque="' + realm + '"' +
         "\r\n"
     end
     out += "Content-length: " + jsondata.length.to_s + "\r\n\r\n"
@@ -430,17 +433,22 @@ class Base
 
     socket = nil
     begin
-      socket = TCPTimeout::TCPSocket.new(host, port, 
+      socket = TCPTimeout::TCPSocket.new(host, port,
         connect_timeout: @config['timeout'], read_timeout: @config['timeout'], write_timeout: @config['timeout'])
       socket.write(out)
-      reply = socket.read 1000000000 
+      reply = []
+      r = ''
+      until r.nil? do
+        reply << r
+        r = socket.read 8192
+      end
     rescue SocketError => e
-      return set_error 299, e.to_s 
+      return set_error 299, e.to_s
     ensure
       socket.close unless socket.nil?
     end
-    hunks = reply.split("\r\n\r\n")
-    return set_error(299, "Error : Reply is too short.") if hunks.length < 2 
+    hunks = reply.join.split("\r\n\r\n")
+    return set_error(299, "Error : Reply is too short.") if hunks.length < 2
     # header = hunks[hunks.length - 2]
     # headers = header.split("\n")
     body = hunks[hunks.length - 1]
@@ -544,7 +552,7 @@ class Base
   # +return+ void
   #
   def send_remote_syslog(headers)
-    headers['version'] = RUBY_VERSION 
+    headers['version'] = RUBY_VERSION
     headers['apikit'] = @apikit
     sock = UDPSocket.new(Socket::AF_INET)
     message = JSON.generate headers

data/lib/handset_detection/cache/memcached.rb

@@ -41,8 +41,9 @@ class Memcached
     else
       options = { 'value_max_bytes' => 4000000 }
     end
-    options = options.map {|k, v| [k.to_sym, v]}.to_h
-    @cache = Dalli::Client.new(servers, options)
+    o = {}
+    options.each { |k, v| o[k.to_sym] = v }
+    @cache = Dalli::Client.new(servers, o)
   end
 
   # Get key

data/lib/handset_detection/device.rb

@@ -264,9 +264,14 @@ class Device < Base
   def specs_overlay(specs_field, device, specs)
     if specs.include? 'hd_specs'
       if specs_field == 'platform'
-          unless specs['hd_specs']['general_platform'].blank?
+          unless specs['hd_specs']['general_platform'].blank? or specs['hd_specs']['general_platform_version'].blank?
             device['Device']['hd_specs']['general_platform'] = specs['hd_specs']['general_platform']
             device['Device']['hd_specs']['general_platform_version'] = specs['hd_specs']['general_platform_version']
+          else
+            unless specs['hd_specs']['general_platform'].blank? or specs['hd_specs']['general_platform'] == device['Device']['hd_specs']['general_platform']
+              device['Device']['hd_specs']['general_platform'] = specs['hd_specs']['general_platform']
+              device['Device']['hd_specs']['general_platform_version'] = ''
+            end
           end
       elsif specs_field == 'browser'
           unless specs['hd_specs']['general_browser'].blank?
@@ -451,7 +456,7 @@ class Device < Base
     # Platform Detection
     @platform = v4_match_bi_helper build_info, 'platform'
     unless @platform.blank?
-      @device = specs_overlay 'platform', @device, @platform
+      @device = specs_overlay 'platform', @device, @platform['Extra']
     end
 
     @reply['hd_specs'] = @device['Device']['hd_specs']
@@ -471,11 +476,13 @@ class Device < Base
 
     hints = [] 
     conf_bi_keys.each do |platform, set|
-      value = ''
       set.each do |tuple|
         checking = true
+        value = ''
         tuple.each do |item|
-          unless build_info.include? item
+          if item == 'hd-platform'
+            value += "|#{platform}"
+          elsif not build_info.include?(item)
             checking = false
             break
           else
@@ -536,6 +543,7 @@ class Device < Base
 
     # Sanitize headers & cleanup language
     headers.each do |key, value|
+      key = key.downcase
       if key == 'accept-language' or key == 'content-language'
         key = 'language'
         tmp = value.downcase.gsub(/ /, '').split(/[,;]/)
@@ -544,9 +552,14 @@ class Device < Base
         else
           next
         end
+      elsif key != 'profile' and key != 'x-wap-profile'
+        # Handle strings that have had + substituted for a space
+        if value.count(' ') == 0 and value.count('+') > 5 and value.length > 20
+          value.gsub!('+', ' ')
+        end
       end
-      @device_headers[key.downcase] = clean_str value 
-      @extra_headers[key.downcase] = @extra.extra_clean_str value
+      @device_headers[key] = clean_str value 
+      @extra_headers[key] = @extra.extra_clean_str value
     end
 
     @device = match_device @device_headers

data/lib/handset_detection/hd4.rb

@@ -327,7 +327,8 @@ class HD4 < Base
   #    
   def device_detect(data={})
     id = data['id'].blank? ? @config['site_id'] : data['id']
-    request_body = @detect_request.merge data
+    data.delete 'id'
+    request_body = data.blank? ? @detect.request: data
     fast_key = ''
     
     # If caching enabled then check cache

data/lib/handset_detection/store.rb

@@ -34,10 +34,7 @@ class Store
   attr_reader :directory, :cache
   @@instance = nil
 
-  # Singleton Constructor
-  #
-  # +param+ string $path Location of storage ROOT dir.
-  # +param+ boolean $createDirectory - Create storage directory if it does not exist
+  # Constructor
   #
   def initialize
     @dirname = "hd40store"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: handset_detection
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Handset Detection
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies: []
 description: Use the HandsetDetection.com API from Ruby.
 email: hello@handsetdetection.com
@@ -37,17 +37,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.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: API kit for HandsetDetection.com