location-service-client 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56b5f5486e19eadd1c14d44b474699d7803ba22f
-  data.tar.gz: 90000cddf0e18ce52096f48c5712ac8aa057dd3f
+  metadata.gz: 2039f0d1911215ae70c7d3bf087a058957b3a619
+  data.tar.gz: 3c93f9335247015659c65b45021833fe4ecd794f
 SHA512:
-  metadata.gz: d8b840d2571bd8c98f05baf7246d4be5d13521b007eb6fb0edbe940949655e755319dd2086436b4f520800240c9dc8122df43356555ca003966cc6eec282192c
-  data.tar.gz: eefb7e43b4713562381bb0fd9e4c72ffdde678c16f720f1baf4f7d1368c5d9a62b42fed3c8ad37395065e574245db668b363f10845aaf8f62562fc4c881fe59e
+  metadata.gz: 8aca6a08dd4b5efae3b07351c67ff82e254c56e7c79f7bdd9fe6150e65e788044f9986a8138eacddbe9dd84318131a8f8f245f25b15dc86a93bd8f5a90a4ec74
+  data.tar.gz: 3bddc36e797c7dc4b579d813d279e2829b4e0b4b175b1e0592a09f2501bb6ea9f302374614b243b4b9851e5c7d7f1feec7a7e97701bbe41da0c2408c25e8e234

data/.gitignore

@@ -8,3 +8,4 @@ spec/dummy/log/*.log
 spec/dummy/tmp/
 spec/dummy/public/system/
 spec/dummy/.sass-cache
+tmp/

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+
+0.1.2 6/28/2016
+==============
+
+Cache hash tables for lookup by id and code. Memoize that cache in the cacheless test environment to greatly speed up test coverage of models that have locations.
+
+0.1.1 6/28/2016
+==============
+
+Replace memoization with the rails cache.
+
 0.1.0 6/24/2016
 ==============
 

data/lib/location.rb

@@ -8,6 +8,7 @@ require 'active_record'
 class Location < Struct.new(:id, :sas_id, :name, :code, :kind, :lat, :lng, :timezone, :parent_location_id, :updated_at, :created_at, :child_locations, :beacons)
   include ActiveModel::Validations
 
+
   def ruby_timezone
     begin 
       TZInfo::Timezone.get(timezone) if timezone && !timezone.empty?
@@ -20,17 +21,30 @@ class Location < Struct.new(:id, :sas_id, :name, :code, :kind, :lat, :lng, :time
     # 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
+ 
+    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[:id_table][l.id]     = l
+          t[:code_table][l.code] = l
+        end
+        t
+      end
+    end 
 
     def find(id)
-      flattened.detect{|l| l.id == id }
+      tables[:id_table][id]
     end
 
     def find_by_code(code)
-      flattened.detect{|l| l.code == code }
+      tables[:code_table][code]
     end
 
     def find_by_parent_code_and_child_name(parent_code, child_name)
-      airport = all.detect {|l| l.code == parent_code}
+      airport = find_by_code(parent_code)
       airport.try(:child_locations) && airport.child_locations.detect {|l| l.name == child_name }
     end
     alias_method :find_by_airport_and_gate, :find_by_parent_code_and_child_name
@@ -43,30 +57,27 @@ class Location < Struct.new(:id, :sas_id, :name, :code, :kind, :lat, :lng, :time
       codes.empty? ? leaf : find_by_codes(codes, leaf.child_locations) 
     end
 
-    def children
-      all.map{|l| l.child_locations }.compact
-    end
-
     def flattened
-      (all + children).flatten
+      (all +  all.map {|l| l.child_locations}.compact).flatten
     end
 
     def all
-      @locations ||= transform_data(request('/locations')).try(:compact) || []
+      cache.fetch(CACHE_KEY) do 
+        Location.reset # make sure you reset the memo cache on a cache miss
+        transform_data(request('/locations').try(:compact) || [])
+      end
     end
 
     def request(endpoint)
       user_token = Thread.current[:current_user].try(:authentication_token)
       url = Settings.location_service.url + "v1/" + endpoint + "?api_key=#{user_token||Settings.location_service.token}"
-      cache.fetch(CACHE_KEY) do
-        logger.debug url
-        JSON.parse(RestClient.get(url))
-      end
+      logger.debug url
+      JSON.parse(RestClient.get(url))
     end
 
     def reset
+      Rails.cache.delete(MEMOS_KEY)
       Rails.cache.delete(CACHE_KEY)
-      @locations = nil
     end
 
     def transform_data(data)
@@ -74,7 +85,6 @@ class Location < Struct.new(:id, :sas_id, :name, :code, :kind, :lat, :lng, :time
         data.map { |v| transform_data(v) }
 
       elsif data.kind_of? Hash
-        #HashWithIndifferentAccess[data.map {|k, v| [k.to_s.underscore, transform_data(v)] }]
         l = Location.new(*data.values_at(*KEY_ORDER))
         l.created_at = data['createdAt'] && time.at( data['createdAt']/1000 ) 
         l.updated_at = data['updatedAt'] && time.at( data['updatedAt']/1000 ) 
@@ -88,8 +98,13 @@ class Location < Struct.new(:id, :sas_id, :name, :code, :kind, :lat, :lng, :time
     def time
       Time.zone || Time
     end
+
     def cache
-      defined?(Rails) ? Rails.cache : ActiveSupport::Cache::FileStore.new
+      @cache ||= defined?(Rails) ? Rails.cache : ActiveSupport::Cache::FileStore.new('tmp/cache')
+    end
+
+    def testing?
+      defined?(Rails) && Rails.env.test?
     end
 
     def logger

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: location-service-client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors:
 - Josh Buermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: config