moneta 1.4.1 → 1.5.1

data/spec/rack/session_moneta_spec.rb

@@ -4,30 +4,50 @@ require 'rack/mock'
 require 'thread'
 
 describe Rack::Session::Moneta do
-  session_key = Rack::Session::Moneta::DEFAULT_OPTIONS[:key]
-  session_match = /#{session_key}=([0-9a-fA-F]+);/
-  incrementor = lambda do |env|
-    env["rack.session"]["counter"] ||= 0
-    env["rack.session"]["counter"] += 1
-    Rack::Response.new(env["rack.session"].inspect).to_a
+  use_timecop
+
+  let(:session_key) { Rack::Session::Moneta::DEFAULT_OPTIONS[:key] }
+  let(:session_match) { /#{session_key}=([0-9a-fA-F]+);/ }
+
+  let :incrementor_proc do
+    lambda do |env|
+      env["rack.session"]["counter"] ||= 0
+      env["rack.session"]["counter"] += 1
+      Rack::Response.new(env["rack.session"].inspect).to_a
+    end
+  end
+
+  let :drop_session do
+    Rack::Lint.new(proc do |env|
+                     env['rack.session.options'][:drop] = true
+                     incrementor_proc.call(env)
+                   end)
+  end
+
+  let :renew_session do
+    Rack::Lint.new(proc do |env|
+                     env['rack.session.options'][:renew] = true
+                     incrementor_proc.call(env)
+                   end)
+  end
+
+  let :defer_session do
+    Rack::Lint.new(proc do |env|
+                     env['rack.session.options'][:defer] = true
+                     incrementor_proc.call(env)
+                   end)
+  end
+
+  let :skip_session do
+    Rack::Lint.new(proc do |env|
+                     env['rack.session.options'][:skip] = true
+                     incrementor_proc.call(env)
+                   end)
+  end
+
+  let :incrementor do
+    Rack::Lint.new(incrementor_proc)
   end
-  drop_session = Rack::Lint.new(proc do |env|
-                                  env['rack.session.options'][:drop] = true
-                                  incrementor.call(env)
-                                end)
-  renew_session = Rack::Lint.new(proc do |env|
-                                   env['rack.session.options'][:renew] = true
-                                   incrementor.call(env)
-                                 end)
-  defer_session = Rack::Lint.new(proc do |env|
-                                   env['rack.session.options'][:defer] = true
-                                   incrementor.call(env)
-                                 end)
-  skip_session = Rack::Lint.new(proc do |env|
-                                  env['rack.session.options'][:skip] = true
-                                  incrementor.call(env)
-                                end)
-  incrementor = Rack::Lint.new(incrementor)
 
   it 'supports different constructors' do
     Rack::Session::Moneta.new(incrementor, :store => :Memory)
@@ -96,8 +116,7 @@ describe Rack::Session::Moneta do
     res = Rack::MockRequest.new(pool).get('/', "HTTP_COOKIE" => cookie)
     res["Set-Cookie"].should == cookie
     res.body.should include '"counter"=>2'
-    puts 'Sleeping to expire session' if $DEBUG
-    sleep 4
+    advance 4
     res = Rack::MockRequest.new(pool).get('/', "HTTP_COOKIE" => cookie)
     res["Set-Cookie"].should_not == cookie
     res.body.should include '"counter"=>1'

data/spec/restserver.rb

@@ -1,18 +1,7 @@
 require 'faraday'
 require 'rack'
 require 'rack/moneta_rest'
-
-MONETA_RESTSERVER_LOGGER =
-  if defined?(JRUBY_VERSION)
-    require 'rjack-logback'
-    RJack::Logback.config_console( :level => :off )
-    require 'fishwife'
-    nil
-  else
-    require 'webrick'
-    # Keep webrick quiet
-    WEBrick::Log.new($stderr, WEBrick::BasicLog::ERROR)
-  end
+require 'webrick'
 
 class MonetaRestServerShutdown < StandardError; end
 
@@ -25,10 +14,10 @@ def start_restserver(port)
       end
     end,
     :environment => 'none',
-    :server => defined?(JRUBY_VERSION) ? :Fishwife : :webrick,
+    :server => :webrick,
     :Port => port,
     :AccessLog => [],
-    :Logger => MONETA_RESTSERVER_LOGGER
+    :Logger => WEBrick::Log.new($stderr, WEBrick::BasicLog::ERROR)
   )
 
   Thread.start { server.start }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moneta
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.1
 platform: ruby
 authors:
 - Daniel Mendler
@@ -11,8 +11,22 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2022-04-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.15.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: parallel_tests
   requirement: !ruby/object:Gem::Requirement
@@ -110,10 +124,10 @@ extra_rdoc_files:
 - SPEC.md
 - LICENSE
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - ".yardopts"
 - CHANGES
 - CONTRIBUTORS
@@ -125,6 +139,7 @@ files:
 - lib/action_dispatch/middleware/session/moneta_store.rb
 - lib/active_support/cache/moneta_store.rb
 - lib/moneta.rb
+- lib/moneta/adapter.rb
 - lib/moneta/adapters/activerecord.rb
 - lib/moneta/adapters/activesupportcache.rb
 - lib/moneta/adapters/cassandra.rb
@@ -166,6 +181,7 @@ files:
 - lib/moneta/adapters/yaml.rb
 - lib/moneta/builder.rb
 - lib/moneta/cache.rb
+- lib/moneta/config.rb
 - lib/moneta/create_support.rb
 - lib/moneta/dbm_adapter.rb
 - lib/moneta/defaults.rb
@@ -299,10 +315,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 +338,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
@@ -357,6 +370,7 @@ files:
 - spec/moneta/adapters/yaml/standard_yaml_spec.rb
 - spec/moneta/adapters/yaml/standard_yaml_with_expires_spec.rb
 - spec/moneta/builder_spec.rb
+- spec/moneta/config_spec.rb
 - spec/moneta/mutex_spec.rb
 - spec/moneta/proxies/cache/cache_file_memory_spec.rb
 - spec/moneta/proxies/cache/cache_memory_null_spec.rb
@@ -369,7 +383,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 +446,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.5.1/CHANGES
+  documentation_uri: https://www.rubydoc.info/gems/moneta/1.5.1
+  source_code_uri: https://github.com/moneta-rb/moneta/tree/v1.5.1
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -451,7 +464,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: A unified interface to key/value stores, including Redis, Memcached, TokyoCabinet,
@@ -545,10 +558,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 +581,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
@@ -603,6 +613,7 @@ test_files:
 - spec/moneta/adapters/yaml/standard_yaml_spec.rb
 - spec/moneta/adapters/yaml/standard_yaml_with_expires_spec.rb
 - spec/moneta/builder_spec.rb
+- spec/moneta/config_spec.rb
 - spec/moneta/mutex_spec.rb
 - spec/moneta/proxies/cache/cache_file_memory_spec.rb
 - spec/moneta/proxies/cache/cache_memory_null_spec.rb
@@ -615,7 +626,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

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

@@ -1,15 +0,0 @@
-require_relative '../../memcached_helper.rb'
-
-describe 'adapter_memcached_dalli_with_default_expires', isolate: true, retry: 3, adapter: :Memcached do
-  # See https://github.com/memcached/memcached/issues/307
-  let(:t_res) { 1 }
-  let(:min_ttl) { 2 }
-
-  include_context :start_memcached, 11221
-
-  moneta_build do
-    Moneta::Adapters::MemcachedDalli.new(server: '127.0.0.1:11221', expires: min_ttl)
-  end
-
-  moneta_specs ADAPTER_SPECS.with_native_expires.with_default_expires
-end

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

@@ -1,15 +0,0 @@
-require_relative '../../memcached_helper.rb'
-
-describe 'adapter_memcached_native_with_default_expires', isolate: true, unstable: defined?(JRUBY_VERSION), retry: 3, adapter: :Memcached do
-  # See https://github.com/memcached/memcached/issues/307
-  let(:t_res) { 1 }
-  let(:min_ttl) { 2 }
-
-  include_context :start_memcached, 11222
-
-  moneta_build do
-    Moneta::Adapters::MemcachedNative.new(server: '127.0.0.1:11222', expires: min_ttl)
-  end
-
-  moneta_specs ADAPTER_SPECS.with_native_expires.with_default_expires
-end

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

@@ -1,10 +0,0 @@
-describe 'adapter_redis_with_default_expires', isolate: true, adapter: :Redis do
-  let(:t_res) { 0.125 }
-  let(:min_ttl) { t_res }
-
-  moneta_build do
-    Moneta::Adapters::Redis.new(db: 7, expires: min_ttl)
-  end
-
-  moneta_specs ADAPTER_SPECS.with_each_key.with_native_expires.with_default_expires
-end

data/spec/moneta/proxies/proxy/proxy_redis_spec.rb

@@ -1,13 +0,0 @@
-describe "proxy_redis", proxy: :Proxy do
-  let(:t_res) { 0.125 }
-  let(:min_ttl) { t_res }
-
-  moneta_build do
-    Moneta.build do
-      use :Proxy
-      adapter :Redis, db: 5
-    end
-  end
-
-  moneta_specs ADAPTER_SPECS.with_each_key.with_expires
-end