moneta 1.2.0 → 1.4.2

data/spec/moneta/adapters/mongo/adapter_mongo_with_default_expires_spec.rb

@@ -1,11 +1,13 @@
 describe 'adapter_mongo_with_default_expires', isolate: true, adapter: :Mongo do
   let(:t_res) { 0.125 }
-  let(:min_ttl) { t_res }
+  let(:min_ttl) { t_res * 4 }
 
   moneta_build do
-    Moneta::Adapters::Mongo.new(db: "adapter_mongo",
-                                collection: 'with_default_expires',
-                                expires: min_ttl)
+    Moneta::Adapters::Mongo.new(
+    	database: File.basename(__FILE__, '.rb'),
+      collection: 'adapter_mongo_with_default_expires',
+      expires: min_ttl
+    )
   end
 
   moneta_specs ADAPTER_SPECS.with_each_key.with_expires.with_default_expires.simplevalues_only

data/spec/moneta/adapters/mongo/standard_mongo_spec.rb

@@ -2,6 +2,6 @@ describe 'standard_mongo', adapter: :Mongo do
   let(:t_res) { 0.125 }
   let(:min_ttl) { t_res }
 
-  moneta_store :Mongo, {db: 'standard_mongo', collection: 'default'}
-  moneta_specs STANDARD_SPECS.with_native_expires
+  moneta_store :Mongo, {database: File.basename(__FILE__, '.rb'), collection: 'standard_mongo'}
+  moneta_specs STANDARD_SPECS.with_native_expires.with_each_key
 end

data/spec/moneta/adapters/pstore/standard_pstore_spec.rb

@@ -5,5 +5,5 @@ describe 'standard_pstore', unsupported: defined?(JRUBY_VERSION), adapter: :PSto
 
   moneta_loader{ |value| value }
 
-  moneta_specs STANDARD_SPECS
+  moneta_specs STANDARD_SPECS.with_each_key
 end

data/spec/moneta/adapters/pstore/standard_pstore_with_expires_spec.rb

@@ -9,5 +9,5 @@ describe 'standard_pstore_with_expires', unsupported: defined?(JRUBY_VERSION), a
 
   moneta_loader{ |value| value }
 
-  moneta_specs STANDARD_SPECS.with_expires
+  moneta_specs STANDARD_SPECS.with_expires.with_each_key
 end

data/spec/moneta/adapters/redis/adapter_redis_spec.rb

@@ -2,9 +2,19 @@ describe 'adapter_redis', adapter: :Redis do
   let(:t_res) { 0.125 }
   let(:min_ttl) { t_res }
 
-  moneta_build do
-    Moneta::Adapters::Redis.new(db: 6)
+  describe 'without default expiry' do
+    moneta_build do
+      Moneta::Adapters::Redis.new(host: redis_host, port: redis_port, db: 6)
+    end
+
+    moneta_specs ADAPTER_SPECS.with_each_key.with_native_expires
   end
 
-  moneta_specs ADAPTER_SPECS.with_each_key.with_native_expires
+  describe 'with default expiry' do
+    moneta_build do
+      Moneta::Adapters::Redis.new(host: redis_host, port: redis_port, db: 6, expires: min_ttl)
+    end
+
+    moneta_specs NATIVE_EXPIRY_SPECS.with_default_expires
+  end
 end

data/spec/moneta/adapters/redis/standard_redis_spec.rb

@@ -2,6 +2,13 @@ describe 'standard_redis', adapter: :Redis do
   let(:t_res) { 0.125 }
   let(:min_ttl) { t_res }
 
-  moneta_store :Redis, db: 4
-  moneta_specs STANDARD_SPECS.with_native_expires
+  moneta_store :Redis do
+    {
+      db: 4,
+      host: redis_host,
+      port: redis_port
+    }
+  end
+
+  moneta_specs STANDARD_SPECS.with_native_expires.with_each_key
 end

data/spec/moneta/adapters/sdbm/standard_sdbm_spec.rb

@@ -3,5 +3,5 @@ describe 'standard_sdbm', unsupported: defined?(JRUBY_VERSION), adapter: :SDBM d
     {file: File.join(tempdir, "simple_sdbm")}
   end
 
-  moneta_specs STANDARD_SPECS.without_multiprocess.without_large
+  moneta_specs STANDARD_SPECS.without_multiprocess.without_large.with_each_key
 end

data/spec/moneta/adapters/sdbm/standard_sdbm_with_expires_spec.rb

@@ -7,5 +7,5 @@ describe 'standard_sdbm_with_expires', unsupported: defined?(JRUBY_VERSION), ada
     {file: File.join(tempdir, "simple_sdbm_with_expires"), expires: true}
   end
 
-  moneta_specs STANDARD_SPECS.without_multiprocess.with_expires.without_large
+  moneta_specs STANDARD_SPECS.without_multiprocess.with_expires.without_large.with_each_key
 end

data/spec/moneta/adapters/sequel/adapter_sequel_spec.rb

@@ -1,43 +1,29 @@
 require_relative './helper.rb'
 
 describe ':Sequel adapter', adapter: :Sequel do
+  include_context :sequel
+
   specs = ADAPTER_SPECS.with_each_key.with_values(:nil)
 
-  context 'with MySQL backend' do
+  context 'with MySQL backend', mysql: true do
     moneta_build do
-      Moneta::Adapters::Sequel.new(opts.merge(
-        db: if defined?(JRUBY_VERSION)
-              "jdbc:mysql://localhost/#{mysql_database1}?user=#{mysql_username}"
-            else
-              "mysql2://#{mysql_username}:@localhost/#{mysql_database1}"
-            end
-        ))
+      Moneta::Adapters::Sequel.new(opts.merge(db: mysql_uri))
     end
 
     include_examples :adapter_sequel, specs
   end
 
-  context "with SQLite backend" do
+  context "with SQLite backend", sqlite: true do
     moneta_build do
-      Moneta::Adapters::Sequel.new(opts.merge(
-        db: "#{defined?(JRUBY_VERSION) && 'jdbc:'}sqlite://" + File.join(tempdir, 'adapter_sequel.db')))
+      Moneta::Adapters::Sequel.new(opts.merge(db: sqlite_uri('adapter_sequel.db')))
     end
 
     include_examples :adapter_sequel, specs.without_concurrent
   end
 
-  context "with Postgres backend" do
+  context "with Postgres backend", postgres: true do
     moneta_build do
-      Moneta::Adapters::Sequel.new(opts.merge(
-        if defined?(JRUBY_VERSION)
-          {db: "jdbc:postgresql://localhost/#{postgres_database1}?user=#{postgres_username}"}
-        else
-          {
-            db: "postgres://localhost/#{postgres_database1}",
-            user: postgres_username
-          }
-        end
-      ))
+      Moneta::Adapters::Sequel.new(opts.merge(postgres_options))
     end
 
     include_examples :adapter_sequel, specs
@@ -45,28 +31,15 @@ describe ':Sequel adapter', adapter: :Sequel do
 
   context "with H2 backend", unsupported: !defined?(JRUBY_VERSION) do
     moneta_build do
-      Moneta::Adapters::Sequel.new(opts.merge(
-        db: "jdbc:h2:" + tempdir))
+      Moneta::Adapters::Sequel.new(opts.merge(db: h2_uri))
     end
 
     include_examples :adapter_sequel, specs, optimize: false
   end
 
-  context "with Postgres HStore backend" do
+  context "with Postgres HStore backend", postgres: true do
     moneta_build do
-      Moneta::Adapters::Sequel.new(
-        if defined?(JRUBY_VERSION)
-          {db: "jdbc:postgresql://localhost/#{postgres_database1}?user=#{postgres_username}"}
-        else
-          {
-            db: "postgres://localhost/#{postgres_database1}",
-            user: postgres_username
-          }
-        end.merge(
-          table: 'hstore_table1',
-          hstore: 'row'
-        )
-      )
+      Moneta::Adapters::Sequel.new(postgres_hstore_options)
     end
 
     # Concurrency is too slow, and binary values cannot be stored in an hstore

data/spec/moneta/adapters/sequel/helper.rb

@@ -1,3 +1,45 @@
+RSpec.shared_context :sequel do
+  def mysql_uri database=nil
+    database ||= mysql_database1
+    if defined?(JRUBY_VERSION)
+      uri = "jdbc:mysql://#{mysql_host}:#{mysql_port}/#{database}?user=#{mysql_username}&useSSL=false"
+      uri += "&password=#{mysql_password}" if mysql_password
+      uri
+    else
+      "mysql2://#{mysql_username}:#{mysql_password}@#{mysql_host}:#{mysql_port}/#{database}"
+    end
+  end
+
+  def sqlite_uri file_name
+    "#{defined?(JRUBY_VERSION) && 'jdbc:'}sqlite://" + File.join(tempdir, file_name)
+  end
+
+  def postgres_options database=nil
+    database ||= postgres_database1
+    if defined?(JRUBY_VERSION)
+      uri = "jdbc:postgresql://localhost/#{database}?user=#{postgres_username}"
+      uri += "&password=#{postgres_password}" if postgres_password
+      {db: uri}
+    else
+      {
+        db: "postgres://localhost/#{database}",
+        user: postgres_username,
+        password: postgres_password
+      }
+    end
+  end
+
+  def postgres_hstore_options database=nil
+    postgres_options(database).merge \
+      table: 'hstore_table1',
+      hstore: 'row'
+  end
+
+  def h2_uri
+    "jdbc:h2:" + tempdir
+  end
+end
+
 RSpec.shared_examples :adapter_sequel do |specs, optimize: true|
   shared_examples :each_key_server do
     context "with each_key server" do

data/spec/moneta/adapters/sequel/standard_sequel_spec.rb

@@ -1,14 +1,8 @@
-describe 'standard_sequel', adapter: :Sequel do
-  moneta_store :Sequel do
-    {
-      db: if defined?(JRUBY_VERSION)
-            "jdbc:mysql://localhost/#{mysql_database1}?user=#{mysql_username}"
-          else
-            "mysql2://#{mysql_username}:@localhost/#{mysql_database1}"
-          end,
-      table: "simple_sequel"
-    }
-  end
+require_relative './helper.rb'
 
-  moneta_specs STANDARD_SPECS
+describe 'standard_sequel', adapter: :Sequel, postgres: true do
+  include_context :sequel
+
+  moneta_store(:Sequel) { postgres_options.merge(table: "standard_sequel") }
+  moneta_specs STANDARD_SPECS.with_each_key
 end

data/spec/moneta/adapters/sequel/standard_sequel_with_expires_spec.rb

@@ -1,19 +1,18 @@
-describe 'standard_sequel_with_expires', adapter: :Sequel do
+require_relative './helper.rb'
+
+describe 'standard_sequel_with_expires', adapter: :Sequel, postgres: true do
+  include_context :sequel
+
   let(:t_res) { 0.125 }
   let(:min_ttl) { t_res }
   use_timecop
 
   moneta_store :Sequel do
-    {
-      db: if defined?(JRUBY_VERSION)
-            "jdbc:mysql://localhost/#{mysql_database1}?user=#{mysql_username}"
-          else
-            "mysql2://#{mysql_username}:@localhost/#{mysql_database1}"
-          end,
-      table: "simple_sequel_with_expires",
+    postgres_options.merge(
+      table: "standard_sequel_with_expires",
       expires: true
-    }
+    )
   end
 
-  moneta_specs STANDARD_SPECS.with_expires
+  moneta_specs STANDARD_SPECS.with_expires.with_each_key
 end

data/spec/moneta/adapters/sqlite/adapter_sqlite_spec.rb

@@ -1,4 +1,4 @@
-describe 'adapter_sqlite', unsupported: defined?(JRUBY_VERSION), adapter: :Sqlite do
+describe 'adapter_sqlite', unsupported: defined?(JRUBY_VERSION), adapter: :Sqlite, sqlite: true do
   moneta_build do
     Moneta::Adapters::Sqlite.new(file: File.join(tempdir, "adapter_sqlite"))
   end

data/spec/moneta/adapters/sqlite/standard_sqlite_spec.rb

@@ -1,7 +1,7 @@
-describe 'standard_sqlite', unsupported: defined?(JRUBY_VERSION), adapter: :Sqlite do
+describe 'standard_sqlite', unsupported: defined?(JRUBY_VERSION), adapter: :Sqlite, sqlite: true do
   moneta_store :Sqlite do
     {file: File.join(tempdir, "standard_sqlite")}
   end
 
-  moneta_specs STANDARD_SPECS.without_concurrent
+  moneta_specs STANDARD_SPECS.without_concurrent.with_each_key
 end

data/spec/moneta/adapters/sqlite/standard_sqlite_with_expires_spec.rb

@@ -1,4 +1,4 @@
-describe 'standard_sqlite_with_expires', unsupported: defined?(JRUBY_VERSION), adapter: :Sqlite do
+describe 'standard_sqlite_with_expires', unsupported: defined?(JRUBY_VERSION), adapter: :Sqlite, sqlite: true do
   let(:t_res) { 0.125 }
   let(:min_ttl) { 1 }
   use_timecop
@@ -11,5 +11,5 @@ describe 'standard_sqlite_with_expires', unsupported: defined?(JRUBY_VERSION), a
     }
   end
 
-  moneta_specs STANDARD_SPECS.with_expires.without_concurrent
+  moneta_specs STANDARD_SPECS.with_expires.without_concurrent.with_each_key
 end

data/spec/moneta/adapters/tdb/standard_tdb_spec.rb

@@ -3,5 +3,5 @@ describe 'standard_tdb', unsupported: defined?(JRUBY_VERSION), adapter: :TDB do
     {file: File.join(tempdir, "simple_tdb")}
   end
 
-  moneta_specs STANDARD_SPECS.without_multiprocess
+  moneta_specs STANDARD_SPECS.without_multiprocess.with_each_key
 end

data/spec/moneta/adapters/tdb/standard_tdb_with_expires_spec.rb

@@ -7,5 +7,5 @@ describe 'standard_tdb_with_expires', unsupported: defined?(JRUBY_VERSION), adap
     {file: File.join(tempdir, "simple_tdb_with_expires"), expires: true}
   end
 
-  moneta_specs STANDARD_SPECS.without_multiprocess.with_expires
+  moneta_specs STANDARD_SPECS.without_multiprocess.with_expires.with_each_key
 end

data/spec/moneta/adapters/tokyocabinet/standard_tokyocabinet_spec.rb

@@ -3,5 +3,5 @@ describe 'standard_tokyocabinet', unsupported: defined?(JRUBY_VERSION), adapter:
     {file: File.join(tempdir, "simple_tokyocabinet")}
   end
 
-  moneta_specs STANDARD_SPECS.without_multiprocess
+  moneta_specs STANDARD_SPECS.without_multiprocess.with_each_key
 end

data/spec/moneta/adapters/tokyocabinet/standard_tokyocabinet_with_expires_spec.rb

@@ -7,5 +7,5 @@ describe 'standard_tokyocabinet_with_expires', unsupported: defined?(JRUBY_VERSI
     {file: File.join(tempdir, "simple_tokyocabinet_with_expires"), expires: true}
   end
 
-  moneta_specs STANDARD_SPECS.without_multiprocess.with_expires
+  moneta_specs STANDARD_SPECS.without_multiprocess.with_expires.with_each_key
 end

data/spec/moneta/adapters/yaml/standard_yaml_spec.rb

@@ -5,5 +5,5 @@ describe 'standard_yaml', adapter: :YAML do
 
   moneta_loader{ |value| value }
 
-  moneta_specs STANDARD_SPECS.without_marshallable_value.without_concurrent
+  moneta_specs STANDARD_SPECS.without_marshallable_value.without_concurrent.with_each_key
 end

data/spec/moneta/adapters/yaml/standard_yaml_with_expires_spec.rb

@@ -9,5 +9,5 @@ describe 'standard_yaml_with_expires', adapter: :YAML do
 
   moneta_loader{ |value| value }
 
-  moneta_specs STANDARD_SPECS.without_marshallable_value.with_expires.without_concurrent
+  moneta_specs STANDARD_SPECS.without_marshallable_value.with_expires.without_concurrent.with_each_key
 end

data/spec/moneta/builder_spec.rb

@@ -25,4 +25,26 @@ describe Moneta::Builder do
       end.build
     end.to raise_error /Please check/
   end
+
+  it 'dups options before passing them to each middleware' do
+    my_adapter = Class.new do
+      def initialize(options)
+        throw "a is missing" unless options.delete(:a)
+      end
+    end
+
+    my_middleware = Class.new do
+      def initialize(backend, options)
+        throw "a is missing" unless options.delete(:a)
+      end
+    end
+
+    options = { a: 1 }
+    Moneta::Builder.new do
+      use my_middleware, options
+      adapter my_adapter, options
+    end.build
+
+    expect(options).to include(a: 1)
+  end
 end

data/spec/moneta/proxies/expires/expires_file_spec.rb

@@ -13,7 +13,7 @@ describe 'expires_file', proxy: :Expires do
     end
   end
 
-  moneta_specs STANDARD_SPECS.with_expires.stringvalues_only
+  moneta_specs STANDARD_SPECS.with_expires.stringvalues_only.with_each_key
 
   it 'deletes expired value in underlying file storage' do
     store.store('foo', 'bar', expires: 2)

data/spec/moneta/proxies/pool/pool_spec.rb

@@ -1,6 +1,6 @@
 require 'timeout'
 
-describe "pool", proxy: :Pool do
+describe "pool", proxy: :Pool, broken: ::Gem::Version.new(RUBY_ENGINE_VERSION) < ::Gem::Version.new('2.4.0') do
   describe "Moneta::Pool" do
     # To test the pool, we create the store once and pass the same object around
     # whenever a new store is requested.
@@ -153,7 +153,7 @@ describe "pool", proxy: :Pool do
       describe "closing stores after TTL expiry" do
         let(:num) { max || min + 10 }
 
-        it "closes available stores after ttl" do
+        it "closes unneeded stores after ttl" do
           stores.each do |store|
             allow(store).to receive(:close)
           end
@@ -169,6 +169,32 @@ describe "pool", proxy: :Pool do
       end
     end
 
+    shared_examples :ttl_with_nonzero_min do |ttl:, min:, max: nil|
+      describe "TTL check" do
+        let(:num) { max || min + 10 }
+
+        # This is testing that a very specific bug is fixed - see
+        # https://github.com/moneta-rb/moneta/issues/197.  A better long-term
+        # solution would be to have more granular tests of the functions in the
+        # PoolManager
+        it "doesn't cause a busy-loop when there are available stores" do
+          # Check a store in and out - now the manager needs to decide whether to close
+          # stores after ttl seconds.
+          store = subject.check_out
+          subject.check_in(store)
+          sleep ttl
+          expect(subject.stats[:available]).to be > 0
+
+          # needs to be less than the TTL, but otherwise not important.
+          sleep_time = ttl / 2.0
+          sleep sleep_time
+
+          # during the sleep, the pool manager should have been idle.
+          expect(subject.stats[:idle_time]).to be >= sleep_time
+        end
+      end
+    end
+
     shared_examples :timeout do |timeout, max:|
       describe "raising an error after timeout" do
         let(:num) { max }
@@ -233,6 +259,7 @@ describe "pool", proxy: :Pool do
       include_examples :min, 10
       include_examples :max, 20, timeout: 4
       include_examples :ttl, 1, min: 10, max: 20
+      include_examples :ttl_with_nonzero_min, ttl: 1, min: 10, max: 20
       include_examples :timeout, 4, max: 20
     end
 
@@ -243,6 +270,7 @@ describe "pool", proxy: :Pool do
       include_examples :min, 10
       include_examples :max, 10, timeout: 4
       include_examples :ttl, 2, min: 10, max: 10
+      include_examples :ttl_with_nonzero_min, ttl: 2, min: 10, max: 10
       include_examples :timeout, 4, max: 10
     end
 
@@ -292,7 +320,7 @@ describe "pool", proxy: :Pool do
       end
 
       it "raises a ShutdownError if the pool is stopped while waiting for a store" do
-        # Exaust the pool
+        # Exhaust the pool
         store = stores.first
         allow(store).to receive(:close).once
         expect(subject.check_out).to eq store