handset_detection 4.1.5 → 4.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a946b3cfcb7c846054036e28089c52302fcde2a
-  data.tar.gz: bfe1ae6a68de490fecc1425245637cf4f8200e5e
+  metadata.gz: 18473df45643ba28520b8290e44302de24a98206
+  data.tar.gz: 1f30d683bd3f207f2cc71d4b6e4666cb8b904491
 SHA512:
-  metadata.gz: 0e219924aa24fd438ed3751189ee033919078207f58e1f801f77221d9994304550cfe381bffcd01734adcac5caf4bbaabce6c0047dde8519b820738aece2f75a
-  data.tar.gz: 152f7e7e25a9c57ebb3034255857ee643411404bc2d9d9757ee8ae625d01bff9a701e0cad697380ea19ef1c65f0b7e113630d52ff3641afa25ebb0f965c05463
+  metadata.gz: e7f8da9077e3e11fd3d19906ee1b6c0764704723c67c70b6654d5da4899a7c133017e614970d7ef83798e42642bd7938aa19214ce8e2ba46d8d1a8d9610aae13
+  data.tar.gz: e9d8faf7dff0ace05b716cce2a653cd707cd1778a70423850647eda35ae41f500428d383719b0167836495900097105f23faf779b35368f5426d3fe1a3428582

data/lib/handset_detection/cache.rb

@@ -29,6 +29,7 @@ require 'handset_detection/cache/filesystem'
 require 'handset_detection/cache/memcached'
 require 'handset_detection/cache/rails'
 require 'handset_detection/cache/none'
+require 'handset_detection/cache/memory'
 
 # Cache class for HandsetDetection
 #
@@ -58,6 +59,8 @@ class Cache
       @cache = RailsCache.new(@config)
     elsif config.include?('cache') and config['cache'].include?('none')
       @cache = None.new(@config)
+    elsif config.include?('cache') and config['cache'].include?('memory')
+      @cache = Memory.new(@config)
     elsif defined? Rails
       @cache = RailsCache.new(@config)
     else

data/lib/handset_detection/cache/memory.rb

@@ -0,0 +1,81 @@
+#--
+# Copyright (c) Richard Uren 2016 <richard@teleport.com.au>
+# All Rights Reserved
+#
+# LICENSE: Redistribution and use in source and binary forms, with or
+# without modification, are permitted provided that the following
+# conditions are met: Redistributions of source code must retain the
+# above copyright notice, this list of conditions and the following
+# disclaimer. Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#
+# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+# NO EVENT SHALL CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+# DAMAGE.
+#++
+
+begin
+  require 'thread_safe'
+rescue LoadError
+end
+
+class Memory
+  # Construct a new Memory cache object.
+  #
+  # +param+  string dir
+  #
+  def initialize(config={})
+    @thread_safe = (config.include?('cache') and config['cache'].include?('memory') and config['cache']['memory']['thread_safe']) ? true : false
+    make_cache unless defined?(@@c)
+  end
+
+  # Get key
+  #
+  def get(key)
+    data, exp = @@c[key]
+    return nil if exp.nil? or Time.now.to_i > exp
+    data 
+  end
+
+  # Set key
+  #
+  def set(key, data, ttl)
+    @@c[key] = [data, Time.now.to_i + ttl]
+    true
+  end
+
+  # Delete key
+  #
+  def del(key)
+    @@c.delete key
+    true
+  end
+  
+  # Flush cache
+  def flush
+    make_cache
+    true
+  end
+
+  # Initialize the cache data structure
+  #
+  def make_cache
+    if !@thread_safe 
+      @@c = {}
+    elsif defined?(ThreadSafe)
+      @@c = ThreadSafe::Hash.new
+    else
+      raise 'ThreadSafe is required to use the Memory cache.'
+    end    
+  end
+end

data/lib/handset_detection/hd4.rb

@@ -333,8 +333,9 @@ class HD4 < Base
     
     # If caching enabled then check cache
     unless @config['cache_requests'].blank?
+      headers = {}
       request_body.each { |k, v| headers[k.downcase] = v }
-      headers = headers.sort.to_h
+      headers = Hash[headers.sort]
       fast_key = JSON.generate(headers).gsub(/ /, '')
       if reply = @cache.read(fast_key)
         @reply = reply
@@ -366,13 +367,29 @@ class HD4 < Base
     result
   end
 
+  # Get the local file path of the Ultimate database ZIP file.
+  #
+  # +return+ string path
+  #
+  def device_get_zip_path
+    File.join(@config['filesdir'], "ultimate.zip")
+  end
+
+  # Get the local file path of the Ultimate database ZIP file.
+  #
+  # +return+ string path
+  #
+  def community_get_zip_path
+    File.join(@config['filesdir'], "communityultimate.zip")
+  end
+
   # Fetch an archive from handset detection which contains all the device specs and matching trees as individual json files.
   #
   # +param+ void
   # +return+ hd_specs data on success, false otherwise
   #
   def device_fetch_archive
-    path = File.join(@config['filesdir'], "ultimate.zip")
+    path = device_get_zip_path
     unless @config['local_archive_source'].blank?
       FileUtils.cp File.join(@config['local_archive_source'], "ultimate.zip"), path
       return install_archive path 
@@ -383,11 +400,15 @@ class HD4 < Base
     if data.blank? 
       return set_error 299, 'Error : FetchArchive failed. Bad Download. File is zero length'
     elsif data.length < 9000000
-      trythis = JSON.parse data
-      if trythis and trythis.include?('status') and trythis.include('message')
-        return set_error trythis['status'].to_i, trythis['message']
+      begin
+        trythis = JSON.parse data
+        if trythis and trythis.include?('status') and trythis.include('message')
+          return set_error trythis['status'].to_i, trythis['message']
+        end
+      rescue Exception
+        return set_error 299, "Error : FetchArchive failed. Cannot parse the file."
       end
-      set_error 299, "Error : FetchArchive failed. Bad Download. File too short at #{data.length} bytes."
+      return set_error 299, "Error : FetchArchive failed. Bad Download. File too short at #{data.length} bytes."
     end
 
     begin
@@ -404,7 +425,7 @@ class HD4 < Base
   # +return+ hd_specs data on success, false otherwise
   #
   def community_fetch_archive
-    path = File.join(@config['filesdir'], "communityultimate.zip")
+    path = community_get_zip_path
     unless @config['local_archive_source'].blank?
       FileUtils.cp File.join(@config['local_archive_source'], "communityultimate.zip"), path
       return install_archive path 
@@ -415,9 +436,13 @@ class HD4 < Base
     if data.blank?
       return set_error 299, 'Error : FetchArchive failed. Bad Download. File is zero length'
     elsif data.length < 900000
-      trythis = JSON.parse data
-      if not trythis.blank? and trythis.include?('status') and trythis.include?('message')
-        return set_error trythis['status'].to_int, trythis['message']
+      begin
+        trythis = JSON.parse data
+        if not trythis.blank? and trythis.include?('status') and trythis.include?('message')
+          return set_error trythis['status'].to_int, trythis['message']
+        end
+      rescue Exception
+        return set_error 299, "Error : FetchArchive failed. Cannot parse the file."
       end
       return set_error 299, "Error : FetchArchive failed. Bad Download. File too short at #{data.length} bytes."
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: handset_detection
 version: !ruby/object:Gem::Version
-  version: 4.1.5
+  version: 4.1.6
 platform: ruby
 authors:
 - Handset Detection
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-16 00:00:00.000000000 Z
+date: 2016-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dalli
@@ -49,6 +49,7 @@ files:
 - lib/handset_detection/cache.rb
 - lib/handset_detection/cache/filesystem.rb
 - lib/handset_detection/cache/memcached.rb
+- lib/handset_detection/cache/memory.rb
 - lib/handset_detection/cache/none.rb
 - lib/handset_detection/cache/rails.rb
 - lib/handset_detection/device.rb