location-service-client 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2039f0d1911215ae70c7d3bf087a058957b3a619
-  data.tar.gz: 3c93f9335247015659c65b45021833fe4ecd794f
+  metadata.gz: 44b1dcf91c7fa1c4b582032349577547fbd00fe6
+  data.tar.gz: 8a799c3134b32d07744f66aa3e69c32efc1fd633
 SHA512:
-  metadata.gz: 8aca6a08dd4b5efae3b07351c67ff82e254c56e7c79f7bdd9fe6150e65e788044f9986a8138eacddbe9dd84318131a8f8f245f25b15dc86a93bd8f5a90a4ec74
-  data.tar.gz: 3bddc36e797c7dc4b579d813d279e2829b4e0b4b175b1e0592a09f2501bb6ea9f302374614b243b4b9851e5c7d7f1feec7a7e97701bbe41da0c2408c25e8e234
+  metadata.gz: fa5da578d26aa90640c56e03d8b7bf09659251535d43e70e2629d0266d4920295bb2225b66e3c53d2750b70fd1038c0ce58afdd000ab2615ab2314646727c5eb
+  data.tar.gz: 496d678862cafce83cdbf99da8f8163ad0210fed5cb9fd112e8d0aa617023b4e2a2d44a0320b89f7dfb861811e67e403fa6e6275a3dbcd6dba2b0d2c040bd7ac

data/CHANGELOG.md

@@ -1,4 +1,9 @@
 
+0.1.4 6/29/2016
+==============
+
+Caching optimizations. Add benchmarking around finder methods.
+
 0.1.2 6/28/2016
 ==============
 

data/lib/location.rb

@@ -20,51 +20,78 @@ class Location < Struct.new(:id, :sas_id, :name, :code, :kind, :lat, :lng, :time
   class << self
     # For mapping the JSON camelcase data from the location service into the Location structs:
     KEY_ORDER = [:id, :sasId, :name, :code, :kind, :lat, :lng, :timezone, :parentLocationId, :updatedAt, :createdAt, :childLocations, :beacons].map(&:to_s).freeze
-    CACHE_KEY = 'location_service_request_cache'.freeze
-    MEMOS_KEY = 'location_service_request_tables'.freeze
- 
+    CACHE_PRE = "location_service_client".freeze
+    BENCHMARK = false.freeze
+
     def tables
       @t   = nil if !testing? # test doesn't have a cache, so memoize in the test env
-      @t ||= cache.fetch(MEMOS_KEY) do
-        t = { id_table: {}, code_table: {} }
-        flattened.each do |l|
+      @t ||= cache.fetch("#{CACHE_PRE}_memos") do
+        t = { id_table: [], code_table: {} }
+        flattened.sort_by(&:id).each do |l|
           t[:id_table][l.id]     = l
           t[:code_table][l.code] = l
         end
         t
       end
-    end 
+    end
+
+    def bench # e.g. logb(caller[0])
+      if !BENCHMARK
+        yield
+      else
+        start = Time.now
+        v = yield
+        logger.fatal v.try(:name)
+        logger.fatal "#{caller[0].split(' ').last} #{(Time.now-start)*1000}ms"
+        v
+      end
+    end
 
     def find(id)
-      tables[:id_table][id]
+      bench do
+        cache.fetch("#{CACHE_PRE}-id-#{id}") do
+          tables[:id_table][id]
+        end
+      end
     end
 
     def find_by_code(code)
-      tables[:code_table][code]
+      bench do
+        cache.fetch("#{CACHE_PRE}-code-#{code}") do
+          tables[:code_table][code]
+        end
+      end
     end
 
     def find_by_parent_code_and_child_name(parent_code, child_name)
-      airport = find_by_code(parent_code)
-      airport.try(:child_locations) && airport.child_locations.detect {|l| l.name == child_name }
+      bench do
+        airport = find_by_code(parent_code)
+        airport.try(:child_locations) && airport.child_locations.detect {|l| l.name == child_name }
+      end
     end
     alias_method :find_by_airport_and_gate, :find_by_parent_code_and_child_name
 
     def find_by_codes(codes, child_locations=nil)
-      child_locations ||= all
-      codes             = [codes].flatten
-      code              = codes.shift
-      leaf              = child_locations.detect{|l| l.code == code }
-      codes.empty? ? leaf : find_by_codes(codes, leaf.child_locations) 
+      bench do
+        child_locations ||= all
+        codes             = [codes].flatten
+        code              = codes.shift
+        leaf              = child_locations.detect{|l| l.code == code }
+        codes.empty? ? leaf : find_by_codes(codes, leaf.child_locations) 
+      end
     end
 
     def flattened
-      (all +  all.map {|l| l.child_locations}.compact).flatten
+      bench do
+        (all +  all.map {|l| l.child_locations}.compact).flatten
+      end
     end
 
     def all
-      cache.fetch(CACHE_KEY) do 
-        Location.reset # make sure you reset the memo cache on a cache miss
-        transform_data(request('/locations').try(:compact) || [])
+      bench do
+        cache.fetch("#{CACHE_PRE}_request") do 
+          transform_data(request('/locations').try(:compact) || [])
+        end
       end
     end
 
@@ -76,8 +103,12 @@ class Location < Struct.new(:id, :sas_id, :name, :code, :kind, :lat, :lng, :time
     end
 
     def reset
-      Rails.cache.delete(MEMOS_KEY)
-      Rails.cache.delete(CACHE_KEY)
+      flattened.each do |l|
+        Rails.cache.delete("#{CACHE_PRE}-id-#{l.id}")
+        Rails.cache.delete("#{CACHE_PRE}-code-#{l.code}")
+      end
+      Rails.cache.delete("#{CACHE_PRE}_memos")
+      Rails.cache.delete("#{CACHE_PRE}_request")
     end
 
     def transform_data(data)

data/lib/version.rb

@@ -1,5 +1,5 @@
 module LocationServiceClient
-  VERSION = "0.1.3".freeze
+  VERSION = "0.1.4".freeze
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: location-service-client
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Josh Buermann