moneta 1.1.1 → 1.2.0

data/spec/helper.rb

@@ -262,8 +262,8 @@ module MonetaHelpers
       # want to run the tests but don't want to grant root access to moneta
       let(:mysql_username) { ENV['MONETA_MYSQL_USERNAME'] || 'root' }
       let(:mysql_password) { ENV['MONETA_MYSQL_PASSWORD'] }
-      let(:mysql_database1) { ENV['MONETA_MYSQL_DATABSASE1'] || 'moneta' }
-      let(:mysql_database2) { ENV['MONETA_MYSQL_DATABSASE2'] || 'moneta2' }
+      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_database1) { ENV['MONETA_POSTGRES_DATABSASE1'] || 'moneta1' }
@@ -300,19 +300,6 @@ module MonetaHelpers
     def use_timecop
       before{ @timecop = true }
     end
-
-    def start_memcached(port)
-      before :context do
-        @memcached = spawn("memcached -p #{port}")
-        sleep 0.5
-      end
-
-      after :context do
-        Process.kill("TERM", @memcached)
-        Process.wait(@memcached)
-        @memcached = nil
-      end
-    end
   end
 
   module InstanceMethods
@@ -336,33 +323,6 @@ module MonetaHelpers
       end
     end
 
-    def start_restserver
-      require 'rack'
-      require 'webrick'
-      require 'rack/moneta_rest'
-
-      # Keep webrick quiet
-      ::WEBrick::HTTPServer.class_eval do
-        def access_log(config, req, res); end
-      end
-      ::WEBrick::BasicLog.class_eval do
-        def log(level, data); end
-      end
-
-      Thread.start do
-        Rack::Server.start(:app => Rack::Builder.app do
-                             use Rack::Lint
-                             map '/moneta' do
-                               run Rack::MonetaRest.new(:store => :Memory)
-                             end
-                           end,
-                           :environment => :none,
-                           :server => :webrick,
-                           :Port => 8808)
-      end
-      sleep 1
-    end
-
     def start_server(*args)
       server = Moneta::Server.new(*args)
       Thread.new { server.run }

data/spec/moneta/adapters/activesupportcache/adapter_activesupportcache_spec.rb

@@ -1,3 +1,5 @@
+require_relative '../memcached_helper.rb'
+
 describe 'adapter_activesupportcache', adapter: :ActiveSupportCache do
   before :all do
     require 'active_support'
@@ -25,7 +27,8 @@ describe 'adapter_activesupportcache', adapter: :ActiveSupportCache do
     let(:t_res) { 1 }
     let(:min_ttl) { 2 }
     use_timecop
-    start_memcached 11215
+
+    include_context :start_memcached, 11215
 
     let(:backend) { ActiveSupport::Cache::MemCacheStore.new('127.0.0.1:11215') }
     include_examples :adapter_activesupportcache

data/spec/moneta/adapters/activesupportcache/adapter_activesupportcache_with_default_expires_spec.rb

@@ -1,3 +1,5 @@
+require_relative '../memcached_helper'
+
 describe 'adapter_activesupportcache_with_default_expires', adapter: :ActiveSupportCache do
   before :all do
     require 'active_support'
@@ -25,7 +27,8 @@ describe 'adapter_activesupportcache_with_default_expires', adapter: :ActiveSupp
     let(:t_res) { 1 }
     let(:min_ttl) { 2 }
     use_timecop
-    start_memcached 11223
+
+    include_context :start_memcached, 11223
 
     let(:backend) { ActiveSupport::Cache::MemCacheStore.new('127.0.0.1:11223') }
     include_examples :adapter_activesupportcache_with_default_expires

data/spec/moneta/adapters/activesupportcache/standard_activesupportcache_spec.rb

@@ -0,0 +1,14 @@
+describe 'standard_activesupportcache' do
+  before :context do
+    require 'active_support'
+  end
+
+  let(:t_res) { 0.1 }
+  let(:min_ttl) { 0.1 }
+
+  moneta_store :ActiveSupportCache do
+    { backend: ActiveSupport::Cache::MemoryStore.new }
+  end
+
+  moneta_specs STANDARD_SPECS.without_create.without_persist.with_native_expires
+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)
   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,5 +1,11 @@
-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 }
+  end
 
   moneta_loader do |value|
     ::Marshal.load(value.unpack('m').first)

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

@@ -1,9 +1,15 @@
+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 }
+  end
 
   moneta_loader do |value|
     ::Marshal.load(value.unpack('m').first)

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/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/memcached/adapter_memcached_spec.rb

@@ -1,4 +1,4 @@
-require_relative './helper.rb'
+require_relative '../memcached_helper.rb'
 
 describe 'adapter_memcached', adapter: :Memcached do
   include_context :start_memcached, 11216

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

@@ -1,4 +1,4 @@
-require_relative '../helper.rb'
+require_relative '../../memcached_helper.rb'
 
 describe 'adapter_memcached_dalli', retry: 3, adapter: :Memcached do
   # See https://github.com/memcached/memcached/issues/307

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

@@ -1,4 +1,4 @@
-require_relative '../helper.rb'
+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

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

@@ -1,4 +1,4 @@
-require_relative '../helper.rb'
+require_relative '../../memcached_helper.rb'
 
 describe 'standard_memcached_dalli', retry: 3, adapter: :Memcached do
   let(:t_res) { 1 }

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

@@ -1,4 +1,4 @@
-require_relative '../helper.rb'
+require_relative '../../memcached_helper.rb'
 
 describe 'adapter_memcached_native', isolate: true, unstable: defined?(JRUBY_VERSION), retry: 3, adapter: :Memcached do
   # See https://github.com/memcached/memcached/issues/307

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

@@ -1,4 +1,4 @@
-require_relative '../helper.rb'
+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

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

@@ -1,4 +1,4 @@
-require_relative '../helper.rb'
+require_relative '../../memcached_helper.rb'
 
 describe 'standard_memcached_native', unstable: defined?(JRUBY_VERSION), retry: 3, adapter: :Memcached do
   let(:t_res) { 1 }

data/spec/moneta/adapters/memcached/standard_memcached_spec.rb

@@ -1,4 +1,4 @@
-require_relative './helper.rb'
+require_relative '../memcached_helper.rb'
 
 describe 'standard_memcached', adapter: :Memcached do
   include_context :start_memcached, 11220

data/spec/moneta/adapters/null/null_adapter_spec.rb

@@ -3,5 +3,5 @@ describe "null_adapter", adapter: :Null do
     Moneta::Adapters::Null.new
   end
 
-  moneta_specs MonetaSpecs.new(specs: [:null, :not_increment, :not_create, :not_persist])
+  moneta_specs MonetaSpecs.new(specs: [:null, :not_increment, :not_create, :not_persist, :not_each_key])
 end

data/spec/moneta/adapters/restclient/adapter_restclient_spec.rb

@@ -1,10 +1,12 @@
-describe 'adapter_restclient', isolate: true, adapter: :RestClient do
-  before :all do
-    start_restserver
-  end
+require_relative '../faraday_helper.rb'
+require_relative './helper.rb'
+
+describe 'adapter_restclient', adapter: :RestClient do
+  include_context :faraday_adapter
+  include_context :start_restserver, 11933
 
   moneta_build do
-    Moneta::Adapters::RestClient.new(url: 'http://localhost:8808/moneta/')
+    Moneta::Adapters::RestClient.new(url: 'http://localhost:11933/moneta', adapter: faraday_adapter)
   end
 
   moneta_specs ADAPTER_SPECS.without_increment.without_create