moneta 1.1.0 → 1.4.0

data/spec/moneta/adapters/client/standard_client_unix_spec.rb

@@ -1,12 +1,28 @@
-describe "standard_client_unix", isolate: true, adapter: :Client do
-  before :all do
-    start_server Moneta::Adapters::Memory.new,
-                 socket: File.join(tempdir, 'standard_client_unix')
-  end
+require_relative './client_helper.rb'
+
+describe "standard_client_unix", adapter: :Client do
+  include_context :start_server,
+                  backend: ->{ Moneta::Adapters::Memory.new },
+                  socket: ->{ File.join(tempdir, 'standard_client_unix') }
 
   moneta_store :Client do
-    {socket: File.join(tempdir, 'standard_client_unix')}
+    { socket: File.join(tempdir, 'standard_client_unix') }
   end
 
-  moneta_specs STANDARD_SPECS
+  moneta_specs STANDARD_SPECS.with_each_key
+
+  it 'supports multiple clients' do
+    store['shared_key'] = 'shared_val'
+    threads = (1..32).map do |i|
+      Thread.new do
+        client = new_store
+        (1..31).each do |j|
+          client['shared_key'].should == 'shared_val'
+          client["key-\#{j}-\#{i}"] = "val-\#{j}-\#{i}"
+          client["key-\#{j}-\#{i}"].should == "val-\#{j}-\#{i}"
+        end
+      end
+    end
+    threads.map(&:join)
+  end
 end

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

@@ -1,7 +1,204 @@
-describe 'adapter_couch', isolate: true, adapter: :Couch do
+require_relative '../faraday_helper.rb'
+
+describe 'adapter_couch', adapter: :Couch do
+  include_context :faraday_adapter
+
   moneta_build do
-    Moneta::Adapters::Couch.new(db: 'adapter_couch')
+    Moneta::Adapters::Couch.new(db: 'adapter_couch', adapter: faraday_adapter, login: couch_login, password: couch_password)
   end
 
   moneta_specs ADAPTER_SPECS.without_increment.simplevalues_only.without_path.with_each_key
+
+  shared_examples :batch do
+    shared_examples :no_batch do
+      it "does not add 'batch=ok' to the query'" do
+        expect(store).not_to receive(:request).with(any_args, hash_including(query: hash_including(batch: 'ok')))
+        expect(store).to receive(:request)
+        store.public_send(m, *args, options)
+      end
+    end
+
+    context 'without a :batch option' do
+      let(:options) { {} }
+      include_examples(:no_batch)
+    end
+
+    context 'with batch: false' do
+      let(:options) { { batch: false } }
+      include_examples(:no_batch)
+    end
+
+    context 'with batch: true' do
+      let(:options) { { batch: true } }
+
+      it "adds 'batch=ok' to the query'" do
+        expect(store).to receive(:request).with(instance_of(Symbol), instance_of(String), any_args,
+                                                hash_including(expect: 202, query: hash_including(batch: 'ok')))
+        store.public_send(m, *args, options)
+      end
+    end
+  end
+
+  shared_examples :full_commit do
+    context 'without a :full_commit option' do
+      let(:options) { {} }
+
+      it "does not add a 'X-Couch-Full-Commit' header'" do
+        expect(store).not_to receive(:request)
+          .with(any_args, hash_including(headers: hash_including('X-Couch-Full-Commit' => instance_of(String))))
+        expect(store).to receive(:request).ordered
+        store.public_send(m, *args, options)
+      end
+    end
+
+    context 'with full_commit: true' do
+      let(:options) { { full_commit: true } }
+
+      it "adds 'X-Couch-Full-Commit: true' to the headers'" do
+        expect(store).to receive(:request)
+          .with(instance_of(Symbol), instance_of(String), any_args,
+                hash_including(headers: hash_including('X-Couch-Full-Commit' => 'true')))
+          .ordered
+        store.public_send(m, *args, options)
+      end
+    end
+
+    context 'with full_commit: false' do
+      let(:options) { { full_commit: false } }
+
+      it "adds 'X-Couch-Full-Commit: false' to the headers'" do
+        expect(store).to receive(:request)
+          .with(instance_of(Symbol), instance_of(String), any_args,
+                hash_including(headers: hash_including('X-Couch-Full-Commit' => 'false')))
+          .ordered
+        store.public_send(m, *args, options)
+      end
+    end
+  end
+
+  describe '#store' do
+    let(:m) { :store }
+    let(:args) { ['a', 'b'] }
+
+    include_examples :batch
+    include_examples :full_commit
+  end
+
+  describe '#delete' do
+    let(:m) { :delete }
+    let(:args) { ['a'] }
+
+    before do
+      expect(store).to receive(:request).with(:get, 'a', any_args).ordered do
+        Faraday::Response.new(
+          Faraday::Env.from(status: 200,
+                            body: '{"type":"Hash","test":1}',
+                            response_headers: { 'ETag' => '"testrev"' }))
+      end
+    end
+
+    include_examples :batch
+    include_examples :full_commit
+  end
+
+  describe '#merge!' do
+    let(:m) { :merge! }
+    let(:args) { [{'a' => '1'}] }
+
+    before do
+      expect(store).to receive(:request).with(:post, '_all_docs', any_args).ordered do
+        { 'rows' => [] }
+      end
+
+      allow(store).to receive(:request).with(:post, '_bulk_docs', any_args) do
+        [
+          {
+            "ok" => true,
+            "id" => 'a',
+            "rev" => 'testrev'
+          }
+        ]
+      end
+    end
+
+    include_examples :full_commit
+  end
+
+  describe '#clear' do
+    context 'changing full commit behaviour' do
+      let(:m) { :clear }
+      let(:args) { [] }
+
+      # This will make the clear method proceed to deletion
+      before do
+        responses = [
+          {
+            'rows' => [
+              {
+                'id' => 'test',
+                'value' => {
+                  'rev' => 'testrev'
+                }
+              }
+            ]
+          },
+          { 'rows' => [] }
+        ]
+
+        expect(store).to receive(:request).at_least(:once).with(:get, '_all_docs', any_args).ordered do
+          responses.shift
+        end
+      end
+
+      include_examples :full_commit
+    end
+
+    shared_examples :no_compact do
+      it 'does not post to the _compact endpoint' do
+        expect(store).not_to receive(:post).with('_compact', any_args)
+        store.clear(options)
+      end
+    end
+
+    context 'without a :compact option' do
+      let(:options) { {} }
+      include_examples :no_compact
+    end
+
+    context 'with compact: true' do
+      it 'posts to the _compact endpoint' do
+        expect(store).to receive(:post).with('_compact', any_args)
+        store.clear(compact: true)
+      end
+    end
+
+    context 'with compact: false' do
+      let(:options) { { compact: false } }
+      include_examples :no_compact
+    end
+
+    context 'with await_compact: true' do
+      it "waits for compaction to complete" do
+        # This simulates an empty DB, so no deletes
+        expect(store).to receive(:get).with('_all_docs', any_args).ordered { { 'rows' => [] } }
+
+        # Next, compact is called.
+        expect(store).to receive(:post).with('_compact', any_args).ordered
+
+        # We expect the method to call get the DB info as many times as the true value is returned.
+        expect(store).to receive(:get).twice.with('', any_args).ordered { { 'compact_running' => true } }
+        expect(store).to receive(:get).once.with('', any_args).ordered { { 'compact_running' => false } }
+        store.clear(compact: true, await_compact: true)
+      end
+    end
+
+    context 'with await_compact: false' do
+      it "does not wait for compaction to complete" do
+        expect(store).to receive(:get).with('_all_docs', any_args).ordered { { 'rows' => [] } }
+        expect(store).to receive(:post).with('_compact', any_args).ordered
+        expect(store).not_to receive(:get).with('', any_args).ordered
+        store.clear(compact: true, await_compact: false)
+      end
+    end
+  end
 end

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

@@ -1,9 +1,15 @@
-describe "standard_couch", isolate: true, adapter: :Couch do
-  moneta_store :Couch, db: 'standard_couch'
+require_relative '../faraday_helper.rb'
+
+describe "standard_couch", adapter: :Couch do
+  include_context :faraday_adapter
+
+  moneta_store :Couch do
+    { 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

@@ -1,13 +1,19 @@
+require_relative '../faraday_helper.rb'
+
 describe "standard_couch_with_expires", adapter: :Couch do
   let(:t_res) { 0.125 }
   let(:min_ttl) { t_res }
   use_timecop
 
-  moneta_store :Couch, db: 'standard_couch_with_expires', expires: true
+  include_context :faraday_adapter
+
+  moneta_store :Couch do
+    { 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/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/faraday_helper.rb

@@ -0,0 +1,9 @@
+RSpec.shared_context :faraday_adapter do
+  before :context do
+    require 'faraday/adapter/manticore' if defined?(JRUBY_VERSION)
+  end
+
+  let(:faraday_adapter) do
+    defined?(JRUBY_VERSION) ? :manticore : :net_http
+  end
+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/adapter_lruhash_spec.rb

@@ -11,9 +11,9 @@ describe 'adapter_lruhash', adapter: :LRUHash do
     (1..1000).each do |i|
       store[i] = 'x'
       store[0].should == 'y'
-      store.instance_variable_get(:@entry).size.should == [10, i+1].min
+      store.instance_variable_get(:@backend).size.should == [10, i+1].min
       (0...[9, i-1].min).each do |j|
-        store.instance_variable_get(:@entry)[i-j].should_not be_nil
+        store.instance_variable_get(:@backend)[i-j].should_not be_nil
       end
       store.key?(i-9).should be false if i > 9
     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