moneta 1.4.1 → 1.4.2

data/lib/moneta/pool.rb

@@ -87,6 +87,7 @@ module Moneta
         @waiting_since = [] if @timeout
         @last_checkout = nil
         @stopping = false
+        @idle_time = nil
 
         # Launch the manager thread
         @thread = run
@@ -126,10 +127,16 @@ module Moneta
             populate_stores
 
             until @stopping && @stores.empty?
+              loop_start = Time.now
+
               # Block until a message arrives, or until we time out for some reason
-              if request = pop
-                handle_request(request)
-              end
+              request = pop
+
+              # Record how long we were idle, for stats purposes
+              @idle_time = Time.now - loop_start
+
+              # If a message arrived, handle it
+              handle_request(request) if request
 
               # Handle any stale checkout requests
               handle_timed_out_requests
@@ -186,7 +193,7 @@ module Moneta
       # @return [Integer, nil]
       def timeout
         # Time to wait before there will be stores that should be closed
-        ttl = if @ttl && @last_checkout && !@available.empty?
+        ttl = if @ttl && @last_checkout && stores_available? && stores_unneeded?
                 [@ttl - (Time.now - @last_checkout), 0].max
               end
 
@@ -199,6 +206,18 @@ module Moneta
         [ttl, timeout].compact.min
       end
 
+      def stores_available?
+        !@available.empty?
+      end
+
+      def stores_unneeded?
+        @stores.length > @min
+      end
+
+      def stores_maxed?
+        @max != nil && @stores.length == @max
+      end
+
       def pop
         @mutex.synchronize do
           @resource.wait(@mutex, timeout) if @inbox.empty?
@@ -218,7 +237,7 @@ module Moneta
           reply.resolve(ShutdownError.new("Shutting down"))
         elsif !@available.empty?
           reply.resolve(@available.pop)
-        elsif !@max || @stores.length < @max
+        elsif !stores_maxed?
           begin
             reply.resolve(add_store)
           rescue => e
@@ -258,7 +277,8 @@ module Moneta
                       waiting: @waiting.length,
                       longest_wait: @timeout && !@waiting_since.empty? ? @waiting_since.first.dup : nil,
                       stopping: @stopping,
-                      last_checkout: @last_checkout && @last_checkout.dup)
+                      last_checkout: @last_checkout && @last_checkout.dup,
+                      idle_time: @idle_time.dup)
       end
 
       def handle_request(request)

data/lib/moneta/version.rb

@@ -1,5 +1,5 @@
 module Moneta
   # Moneta version number
   # @api public
-  VERSION = '1.4.1'.freeze
+  VERSION = '1.4.2'.freeze
 end

data/spec/active_support/cache_moneta_store_spec.rb

@@ -74,7 +74,7 @@ describe "cache_moneta_store" do
       end
       expect(result['rabbit']).to eq rabbit
       expect(result['irish whisky']).to eq 'irish whisky was missing'
-      expect(store.fetch 'irish whisky').to eq 'irish whisky was missing'
+      expect(store.fetch('irish whisky')).to eq 'irish whisky was missing'
     end
   end
 
@@ -88,9 +88,9 @@ describe "cache_moneta_store" do
 
     it 'writes multiple values with expiration time' do
       store.write_multi({
-        'rabbit' => white_rabbit,
-        'irish whisky' => 'Jameson'
-      }, expires_in: 0.2.second)
+                          'rabbit' => white_rabbit,
+                          'irish whisky' => 'Jameson'
+                        }, expires_in: 0.2.second)
 
       expect(store.read_multi('rabbit', 'irish whisky')).to eq \
         'rabbit' => white_rabbit,
@@ -234,23 +234,23 @@ describe "cache_moneta_store" do
     end
 
     context "with :Memory store" do
-      let(:store){ described_class.new(store: :Memory) }
+      let(:store) { described_class.new(store: :Memory) }
       include_examples :moneta_store
     end
 
     context "with existing :Memory store" do
-      let(:store){ described_class.new(store: ::Moneta.new(:Memory)) }
+      let(:store) { described_class.new(store: ::Moneta.new(:Memory)) }
       include_examples :moneta_store
     end
 
-    context "with Redis store" do
-      let(:store) {described_class.new(store: :Redis) }
+    context "with Redis store", adapter: :Redis do
+      let(:store) { described_class.new(store: :Redis) }
       include_examples :moneta_store
     end
   end
 
   describe ActiveSupport::Cache::MemoryStore do
-    let(:store){ described_class.new }
+    let(:store) { described_class.new }
 
     include_examples :basic_store
     include_examples :expiry
@@ -258,8 +258,8 @@ describe "cache_moneta_store" do
     include_examples :basic_instrumentation
   end
 
-  describe ActiveSupport::Cache::MemCacheStore do
-    let(:store){ described_class.new('127.0.0.1:11213') }
+  describe ActiveSupport::Cache::MemCacheStore, memcached: true do
+    let(:store) { described_class.new('127.0.0.1:11213') }
 
     include_context :start_memcached, 11213
 
@@ -270,8 +270,8 @@ describe "cache_moneta_store" do
     include_examples :increment_decrement_instrumentation
   end
 
-  describe ActiveSupport::Cache::RedisCacheStore do
-    let(:store){ described_class.new(url: 'redis:///3') }
+  describe ActiveSupport::Cache::RedisCacheStore, redis: true do
+    let(:store) { described_class.new(url: "redis:///3") }
 
     include_examples :basic_store
     include_examples :expiry

data/spec/helper.rb

@@ -213,11 +213,18 @@ ADAPTER_SPECS = MonetaSpecs.new(
     :create, :features, :store_large, :not_each_key],
   key: %w(string path),
   value: %w(string path binary))
+
+NATIVE_EXPIRY_SPECS = MonetaSpecs.new(
+  specs: [:create, :expires, :create_expires],
+  key: %w(string path),
+  value: %w(string path binary))
+
 STANDARD_SPECS = MonetaSpecs.new(
   specs: [:null, :store, :returndifferent,
     :marshallable_key, :marshallable_value, :transform_value, :increment,
     :concurrent_increment, :concurrent_create, :persist, :multiprocess, :create,
     :features, :store_large, :not_each_key])
+
 TRANSFORMER_SPECS = MonetaSpecs.new(
   specs: [:null, :store, :returndifferent,
     :transform_value, :increment, :create, :features, :store_large,
@@ -260,18 +267,24 @@ module MonetaHelpers
 
       # Used by tests that rely on MySQL.  These env vars can be used if you
       # want to run the tests but don't want to grant root access to moneta
+      let(:mysql_host) { ENV['MYSQL_HOST'] || 'localhost' }
+      let(:mysql_port) { ENV['MYSQL_TCP_PORT'] || '3306' }
       let(:mysql_username) { ENV['MONETA_MYSQL_USERNAME'] || 'root' }
       let(:mysql_password) { ENV['MONETA_MYSQL_PASSWORD'] }
       let(:mysql_database1) { ENV['MONETA_MYSQL_DATABASE1'] || 'moneta' }
       let(:mysql_database2) { ENV['MONETA_MYSQL_DATABASE2'] || 'moneta2' }
 
-      let(:postgres_username) { ENV['MONETA_POSTGRES_USERNAME'] || 'postgres' }
+      let(:postgres_username) { ENV['PGUSER'] || 'postgres' }
+      let(:postgres_password) { ENV['PGPASSWORD'] }
       let(:postgres_database1) { ENV['MONETA_POSTGRES_DATABSASE1'] || 'moneta1' }
       let(:postgres_database2) { ENV['MONETA_POSTGRES_DATABSASE1'] || 'moneta2' }
 
       let(:couch_login) { ENV['COUCH_LOGIN'] || 'admin' }
       let(:couch_password) { ENV['COUCH_PASSWORD'] || 'password' }
 
+      let(:redis_host) { ENV.fetch('REDIS_HOST', 'localhost') }
+      let(:redis_port) { ENV.fetch('REDIS_PORT', '6379') }
+
       before do
         store = new_store
         store.clear

data/spec/moneta/adapters/activerecord/adapter_activerecord_existing_connection_spec.rb

@@ -1,4 +1,4 @@
-describe 'adapter_activerecord_existing_connection', adapter: :ActiveRecord do
+describe 'adapter_activerecord_existing_connection', adapter: :ActiveRecord, mysql: true do
   before :all do
     require 'active_record'
   end
@@ -8,6 +8,8 @@ describe 'adapter_activerecord_existing_connection', adapter: :ActiveRecord do
     ActiveRecord::Base.configurations = {
       default_env => {
         'adapter' => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'),
+        'host' => mysql_host,
+        'port' => mysql_port,
         'database' => mysql_database1,
         'username' => mysql_username,
         'password' => mysql_password

data/spec/moneta/adapters/activerecord/adapter_activerecord_spec.rb

@@ -58,32 +58,39 @@ describe 'adapter_activerecord', adapter: :ActiveRecord do
     end
   end
 
-  context "with MySQL" do
+  context "with MySQL", mysql: true do
     let(:connection1) do
       {
         adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'),
+        host: mysql_host,
+        port: mysql_port,
         database: mysql_database1,
-        username: mysql_username
+        username: mysql_username,
+        password: mysql_password
       }
     end
 
     let(:connection2) do
       {
         adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'),
+        host: mysql_host,
+        port: mysql_port,
         database: mysql_database2,
-        username: mysql_username
+        username: mysql_username,
+        password: mysql_password
       }
     end
 
     include_examples :adapter_activerecord, activerecord_specs
   end
 
-  context "with PostgreSQL" do
+  context "with PostgreSQL", postgres: true do
     let(:connection1) do
       {
         adapter: (defined?(JRUBY_VERSION) ? 'jdbcpostgresql' : 'postgresql'),
         database: postgres_database1,
-        username: postgres_username
+        username: postgres_username,
+        password: postgres_password
       }
     end
 
@@ -91,14 +98,15 @@ describe 'adapter_activerecord', adapter: :ActiveRecord do
       {
         adapter: (defined?(JRUBY_VERSION) ? 'jdbcpostgresql' : 'postgresql'),
         database: postgres_database2,
-        username: postgres_username
+        username: postgres_username,
+        password: postgres_password
       }
     end
 
     include_examples :adapter_activerecord, activerecord_specs
   end
 
-  context "with SQLite" do
+  context "with SQLite", sqlite: true do
     let(:connection1) do
       {
         adapter: (defined?(JRUBY_VERSION) ? 'jdbcsqlite3' : 'sqlite3'),

data/spec/moneta/adapters/activerecord/standard_activerecord_spec.rb

@@ -1,11 +1,14 @@
-describe "standard_activerecord", adapter: :ActiveRecord do
+describe "standard_activerecord", adapter: :ActiveRecord, mysql: true do
   moneta_store :ActiveRecord do
     {
       table: 'standard_activerecord',
       connection: {
         adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'),
+        host: mysql_host,
+        port: mysql_port,
         database: mysql_database1,
-        username: mysql_username
+        username: mysql_username,
+        password: mysql_password
       }
     }
   end

data/spec/moneta/adapters/activerecord/standard_activerecord_with_expires_spec.rb

@@ -1,4 +1,4 @@
-describe "standard_activerecord_with_expires", adapter: :ActiveRecord do
+describe "standard_activerecord_with_expires", adapter: :ActiveRecord, mysql: true do
   let(:t_res) { 0.125 }
   let(:min_ttl) { t_res }
   use_timecop
@@ -8,8 +8,11 @@ describe "standard_activerecord_with_expires", adapter: :ActiveRecord do
       table: 'standard_activerecord_with_expires',
       connection: {
         adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'),
+        host: mysql_host,
+        port: mysql_port,
         database: mysql_database1,
-        username: mysql_username
+        username: mysql_username,
+        password: mysql_password
       },
       expires: true
     }

data/spec/moneta/adapters/activesupportcache/adapter_activesupportcache_spec.rb

@@ -23,7 +23,7 @@ describe 'adapter_activesupportcache', adapter: :ActiveSupportCache do
     include_examples :adapter_activesupportcache
   end
 
-  context 'using MemCacheStore' do
+  context 'using MemCacheStore', memcached: true do
     let(:t_res) { 1 }
     let(:min_ttl) { 2 }
     use_timecop
@@ -34,12 +34,12 @@ describe 'adapter_activesupportcache', adapter: :ActiveSupportCache do
     include_examples :adapter_activesupportcache
   end
 
-  context 'using RedisCacheStore' do
+  context 'using RedisCacheStore', redis: true do
     let(:t_res) { 1 }
     let(:min_ttl) { t_res }
     use_timecop
 
-    let(:backend) { ActiveSupport::Cache::RedisCacheStore.new(url: 'redis:///1') }
+    let(:backend) { ActiveSupport::Cache::RedisCacheStore.new(url: "redis://#{redis_host}:#{redis_port}/1") }
     include_examples :adapter_activesupportcache
   end
 

data/spec/moneta/adapters/activesupportcache/adapter_activesupportcache_with_default_expires_spec.rb

@@ -23,7 +23,7 @@ describe 'adapter_activesupportcache_with_default_expires', adapter: :ActiveSupp
     include_examples :adapter_activesupportcache_with_default_expires
   end
 
-  context 'using MemCacheStore' do
+  context 'using MemCacheStore', memcached: true do
     let(:t_res) { 1 }
     let(:min_ttl) { 2 }
     use_timecop
@@ -39,7 +39,7 @@ describe 'adapter_activesupportcache_with_default_expires', adapter: :ActiveSupp
     let(:min_ttl) { t_res }
     use_timecop
 
-    let(:backend) { ActiveSupport::Cache::RedisCacheStore.new(url: 'redis:///2') }
+    let(:backend) { ActiveSupport::Cache::RedisCacheStore.new(url: "redis://#{redis_host}:#{redis_port}/2") }
     include_examples :adapter_activesupportcache_with_default_expires
   end
 

data/spec/moneta/adapters/datamapper/adapter_datamapper_spec.rb

@@ -1,22 +1,32 @@
-describe 'adapter_datamapper', broken: defined?(JRUBY_VERSION), adapter: :DataMapper do
+describe 'adapter_datamapper', broken: defined?(JRUBY_VERSION), adapter: :DataMapper, mysql: true do
   before :all do
     require 'dm-core'
 
     # DataMapper needs default repository to be setup
     DataMapper.setup(:default, adapter: :in_memory)
   end
-  
+
   moneta_build do
-    Moneta::Adapters::DataMapper.new(setup: "mysql://#{mysql_username}:#{mysql_password}@localhost/#{mysql_database1}", table: "adapter_datamapper")
+    Moneta::Adapters::DataMapper.new(
+      setup: "mysql://#{mysql_username}:#{mysql_password}@#{mysql_host}:#{mysql_port}/#{mysql_database1}",
+      table: "adapter_datamapper"
+    )
   end
 
   moneta_specs ADAPTER_SPECS.without_increment.with_values(:nil).without_values(:binary)
-    
+
   it 'does not cross contaminate when storing' do
-    first = Moneta::Adapters::DataMapper.new(setup: "mysql://#{mysql_username}:#{mysql_password}@localhost/#{mysql_database1}", table: "datamapper_first")
+    first = Moneta::Adapters::DataMapper.new(
+      setup: "mysql://#{mysql_username}:#{mysql_password}@#{mysql_host}:#{mysql_port}/#{mysql_database1}",
+      table: "datamapper_first"
+    )
     first.clear
 
-    second = Moneta::Adapters::DataMapper.new(repository: :sample, setup: "mysql://#{mysql_username}:#{mysql_password}@localhost/#{mysql_database1}", table: "datamapper_second")
+    second = Moneta::Adapters::DataMapper.new(
+      repository: :sample,
+      setup: "mysql://#{mysql_username}:#{mysql_password}@#{mysql_host}:#{mysql_port}/#{mysql_database1}",
+      table: "datamapper_second"
+    )
     second.clear
 
     first['key'] = 'value'
@@ -27,10 +37,17 @@ describe 'adapter_datamapper', broken: defined?(JRUBY_VERSION), adapter: :DataMa
   end
 
   it 'does not cross contaminate when deleting' do
-    first = Moneta::Adapters::DataMapper.new(setup: "mysql://#{mysql_username}:#{mysql_password}@localhost/#{mysql_database1}", table: "datamapper_first")
+    first = Moneta::Adapters::DataMapper.new(
+      setup: "mysql://#{mysql_username}:#{mysql_password}@#{mysql_host}:#{mysql_port}/#{mysql_database1}",
+      table: "datamapper_first"
+    )
     first.clear
 
-    second = Moneta::Adapters::DataMapper.new(repository: :sample, setup: "mysql://#{mysql_username}:#{mysql_password}@localhost/#{mysql_database1}", table: "datamapper_second")
+    second = Moneta::Adapters::DataMapper.new(
+      repository: :sample,
+      setup: "mysql://#{mysql_username}:#{mysql_password}@#{mysql_host}:#{mysql_port}/#{mysql_database1}",
+      table: "datamapper_second"
+    )
     second.clear
 
     first['key'] = 'value'

data/spec/moneta/adapters/datamapper/standard_datamapper_spec.rb

@@ -1,4 +1,4 @@
-describe "standard_datamapper", broken: defined?(JRUBY_VERSION), adapter: :DataMapper do
+describe "standard_datamapper", broken: defined?(JRUBY_VERSION), adapter: :DataMapper, mysql: true do
   before :all do
     require 'dm-core'
 
@@ -8,7 +8,7 @@ describe "standard_datamapper", broken: defined?(JRUBY_VERSION), adapter: :DataM
 
   moneta_store :DataMapper do
     {
-      setup: "mysql://#{mysql_username}:#{mysql_password}@localhost/#{mysql_database1}",
+      setup: "mysql://#{mysql_username}:#{mysql_password}@#{mysql_host}:#{mysql_port}/#{mysql_database1}",
       table: "simple_datamapper"
     }
   end

data/spec/moneta/adapters/datamapper/standard_datamapper_with_expires_spec.rb

@@ -1,4 +1,4 @@
-describe "standard_datamapper_with_expires", broken: defined?(JRUBY_VERSION), adapter: :DataMapper do
+describe "standard_datamapper_with_expires", broken: defined?(JRUBY_VERSION), adapter: :DataMapper, mysql: true do
   let(:t_res) { 0.125 }
   let(:min_ttl) { t_res }
   use_timecop
@@ -12,7 +12,7 @@ describe "standard_datamapper_with_expires", broken: defined?(JRUBY_VERSION), ad
 
   moneta_store :DataMapper do
     {
-      setup: "mysql://#{mysql_username}:#{mysql_password}@localhost/#{mysql_database1}",
+      setup: "mysql://#{mysql_username}:#{mysql_password}@#{mysql_host}:#{mysql_port}/#{mysql_database1}",
       table: "simple_datamapper_with_expires",
       expires: true
     }