moneta 1.1.1 → 1.4.1

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/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

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

@@ -3,9 +3,11 @@ describe 'adapter_mongo_with_default_expires', isolate: true, adapter: :Mongo do
   let(:min_ttl) { t_res }
 
   moneta_build do
-    Moneta::Adapters::Mongo.new(db: "adapter_mongo",
-                                collection: 'with_default_expires',
-                                expires: min_ttl)
+    Moneta::Adapters::Mongo.new(
+    	database: File.basename(__FILE__, '.rb'),
+      collection: 'adapter_mongo_with_default_expires',
+      expires: min_ttl
+    )
   end
 
   moneta_specs ADAPTER_SPECS.with_each_key.with_expires.with_default_expires.simplevalues_only

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

@@ -2,6 +2,6 @@ describe 'standard_mongo', adapter: :Mongo do
   let(:t_res) { 0.125 }
   let(:min_ttl) { t_res }
 
-  moneta_store :Mongo, {db: 'standard_mongo', collection: 'default'}
-  moneta_specs STANDARD_SPECS.with_native_expires
+  moneta_store :Mongo, {database: File.basename(__FILE__, '.rb'), collection: 'standard_mongo'}
+  moneta_specs STANDARD_SPECS.with_native_expires.with_each_key
 end

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/pstore/standard_pstore_spec.rb

@@ -5,5 +5,5 @@ describe 'standard_pstore', unsupported: defined?(JRUBY_VERSION), adapter: :PSto
 
   moneta_loader{ |value| value }
 
-  moneta_specs STANDARD_SPECS
+  moneta_specs STANDARD_SPECS.with_each_key
 end

data/spec/moneta/adapters/pstore/standard_pstore_with_expires_spec.rb

@@ -9,5 +9,5 @@ describe 'standard_pstore_with_expires', unsupported: defined?(JRUBY_VERSION), a
 
   moneta_loader{ |value| value }
 
-  moneta_specs STANDARD_SPECS.with_expires
+  moneta_specs STANDARD_SPECS.with_expires.with_each_key
 end

data/spec/moneta/adapters/redis/standard_redis_spec.rb

@@ -3,5 +3,5 @@ describe 'standard_redis', adapter: :Redis do
   let(:min_ttl) { t_res }
 
   moneta_store :Redis, db: 4
-  moneta_specs STANDARD_SPECS.with_native_expires
+  moneta_specs STANDARD_SPECS.with_native_expires.with_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

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

@@ -0,0 +1,12 @@
+require_relative '../../../restserver.rb'
+
+RSpec.shared_context :start_restserver do |port|
+  before :context do
+    @restserver_handle = start_restserver(port)
+  end
+
+  after :context do
+    stop_restserver(@restserver_handle)
+    @restserver_handle = nil
+  end
+end

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

@@ -1,10 +1,13 @@
-describe 'standard_restclient', isolate: true, adapter: :RestClient do
-  before :all do
-    start_restserver
-  end
+require_relative '../faraday_helper.rb'
+require_relative './helper.rb'
+
+describe 'standard_restclient', adapter: :RestClient do
+  include_context :faraday_adapter
+  include_context :start_restserver, 11934
 
-  moneta_store :RestClient,
-                   {url: 'http://localhost:8808/moneta/'}
+  moneta_store :RestClient do
+    { url: 'http://localhost:11934/moneta', adapter: faraday_adapter }
+  end
 
   moneta_specs STANDARD_SPECS.without_increment.without_create
 end

data/spec/moneta/adapters/riak/standard_riak_with_expires_spec.rb

@@ -5,6 +5,10 @@ describe 'standard_riak_with_expires', unstable: true, adapter: :Riak do
     Riak.disable_list_keys_warnings = true
   end
 
+  let(:t_res) { 0.125 }
+  let(:min_ttl) { t_res }
+  use_timecop
+
   moneta_store :Riak, {bucket: 'standard_riak_with_expires', expires: true}
   moneta_specs STANDARD_SPECS.without_increment.with_expires.without_create
 end

data/spec/moneta/adapters/sdbm/standard_sdbm_spec.rb

@@ -3,5 +3,5 @@ describe 'standard_sdbm', unsupported: defined?(JRUBY_VERSION), adapter: :SDBM d
     {file: File.join(tempdir, "simple_sdbm")}
   end
 
-  moneta_specs STANDARD_SPECS.without_multiprocess.without_large
+  moneta_specs STANDARD_SPECS.without_multiprocess.without_large.with_each_key
 end

data/spec/moneta/adapters/sdbm/standard_sdbm_with_expires_spec.rb

@@ -7,5 +7,5 @@ describe 'standard_sdbm_with_expires', unsupported: defined?(JRUBY_VERSION), ada
     {file: File.join(tempdir, "simple_sdbm_with_expires"), expires: true}
   end
 
-  moneta_specs STANDARD_SPECS.without_multiprocess.with_expires.without_large
+  moneta_specs STANDARD_SPECS.without_multiprocess.with_expires.without_large.with_each_key
 end

data/spec/moneta/adapters/sequel/adapter_sequel_spec.rb

@@ -1,17 +1,13 @@
 require_relative './helper.rb'
 
 describe ':Sequel adapter', adapter: :Sequel do
+  include_context :sequel
+
   specs = ADAPTER_SPECS.with_each_key.with_values(:nil)
 
   context 'with MySQL backend' do
     moneta_build do
-      Moneta::Adapters::Sequel.new(opts.merge(
-        db: if defined?(JRUBY_VERSION)
-              "jdbc:mysql://localhost/#{mysql_database1}?user=#{mysql_username}"
-            else
-              "mysql2://#{mysql_username}:@localhost/#{mysql_database1}"
-            end
-        ))
+      Moneta::Adapters::Sequel.new(opts.merge(db: mysql_uri))
     end
 
     include_examples :adapter_sequel, specs
@@ -19,8 +15,7 @@ describe ':Sequel adapter', adapter: :Sequel do
 
   context "with SQLite backend" do
     moneta_build do
-      Moneta::Adapters::Sequel.new(opts.merge(
-        db: "#{defined?(JRUBY_VERSION) && 'jdbc:'}sqlite://" + File.join(tempdir, 'adapter_sequel.db')))
+      Moneta::Adapters::Sequel.new(opts.merge(db: sqlite_uri('adapter_sequel.db')))
     end
 
     include_examples :adapter_sequel, specs.without_concurrent
@@ -28,16 +23,7 @@ describe ':Sequel adapter', adapter: :Sequel do
 
   context "with Postgres backend" do
     moneta_build do
-      Moneta::Adapters::Sequel.new(opts.merge(
-        if defined?(JRUBY_VERSION)
-          {db: "jdbc:postgresql://localhost/#{postgres_database1}?user=#{postgres_username}"}
-        else
-          {
-            db: "postgres://localhost/#{postgres_database1}",
-            user: postgres_username
-          }
-        end
-      ))
+      Moneta::Adapters::Sequel.new(opts.merge(postgres_options))
     end
 
     include_examples :adapter_sequel, specs
@@ -45,8 +31,7 @@ describe ':Sequel adapter', adapter: :Sequel do
 
   context "with H2 backend", unsupported: !defined?(JRUBY_VERSION) do
     moneta_build do
-      Moneta::Adapters::Sequel.new(opts.merge(
-        db: "jdbc:h2:" + tempdir))
+      Moneta::Adapters::Sequel.new(opts.merge(db: h2_uri))
     end
 
     include_examples :adapter_sequel, specs, optimize: false
@@ -54,19 +39,7 @@ describe ':Sequel adapter', adapter: :Sequel do
 
   context "with Postgres HStore backend" do
     moneta_build do
-      Moneta::Adapters::Sequel.new(
-        if defined?(JRUBY_VERSION)
-          {db: "jdbc:postgresql://localhost/#{postgres_database1}?user=#{postgres_username}"}
-        else
-          {
-            db: "postgres://localhost/#{postgres_database1}",
-            user: postgres_username
-          }
-        end.merge(
-          table: 'hstore_table1',
-          hstore: 'row'
-        )
-      )
+      Moneta::Adapters::Sequel.new(postgres_hstore_options)
     end
 
     # Concurrency is too slow, and binary values cannot be stored in an hstore

data/spec/moneta/adapters/sequel/helper.rb

@@ -1,3 +1,40 @@
+RSpec.shared_context :sequel do
+  def mysql_uri database=nil
+    database ||= mysql_database1
+    if defined?(JRUBY_VERSION)
+      "jdbc:mysql://localhost/#{database}?user=#{mysql_username}&useSSL=false"
+    else
+      "mysql2://#{mysql_username}:@localhost/#{database}"
+    end
+  end
+
+  def sqlite_uri file_name
+    "#{defined?(JRUBY_VERSION) && 'jdbc:'}sqlite://" + File.join(tempdir, file_name)
+  end
+
+  def postgres_options database=nil
+    database ||= postgres_database1
+    if defined?(JRUBY_VERSION)
+      {db: "jdbc:postgresql://localhost/#{database}?user=#{postgres_username}"}
+    else
+      {
+        db: "postgres://localhost/#{database}",
+        user: postgres_username
+      }
+    end
+  end
+
+  def postgres_hstore_options database=nil
+    postgres_options(database).merge \
+      table: 'hstore_table1',
+      hstore: 'row'
+  end
+
+  def h2_uri
+    "jdbc:h2:" + tempdir
+  end
+end 
+
 RSpec.shared_examples :adapter_sequel do |specs, optimize: true|
   shared_examples :each_key_server do
     context "with each_key server" do

data/spec/moneta/adapters/sequel/standard_sequel_spec.rb

@@ -1,14 +1,8 @@
+require_relative './helper.rb'
+
 describe 'standard_sequel', adapter: :Sequel do
-  moneta_store :Sequel do
-    {
-      db: if defined?(JRUBY_VERSION)
-            "jdbc:mysql://localhost/#{mysql_database1}?user=#{mysql_username}"
-          else
-            "mysql2://#{mysql_username}:@localhost/#{mysql_database1}"
-          end,
-      table: "simple_sequel"
-    }
-  end
+  include_context :sequel
 
-  moneta_specs STANDARD_SPECS
+  moneta_store(:Sequel) { postgres_options.merge(table: "standard_sequel") }
+  moneta_specs STANDARD_SPECS.with_each_key
 end