moneta 1.4.0 → 1.5.0

data/lib/moneta/server.rb

@@ -4,14 +4,17 @@ module Moneta
   # Moneta server to be used together with Moneta::Adapters::Client
   # @api public
   class Server
-    TIMEOUT = 1
-    MAXSIZE = 0x100000
+    include Config
+
+    config :timeout, default: 1
+    config :max_size, default: 0x100000
 
     # @api private
     class Connection
-      def initialize(io, store)
+      def initialize(io, store, max_size)
         @io = io
         @store = store
+        @max_size = max_size
         @fiber = Fiber.new { run }
       end
 
@@ -58,7 +61,7 @@ module Moneta
 
       def read_msg
         size = read(4).unpack('N').first
-        throw :closed, 'Message too big' if size > MAXSIZE
+        throw :closed, 'Message too big' if size > @max_size
         Marshal.load(read(size))
       end
 
@@ -155,9 +158,13 @@ module Moneta
     # @param [Hash] options
     # @option options [Integer] :port (9000) TCP port
     # @option options [String] :socket Alternative Unix socket file name
+    # @option options [Integer] :timeout (1) Number of seconds to timeout on IO.select
+    # @option options [Integer] :max_size (0x100000) Maximum number of bytes
+    #   allowed to be sent by clients in requests
     def initialize(store, options = {})
+      options = configure(**options)
       @store = store
-      @server = start(options)
+      @server = start(**options)
       @ios = [@server]
       @reads = @ios.dup
       @writes = []
@@ -187,7 +194,7 @@ module Moneta
         @ios
           .reject { |io| io == @server }
           .each { |io| close_connection(io) }
-        File.unlink(@socket) if @socket rescue nil
+        File.unlink(config.socket) if config.socket rescue nil
       end
     end
 
@@ -202,7 +209,7 @@ module Moneta
     private
 
     def mainloop
-      if ready = IO.select(@reads, @writes, @ios, TIMEOUT)
+      if ready = IO.select(@reads, @writes, @ios, config.timeout)
         reads, writes, errors = ready
         errors.each { |io| close_connection(io) }
 
@@ -229,7 +236,7 @@ module Moneta
 
     def accept_connection
       io = @server.accept
-      @connections[io] = Connection.new(io, @store)
+      @connections[io] = Connection.new(io, @store, config.max_size)
       @ios << io
       resume(io)
     ensure
@@ -261,21 +268,21 @@ module Moneta
       end
     end
 
-    def start(options)
-      if @socket = options[:socket]
+    def start(host: '127.0.0.1', port: 9000, socket: nil)
+      if socket
         begin
-          UNIXServer.open(@socket)
+          UNIXServer.open(socket)
         rescue Errno::EADDRINUSE
-          if client = (UNIXSocket.open(@socket) rescue nil)
+          if client = (UNIXSocket.open(socket) rescue nil)
             client.close
             raise
           end
-          File.unlink(@socket)
+          File.unlink(socket)
           tries ||= 0
           (tries += 1) < 3 ? retry : raise
         end
       else
-        TCPServer.open(options[:host] || '127.0.0.1', options[:port] || 9000)
+        TCPServer.open(host, port)
       end
     end
 

data/lib/moneta/version.rb

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

data/lib/moneta/wrapper.rb

@@ -71,5 +71,10 @@ module Moneta
     def merge!(pairs, options = {})
       wrap(:merge!, pairs, options) { super }
     end
+
+    # (see Proxy#config)
+    def config
+      wrap(:config) { super }
+    end
   end
 end

data/lib/moneta.rb

@@ -3,9 +3,11 @@
 # * {Moneta.new}
 # * {Moneta.build}
 module Moneta
+  autoload :Adapter,           'moneta/adapter'
   autoload :Builder,           'moneta/builder'
   autoload :Cache,             'moneta/cache'
   autoload :CreateSupport,     'moneta/create_support'
+  autoload :Config,            'moneta/config'
   autoload :DBMAdapter,        'moneta/dbm_adapter'
   autoload :Defaults,          'moneta/defaults'
   autoload :EachKeySupport,    'moneta/each_key_support'

data/moneta.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.3.0'
 
+  s.add_development_dependency 'multi_json', '~> 1.15.0'
   s.add_development_dependency 'parallel_tests', '~> 2.29.2'
   s.add_development_dependency 'rantly', '~> 1.2.0'
   s.add_development_dependency 'rspec', '~> 3.0'

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

@@ -10,7 +10,6 @@ require 'rantly'
 require 'rantly/rspec_extensions'
 # rantly/shrinks
 require 'timecop'
-require_relative 'support/mongo_helper'
 
 class MonetaParallelFormatter < RSpec::Core::Formatters::BaseTextFormatter
   def start(*args)
@@ -214,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,
@@ -261,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
@@ -366,7 +378,6 @@ RSpec.configure do |config|
 
   config.extend MonetaHelpers::ClassMethods
   config.include MonetaHelpers::InstanceMethods
-  config.include MongoHelper, adapter: :Mongo
 end
 
 # FIXME: Get rid of this once raise_error expectations no longer generate

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/client/client_helper.rb

@@ -12,13 +12,14 @@ RSpec.shared_context :start_server do |**options|
       puts "Failed to start server - #{ex.message}"
       tries ||= 0
       tries += 1
-      sleep Moneta::Server::TIMEOUT
+      timeout = options[:timeout] || Moneta::Server.config_defaults[:timeout]
+      sleep 1
       tries < 3 ? retry : raise
     end
   end
 
   after :context do
-    @server.stop
-    @thread.join
+    @server&.stop
+    @thread&.join
   end
 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
     }

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/faraday_helper.rb

@@ -1,9 +1,10 @@
 RSpec.shared_context :faraday_adapter do
   before :context do
-    require 'faraday/adapter/manticore' if defined?(JRUBY_VERSION)
+    #require 'faraday/adapter/manticore' if defined?(JRUBY_VERSION)
   end
 
   let(:faraday_adapter) do
-    defined?(JRUBY_VERSION) ? :manticore : :net_http
+    #defined?(JRUBY_VERSION) ? :manticore : :net_http
+    :net_http
   end
 end

data/spec/moneta/adapters/lruhash/adapter_lruhash_spec.rb

@@ -52,8 +52,10 @@ describe 'adapter_lruhash', adapter: :LRUHash do
 
   it 'adds a value that is as large as the default max_size when max_size is missing' do
     store = Moneta::Adapters::LRUHash.new
+    expect(store.config.max_size).to eq Moneta::Adapters::LRUHash.config_defaults[:max_size]
+
     large_item = 'Really big'
-    allow(large_item).to receive(:bytesize).and_return(Moneta::Adapters::LRUHash::DEFAULT_MAX_SIZE)
+    allow(large_item).to receive(:bytesize).and_return(Moneta::Adapters::LRUHash.config_defaults[:max_size])
     store[:really_big] = large_item
     store[:really_big].should eq(large_item)
   end
@@ -61,7 +63,7 @@ describe 'adapter_lruhash', adapter: :LRUHash do
   it 'does not add values that are larger than the default max_size when max_size is missing' do
     store = Moneta::Adapters::LRUHash.new
     large_item = 'Really big'
-    allow(large_item).to receive(:bytesize).and_return(Moneta::Adapters::LRUHash::DEFAULT_MAX_SIZE + 1)
+    allow(large_item).to receive(:bytesize).and_return(Moneta::Adapters::LRUHash.config_defaults[:max_size] + 1)
     store[:really_big] = large_item
     store[:really_big].should be_nil
   end
@@ -69,7 +71,7 @@ describe 'adapter_lruhash', adapter: :LRUHash do
   it 'adds values that are larger than the default max_size when max_size is nil' do
     store = Moneta::Adapters::LRUHash.new(max_size: nil)
     large_item = 'Really big'
-    allow(large_item).to receive(:bytesize).and_return(Moneta::Adapters::LRUHash::DEFAULT_MAX_SIZE + 1)
+    allow(large_item).to receive(:bytesize).and_return(Moneta::Adapters::LRUHash.config_defaults[:max_size] + 1)
     store[:really_big] = large_item
     store[:really_big].should eq(large_item)
   end
@@ -94,7 +96,8 @@ describe 'adapter_lruhash', adapter: :LRUHash do
   end
 
   it 'only allows the default number of items when max_count is missing' do
-    stub_const('Moneta::Adapters::LRUHash::DEFAULT_MAX_COUNT', 5)
+    defaults = Moneta::Adapters::LRUHash.config_defaults
+    allow(Moneta::Adapters::LRUHash).to receive(:config_defaults).and_return(defaults.merge(max_count: 5))
     store = Moneta::Adapters::LRUHash.new(max_value: nil, max_size: nil)
     (1..6).each { |n| store[n] = n }
     store.key?(1).should be false
@@ -103,8 +106,9 @@ describe 'adapter_lruhash', adapter: :LRUHash do
     store[6].should eq(6)
   end
 
-  it 'adds more values than DEFAULT_MAX_COUNT allows when max_count is nil' do
-    stub_const('Moneta::Adapters::LRUHash::DEFAULT_MAX_COUNT', 5)
+  it 'adds more values than the default max_count allows when max_count is nil' do
+    defaults = Moneta::Adapters::LRUHash.config_defaults
+    allow(Moneta::Adapters::LRUHash).to receive(:config_defaults).and_return(defaults.merge(max_count: 5))
     store = Moneta::Adapters::LRUHash.new(max_count: nil, max_value: nil, max_size: nil)
     (1..6).each { |n| store[n] = n }
     store[1].should eq(1)

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