rpc-mapper 0.1.5 → 0.1.6

data/lib/rpc_mapper/cacheable.rb

@@ -8,20 +8,25 @@ module RPCMapper::Cacheable
 
     # TRP: Default to a 5 minute cache
     DEFAULT_LONGEVITY = 5*60
+    @@cache_store = nil
 
-    def reset_cache_store
-      self.cacheable = RPCMapper::Cacheable::Store.new(DEFAULT_LONGEVITY)
+    def reset_cache_store(default_longevity=DEFAULT_LONGEVITY)
+      @@cache_store = RPCMapper::Cacheable::Store.new(default_longevity)
+    end
+
+    def cache_store
+      @@cache_store
     end
 
     protected
 
     def fetch_records_with_caching(options={})
       key = Digest::MD5.hexdigest(self.to_s + options.to_a.sort { |a,b| a.to_s.first <=> b.to_s.first }.inspect)
-      cache_hit = self.cacheable.read(key)
+      cache_hit = self.cache_store.read(key)
       get_fresh = options.delete(:fresh)
 
       if cache_hit && !get_fresh
-        self.read_adapter.log(options, "CACHE #{self.class.name}")
+        self.read_adapter.log(options, "CACHE #{self.name}")
         cache_hit.each { |fv| fv.fresh = false.freeze }
         cache_hit
       else
@@ -29,7 +34,7 @@ module RPCMapper::Cacheable
 
         # TRP: Only store in cache if record count is below the cache_record_count_threshold (if it is set)
         if !self.cache_record_count_threshold || fresh_value.size <= self.cache_record_count_threshold
-          self.cacheable.write(key, fresh_value, (self.cache_expires) ? fresh_value[0].send(self.cache_expires) : Time.now + DEFAULT_LONGEVITY) unless fresh_value.empty?
+          self.cache_store.write(key, fresh_value, (self.cache_expires) ? fresh_value[0].send(self.cache_expires) : Time.now + DEFAULT_LONGEVITY) unless fresh_value.empty?
           fresh_value.each { |fv| fv.fresh = true.freeze }
         end
 
@@ -38,7 +43,8 @@ module RPCMapper::Cacheable
     end
 
     def enable_caching(options)
-      reset_cache_store
+      reset_cache_store unless cache_store
+      self.cacheable = true
       self.cache_expires = options[:expires]
       self.cache_record_count_threshold = options[:record_count_threshold]
     end

data/lib/rpc_mapper/version.rb

@@ -3,7 +3,7 @@ module RPCMapper
 
     MAJOR = 0
     MINOR = 1
-    TINY  = 5
+    TINY  = 6
 
     def self.to_s # :nodoc:
       [MAJOR, MINOR, TINY].join('.')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rpc-mapper
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Travis Petticrew