moneta 1.4.1 → 1.4.2

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

@@ -1,4 +1,4 @@
-describe 'standard_datamapper_with_repository', broken: defined?(JRUBY_VERSION), adapter: :DataMapper do
+describe 'standard_datamapper_with_repository', broken: defined?(JRUBY_VERSION), adapter: :DataMapper, mysql: true do
   before :all do
     require 'dm-core'
 
@@ -9,7 +9,7 @@ describe 'standard_datamapper_with_repository', broken: defined?(JRUBY_VERSION),
   moneta_store :DataMapper do
     {
       repository: :repo,
-      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_repository"
     }
   end

data/spec/moneta/adapters/memcached/dalli/adapter_memcached_dalli_spec.rb

@@ -7,9 +7,19 @@ describe 'adapter_memcached_dalli', retry: 3, adapter: :Memcached do
 
   include_context :start_memcached, 11212
 
-  moneta_build do
-    Moneta::Adapters::MemcachedDalli.new(server: "127.0.0.1:11212")
+  describe 'without default expires' do
+    moneta_build do
+      Moneta::Adapters::MemcachedDalli.new(server: "127.0.0.1:11212")
+    end
+
+    moneta_specs ADAPTER_SPECS.with_native_expires
   end
 
-  moneta_specs ADAPTER_SPECS.with_native_expires
+  describe 'with default expires' do
+    moneta_build do
+      Moneta::Adapters::MemcachedDalli.new(server: '127.0.0.1:11212', expires: min_ttl)
+    end
+
+    moneta_specs NATIVE_EXPIRY_SPECS.with_default_expires
+  end
 end

data/spec/moneta/adapters/memcached/native/adapter_memcached_native_spec.rb

@@ -7,9 +7,19 @@ describe 'adapter_memcached_native', isolate: true, unstable: defined?(JRUBY_VER
 
   include_context :start_memcached, 11214
 
-  moneta_build do
-    Moneta::Adapters::MemcachedNative.new(server: "127.0.0.1:11214")
+  describe 'without default expires' do
+    moneta_build do
+      Moneta::Adapters::MemcachedNative.new(server: "127.0.0.1:11214")
+    end
+
+    moneta_specs ADAPTER_SPECS.with_native_expires
   end
 
-  moneta_specs ADAPTER_SPECS.with_native_expires
+  describe 'with default expires' do
+    moneta_build do
+      Moneta::Adapters::MemcachedNative.new(server: '127.0.0.1:11214', expires: min_ttl)
+    end
+
+    moneta_specs NATIVE_EXPIRY_SPECS.with_default_expires
+  end
 end

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

@@ -1,6 +1,6 @@
 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(

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_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/sequel/adapter_sequel_spec.rb

@@ -5,7 +5,7 @@ describe ':Sequel adapter', adapter: :Sequel do
 
   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: mysql_uri))
     end
@@ -13,7 +13,7 @@ describe ':Sequel adapter', adapter: :Sequel do
     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: sqlite_uri('adapter_sequel.db')))
     end
@@ -21,7 +21,7 @@ describe ':Sequel adapter', adapter: :Sequel do
     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(postgres_options))
     end
@@ -37,7 +37,7 @@ describe ':Sequel adapter', adapter: :Sequel do
     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(postgres_hstore_options)
     end

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

@@ -2,9 +2,11 @@ RSpec.shared_context :sequel do
   def mysql_uri database=nil
     database ||= mysql_database1
     if defined?(JRUBY_VERSION)
-      "jdbc:mysql://localhost/#{database}?user=#{mysql_username}&useSSL=false"
+      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}:@localhost/#{database}"
+      "mysql2://#{mysql_username}:#{mysql_password}@#{mysql_host}:#{mysql_port}/#{database}"
     end
   end
 
@@ -15,11 +17,14 @@ RSpec.shared_context :sequel do
   def postgres_options database=nil
     database ||= postgres_database1
     if defined?(JRUBY_VERSION)
-      {db: "jdbc:postgresql://localhost/#{database}?user=#{postgres_username}"}
+      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
+        user: postgres_username,
+        password: postgres_password
       }
     end
   end
@@ -33,7 +38,7 @@ RSpec.shared_context :sequel do
   def h2_uri
     "jdbc:h2:" + tempdir
   end
-end 
+end
 
 RSpec.shared_examples :adapter_sequel do |specs, optimize: true|
   shared_examples :each_key_server do

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

@@ -1,6 +1,6 @@
 require_relative './helper.rb'
 
-describe 'standard_sequel', adapter: :Sequel do
+describe 'standard_sequel', adapter: :Sequel, postgres: true do
   include_context :sequel
 
   moneta_store(:Sequel) { postgres_options.merge(table: "standard_sequel") }

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

@@ -1,6 +1,6 @@
 require_relative './helper.rb'
 
-describe 'standard_sequel_with_expires', adapter: :Sequel do
+describe 'standard_sequel_with_expires', adapter: :Sequel, postgres: true do
   include_context :sequel
 
   let(:t_res) { 0.125 }

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,4 +1,4 @@
-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

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moneta
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Daniel Mendler
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2021-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel_tests
@@ -110,10 +110,10 @@ extra_rdoc_files:
 - SPEC.md
 - LICENSE
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - ".yardopts"
 - CHANGES
 - CONTRIBUTORS
@@ -299,10 +299,8 @@ files:
 - spec/moneta/adapters/lruhash/standard_lruhash_with_expires_spec.rb
 - spec/moneta/adapters/memcached/adapter_memcached_spec.rb
 - spec/moneta/adapters/memcached/dalli/adapter_memcached_dalli_spec.rb
-- spec/moneta/adapters/memcached/dalli/adapter_memcached_dalli_with_default_expires_spec.rb
 - spec/moneta/adapters/memcached/dalli/standard_memcached_dalli_spec.rb
 - spec/moneta/adapters/memcached/native/adapter_memcached_native_spec.rb
-- spec/moneta/adapters/memcached/native/adapter_memcached_native_with_default_expires_spec.rb
 - spec/moneta/adapters/memcached/native/standard_memcached_native_spec.rb
 - spec/moneta/adapters/memcached/standard_memcached_spec.rb
 - spec/moneta/adapters/memcached_helper.rb
@@ -324,7 +322,6 @@ files:
 - spec/moneta/adapters/pstore/standard_pstore_spec.rb
 - spec/moneta/adapters/pstore/standard_pstore_with_expires_spec.rb
 - spec/moneta/adapters/redis/adapter_redis_spec.rb
-- spec/moneta/adapters/redis/adapter_redis_with_default_expires_spec.rb
 - spec/moneta/adapters/redis/standard_redis_spec.rb
 - spec/moneta/adapters/restclient/adapter_restclient_spec.rb
 - spec/moneta/adapters/restclient/helper.rb
@@ -369,7 +366,6 @@ files:
 - spec/moneta/proxies/optionmerger/optionmerger_spec.rb
 - spec/moneta/proxies/pool/pool_spec.rb
 - spec/moneta/proxies/proxy/proxy_expires_memory_spec.rb
-- spec/moneta/proxies/proxy/proxy_redis_spec.rb
 - spec/moneta/proxies/shared/shared_tcp_spec.rb
 - spec/moneta/proxies/shared/shared_unix_spec.rb
 - spec/moneta/proxies/transformer/transformer_bencode_spec.rb
@@ -433,9 +429,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/moneta-rb/moneta/issues
-  changelog_uri: https://github.com/moneta-rb/moneta/blob/v1.4.1/CHANGES
-  documentation_uri: https://www.rubydoc.info/gems/moneta/1.4.1
-  source_code_uri: https://github.com/moneta-rb/moneta/tree/v1.4.1
+  changelog_uri: https://github.com/moneta-rb/moneta/blob/v1.4.2/CHANGES
+  documentation_uri: https://www.rubydoc.info/gems/moneta/1.4.2
+  source_code_uri: https://github.com/moneta-rb/moneta/tree/v1.4.2
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -451,7 +447,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: A unified interface to key/value stores, including Redis, Memcached, TokyoCabinet,
@@ -545,10 +541,8 @@ test_files:
 - spec/moneta/adapters/lruhash/standard_lruhash_with_expires_spec.rb
 - spec/moneta/adapters/memcached/adapter_memcached_spec.rb
 - spec/moneta/adapters/memcached/dalli/adapter_memcached_dalli_spec.rb
-- spec/moneta/adapters/memcached/dalli/adapter_memcached_dalli_with_default_expires_spec.rb
 - spec/moneta/adapters/memcached/dalli/standard_memcached_dalli_spec.rb
 - spec/moneta/adapters/memcached/native/adapter_memcached_native_spec.rb
-- spec/moneta/adapters/memcached/native/adapter_memcached_native_with_default_expires_spec.rb
 - spec/moneta/adapters/memcached/native/standard_memcached_native_spec.rb
 - spec/moneta/adapters/memcached/standard_memcached_spec.rb
 - spec/moneta/adapters/memcached_helper.rb
@@ -570,7 +564,6 @@ test_files:
 - spec/moneta/adapters/pstore/standard_pstore_spec.rb
 - spec/moneta/adapters/pstore/standard_pstore_with_expires_spec.rb
 - spec/moneta/adapters/redis/adapter_redis_spec.rb
-- spec/moneta/adapters/redis/adapter_redis_with_default_expires_spec.rb
 - spec/moneta/adapters/redis/standard_redis_spec.rb
 - spec/moneta/adapters/restclient/adapter_restclient_spec.rb
 - spec/moneta/adapters/restclient/helper.rb
@@ -615,7 +608,6 @@ test_files:
 - spec/moneta/proxies/optionmerger/optionmerger_spec.rb
 - spec/moneta/proxies/pool/pool_spec.rb
 - spec/moneta/proxies/proxy/proxy_expires_memory_spec.rb
-- spec/moneta/proxies/proxy/proxy_redis_spec.rb
 - spec/moneta/proxies/shared/shared_tcp_spec.rb
 - spec/moneta/proxies/shared/shared_unix_spec.rb
 - spec/moneta/proxies/transformer/transformer_bencode_spec.rb

data/.travis.yml

@@ -1,146 +0,0 @@
-dist: xenial
-language: ruby
-rvm:
-  - 2.7
-  - 2.6
-  - 2.5
-  - 2.4
-  - 2.3
-  - jruby-9.2.9.0
-  - rbx-3
-services:
-  - mysql
-  - riak
-  - redis
-  - cassandra
-  - memcached
-  - mongodb
-  - postgresql
-addons:
-  apt:
-    sources:
-      - cassandra
-      - sourceline: "deb https://apache.bintray.com/couchdb-deb xenial main"
-        key_url: https://couchdb.apache.org/repo/bintray-pubkey.asc
-      - sourceline: "deb https://packagecloud.io/basho/riak/ubuntu/ xenial main"
-        key_url: https://packagecloud.io/basho/riak/gpgkey
-    packages:
-      - cassandra
-      - libkyotocabinet-dev
-      - libleveldb-dev
-      - liblzo2-dev
-      - libtdb-dev
-      - libtokyocabinet-dev
-      - tokyotyrant
-      - riak
-  postgresql: '9.6'
-before_install:
-  - gem install bundler
-  - script/start-services
-cache:
-  bundler: true
-  directories:
-    - downloads
-before_script:
-  - mysql -e 'create database moneta;'
-  - mysql -e 'create database moneta2;'
-  - psql -c 'create database moneta1;' -U postgres
-  - psql -c 'create extension hstore;' -U postgres moneta1
-  - psql -c 'create database moneta2;' -U postgres
-  # FIXME: remove this once moneta no longer generates hundreds of warnings
-  # in Ruby 2.7
-  - if echo $RUBY_VERSION | grep -q 'ruby-2.7'; then export RUBYOPT='-W0'; fi
-  - export
-env:
-  matrix:
-    - SCRIPT='script/parallel-tests ~unstable --
-      test/action_dispatch/session_moneta_store_test.rb
-      spec/moneta/adapters/activerecord
-      spec/moneta/adapters/localmemcache
-      spec/moneta/adapters/activesupportcache
-      spec/moneta/adapters/lruhash
-      spec/moneta/adapters/gdbm
-      spec/moneta/adapters/null
-      spec/moneta/adapters/datamapper
-      spec/moneta/adapters/pstore
-      spec/moneta/adapters/daybreak
-      spec/moneta/adapters/redis
-      spec/moneta/adapters/dbm
-      spec/moneta/adapters/restclient
-      spec/moneta/adapters/file
-      spec/moneta/adapters/fog
-      spec/moneta/adapters/sdbm
-      spec/moneta/adapters/tokyocabinet
-      spec/moneta/adapters/leveldb
-      spec/moneta/adapters/tokyotyrant
-      spec/moneta/adapters/lmdb
-      spec/moneta/adapters/yaml
-      '
-    - SCRIPT='script/parallel-tests ~unstable --
-      spec/moneta/adapters/client
-      spec/moneta/adapters/memory
-      spec/moneta/adapters/cookie
-      spec/moneta/adapters/mongo
-      spec/moneta/adapters/tdb
-      spec/moneta/adapters/kyotocabinet
-      '
-    - SCRIPT='script/parallel-tests ~unstable --
-      spec/moneta/adapters/couch/standard_couch_spec.rb
-      '
-    - SCRIPT='script/parallel-tests ~unstable --
-      spec/moneta/adapters/couch/standard_couch_with_expires_spec.rb
-      '
-    - SCRIPT='script/parallel-tests ~unstable --
-      spec/moneta/adapters/memcached/dalli
-      '
-    - SCRIPT='script/parallel-tests ~unstable --
-      spec/moneta/adapters/memcached/native
-      spec/moneta/adapters/couch/adapter_couch_spec.rb
-      '
-    - SCRIPT='script/parallel-tests ~unstable --
-      spec/moneta/adapters/cassandra/adapter_cassandra_spec.rb
-      spec/moneta/adapters/cassandra/standard_cassandra_spec.rb
-      '
-    - SCRIPT='script/parallel-tests ~unstable --
-      spec/moneta/adapters/cassandra/adapter_cassandra_with_default_expires_spec.rb
-      spec/moneta/adapters/hashfile
-      spec/moneta/adapters/sqlite
-      spec/moneta/adapters/sequel
-      '
-    - SCRIPT='script/parallel-tests ~unstable --
-      spec/moneta/proxies
-      '
-    - SCRIPT='script/parallel-tests ~unstable --remainder'
-    - SCRIPT='script/parallel-tests unstable'
-    - SCRIPT='script/benchmarks uniform_small'
-    - SCRIPT='script/benchmarks uniform_medium'
-    - SCRIPT='script/benchmarks uniform_large'
-    - SCRIPT='script/benchmarks normal_small'
-    - SCRIPT='script/benchmarks normal_medium'
-    - SCRIPT='script/benchmarks normal_large'
-    - SCRIPT='rubocop lib'
-matrix:
-  allow_failures:
-    - rvm: rbx-3
-    - env: SCRIPT='script/parallel-tests unstable'
-  exclude:
-    - rvm: 2.6
-      env: SCRIPT='rubocop lib'
-    - rvm: 2.5
-      env: SCRIPT='rubocop lib'
-    - rvm: 2.4
-      env: SCRIPT='rubocop lib'
-    - rvm: 2.3
-      env: SCRIPT='rubocop lib'
-    - rvm: 2.2
-      env: SCRIPT='rubocop lib'
-    - rvm: jruby-9.2.9.0
-      env: SCRIPT='rubocop lib'
-    - rvm: rbx-3
-      env: SCRIPT='rubocop lib'
-
-script: "bundle exec $SCRIPT"
-branches:
-  only:
-    - master
-    - travis