moneta 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67e7a85926fad89dd255f180a3455b67c923d0194d447a8fe82cca0dbb546bbe
-  data.tar.gz: 51e15e0e3e1bafd312ee62d807afb72836e4f5c3cc036dc8c1ee0dcb8d51f80a
+  metadata.gz: 057afad07820c6a0099c1c8f0d08e8a8db0d8f163ae699a6c492b5114e7690da
+  data.tar.gz: 277352fb763982da85855f170234cf6a2660afeb3b90f6bf34df6dccda586291
 SHA512:
-  metadata.gz: cc4340a0c94ce262108361a3ed49116980cc0ee94838810babe5015bb43d3084875fa3e76f232b182470dda6a5ab9ac7e09fe9917a97082047ec9d0b7112a02a
-  data.tar.gz: a0f1c197e3222848e246bf0535805b4dd47bf8dbf9b3a383c619e187cb9b6d64ac6de4f711190630b4befac1e820061fd66a04d83a529a01bee519fbcde4af23
+  metadata.gz: 0266a4e3016c53408a92a5929152f088ff26c0981561e279e0812726a085e65a6ea90305d362ca04383ee0225915bd470f687c97d9eeafeff960ca21de716616
+  data.tar.gz: 95f6df87a40afeeff7d0c490c88f9c9950a12949358df57da9014cff3ffba1e7893ca43cdfb1d90c20750050d6bc0617e76655a025bff58caa1c89567256a894

data/.github/workflows/ruby.yml

@@ -9,12 +9,13 @@ on:
 jobs:
   adapters:
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.ruby-version == '3.0' }}
 
     strategy:
       fail-fast: false
 
       matrix:
-        ruby-version: [2.7, 2.6, 2.5, 2.4, jruby]
+        ruby-version: ['3.0', '2.7', '2.6', '2.5', '2.4', jruby]
         adapter:
           - Client
           - Cookie
@@ -66,6 +67,7 @@ jobs:
   couch:
     name: "Couch adapter"
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.ruby-version == '3.0' }}
 
     services:
       couch:
@@ -83,7 +85,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: [2.7, 2.4, jruby]
+        ruby-version: ['3.0', '2.7', '2.4', jruby]
 
     env:
       BUNDLE_WITH: RestClient
@@ -118,7 +120,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: [2.7, 2.4, jruby]
+        ruby-version: ['2.7', '2.4', jruby]
 
     env:
       BUNDLE_WITH: Cassandra
@@ -139,6 +141,7 @@ jobs:
   mysql-adapters:
     name: "MySQL adapters"
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.ruby-version == '3.0' }}
 
     services:
       mysql:
@@ -155,7 +158,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: [2.7, 2.4, jruby]
+        ruby-version: ['3.0', '2.7', '2.4', jruby]
 
     env:
       BUNDLE_WITH: ActiveRecord Sequel DataMapper mysql
@@ -194,6 +197,7 @@ jobs:
   postgres-adapters:
     name: "Postgres adapters"
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.ruby-version == '3.0' }}
 
     services:
       postgres:
@@ -210,7 +214,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: [2.7, 2.4, jruby]
+        ruby-version: ['3.0', '2.7', '2.4', jruby]
 
     env:
       BUNDLE_WITH: ActiveRecord Sequel DataMapper postgresql
@@ -243,10 +247,11 @@ jobs:
   sqlite-adapters:
     name: "SQLite adapters"
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.ruby-version == '3.0' }}
 
     strategy:
       matrix:
-        ruby-version: [2.7, 2.4, jruby]
+        ruby-version: ['3.0', '2.7', '2.4', jruby]
 
     env:
       BUNDLE_WITH: ActiveRecord Sequel DataMapper sqlite
@@ -267,6 +272,7 @@ jobs:
   redis:
     name: "Redis adapters"
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.ruby-version == '3.0' }}
 
     services:
       redis:
@@ -281,7 +287,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: [2.7, 2.4, jruby]
+        ruby-version: ['3.0', '2.7', '2.4', jruby]
 
     env:
       BUNDLE_WITH: Redis
@@ -302,10 +308,11 @@ jobs:
   memcached:
     name: "Memcached adapters"
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.ruby-version == '3.0' }}
 
     strategy:
       matrix:
-        ruby-version: [2.7, 2.4, jruby]
+        ruby-version: ['3.0', '2.7', '2.4', jruby]
 
     env:
       BUNDLE_WITH: Memcached
@@ -332,6 +339,7 @@ jobs:
   mongo:
     name: "Mongo adapter"
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.ruby-version == '3.0' }}
 
     services:
       mongo:
@@ -346,7 +354,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: [2.7, 2.4] #, jruby] - FIXME reenable once https://github.com/mongodb/mongo-ruby-driver/pull/2143 is released
+        ruby-version: ['3.0', '2.7', '2.4', jruby]
 
     env:
       BUNDLE_WITH: Mongo
@@ -367,10 +375,11 @@ jobs:
   residual-specs:
     name: "Proxies and other specs"
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.ruby-version == '3.0' }}
 
     strategy:
       matrix:
-        ruby-version: [2.7, 2.4, jruby]
+        ruby-version: ['3.0', '2.7', '2.4', jruby]
 
     env:
       BUNDLE_WITH: transformers GDBM Fog
@@ -400,6 +409,7 @@ jobs:
   rubocop:
     name: "Rubocop"
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.ruby-version == '3.0' }}
 
     steps:
     - uses: actions/checkout@v2
@@ -407,7 +417,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: '3.0'
         bundler: latest
         bundler-cache: true
 

data/CHANGES

@@ -1,3 +1,7 @@
+1.5.1
+
+* Adapters::File - fix an implicit hash issue in Ruby 3 (#222)
+
 1.5.0
 
 * Adapters - internally, most (all?) adapters now inherit from a base Adapter class

data/Gemfile

@@ -89,8 +89,8 @@ group :Memcached, optional: true do
   end
 
   group :MemcachedNative, optional: true do
-    gem 'memcached', platforms: :ruby
     gem 'jruby-memcached', platforms: :jruby
+    gem 'memcached', platforms: :ruby
   end
 end
 
@@ -99,7 +99,9 @@ group :Riak, optional: true do
 end
 
 group :Cassandra, optional: true do
-  gem 'cassandra-driver'
+  install_if lambda { RUBY_ENGINE != 'ruby' || Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.0.0') } do
+    gem 'cassandra-driver'
+  end
 end
 
 group :TokyoTyrant, optional: true do
@@ -131,7 +133,9 @@ group :TokyoCabinet, optional: true do
 end
 
 group :KyotoCabinet, optional: true do
-  gem 'kyotocabinet-ruby-reanimated', platforms: [:ruby_23, :ruby_24, :ruby_25, :ruby_26]
+  install_if lambda { Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.7.0') } do
+    gem 'kyotocabinet-ruby-reanimated', platforms: :ruby
+  end
 end
 
 group :H2, optional: true do
@@ -148,9 +152,11 @@ group :RestClient do
 end
 
 group :DataMapper, optional: true do
-  gem 'dm-core'
-  gem 'dm-migrations'
-  gem 'dm-mysql-adapter'
+  install_if lambda { RUBY_ENGINE == 'ruby' && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.0.0') } do
+    gem 'dm-core'
+    gem 'dm-migrations'
+    gem 'dm-mysql-adapter'
+  end
 end
 
 group :Fog, optional: true do
@@ -173,6 +179,12 @@ group :postgresql, optional: true do
   gem 'pg', platforms: :ruby
 end
 
+group :SDBM, optional: true do
+  install_if lambda { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0') } do
+    gem 'sdbm', platforms: :ruby
+  end
+end
+
 # Rack integration testing
 group :rack do
   gem 'rack'
@@ -194,4 +206,5 @@ end
 # Used for running a dev console
 group :console, optional: true do
   gem 'irb'
+  gem 'rdoc'
 end

data/lib/moneta/adapters/file.rb

@@ -16,7 +16,7 @@ module Moneta
       # @param [Hash] options
       # @option options [String] :dir Directory where files will be stored
       def initialize(options = {})
-        configure(options)
+        configure(**options)
         FileUtils.mkpath(config.dir)
         raise "#{config.dir} is not a directory" unless ::File.directory?(config.dir)
       end

data/lib/moneta/version.rb

@@ -1,5 +1,5 @@
 module Moneta
   # Moneta version number
   # @api public
-  VERSION = '1.5.0'.freeze
+  VERSION = '1.5.1'.freeze
 end

data/spec/features/null.rb

@@ -1,66 +1,66 @@
 shared_examples :null do
   it 'reads from keys like a Hash' do
-    moneta_property_of(keys: 1).check do |keys:|
-      store[keys[0]].should be_nil
-      store.load(keys[0]).should be_nil
+    moneta_property_of(keys: 1).check do |m|
+      store[m.keys[0]].should be_nil
+      store.load(m.keys[0]).should be_nil
     end
   end
 
   it 'guarantees that the same value is returned when setting a key' do
-    moneta_property_of(keys: 1, values: 1).check do |keys:, values:|
-      (store[keys[0]] = values[0]).should equal(values[0])
+    moneta_property_of(keys: 1, values: 1).check do |m|
+      (store[m.keys[0]] = m.values[0]).should equal(m.values[0])
     end
   end
 
   it 'returns false from #key? if a key is not available' do
-    moneta_property_of(keys: 1).check(1) do |keys:|
-      store.key?(keys[0]).should be false
+    moneta_property_of(keys: 1).check(1) do |m|
+      store.key?(m.keys[0]).should be false
     end
   end
 
   it 'returns nil from delete if a value for a key does not exist' do
-    moneta_property_of(keys: 1).check do |keys:|
-      store.delete(keys[0]).should be_nil
+    moneta_property_of(keys: 1).check do |m|
+      store.delete(m.keys[0]).should be_nil
     end
   end
 
   it 'removes all keys from the store with clear' do
-    moneta_property_of(keys: 2, values: 2).check do |keys:, values:|
-      store[keys[0]] = values[0]
-      store[keys[1]] = values[1]
+    moneta_property_of(keys: 2, values: 2).check do |m|
+      store[m.keys[0]] = m.values[0]
+      store[m.keys[1]] = m.values[1]
       store.clear.should equal(store)
-      store.key?(keys[0]).should be false
-      store.key?(keys[1]).should be false
+      store.key?(m.keys[0]).should be false
+      store.key?(m.keys[1]).should be false
     end
   end
 
   it 'fetches a key with a default value with fetch, if the key is not available' do
-    moneta_property_of(keys: 1, values: 1).check do |keys:, values:|
-      store.fetch(keys[0], values[0]).should == values[0]
+    moneta_property_of(keys: 1, values: 1).check do |m|
+      store.fetch(m.keys[0], m.values[0]).should == m.values[0]
     end
   end
 
   it 'fetches a key with a block with fetch, if the key is not available' do
-    moneta_property_of(keys: 1, values: 1).check do |keys:, values:|
-      store.fetch(keys[0]) do |k|
-        k.should equal(keys[0])
-        values[0]
-      end.should equal(values[0])
+    moneta_property_of(keys: 1, values: 1).check do |m|
+      store.fetch(m.keys[0]) do |k|
+        k.should equal(m.keys[0])
+        m.values[0]
+      end.should equal(m.values[0])
     end
   end
 
   it 'accepts frozen options' do
-    moneta_property_of(keys: 1, values: 1).check do |keys:, values:|
+    moneta_property_of(keys: 1, values: 1).check do |m|
       options = {option1: 1, options2: 2}
       options.freeze
       store.clear.should equal(store)
-      store.key?(keys[0], options).should be false
-      store.load(keys[0], options).should be_nil
-      store.fetch(keys[0], 42, options).should == 42
-      store.fetch(keys[0], options) { 42 }.should == 42
-      store.delete(keys[0], options).should be_nil
+      store.key?(m.keys[0], options).should be false
+      store.load(m.keys[0], options).should be_nil
+      store.fetch(m.keys[0], 42, options).should == 42
+      store.fetch(m.keys[0], options) { 42 }.should == 42
+      store.delete(m.keys[0], options).should be_nil
       store.clear(options).should equal(store)
-      store.store(keys[0], values[0], options).should == values[0]
+      store.store(m.keys[0], m.values[0], options).should == m.values[0]
     end
   end
 end

data/spec/features/persist.rb

@@ -1,12 +1,12 @@
 shared_examples :persist do
   it 'persists values' do
-    moneta_property_of(keys: 1, values: 1).check do |keys:, values:|
+    moneta_property_of(keys: 1, values: 1).check do |m|
       new_store.tap do |store|
-        store[keys[0]] = values[0]
+        store[m.keys[0]] = m.values[0]
         store.close
       end
       new_store.tap do |store|
-        store[keys[0]].should == values[0]
+        store[m.keys[0]].should == m.values[0]
         store.close
       end
     end

data/spec/features/returndifferent.rb

@@ -1,9 +1,9 @@
 shared_examples :returndifferent do
   it 'guarantees that a different value is retrieved' do
-    moneta_property_of(keys: 1, values: 1).check do |keys:, values:|
-      next if [TrueClass,FalseClass,NilClass,Numeric].any?(&values[0].method(:is_a?))
-      store[keys[0]] = values[0]
-      store[keys[0]].should_not be_equal(values[0])
+    moneta_property_of(keys: 1, values: 1).check do |m|
+      next if [TrueClass,FalseClass,NilClass,Numeric].any?(&m.values[0].method(:is_a?))
+      store[m.keys[0]] = m.values[0]
+      store[m.keys[0]].should_not be_equal(m.values[0])
     end
   end
 end

data/spec/features/returnsame.rb

@@ -1,9 +1,9 @@
 shared_examples :returnsame do
   it 'guarantees that the same value is retrieved' do
-    moneta_property_of(keys: 1, values: 1).check do |keys:, values:|
-      next if [TrueClass,FalseClass,Numeric].any?(&values[0].method(:is_a?))
-      store[keys[0]] = values[0]
-      store[keys[0]].should be_equal(values[0])
+    moneta_property_of(keys: 1, values: 1).check do |m|
+      next if [TrueClass, FalseClass, Numeric].any?(&m.values[0].method(:is_a?))
+      store[m.keys[0]] = m.values[0]
+      store[m.keys[0]].should be_equal(m.values[0])
     end
   end
 end

data/spec/features/store.rb

@@ -1,106 +1,106 @@
 shared_examples :store do
   it 'writes values to keys that like a Hash' do
-    moneta_property_of(keys: 1, values: 1).check do |keys:, values:|
-      store[keys[0]] = values[0]
-      store[keys[0]].should == values[0]
-      store.load(keys[0]).should == values[0]
+    moneta_property_of(keys: 1, values: 1).check do |m|
+      store[m.keys[0]] = m.values[0]
+      store[m.keys[0]].should == m.values[0]
+      store.load(m.keys[0]).should == m.values[0]
     end
   end
 
   it 'returns true from #key? if a key is available' do
-    moneta_property_of(keys: 1, values: 1).check do |keys:, values:|
-      store[keys[0]] = values[0]
-      store.key?(keys[0]).should be true
+    moneta_property_of(keys: 1, values: 1).check do |m|
+      store[m.keys[0]] = m.values[0]
+      store.key?(m.keys[0]).should be true
     end
   end
 
   it 'stores values with #store' do
-    moneta_property_of(keys: 1, values: 1).check do |keys:, values:|
-      value = values[0]
-      store.store(keys[0], value).should equal(value)
-      store[keys[0]].should == values[0]
-      store.load(keys[0]).should == values[0]
+    moneta_property_of(keys: 1, values: 1).check do |m|
+      value = m.values[0]
+      store.store(m.keys[0], value).should equal(value)
+      store[m.keys[0]].should == m.values[0]
+      store.load(m.keys[0]).should == m.values[0]
     end
   end
 
   it 'stores values after clear' do
-    moneta_property_of(keys: 2, values: 2).check do |keys:, values:|
-      store[keys[0]] = values[0]
-      store[keys[1]] = values[1]
+    moneta_property_of(keys: 2, values: 2).check do |m|
+      store[m.keys[0]] = m.values[0]
+      store[m.keys[1]] = m.values[1]
       store.clear.should equal(store)
-      store[keys[0]] = values[0]
-      store[keys[0]].should == values[0]
-      store[keys[1]].should be_nil
+      store[m.keys[0]] = m.values[0]
+      store[m.keys[0]].should == m.values[0]
+      store[m.keys[1]].should be_nil
     end
   end
 
   it 'removes and returns a value from the backing store via delete if it exists' do
-    moneta_property_of(keys: 1, values: 1).check do |keys:, values:|
-      store[keys[0]] = values[0]
-      store.delete(keys[0]).should == values[0]
-      store.key?(keys[0]).should be false
+    moneta_property_of(keys: 1, values: 1).check do |m|
+      store[m.keys[0]] = m.values[0]
+      store.delete(m.keys[0]).should == m.values[0]
+      store.key?(m.keys[0]).should be false
     end
   end
 
   it 'overwrites existing values' do
-    moneta_property_of(keys: 1, values: 2).check do |keys:, values:|
-      store[keys[0]] = values[0]
-      store[keys[0]].should == values[0]
-      store[keys[0]] = values[1]
-      store[keys[0]].should == values[1]
+    moneta_property_of(keys: 1, values: 2).check do |m|
+      store[m.keys[0]] = m.values[0]
+      store[m.keys[0]].should == m.values[0]
+      store[m.keys[0]] = m.values[1]
+      store[m.keys[0]].should == m.values[1]
     end
   end
 
   it 'stores frozen values' do
-    moneta_property_of(keys: 1, values: 1).check do |keys:, values:|
-      value = values[0].freeze
-      (store[keys[0]] = value).should equal(value)
-      store[keys[0]].should == values[0]
+    moneta_property_of(keys: 1, values: 1).check do |m|
+      value = m.values[0].freeze
+      (store[m.keys[0]] = value).should equal(value)
+      store[m.keys[0]].should == m.values[0]
     end
   end
 
   it 'stores frozen keys' do
-    moneta_property_of(keys: 1, values: 1).check do |keys:, values:|
-      key = keys[0].freeze
-      store[key] = values[0]
-      store[keys[0]].should == values[0]
+    moneta_property_of(keys: 1, values: 1).check do |m|
+      key = m.keys[0].freeze
+      store[key] = m.values[0]
+      store[m.keys[0]].should == m.values[0]
     end
   end
 
   it 'fetches a key with a default value with fetch, if the key is available' do
-    moneta_property_of(keys: 1, values: 2).check do |keys:, values:|
-      next if values[0].nil?
-      store[keys[0]] = values[0]
-      store.fetch(keys[0], values[1]).should == values[0]
+    moneta_property_of(keys: 1, values: 2).check do |m|
+      next if m.values[0].nil?
+      store[m.keys[0]] = m.values[0]
+      store.fetch(m.keys[0], m.values[1]).should == m.values[0]
     end
   end
 
   it 'does not run the block in fetch if the key is available' do
-    moneta_property_of(keys: 1, values: 1).check do |keys:, values:|
-      next if values[0].nil?
-      store[keys[0]] = values[0]
+    moneta_property_of(keys: 1, values: 1).check do |m|
+      next if m.values[0].nil?
+      store[m.keys[0]] = m.values[0]
       unaltered = 'unaltered'
-      store.fetch(keys[0]) { unaltered = 'altered' }
+      store.fetch(m.keys[0]) { unaltered = 'altered' }
       unaltered.should == 'unaltered'
     end
   end
 
   shared_examples :values_at do |name|
     it 'retrieves stored values' do
-      moneta_property_of(keys: 3, values: 3).check do |keys:, values:|
-        store[keys[0]] = values[0]
-        store[keys[1]] = values[1]
-        store[keys[2]] = values[2]
-        expect(store.public_send(name, keys[1], keys[2], keys[0])).to eq [values[1], values[2], values[0]]
+      moneta_property_of(keys: 3, values: 3).check do |m|
+        store[m.keys[0]] = m.values[0]
+        store[m.keys[1]] = m.values[1]
+        store[m.keys[2]] = m.values[2]
+        expect(store.public_send(name, m.keys[1], m.keys[2], m.keys[0])).to eq [m.values[1], m.values[2], m.values[0]]
         store.clear
       end
     end
 
     it 'returns nil in place of missing values' do
-      moneta_property_of(keys: 3, values: 2).check do |keys:, values:|
-        store[keys[0]] = values[0]
-        store[keys[1]] = values[1]
-        expect(store.public_send(name, keys[1], keys[2], keys[0])).to eq [values[1], nil, values[0]]
+      moneta_property_of(keys: 3, values: 2).check do |m|
+        store[m.keys[0]] = m.values[0]
+        store[m.keys[1]] = m.values[1]
+        expect(store.public_send(name, m.keys[1], m.keys[2], m.keys[0])).to eq [m.values[1], nil, m.values[0]]
         store.clear
       end
     end
@@ -114,29 +114,29 @@ shared_examples :store do
     include_examples :values_at, :fetch_values
 
     it 'yields to the block, if given, for keys that are not in the store' do
-      moneta_property_of(keys: 4, values: 3).check do |keys:, values:|
-        store[keys[0]] = values[0]
-        store[keys[1]] = values[1]
-        store[keys[2]] = values[2]
+      moneta_property_of(keys: 4, values: 3).check do |m|
+        store[m.keys[0]] = m.values[0]
+        store[m.keys[1]] = m.values[1]
+        store[m.keys[2]] = m.values[2]
 
         expect do |b|
-          store.fetch_values(keys[0], keys[1], keys[2], keys[3], &b)
-        end.to yield_with_args(keys[3])
+          store.fetch_values(m.keys[0], m.keys[1], m.keys[2], m.keys[3], &b)
+        end.to yield_with_args(m.keys[3])
 
         store.clear
       end
     end
 
     it 'uses the value of the block, if given, for keys that are not in the store' do
-      moneta_property_of(keys: 4, values: 4).check do |keys:, values:|
-        store[keys[0]] = values[0]
-        store[keys[1]] = values[1]
-        store[keys[2]] = values[2]
+      moneta_property_of(keys: 4, values: 4).check do |m|
+        store[m.keys[0]] = m.values[0]
+        store[m.keys[1]] = m.values[1]
+        store[m.keys[2]] = m.values[2]
 
-        expect(store.fetch_values(keys[0], keys[1], keys[2], keys[3]) do |key|
-          expect(key).to eq keys[3]
-          values[3]
-        end).to eq [values[0], values[1], values[2], values[3]]
+        expect(store.fetch_values(m.keys[0], m.keys[1], m.keys[2], m.keys[3]) do |key|
+          expect(key).to eq m.keys[3]
+          m.values[3]
+        end).to eq [m.values[0], m.values[1], m.values[2], m.values[3]]
 
         store.clear
       end
@@ -149,26 +149,26 @@ shared_examples :store do
 
   describe '#slice' do
     it 'returns pairs of stored keys and values' do
-      moneta_property_of(keys: 3, values: 3).check do |keys:, values:|
-        store[keys[0]] = values[0]
-        store[keys[1]] = values[1]
-        store[keys[2]] = values[2]
+      moneta_property_of(keys: 3, values: 3).check do |m|
+        store[m.keys[0]] = m.values[0]
+        store[m.keys[1]] = m.values[1]
+        store[m.keys[2]] = m.values[2]
 
-        expect(store.slice(*[keys[0], keys[1], keys[2]].shuffle).to_a).to \
-          contain_exactly([keys[0], values[0]], [keys[1], values[1]], [keys[2], values[2]])
+        expect(store.slice(*[m.keys[0], m.keys[1], m.keys[2]].shuffle).to_a).to \
+          contain_exactly([m.keys[0], m.values[0]], [m.keys[1], m.values[1]], [m.keys[2], m.values[2]])
 
         store.clear
       end
     end
 
     it 'does not return pairs for any keys absent from the store' do
-      moneta_property_of(keys: 4, values: 3).check do |keys:, values:|
-        store[keys[0]] = values[0]
-        store[keys[1]] = values[1]
-        store[keys[2]] = values[2]
+      moneta_property_of(keys: 4, values: 3).check do |m|
+        store[m.keys[0]] = m.values[0]
+        store[m.keys[1]] = m.values[1]
+        store[m.keys[2]] = m.values[2]
 
-        expect(store.slice(*[keys[0], keys[1], keys[2], keys[3]].shuffle).to_a).to \
-          contain_exactly([keys[0], values[0]], [keys[1], values[1]], [keys[2], values[2]])
+        expect(store.slice(*[m.keys[0], m.keys[1], m.keys[2], m.keys[3]].shuffle).to_a).to \
+          contain_exactly([m.keys[0], m.values[0]], [m.keys[1], m.values[1]], [m.keys[2], m.values[2]])
 
         store.clear
       end
@@ -177,44 +177,44 @@ 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.key?(keys[0])).to be true
-        expect(store[keys[0]]).to eq values[0]
-        expect(store.key?(keys[1])).to be true
-        expect(store[keys[1]]).to eq values[1]
-        expect(store.key?(keys[2])).to be true
-        expect(store[keys[2]]).to eq values[2]
+      moneta_property_of(keys: 3, values: 3).check do |m|
+        expect(store.public_send(method, pairs.call({ m.keys[0] => m.values[0], m.keys[1] => m.values[1], m.keys[2] => m.values[2] }))).to be store
+        expect(store.key?(m.keys[0])).to be true
+        expect(store[m.keys[0]]).to eq m.values[0]
+        expect(store.key?(m.keys[1])).to be true
+        expect(store[m.keys[1]]).to eq m.values[1]
+        expect(store.key?(m.keys[2])).to be true
+        expect(store[m.keys[2]]).to eq m.values[2]
         store.clear
       end
     end
 
     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.key?(keys[0])).to be true
-        expect(store[keys[0]]).to eq values[1]
-        expect(store.key?(keys[1])).to be true
-        expect(store[keys[1]]).to eq values[2]
+      moneta_property_of(keys: 2, values: 3).check do |m|
+        expect(store[m.keys[0]] = m.values[0]).to eq m.values[0]
+        expect(store.public_send(method, pairs.call({ m.keys[0] => m.values[1], m.keys[1] => m.values[2] }))).to be store
+        expect(store.key?(m.keys[0])).to be true
+        expect(store[m.keys[0]]).to eq m.values[1]
+        expect(store.key?(m.keys[1])).to be true
+        expect(store[m.keys[1]]).to eq m.values[2]
         store.clear
       end
     end
 
     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(key).to eq keys[0]
-          expect(old_val).to eq values[0]
-          expect(new_val).to eq values[1]
-          values[3]
+      moneta_property_of(keys: 2, values: 4).check do |m|
+        expect(store[m.keys[0]] = m.values[0]).to eq m.values[0]
+        expect(store.public_send(method, pairs.call({ m.keys[0] => m.values[1], m.keys[1] => m.values[2] })) do |key, old_val, new_val|
+          expect(key).to eq m.keys[0]
+          expect(old_val).to eq m.values[0]
+          expect(new_val).to eq m.values[1]
+          m.values[3]
         end).to be store
 
-        expect(store.key?(keys[0])).to be true
-        expect(store[keys[0]]).to eq values[3]
-        expect(store.key?(keys[1])).to be true
-        expect(store[keys[1]]).to eq values[2]
+        expect(store.key?(m.keys[0])).to be true
+        expect(store[m.keys[0]]).to eq m.values[3]
+        expect(store.key?(m.keys[1])).to be true
+        expect(store[m.keys[1]]).to eq m.values[2]
         store.clear
       end
     end

data/spec/helper.rb

@@ -335,9 +335,7 @@ module MonetaHelpers
         value_values = values.times.map { call(values_meta) }
         guard value_values.uniq.length == value_values.length
 
-        [[:keys, key_values], [:values, value_values]].
-          reject { |key, value| value.empty? }.
-          to_h
+        Struct.new(:keys, :values).new(key_values, value_values)
       end
     end
 

data/spec/moneta/adapters/cassandra/adapter_cassandra_spec.rb

@@ -1,6 +1,6 @@
 require_relative './helper.rb'
 
-describe 'adapter_cassandra', retry: 3, adapter: :Cassandra do
+describe 'adapter_cassandra', retry: 3, adapter: :Cassandra, unsupported: RUBY_ENGINE == 'ruby' && Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0') do
   let(:t_res) { 1 }
   let(:min_ttl) { 2 }
 

data/spec/moneta/adapters/cassandra/adapter_cassandra_with_default_expires_spec.rb

@@ -1,6 +1,6 @@
 require_relative './helper.rb'
 
-describe 'adapter_cassandra_with_default_expires', isolate: true, retry: 3, adapter: :Cassandra do
+describe 'adapter_cassandra_with_default_expires', isolate: true, retry: 3, adapter: :Cassandra, unsupported: RUBY_ENGINE == 'ruby' && Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0') do
   let(:t_res) { 1 }
   let(:min_ttl) { 2 }
 

data/spec/moneta/adapters/cassandra/standard_cassandra_spec.rb

@@ -1,6 +1,6 @@
 require_relative './helper.rb'
 
-describe "standard_cassandra", retry: 3, adapter: :Cassandra do
+describe "standard_cassandra", retry: 3, adapter: :Cassandra, unsupported: RUBY_ENGINE == 'ruby' && Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0') do
   let(:t_res) { 1 }
   let(:min_ttl) { 2 }
 

data/spec/moneta/adapters/datamapper/adapter_datamapper_spec.rb

@@ -1,4 +1,4 @@
-describe 'adapter_datamapper', broken: defined?(JRUBY_VERSION), adapter: :DataMapper, mysql: true do
+describe 'adapter_datamapper', unsupported: defined?(JRUBY_VERSION) || RUBY_ENGINE == 'ruby' && Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0'), adapter: :DataMapper, mysql: true do
   before :all do
     require 'dm-core'
 

data/spec/moneta/adapters/datamapper/standard_datamapper_spec.rb

@@ -1,4 +1,4 @@
-describe "standard_datamapper", broken: defined?(JRUBY_VERSION), adapter: :DataMapper, mysql: true do
+describe "standard_datamapper", unsupported: defined?(JRUBY_VERSION) || RUBY_ENGINE == 'ruby' && Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0'), adapter: :DataMapper, mysql: true do
   before :all do
     require 'dm-core'
 

data/spec/moneta/adapters/datamapper/standard_datamapper_with_expires_spec.rb

@@ -1,4 +1,4 @@
-describe "standard_datamapper_with_expires", broken: defined?(JRUBY_VERSION), adapter: :DataMapper, mysql: true do
+describe "standard_datamapper_with_expires", unsupported: defined?(JRUBY_VERSION) || RUBY_ENGINE == 'ruby' && Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0'), adapter: :DataMapper, mysql: true do
   let(:t_res) { 0.125 }
   let(:min_ttl) { t_res }
   use_timecop

data/spec/moneta/adapters/datamapper/standard_datamapper_with_repository_spec.rb

@@ -1,4 +1,4 @@
-describe 'standard_datamapper_with_repository', broken: defined?(JRUBY_VERSION), adapter: :DataMapper, mysql: true do
+describe 'standard_datamapper_with_repository', unsupported: defined?(JRUBY_VERSION) || RUBY_ENGINE == 'ruby' && Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0'), adapter: :DataMapper, mysql: true do
   before :all do
     require 'dm-core'
 

data/spec/moneta/proxies/enumerable/enumerable_spec.rb

@@ -14,8 +14,8 @@ describe 'enumerable', proxy: :Enumerable do
   end
 
   it 'allows enumeration over key-value pairs' do
-    moneta_property_of(keys: 100, values: 100) do |keys:, values:|
-      pairs = keys.zip(values)
+    moneta_property_of(keys: 100, values: 100) do |m|
+      pairs = m.keys.zip(m.values)
       store.merge!(pairs)
       expect(store.to_a).to contain_exactly(*pairs)
       expect(store.each.to_a).to contain_exactly(*pairs)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moneta
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Daniel Mendler
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-06 00:00:00.000000000 Z
+date: 2022-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -446,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.5.0/CHANGES
-  documentation_uri: https://www.rubydoc.info/gems/moneta/1.5.0
-  source_code_uri: https://github.com/moneta-rb/moneta/tree/v1.5.0
+  changelog_uri: https://github.com/moneta-rb/moneta/blob/v1.5.1/CHANGES
+  documentation_uri: https://www.rubydoc.info/gems/moneta/1.5.1
+  source_code_uri: https://github.com/moneta-rb/moneta/tree/v1.5.1
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -464,7 +464,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.8
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: A unified interface to key/value stores, including Redis, Memcached, TokyoCabinet,