moneta 1.2.0 → 1.4.2

data/spec/moneta/adapters/couch/standard_couch_spec.rb

@@ -4,12 +4,12 @@ describe "standard_couch", adapter: :Couch do
   include_context :faraday_adapter
 
   moneta_store :Couch do
-    { db: 'standard_couch', adapter: faraday_adapter }
+    { db: 'standard_couch', adapter: faraday_adapter, login: couch_login, password: couch_password }
   end
 
   moneta_loader do |value|
     ::Marshal.load(value.unpack('m').first)
   end
 
-  moneta_specs STANDARD_SPECS.without_increment
+  moneta_specs STANDARD_SPECS.without_increment.with_each_key
 end

data/spec/moneta/adapters/couch/standard_couch_with_expires_spec.rb

@@ -8,12 +8,12 @@ describe "standard_couch_with_expires", adapter: :Couch do
   include_context :faraday_adapter
 
   moneta_store :Couch do
-    { db: 'standard_couch_with_expires', adapter: faraday_adapter, expires: true }
+    { db: 'standard_couch_with_expires', adapter: faraday_adapter, expires: true, login: couch_login, password: couch_password }
   end
 
   moneta_loader do |value|
     ::Marshal.load(value.unpack('m').first)
   end
 
-  moneta_specs STANDARD_SPECS.without_increment.with_expires
+  moneta_specs STANDARD_SPECS.without_increment.with_expires.with_each_key
 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/daybreak/standard_daybreak_spec.rb

@@ -3,5 +3,5 @@ describe 'standard_daybreak', adapter: :Daybreak do
     {file: File.join(tempdir, "simple_daybreak")}
   end
 
-  moneta_specs STANDARD_SPECS.without_multiprocess
+  moneta_specs STANDARD_SPECS.without_multiprocess.with_each_key
 end

data/spec/moneta/adapters/daybreak/standard_daybreak_with_expires_spec.rb

@@ -7,5 +7,5 @@ describe 'standard_daybreak_with_expires', adapter: :Daybreak do
     {file: File.join(tempdir, "simple_daybreak_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/dbm/standard_dbm_spec.rb

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

data/spec/moneta/adapters/dbm/standard_dbm_with_expires_spec.rb

@@ -8,5 +8,5 @@ describe 'standard_dbm_with_expires', unsupported: defined?(JRUBY_VERSION), adap
       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/file/standard_file_spec.rb

@@ -2,6 +2,6 @@ describe 'standard_file', adapter: :File do
   moneta_store :File do
     {dir: File.join(tempdir, "simple_file")}
   end
-  
-  moneta_specs STANDARD_SPECS
+
+  moneta_specs STANDARD_SPECS.with_each_key
 end

data/spec/moneta/adapters/file/standard_file_with_expires_spec.rb

@@ -7,5 +7,5 @@ describe 'standard_file_with_expires', adapter: :File do
     {dir: File.join(tempdir, "simple_file_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/gdbm/standard_gdbm_spec.rb

@@ -3,5 +3,5 @@ describe 'standard_gdbm', adapter: :GDBM do
     {file: File.join(tempdir, "simple_gdbm")}
   end
 
-  moneta_specs STANDARD_SPECS.without_multiprocess
+  moneta_specs STANDARD_SPECS.without_multiprocess.with_each_key
 end

data/spec/moneta/adapters/gdbm/standard_gdbm_with_expires_spec.rb

@@ -7,5 +7,5 @@ describe 'standard_gdbm_with_expires', adapter: :GDBM do
     {file: File.join(tempdir, "simple_gdbm_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/kyotocabinet/adapter_kyotocabinet_spec.rb

@@ -1,4 +1,4 @@
-describe 'adapter_kyotocabinet', unsupported: defined?(JRUBY_VERSION), adapter: :KyotoCabinet do
+describe 'adapter_kyotocabinet', unsupported: defined?(JRUBY_VERSION) || ::Gem::Version.new(RUBY_ENGINE_VERSION) >= ::Gem::Version.new('2.7.0'), adapter: :KyotoCabinet do
   moneta_build do
     Moneta::Adapters::KyotoCabinet.new(file: File.join(tempdir, "adapter_kyotocabinet.kch"))
   end

data/spec/moneta/adapters/kyotocabinet/standard_kyotocabinet_spec.rb

@@ -1,7 +1,7 @@
-describe 'standard_kyotocabinet', unsupported: defined?(JRUBY_VERSION), adapter: :KyotoCabinet do
+describe 'standard_kyotocabinet', unsupported: defined?(JRUBY_VERSION) || ::Gem::Version.new(RUBY_ENGINE_VERSION) >= ::Gem::Version.new('2.7.0'), adapter: :KyotoCabinet do
   moneta_store :KyotoCabinet do
     {file: File.join(tempdir, "simple_kyotocabinet.kch")}
   end
 
-  moneta_specs STANDARD_SPECS.without_multiprocess
+  moneta_specs STANDARD_SPECS.without_multiprocess.with_each_key
 end

data/spec/moneta/adapters/kyotocabinet/standard_kyotocabinet_with_expires_spec.rb

@@ -1,4 +1,4 @@
-describe 'standard_kyotocabinet_with_expires', unsupported: defined?(JRUBY_VERSION), adapter: :KyotoCabinet do
+describe 'standard_kyotocabinet_with_expires', unsupported: defined?(JRUBY_VERSION)|| ::Gem::Version.new(RUBY_ENGINE_VERSION) >= ::Gem::Version.new('2.7.0'), adapter: :KyotoCabinet do
   let(:t_res) { 0.125 }
   let(:min_ttl) { t_res }
   use_timecop
@@ -10,5 +10,5 @@ describe 'standard_kyotocabinet_with_expires', unsupported: defined?(JRUBY_VERSI
     }
   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/leveldb/standard_leveldb_spec.rb

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

data/spec/moneta/adapters/leveldb/standard_leveldb_with_expires_spec.rb

@@ -7,5 +7,5 @@ describe 'standard_leveldb_with_expires', unsupported: defined?(JRUBY_VERSION),
     {dir: File.join(tempdir, "standard_leveldb_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/lmdb/standard_lmdb_spec.rb

@@ -3,5 +3,5 @@ describe 'standard_lmdb', unsupported: defined?(JRUBY_VERSION), adapter: :LMDB d
     {dir: File.join(tempdir, "simple_lmdb")}
   end
 
-  moneta_specs STANDARD_SPECS.without_concurrent
+  moneta_specs STANDARD_SPECS.without_concurrent.with_each_key
 end

data/spec/moneta/adapters/lmdb/standard_lmdb_with_expires_spec.rb

@@ -7,5 +7,5 @@ describe 'standard_lmdb_with_expires', unsupported: defined?(JRUBY_VERSION), ada
     {dir: File.join(tempdir, "simple_lmdb_with_expires"), expires: true}
   end
 
-  moneta_specs STANDARD_SPECS.without_concurrent.with_expires
+  moneta_specs STANDARD_SPECS.without_concurrent.with_expires.with_each_key
 end

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

@@ -1,4 +1,4 @@
 describe 'standard_lruhash', adapter: :LRUHash do
   moneta_store :LRUHash
-  moneta_specs STANDARD_SPECS.without_persist
+  moneta_specs STANDARD_SPECS.without_persist.with_each_key
 end

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

@@ -4,5 +4,5 @@ describe 'standard_lruhash_with_expires', adapter: :LRUHash do
   use_timecop
 
   moneta_store :LRUHash, {expires: true}
-  moneta_specs STANDARD_SPECS.with_expires.without_persist
+  moneta_specs STANDARD_SPECS.with_expires.without_persist.with_each_key
 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/memory/standard_memory_spec.rb

@@ -1,4 +1,4 @@
 describe 'standard_memory', adapter: :Memory do
   moneta_store :Memory
-  moneta_specs STANDARD_SPECS.without_persist
+  moneta_specs STANDARD_SPECS.without_persist.with_each_key
 end

data/spec/moneta/adapters/memory/standard_memory_with_compress_spec.rb

@@ -5,5 +5,5 @@ describe 'standard_memory_with_compress', adapter: :Memory do
     Marshal.load(::Zlib::Inflate.inflate(value))
   end
 
-  moneta_specs STANDARD_SPECS.without_persist
+  moneta_specs STANDARD_SPECS.without_persist.with_each_key
 end

data/spec/moneta/adapters/memory/standard_memory_with_expires_spec.rb

@@ -4,5 +4,5 @@ describe 'standard_memory_with_expires', adapter: :Memory do
   use_timecop
 
   moneta_store :Memory, {expires: true}
-  moneta_specs STANDARD_SPECS.with_expires.without_persist
+  moneta_specs STANDARD_SPECS.with_expires.without_persist.with_each_key
 end

data/spec/moneta/adapters/memory/standard_memory_with_json_key_serializer_spec.rb

@@ -1,4 +1,4 @@
 describe 'standard_memory_with_json_key_serializer', adapter: :Memory do
   moneta_store :Memory, {key_serializer: :json}
-  moneta_specs STANDARD_SPECS.without_marshallable_key.simplekeys_only.without_persist
+  moneta_specs STANDARD_SPECS.without_marshallable_key.simplekeys_only.without_persist.with_each_key
 end

data/spec/moneta/adapters/memory/standard_memory_with_json_serializer_spec.rb

@@ -5,5 +5,5 @@ describe 'standard_memory_with_json_serializer', adapter: :Memory do
     ::MultiJson.load(value)
   end
 
-  moneta_specs STANDARD_SPECS.without_marshallable.simplekeys_only.simplevalues_only.without_persist
+  moneta_specs STANDARD_SPECS.without_marshallable.simplekeys_only.simplevalues_only.without_persist.with_each_key
 end

data/spec/moneta/adapters/memory/standard_memory_with_json_value_serializer_spec.rb

@@ -4,6 +4,6 @@ describe 'standard_memory_with_json_value_serializer', adapter: :Memory do
   moneta_loader do |value|
     ::MultiJson.load(value)
   end
-  
-  moneta_specs STANDARD_SPECS.without_marshallable_value.simplevalues_only.without_persist
+
+  moneta_specs STANDARD_SPECS.without_marshallable_value.simplevalues_only.without_persist.with_each_key
 end

data/spec/moneta/adapters/memory/standard_memory_with_prefix_spec.rb

@@ -1,4 +1,41 @@
 describe 'standard_memory_with_prefix', adapter: :Memory do
-  moneta_store :Memory, {prefix: "moneta"}
-  moneta_specs STANDARD_SPECS.without_persist
+  moneta_store :Memory, { prefix: "moneta" }
+  moneta_specs STANDARD_SPECS.without_persist.with_each_key
+
+  context 'with keys from no prefix' do
+    before(:each) do
+      store.adapter.adapter.backend['no_prefix'] = 'hidden'
+    end
+
+    after(:each) do
+      expect(store.adapter.adapter.backend.keys).to include('no_prefix')
+    end
+
+    include_examples :each_key
+  end
+
+  context 'with keys from other prefixes' do
+    before do
+      backend = store.adapter.adapter.backend
+      @alternative_store ||= Moneta.build do
+        use :Transformer, key: [:marshal, :prefix], value: :marshal, prefix: 'alternative_'
+        adapter :Memory, backend: backend
+      end
+      expect(@alternative_store).to be_a(Moneta::Transformer::MarshalPrefixKeyMarshalValue)
+    end
+    let(:alternative) { @alternative_store }
+
+    before(:each) do
+      alternative.store('with_prefix_key', 'hidden')
+    end
+
+    after(:each) do
+      expect(store.adapter.adapter.backend.keys).to include('alternative_with_prefix_key')
+      expect(alternative.each_key.to_a).to eq(['with_prefix_key'])
+      expect(alternative['with_prefix_key']).to eq('hidden')
+    end
+
+    include_examples :each_key
+  end
+
 end

data/spec/moneta/adapters/memory/standard_memory_with_snappy_compress_spec.rb

@@ -4,6 +4,6 @@ describe 'standard_memory_with_snappy_compress', unstable: defined?(JRUBY_VERSIO
   moneta_loader do |value|
     Marshal.load(::Snappy.inflate(value))
   end
-  
-  moneta_specs STANDARD_SPECS.without_persist
+
+  moneta_specs STANDARD_SPECS.without_persist.with_each_key
 end

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

@@ -2,10 +2,40 @@ describe 'adapter_mongo', adapter: :Mongo do
   let(:t_res) { 0.125 }
   let(:min_ttl) { t_res }
 
+  let(:database) { File.basename(__FILE__, '.rb') }
+
   moneta_build do
-    Moneta::Adapters::Mongo.new(db: "adapter_mongo",
-                                collection: 'default')
+    Moneta::Adapters::Mongo.new(
+      database: database,
+      collection: 'adapter_mongo'
+    )
   end
 
   moneta_specs ADAPTER_SPECS.with_each_key.with_native_expires.simplevalues_only
+
+  it 'automatically deletes expired document' do
+    store.store('key', 'val', expires: 5)
+
+    i = 0
+    query = store.instance_variable_get(:@collection).find(_id: ::BSON::Binary.new('key'))
+    while i < 70 && query.first
+      i += 1
+      sleep 1 # Mongo needs up to 60 seconds
+    end
+
+    i.should be > 0 # Indicates that it took at least one sleep to expire
+    query.count.should == 0
+  end
+
+  it 'uses the database specified via the :database option' do
+    expect(store.backend.database.name).to eq database
+  end
+
+  it 'uses the database specified via the :db option' do
+    store = Moneta::Adapters::Mongo.new(
+      db: database,
+      collection: 'adapter_mongo'
+    )
+    expect(store.backend.database.name).to eq database
+  end
 end