neuron-client 0.4.8 → 0.5.0

data/README.md

@@ -24,6 +24,10 @@ Connect to the Membase (or Memcached) Server for limited read access to some exp
   Neuron::Client::API.default_api.configure do |config|
     config.connection_type = :membase
     config.membase_servers = "127.0.0.1:11211"
+    config.local_cache_ttl = 15.minutes
+    config.local_cache_soft_ttl = 1.minute
+    config.local_cache_retry_delay = 1.second
+    config.local_cache_max_items = 10_000
   end
 
   Short form to copy and paste into console:

data/lib/neuron-client/api.rb

@@ -38,7 +38,9 @@ module Neuron
 
       def inclusion(obj, attrib, valid_values)
         val = obj.send(attrib)
-        raise "Inclusion: #{attrib} must be one of #{valid_values.join(', ')}" if !valid_values.include?(val)
+        if !valid_values.include?(val)
+          raise "Inclusion: #{attrib} must be one of #{valid_values.join(', ')}"
+        end
       end
 
       def configure_admin_connection
@@ -49,14 +51,16 @@ module Neuron
         rescue
           raise "Invalid admin_url: #{config.admin_url}"
         end
-        self.connection = AdminConnection.new(config.admin_url, config.admin_key)
+        self.connection = AdminConnection.new(config.admin_url,config.admin_key)
       end
 
       def configure_membase_connection
         required(@config, :membase_servers)
         self.connection = MembaseConnection.new(config.membase_servers,
-          :local_cache_size => config.local_cache_size,
-          :local_cache_expires => config.local_cache_expires
+          :local_cache_ttl => config.local_cache_ttl,
+          :local_cache_soft_ttl => config.local_cache_soft_ttl,
+          :local_cache_retry_delay => config.local_cache_retry_delay,
+          :local_cache_max_items => config.local_cache_max_items
         )
       end
 

data/lib/neuron-client/membase_connection.rb

@@ -9,19 +9,37 @@ module Neuron
 
       def initialize(servers, opts={})
         @client = Dalli::Client.new(servers)
+        max_items   = opts[:local_cache_max_items]    || 10_000
+        ttl         = opts[:local_cache_ttl]          || 15.minutes
+        soft_ttl    = [opts[:local_cache_soft_ttl]    || 1.minute, ttl].min
+        retry_delay = [opts[:local_cache_retry_delay] || 1.second, soft_ttl].min
         @local_cache = LRUCache.new(
-          :max_items => opts[:local_cache_size],
-          :ttl => opts[:local_cache_expires] || 60.seconds)
+          :max_items => max_items,
+          :ttl => ttl,
+          :soft_ttl => soft_ttl,
+          :retry_delay => retry_delay)
       end
 
       def get(key, ttl=nil)
-        @local_cache.fetch(key, local_ttl(ttl)) do
+        ttl = local_ttl(ttl)
+        soft_ttl =[@local_cache.soft_ttl, ttl].compact.min
+        retry_delay = [@local_cache.retry_delay, soft_ttl].compact.min
+        @local_cache.fetch(key,
+                           :ttl => ttl,
+                           :soft_ttl => soft_ttl,
+                           :retry_delay => retry_delay) do
           @client.get(key)
         end
       end
 
       def fetch(key, ttl=nil, options=nil, &callback)
-        @local_cache.fetch(key, local_ttl(ttl)) do
+        ttl = local_ttl(ttl)
+        soft_ttl =[@local_cache.soft_ttl, ttl].compact.min
+        retry_delay = [@local_cache.retry_delay, soft_ttl].compact.min
+        @local_cache.fetch(key,
+                           :ttl => ttl,
+                           :soft_ttl => soft_ttl,
+                           :retry_delay => retry_delay) do
           @client.fetch(key, ttl, options, &callback)
         end
       end

data/lib/neuron-client/version.rb

@@ -1,5 +1,5 @@
 module Neuron
   module Client
-    VERSION = "0.4.8"
+    VERSION = "0.5.0"
   end
 end

data/neuron-client.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency "tzinfo", "~> 0.3.29"
   s.add_dependency "i18n", ">= 0.5.0", "< 0.7"
   s.add_dependency "dalli", ">= 1.0.5", "< 1.2"
-  s.add_dependency "lrucache", "~> 0.1.0"
+  s.add_dependency "lrucache", "~> 0.1.2"
   s.add_dependency "map", ">= 4.2.0", "< 5"
   s.add_dependency "deep_merge", "~> 1.0.0"
   s.add_dependency "json-schema", ">= 0.9.12", "< 1.1"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: neuron-client
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
-  - 8
-  version: 0.4.8
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - RMM Online
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-30 00:00:00 Z
+date: 2012-04-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
@@ -149,12 +149,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 31
         segments: 
         - 0
         - 1
-        - 0
-        version: 0.1.0
+        - 2
+        version: 0.1.2
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency