moneta 1.2.1 → 1.3.0

data/spec/moneta/adapters/tdb/standard_tdb_with_expires_spec.rb

@@ -7,5 +7,5 @@ describe 'standard_tdb_with_expires', unsupported: defined?(JRUBY_VERSION), adap
     {file: File.join(tempdir, "simple_tdb_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/tokyocabinet/standard_tokyocabinet_spec.rb

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

data/spec/moneta/adapters/tokyocabinet/standard_tokyocabinet_with_expires_spec.rb

@@ -7,5 +7,5 @@ describe 'standard_tokyocabinet_with_expires', unsupported: defined?(JRUBY_VERSI
     {file: File.join(tempdir, "simple_tokyocabinet_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/yaml/standard_yaml_spec.rb

@@ -5,5 +5,5 @@ describe 'standard_yaml', adapter: :YAML do
 
   moneta_loader{ |value| value }
 
-  moneta_specs STANDARD_SPECS.without_marshallable_value.without_concurrent
+  moneta_specs STANDARD_SPECS.without_marshallable_value.without_concurrent.with_each_key
 end

data/spec/moneta/adapters/yaml/standard_yaml_with_expires_spec.rb

@@ -9,5 +9,5 @@ describe 'standard_yaml_with_expires', adapter: :YAML do
 
   moneta_loader{ |value| value }
 
-  moneta_specs STANDARD_SPECS.without_marshallable_value.with_expires.without_concurrent
+  moneta_specs STANDARD_SPECS.without_marshallable_value.with_expires.without_concurrent.with_each_key
 end

data/spec/moneta/builder_spec.rb

@@ -25,4 +25,26 @@ describe Moneta::Builder do
       end.build
     end.to raise_error /Please check/
   end
+
+  it 'dups options before passing them to each middleware' do
+    my_adapter = Class.new do
+      def initialize(options)
+        throw "a is missing" unless options.delete(:a)
+      end
+    end
+
+    my_middleware = Class.new do
+      def initialize(backend, options)
+        throw "a is missing" unless options.delete(:a)
+      end
+    end
+
+    options = { a: 1 }
+    Moneta::Builder.new do
+      use my_middleware, options
+      adapter my_adapter, options
+    end.build
+
+    expect(options).to include(a: 1)
+  end
 end

data/spec/moneta/proxies/expires/expires_file_spec.rb

@@ -13,7 +13,7 @@ describe 'expires_file', proxy: :Expires do
     end
   end
 
-  moneta_specs STANDARD_SPECS.with_expires.stringvalues_only
+  moneta_specs STANDARD_SPECS.with_expires.stringvalues_only.with_each_key
 
   it 'deletes expired value in underlying file storage' do
     store.store('foo', 'bar', expires: 2)

data/spec/moneta/proxies/shared/shared_tcp_spec.rb

@@ -1,15 +1,15 @@
-describe "shared_tcp", isolate: true, proxy: :Shared do
+describe "shared_tcp", proxy: :Shared do
   moneta_build do
     tempdir = self.tempdir
     Moneta.build do
       use(:Shared, port: 9001) do
-        adapter :PStore, file: File.join(tempdir, 'shared_tcp')
+        adapter :GDBM, file: File.join(tempdir, 'shared_tcp')
       end
     end
   end
 
   shared_examples :shared_tcp do
-    moneta_specs ADAPTER_SPECS
+    moneta_specs ADAPTER_SPECS.with_each_key
 
     it 'shares values' do
       store['shared_key'] = 'shared_value'
@@ -22,11 +22,16 @@ describe "shared_tcp", isolate: true, proxy: :Shared do
 
   # The first store initialised will be running the server
   context "running as the server" do
+    before do
+      store.load('dummy')
+      expect(store.server?).to be true
+    end
+
     include_examples :shared_tcp
 
     it 'has the underlying adapter' do
       store.load('dummy')
-      expect(store.adapter.adapter).to be_a Moneta::Adapters::PStore
+      expect(store.adapter.adapter).to be_a Moneta::Adapters::GDBM
     end
   end
 
@@ -35,6 +40,11 @@ describe "shared_tcp", isolate: true, proxy: :Shared do
       new_store.tap { |store| store.load('dummy') } # Makes a connection
     end
 
+    before do
+      store.load('dummy')
+      expect(store.server?).to be false
+    end
+
     after do
       server_store.close
     end

data/spec/moneta/proxies/shared/shared_unix_spec.rb

@@ -1,15 +1,15 @@
-describe "shared_unix", isolate: true, proxy: :Shared do
+describe "shared_unix", proxy: :Shared do
   moneta_build do
     tempdir = self.tempdir
     Moneta.build do
       use(:Shared, socket: File.join(tempdir, 'shared_unix.socket')) do
-        adapter :PStore, file: File.join(tempdir, 'shared_unix')
+        adapter :GDBM, file: File.join(tempdir, 'shared_unix')
       end
     end
   end
 
   shared_examples :shared_unix do
-    moneta_specs ADAPTER_SPECS
+    moneta_specs ADAPTER_SPECS.with_each_key
 
     it 'shares values' do
       store['shared_key'] = 'shared_value'
@@ -25,7 +25,7 @@ describe "shared_unix", isolate: true, proxy: :Shared do
 
     it "has the underlying adapter" do
       store.load('dummy')
-      expect(store.adapter.adapter).to be_a Moneta::Adapters::PStore
+      expect(store.adapter.adapter).to be_a Moneta::Adapters::GDBM
     end
   end
 

data/spec/moneta/proxies/transformer/transformer_bencode_spec.rb

@@ -10,7 +10,7 @@ describe 'transformer_bencode', proxy: :Transformer do
     ::BEncode.load(value)
   end
 
-  moneta_specs TRANSFORMER_SPECS.simplekeys_only.simplevalues_only
+  moneta_specs TRANSFORMER_SPECS.simplekeys_only.simplevalues_only.with_each_key
 
   it 'compile transformer class' do
     store.should_not be_nil

data/spec/moneta/proxies/transformer/transformer_bert_spec.rb

@@ -9,9 +9,9 @@ describe 'transformer_bert', unsupported: defined?(JRUBY_VERSION), proxy: :Trans
   moneta_loader do |value|
     ::BERT.decode(value)
   end
-  
-  moneta_specs TRANSFORMER_SPECS.simplekeys_only.simplevalues_only
-  
+
+  moneta_specs TRANSFORMER_SPECS.simplekeys_only.simplevalues_only.with_each_key
+
   it 'compile transformer class' do
     store.should_not be_nil
     Moneta::Transformer::BertKeyBertValue.should_not be_nil

data/spec/moneta/proxies/transformer/transformer_bson_spec.rb

@@ -14,8 +14,8 @@ describe 'transformer_bson', proxy: :Transformer do
     end
   end
 
-  moneta_specs TRANSFORMER_SPECS.simplekeys_only.simplevalues_only
-  
+  moneta_specs TRANSFORMER_SPECS.simplekeys_only.simplevalues_only.with_each_key
+
   it 'compile transformer class' do
     store.should_not be_nil
     Moneta::Transformer::BsonKeyBsonValue.should_not be_nil

data/spec/moneta/proxies/transformer/transformer_json_spec.rb

@@ -10,7 +10,7 @@ describe 'transformer_json', proxy: :Transformer do
     ::MultiJson.load(value)
   end
 
-  moneta_specs TRANSFORMER_SPECS.simplekeys_only.simplevalues_only
+  moneta_specs TRANSFORMER_SPECS.simplekeys_only.simplevalues_only.with_each_key
 
   it 'compile transformer class' do
     store.should_not be_nil

data/spec/moneta/proxies/transformer/transformer_key_marshal_spec.rb

@@ -8,7 +8,7 @@ describe 'transformer_key_marshal', proxy: :Transformer do
 
   moneta_loader{ |value| value }
 
-  moneta_specs TRANSFORMER_SPECS.returnsame
+  moneta_specs TRANSFORMER_SPECS.returnsame.with_each_key
 
   it 'compile transformer class' do
     store.should_not be_nil

data/spec/moneta/proxies/transformer/transformer_key_yaml_spec.rb

@@ -8,7 +8,7 @@ describe 'transformer_key_yaml', proxy: :Transformer do
 
   moneta_loader{ |value| value }
 
-  moneta_specs TRANSFORMER_SPECS.returnsame
+  moneta_specs TRANSFORMER_SPECS.returnsame.with_each_key
 
   it 'compile transformer class' do
     store.should_not be_nil

data/spec/moneta/proxies/transformer/transformer_marshal_base64_spec.rb

@@ -11,7 +11,7 @@ describe 'transformer_marshal_base64', proxy: :Transformer do
     ::Marshal.load(value.unpack('m').first)
   end
 
-  moneta_specs STANDARD_SPECS.without_persist
+  moneta_specs STANDARD_SPECS.without_persist.with_each_key
 
   it 'compile transformer class' do
     store.should_not be_nil

data/spec/moneta/proxies/transformer/transformer_marshal_escape_spec.rb

@@ -10,7 +10,7 @@ describe 'transformer_marshal_escape', proxy: :Transformer do
     ::Marshal.load(::URI.decode_www_form_component(value))
   end
 
-  moneta_specs STANDARD_SPECS.without_persist
+  moneta_specs STANDARD_SPECS.without_persist.with_each_key
 
   it 'compiles the transformer class' do
     store.should_not be_nil

data/spec/moneta/proxies/transformer/transformer_marshal_hex_spec.rb

@@ -11,7 +11,7 @@ describe 'transformer_marshal_hex', proxy: :Transformer do
     ::Marshal.load([value].pack('H*'))
   end
 
-  moneta_specs STANDARD_SPECS.without_persist
+  moneta_specs STANDARD_SPECS.without_persist.with_each_key
 
   it 'compile transformer class' do
     store.should_not be_nil

data/spec/moneta/proxies/transformer/transformer_marshal_hmac_spec.rb

@@ -10,7 +10,7 @@ describe 'transformer_marshal_hmac', proxy: :Transformer do
     ::Marshal.load(::Moneta::Transformer::Helper.hmacverify(value, 'secret'))
   end
 
-  moneta_specs STANDARD_SPECS.without_persist
+  moneta_specs STANDARD_SPECS.without_persist.with_each_key
 
   it 'compile transformer class' do
     store.should_not be_nil

data/spec/moneta/proxies/transformer/transformer_marshal_prefix_base64_spec.rb

@@ -0,0 +1,33 @@
+describe 'transformer_marshal_prefix_base64', proxy: :Transformer do
+  moneta_build do
+
+    Moneta.build do
+      use :Transformer, key: [:marshal, :prefix, :base64], value: [:marshal, :base64], prefix: 'moneta'
+      adapter :Memory
+    end
+  end
+
+  moneta_loader do |value|
+    ::Marshal.load(value.unpack('m').first)
+  end
+
+  moneta_specs STANDARD_SPECS.without_persist.with_each_key
+
+  it 'compile transformer class' do
+    store.should_not be_nil
+    Moneta::Transformer::MarshalPrefixBase64KeyMarshalBase64Value.should_not be_nil
+  end
+
+  context 'with keys with no prefix' do
+    before(:each) do
+      store.adapter.backend['no_prefix'] = 'hidden'
+    end
+
+    after(:each) do
+      expect(store.adapter.backend.keys).to include('no_prefix')
+    end
+
+    include_examples :each_key
+  end
+
+end

data/spec/moneta/proxies/transformer/transformer_marshal_prefix_spec.rb

@@ -6,7 +6,7 @@ describe 'transformer_marshal_prefix', proxy: :Transformer do
     end
   end
 
-  moneta_specs STANDARD_SPECS.without_persist
+  moneta_specs STANDARD_SPECS.without_persist.with_each_key
 
   it 'compile transformer class' do
     store.should_not be_nil

data/spec/moneta/proxies/transformer/transformer_marshal_qp_spec.rb

@@ -11,7 +11,7 @@ describe 'transformer_marshal_qp', proxy: :Transformer do
     ::Marshal.load(value.unpack('M').first)
   end
 
-  moneta_specs STANDARD_SPECS.without_persist
+  moneta_specs STANDARD_SPECS.without_persist.with_each_key
 
   it 'compile transformer class' do
     store.should_not be_nil

data/spec/moneta/proxies/transformer/transformer_marshal_spec.rb

@@ -10,7 +10,7 @@ describe 'transformer_marshal', proxy: :Transformer do
     ::Marshal.load(value)
   end
 
-  moneta_specs TRANSFORMER_SPECS
+  moneta_specs TRANSFORMER_SPECS.with_each_key
 
   it 'compile transformer class' do
     store.should_not be_nil

data/spec/moneta/proxies/transformer/transformer_marshal_urlsafe_base64_spec.rb

@@ -11,7 +11,7 @@ describe 'transformer_marshal_urlsafe_base64', proxy: :Transformer do
     ::Marshal.load(::Base64.urlsafe_decode64(value))
   end
 
-  moneta_specs STANDARD_SPECS.without_persist
+  moneta_specs STANDARD_SPECS.without_persist.with_each_key
 
   it 'compile transformer class' do
     store.should_not be_nil

data/spec/moneta/proxies/transformer/transformer_marshal_uuencode_spec.rb

@@ -10,7 +10,7 @@ describe 'transformer_marshal_uuencode', proxy: :Transformer do
     ::Marshal.load(value.unpack('u').first)
   end
 
-  moneta_specs STANDARD_SPECS.without_persist
+  moneta_specs STANDARD_SPECS.without_persist.with_each_key
 
   it 'compile transformer class' do
     store.should_not be_nil

data/spec/moneta/proxies/transformer/transformer_msgpack_spec.rb

@@ -10,7 +10,7 @@ describe 'transformer_msgpack', proxy: :Transformer do
     ::MessagePack.unpack(value)
   end
 
-  moneta_specs TRANSFORMER_SPECS.simplekeys_only.simplevalues_only
+  moneta_specs TRANSFORMER_SPECS.simplekeys_only.simplevalues_only.with_each_key
 
   it 'compile transformer class' do
     store.should_not be_nil

data/spec/moneta/proxies/transformer/transformer_ox_spec.rb

@@ -10,7 +10,7 @@ describe 'transformer_ox', unsupported: defined?(JRUBY_VERSION), proxy: :Transfo
     ::Ox.parse_obj(value)
   end
 
-  moneta_specs TRANSFORMER_SPECS.without_keys_or_values(:binary, :float)
+  moneta_specs TRANSFORMER_SPECS.without_keys_or_values(:binary, :float).with_each_key
 
   it 'compile transformer class' do
     store.should_not be_nil

data/spec/moneta/proxies/transformer/transformer_php_spec.rb

@@ -10,7 +10,7 @@ describe 'transformer_php', proxy: :Transformer do
     ::PHP.unserialize(value)
   end
 
-  moneta_specs TRANSFORMER_SPECS.simplekeys_only.simplevalues_only
+  moneta_specs TRANSFORMER_SPECS.simplekeys_only.simplevalues_only.with_each_key
 
   it 'compile transformer class' do
     store.should_not be_nil

data/spec/moneta/proxies/transformer/transformer_tnet_spec.rb

@@ -10,7 +10,7 @@ describe 'transformer_tnet', proxy: :Transformer do
     ::TNetstring.parse(value).first
   end
 
-  moneta_specs TRANSFORMER_SPECS.simplekeys_only.simplevalues_only
+  moneta_specs TRANSFORMER_SPECS.simplekeys_only.simplevalues_only.with_each_key
 
   it 'compile transformer class' do
     store.should_not be_nil

data/spec/moneta/proxies/transformer/transformer_yaml_spec.rb

@@ -9,8 +9,8 @@ describe 'transformer_yaml', proxy: :Transformer do
   moneta_loader do |value|
     ::YAML.load(value)
   end
-  
-  moneta_specs TRANSFORMER_SPECS
+
+  moneta_specs TRANSFORMER_SPECS.with_each_key
 
   it 'compile transformer class' do
     store.should_not be_nil

data/spec/moneta/proxies/weak_each_key/weak_each_key_spec.rb

@@ -9,8 +9,6 @@ describe 'weak_each_key', proxy: :WeakEachKey do
   moneta_build do
     Moneta.build do
       use :WeakEachKey
-      # use :WeakIncrement
-      # use :WeakCreate
 
       adapter :Fog,
               aws_access_key_id: 'fake_access_key_id',

data/spec/support/mongo_helper.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module MongoHelper
+  def mongo_config(opts = {})
+    prefix = ENV.fetch('TEST_ENV_NUMBER', '')
+    opts.merge(collection: "#{prefix}#{opts[:collection]}")
+  end
+
+  def self.mongo_config(args)
+    Class.include(MongoHelper).new.mongo_config(args)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moneta
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Daniel Mendler
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2020-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -101,16 +101,16 @@ dependencies:
   name: irb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.1
 description: A unified interface to key/value stores
 email:
 - mail@daniel-mendler.de
@@ -211,7 +211,7 @@ files:
 - script/contributors
 - script/memusage
 - script/parallel-tests
-- script/reconfigure-couchdb
+- script/start-couchdb
 - script/start-hbase
 - script/start-services
 - script/travis-logs
@@ -254,6 +254,7 @@ files:
 - spec/moneta/adapters/cassandra/helper.rb
 - spec/moneta/adapters/cassandra/standard_cassandra_spec.rb
 - spec/moneta/adapters/client/adapter_client_spec.rb
+- spec/moneta/adapters/client/client_helper.rb
 - spec/moneta/adapters/client/standard_client_tcp_spec.rb
 - spec/moneta/adapters/client/standard_client_unix_spec.rb
 - spec/moneta/adapters/cookie/adapter_cookie_spec.rb
@@ -403,6 +404,7 @@ files:
 - spec/moneta/proxies/transformer/transformer_marshal_hmac_spec.rb
 - spec/moneta/proxies/transformer/transformer_marshal_md5_spec.rb
 - spec/moneta/proxies/transformer/transformer_marshal_md5_spread_spec.rb
+- spec/moneta/proxies/transformer/transformer_marshal_prefix_base64_spec.rb
 - spec/moneta/proxies/transformer/transformer_marshal_prefix_spec.rb
 - spec/moneta/proxies/transformer/transformer_marshal_qp_spec.rb
 - spec/moneta/proxies/transformer/transformer_marshal_rmd160_spec.rb
@@ -436,6 +438,7 @@ files:
 - spec/rack/moneta_store_spec.rb
 - spec/rack/session_moneta_spec.rb
 - spec/restserver.rb
+- spec/support/mongo_helper.rb
 - test/action_dispatch/fixtures/session_autoload_test/foo.rb
 - test/action_dispatch/session_moneta_store_test.rb
 homepage: https://github.com/moneta-rb/moneta
@@ -443,9 +446,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/moneta-rb/moneta/issues
-  changelog_uri: https://github.com/moneta-rb/moneta/blob/v1.2.1/CHANGES
-  documentation_uri: https://www.rubydoc.info/gems/moneta/1.2.1
-  source_code_uri: https://github.com/moneta-rb/moneta/tree/v1.2.1
+  changelog_uri: https://github.com/moneta-rb/moneta/blob/v1.3.0/CHANGES
+  documentation_uri: https://www.rubydoc.info/gems/moneta/1.3.0
+  source_code_uri: https://github.com/moneta-rb/moneta/tree/v1.3.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -454,14 +457,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A unified interface to key/value stores, including Redis, Memcached, TokyoCabinet,
@@ -505,6 +508,7 @@ test_files:
 - spec/moneta/adapters/cassandra/helper.rb
 - spec/moneta/adapters/cassandra/standard_cassandra_spec.rb
 - spec/moneta/adapters/client/adapter_client_spec.rb
+- spec/moneta/adapters/client/client_helper.rb
 - spec/moneta/adapters/client/standard_client_tcp_spec.rb
 - spec/moneta/adapters/client/standard_client_unix_spec.rb
 - spec/moneta/adapters/cookie/adapter_cookie_spec.rb
@@ -654,6 +658,7 @@ test_files:
 - spec/moneta/proxies/transformer/transformer_marshal_hmac_spec.rb
 - spec/moneta/proxies/transformer/transformer_marshal_md5_spec.rb
 - spec/moneta/proxies/transformer/transformer_marshal_md5_spread_spec.rb
+- spec/moneta/proxies/transformer/transformer_marshal_prefix_base64_spec.rb
 - spec/moneta/proxies/transformer/transformer_marshal_prefix_spec.rb
 - spec/moneta/proxies/transformer/transformer_marshal_qp_spec.rb
 - spec/moneta/proxies/transformer/transformer_marshal_rmd160_spec.rb
@@ -687,5 +692,6 @@ test_files:
 - spec/rack/moneta_store_spec.rb
 - spec/rack/session_moneta_spec.rb
 - spec/restserver.rb
+- spec/support/mongo_helper.rb
 - test/action_dispatch/fixtures/session_autoload_test/foo.rb
 - test/action_dispatch/session_moneta_store_test.rb