moneta 1.2.0 → 1.4.2

data/spec/features/store.rb

@@ -178,7 +178,7 @@ shared_examples :store do
   shared_examples :merge! do
     it 'stores values' do
       moneta_property_of(keys: 3, values: 3).check do |keys:, values:|
-        expect(store.public_send(method, pairs.call(keys[0] => values[0], keys[1] => values[1], keys[2] => values[2]))).to be store
+        expect(store.public_send(method, pairs.call({ keys[0] => values[0], keys[1] => values[1], keys[2] => values[2] }))).to be store
         expect(store.key?(keys[0])).to be true
         expect(store[keys[0]]).to eq values[0]
         expect(store.key?(keys[1])).to be true
@@ -192,7 +192,7 @@ shared_examples :store do
     it 'overwrites existing values' do
       moneta_property_of(keys: 2, values: 3).check do |keys:, values:|
         expect(store[keys[0]] = values[0]).to eq values[0]
-        expect(store.public_send(method, pairs.call(keys[0] => values[1], keys[1] => values[2]))).to be store
+        expect(store.public_send(method, pairs.call({ keys[0] => values[1], keys[1] => values[2] }))).to be store
         expect(store.key?(keys[0])).to be true
         expect(store[keys[0]]).to eq values[1]
         expect(store.key?(keys[1])).to be true
@@ -204,7 +204,7 @@ shared_examples :store do
     it 'stores the return value of the block, if given, for keys that will be overwritten' do
       moneta_property_of(keys: 2, values: 4).check do |keys:, values:|
         expect(store[keys[0]] = values[0]).to eq values[0]
-        expect(store.public_send(method, pairs.call(keys[0] => values[1], keys[1] => values[2])) do |key, old_val, new_val|
+        expect(store.public_send(method, pairs.call({ keys[0] => values[1], keys[1] => values[2] })) do |key, old_val, new_val|
           expect(key).to eq keys[0]
           expect(old_val).to eq values[0]
           expect(new_val).to eq values[1]

data/spec/helper.rb

@@ -213,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,
@@ -260,15 +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
@@ -282,23 +298,9 @@ module MonetaHelpers
       end
     end
 
-    # Used to test time-dependent specs (e.g. expiry at different positions
-    # within a second). Once close to the start of the second, and once close
-    # to the end.
-    def usecs
-      [1e4, 99e4].map(&:to_i)
-    end
-
-    def at_each_usec(&block)
-      usecs.each do |usec|
-        context "at #{usec} microseconds", isolate: true do
-          include_examples :at_usec, usec, &block
-        end
-      end
-    end
-
     def use_timecop
-      before{ @timecop = true }
+      before { @timecop = true }
+      after { Timecop.return }
     end
   end
 
@@ -323,14 +325,6 @@ module MonetaHelpers
       end
     end
 
-    def start_server(*args)
-      server = Moneta::Server.new(*args)
-      Thread.new { server.run }
-      sleep 0.1 until server.running?
-    rescue Exception => ex
-      puts "Failed to start server - #{ex.message}"
-    end
-
     def moneta_property_of(keys: 0, values: 0)
       keys_meta = self.keys_meta
       values_meta = self.values_meta
@@ -355,6 +349,20 @@ module MonetaHelpers
         sleep seconds
       end
     end
+
+    def time_till_next(tick)
+      now = Time.now.to_f
+      tick - (now % tick)
+    end
+
+    # advance to the moment just after a tick. 1e-2 is needed in some
+    # environments (JRuby) to be able to pass the "not in earlier half" test.
+    def advance_next_tick
+      tick = t_res
+      offset = time_till_next(tick) + 1e-2
+      advance offset
+      raise "not in earlier half of tick" unless Time.now.to_f % tick < tick / 2.0
+    end
   end
 end
 
@@ -435,20 +443,4 @@ RSpec.shared_context :setup_moneta_store do |builder|
   end
 end
 
-RSpec.shared_examples :at_usec do |usec|
-  before do
-    now = Time.now
-    # 1000us is a rough guess at how many microseconds this code will take to run
-    if now.usec + 1000 > usec
-      advance(1 - 1e-6 * (now.usec - usec))
-    else
-      advance(1e-6 * (usec - now.usec))
-    end
-  end
-
-  after do
-    Timecop.return if @timecop
-  end
-end
-
 Dir['./spec/features/*.rb'].each{ |rb| require rb }

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
@@ -14,5 +17,5 @@ describe "standard_activerecord", adapter: :ActiveRecord do
     ::Marshal.load(value.unpack('m').first)
   end
 
-  moneta_specs STANDARD_SPECS
+  moneta_specs STANDARD_SPECS.with_each_key
 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
     }
@@ -20,5 +23,5 @@ describe "standard_activerecord_with_expires", adapter: :ActiveRecord do
     ::Marshal.load(value.unpack('m').first)
   end
 
-  moneta_specs STANDARD_SPECS.with_expires
+  moneta_specs STANDARD_SPECS.with_expires.with_each_key
 end

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/cassandra/standard_cassandra_spec.rb

@@ -14,5 +14,5 @@ describe "standard_cassandra", retry: 3, adapter: :Cassandra do
     }
   end
 
-  moneta_specs STANDARD_SPECS.without_increment.without_create.with_native_expires
+  moneta_specs STANDARD_SPECS.without_increment.without_create.with_native_expires.with_each_key
 end

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

@@ -1,11 +1,11 @@
-describe 'adapter_client', isolate: true, adapter: :Client do
-  before :all do
-    start_server(Moneta::Adapters::Memory.new)
-  end
+require_relative './client_helper.rb'
+
+describe 'adapter_client', adapter: :Client do
+  include_context :start_server, port: 9002, backend: ->{ Moneta::Adapters::Memory.new }
 
   moneta_build do
-    Moneta::Adapters::Client.new
+    Moneta::Adapters::Client.new(port: 9002)
   end
 
-  moneta_specs ADAPTER_SPECS
+  moneta_specs ADAPTER_SPECS.with_each_key
 end

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

@@ -0,0 +1,24 @@
+RSpec.shared_context :start_server do |**options|
+  before :context do
+    begin
+      options.each do |key, value|
+        options[key] = instance_exec(&value) if value.respond_to? :call
+      end
+      backend = options.delete(:backend)
+      @server = Moneta::Server.new(backend, options)
+      @thread = Thread.new { @server.run }
+      sleep 0.1 until @server.running?
+    rescue Exception => ex
+      puts "Failed to start server - #{ex.message}"
+      tries ||= 0
+      tries += 1
+      sleep Moneta::Server::TIMEOUT
+      tries < 3 ? retry : raise
+    end
+  end
+
+  after :context do
+    @server.stop
+    @thread.join
+  end
+end

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

@@ -1,17 +1,17 @@
-describe "standard_client_tcp", isolate: true, adapter: :Client do
-  before :all do
-    start_server(Moneta::Adapters::Memory.new)
-  end
+require_relative './client_helper.rb'
+
+describe "standard_client_tcp", adapter: :Client do
+  include_context :start_server, port: 9003, backend: ->{ Moneta::Adapters::Memory.new }
 
-  moneta_store :Client
-  moneta_specs STANDARD_SPECS
+  moneta_store :Client, port: 9003
+  moneta_specs STANDARD_SPECS.with_each_key
 
   it 'supports multiple clients' do
     store['shared_key'] = 'shared_val'
-    threads = (1..100).map do |i|
+    threads = (1..32).map do |i|
       Thread.new do
         client = new_store
-        (1..100).each do |j|
+        (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}"

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

@@ -4,7 +4,7 @@ describe 'adapter_couch', adapter: :Couch do
   include_context :faraday_adapter
 
   moneta_build do
-    Moneta::Adapters::Couch.new(db: 'adapter_couch', adapter: faraday_adapter)
+    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