Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rubygem-moneta for openSUSE:Factory checked in at 2022-12-13 18:56:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-moneta (Old) and /work/SRC/openSUSE:Factory/.rubygem-moneta.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-moneta" Tue Dec 13 18:56:49 2022 rev:15 rq:1042648 version:1.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-moneta/rubygem-moneta.changes 2022-04-30 22:52:44.668241027 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-moneta.new.1835/rubygem-moneta.changes 2022-12-13 18:57:12.543760996 +0100 @@ -1,0 +2,13 @@ +Wed Dec 7 11:26:16 UTC 2022 - Stephan Kulow <co...@suse.com> + +updated to version 1.5.2 + see installed CHANGES + + 1.5.2 + + * Proxy - handle returning config when the adapter does not use config + * Avoid calling `supports?(:expires)` when expiry isn't needed + * Adapters::Mongo - fix `merge!` behaviour when no values are inserted + + +------------------------------------------------------------------- Old: ---- moneta-1.5.1.gem New: ---- moneta-1.5.2.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-moneta.spec ++++++ --- /var/tmp/diff_new_pack.nvKr8k/_old 2022-12-13 18:57:13.163764305 +0100 +++ /var/tmp/diff_new_pack.nvKr8k/_new 2022-12-13 18:57:13.167764326 +0100 @@ -24,7 +24,7 @@ # Name: rubygem-moneta -Version: 1.5.1 +Version: 1.5.2 Release: 0 %define mod_name moneta %define mod_full_name %{mod_name}-%{version} ++++++ moneta-1.5.1.gem -> moneta-1.5.2.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/.github/workflows/ruby.yml new/.github/workflows/ruby.yml --- old/.github/workflows/ruby.yml 2022-04-13 12:17:04.000000000 +0200 +++ new/.github/workflows/ruby.yml 2022-11-10 12:51:52.000000000 +0100 @@ -343,7 +343,7 @@ services: mongo: - image: mongo + image: mongo:4.4 options: >- --health-cmd "mongo --eval db" --health-interval 10s diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHANGES new/CHANGES --- old/CHANGES 2022-04-13 12:17:04.000000000 +0200 +++ new/CHANGES 2022-11-10 12:51:52.000000000 +0100 @@ -1,3 +1,9 @@ +1.5.2 + +* Proxy - handle returning config when the adapter does not use config +* Avoid calling `supports?(:expires)` when expiry isn't needed +* Adapters::Mongo - fix `merge!` behaviour when no values are inserted + 1.5.1 * Adapters::File - fix an implicit hash issue in Ruby 3 (#222) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CONTRIBUTORS new/CONTRIBUTORS --- old/CONTRIBUTORS 2022-04-13 12:17:04.000000000 +0200 +++ new/CONTRIBUTORS 2022-11-10 12:51:52.000000000 +0100 @@ -3,11 +3,13 @@ Alejandro Crosa <acrosa@sharing.local> Alessio Signorini <ales...@signorini.us> Anthony Eden <anthonye...@gmail.com> +Antoine Beaupré <anar...@debian.org> Antonio Terceiro <terce...@debian.org> Atoxhybrid <atoxhyb...@gmail.com> AtoxIO <atoxhyb...@gmail.com> Ben Schwarz <ben.schw...@gmail.com> Benjamin Yu <benjamin...@gmail.com> +Corey Smith <korkey1...@gmail.com> Daniel Mendler <m...@daniel-mendler.de> Denis Defreyne <denis.defre...@stoneship.org> Derek Kastner <dkast...@gmail.com> @@ -34,6 +36,7 @@ Ryan T. Hosford <tad.hosf...@gmail.com> Scott Wadden <scott.wad...@gmail.com> Sven Riedel <s...@gimp.org> +Thomas R. Koll <tom...@tomk32.de> Timo Goebel <timo.goe...@dm.de> Tom Meier <ozme...@yahoo.co.uk> Tony Han <h.bing...@gmail.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gemfile new/Gemfile --- old/Gemfile 2022-04-13 12:17:04.000000000 +0200 +++ new/Gemfile 2022-11-10 12:51:52.000000000 +0100 @@ -52,10 +52,6 @@ gem 'snappy', platforms: :ruby end - group :quicklz, optional: true do - gem 'qlzruby', platforms: :ruby - end - # Hash transformer library group :city, optional: true do gem 'cityhash', platforms: :ruby @@ -171,7 +167,7 @@ group :sqlite, optional: true do gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby - gem 'sqlite3', '~> 1.3.6', platforms: :ruby + gem 'sqlite3', '~> 1.5.3', platforms: :ruby end group :postgresql, optional: true do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/README.md new/README.md --- old/README.md 2022-04-13 12:17:04.000000000 +0200 +++ new/README.md 2022-11-10 12:51:52.000000000 +0100 @@ -106,11 +106,11 @@ * Key/value databases: * [Berkeley DB using DBM interface or NDBM (Depends on Ruby environment)](http://www.ruby-doc.org/stdlib/libdoc/dbm/rdoc/DBM.html) (`:DBM`) * [Cassandra](http://cassandra.apache.org/) (`:Cassandra`) - * [Daybreak](http://propublica.github.com/daybreak/) (`:Daybreak`) + * [Daybreak](https://propublica.github.io/daybreak/) (`:Daybreak`) * [GDBM](http://www.ruby-doc.org/stdlib/libdoc/gdbm/rdoc/GDBM.html) (`:GDBM`) * [HBase](http://hbase.apache.org/) (`:HBase`) * [LevelDB](http://code.google.com/p/leveldb/) (`:LevelDB`) - * [LMDB](http://symas.com/mdb/) (`:LMDB`) + * [LMDB](http://symas.com/lmdb) (`:LMDB`) * [Redis](http://redis.io/) (`:Redis`) * [Riak](http://docs.basho.com/) (`:Riak`) * [SDBM](http://www.ruby-doc.org/stdlib/libdoc/sdbm/rdoc/SDBM.html) (`:SDBM`) @@ -150,7 +150,7 @@ <tr><td>File</td><td>-</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#F44">â</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#F44">â</td><td style="text-align:center;background:#F44">â</td><td>File store</td></tr> -<tr><td>LMDB</td><td>lmdb</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#F44">â</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#F44">â</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#5F5">â</td><td><a href="http://symas.com/mdb/">Symas Lightning Memory-Mapped Database (LMDB)</a></td></tr> +<tr><td>LMDB</td><td>lmdb</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#F44">â</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#F44">â</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#5F5">â</td><td><a href="http://symas.com/lmdb">Symas Lightning Memory-Mapped Database (LMDB)</a></td></tr> <tr><td>Sequel</td><td>sequel</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#F44">â</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#5F5">â</td><td style="text-align:center;background:#5F5">â</td><td><a href="http://sequel.rubyforge.org/">Sequel</a> ORM</td></tr> @@ -221,9 +221,7 @@ 3. Share a Moneta store between multiple processes using `Moneta::Shared` (See below). 4. If a store provides atomic increment it can be used with `Moneta::Semaphore`. You can add weak `#increment` support using the `Moneta::WeakIncrement` proxy. 5. If a store provides atomic creation it can be used with `Moneta::Mutex`. You can add weak `#create` support using the `Moneta::WeakCreate` proxy. -6. Add expiration support by using `Moneta::Expires` or by passing the option - `expires: true` (or `expires: <seconds>` if you want all values to expire by - default) to `Moneta#new`. +6. Add expiration support by using `Moneta::Expires` or by passing the option `expires: true` to `Moneta#new`. 7. This indicates that there is some performance gain when fetching multiple values at once using `#values_at`/`#fetch_values` or `#slice`. For instance, the `MGET` instruction in Redis, or the ability to retrieve several rows in one query in SQL. 8. This indicates that there is some performance gain when storing multiple key/value pairs at once using `#merge!`/`#update`. 9. Sqlite/YAML/PStore are multiprocess safe, but the performance suffers badly since the whole database file must be locked for writing. Use a key/value server if you want multiprocess concurrency! Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/feature_matrix.yaml new/feature_matrix.yaml --- old/feature_matrix.yaml 2022-04-13 12:17:04.000000000 +0200 +++ new/feature_matrix.yaml 2022-11-10 12:51:52.000000000 +0100 @@ -30,7 +30,7 @@ platforms: [ MRI ] gems: lmdb features: [ threadsafe, multiprocess, increment, create, each_key, bulk_read, bulk_write ] - description: "[Symas Lightning Memory-Mapped Database (LMDB)](http://symas.com/mdb/)" + description: "[Symas Lightning Memory-Mapped Database (LMDB)](http://symas.com/lmdb)" - adapter: Sequel platforms: [ MRI, JRuby ] gems: sequel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/moneta/adapters/mongo.rb new/lib/moneta/adapters/mongo.rb --- old/lib/moneta/adapters/mongo.rb 2022-04-13 12:17:04.000000000 +0200 +++ new/lib/moneta/adapters/mongo.rb 2022-11-10 12:51:52.000000000 +0100 @@ -164,9 +164,11 @@ existing = Hash[slice(*pairs.map { |key, _| key })] update_pairs, insert_pairs = pairs.partition { |key, _| existing.key?(key) } - @collection.insert_many(insert_pairs.map do |key, value| - value_to_doc(to_binary(key), value, options) - end) + unless insert_pairs.empty? + @collection.insert_many(insert_pairs.map do |key, value| + value_to_doc(to_binary(key), value, options) + end) + end update_pairs.each do |key, value| value = yield(key, existing[key], value) if block_given? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/moneta/proxy.rb new/lib/moneta/proxy.rb --- old/lib/moneta/proxy.rb 2022-04-13 12:17:04.000000000 +0200 +++ new/lib/moneta/proxy.rb 2022-11-10 12:51:52.000000000 +0100 @@ -145,7 +145,7 @@ def config unless @proxy_config config = super - adapter_config = adapter&.config + adapter_config = adapter.config if adapter.class.include?(Config) @proxy_config = if config && adapter_config diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/moneta/version.rb new/lib/moneta/version.rb --- old/lib/moneta/version.rb 2022-04-13 12:17:04.000000000 +0200 +++ new/lib/moneta/version.rb 2022-11-10 12:51:52.000000000 +0100 @@ -1,5 +1,5 @@ module Moneta # Moneta version number # @api public - VERSION = '1.5.1'.freeze + VERSION = '1.5.2'.freeze end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/moneta.rb new/lib/moneta.rb --- old/lib/moneta.rb 2022-04-13 12:17:04.000000000 +0200 +++ new/lib/moneta.rb 2022-11-10 12:51:52.000000000 +0100 @@ -144,7 +144,7 @@ a = Adapters.const_get(name).new(options) build do use :Logger, Hash === logger ? logger : {} if logger - use :Expires, expires: options[:expires] if !a.supports?(:expires) && expires + use :Expires, expires: options[:expires] if expires && !a.supports?(:expires) use :Transformer, transformer use :Lock if threadsafe adapter a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2022-04-13 12:17:04.000000000 +0200 +++ new/metadata 2022-11-10 12:51:52.000000000 +0100 @@ -1,7 +1,7 @@ --- !ruby/object:Gem::Specification name: moneta version: !ruby/object:Gem::Version - version: 1.5.1 + version: 1.5.2 platform: ruby authors: - Daniel Mendler @@ -11,7 +11,7 @@ autorequire: bindir: bin cert_chain: [] -date: 2022-04-13 00:00:00.000000000 Z +date: 2022-11-10 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: multi_json @@ -446,9 +446,9 @@ - MIT metadata: bug_tracker_uri: https://github.com/moneta-rb/moneta/issues - 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 + changelog_uri: https://github.com/moneta-rb/moneta/blob/v1.5.2/CHANGES + documentation_uri: https://www.rubydoc.info/gems/moneta/1.5.2 + source_code_uri: https://github.com/moneta-rb/moneta/tree/v1.5.2 post_install_message: rdoc_options: [] require_paths: @@ -464,7 +464,7 @@ - !ruby/object:Gem::Version version: '0' requirements: [] -rubygems_version: 3.2.29 +rubygems_version: 3.3.25 signing_key: specification_version: 4 summary: A unified interface to key/value stores, including Redis, Memcached, TokyoCabinet, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/helper.rb new/spec/helper.rb --- old/spec/helper.rb 2022-04-13 12:17:04.000000000 +0200 +++ new/spec/helper.rb 2022-11-10 12:51:52.000000000 +0100 @@ -269,6 +269,7 @@ # 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_socket) { ENV['MYSQL_SOCKET'] } let(:mysql_username) { ENV['MONETA_MYSQL_USERNAME'] || 'root' } let(:mysql_password) { ENV['MONETA_MYSQL_PASSWORD'] } let(:mysql_database1) { ENV['MONETA_MYSQL_DATABASE1'] || 'moneta' } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/moneta/adapters/activerecord/adapter_activerecord_existing_connection_spec.rb new/spec/moneta/adapters/activerecord/adapter_activerecord_existing_connection_spec.rb --- old/spec/moneta/adapters/activerecord/adapter_activerecord_existing_connection_spec.rb 2022-04-13 12:17:04.000000000 +0200 +++ new/spec/moneta/adapters/activerecord/adapter_activerecord_existing_connection_spec.rb 2022-11-10 12:51:52.000000000 +0100 @@ -1,4 +1,4 @@ -describe 'adapter_activerecord_existing_connection', adapter: :ActiveRecord, mysql: true do +describe 'adapter_activerecord_existing_connection', adapter: :ActiveRecord, mysql: true, broken: ::Gem::Version.new(RUBY_ENGINE_VERSION) >= ::Gem::Version.new('3.0.0') do before :all do require 'active_record' end @@ -8,6 +8,7 @@ ActiveRecord::Base.configurations = { default_env => { 'adapter' => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), + 'socket' => mysql_socket, 'host' => mysql_host, 'port' => mysql_port, 'database' => mysql_database1, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/moneta/adapters/activerecord/adapter_activerecord_spec.rb new/spec/moneta/adapters/activerecord/adapter_activerecord_spec.rb --- old/spec/moneta/adapters/activerecord/adapter_activerecord_spec.rb 2022-04-13 12:17:04.000000000 +0200 +++ new/spec/moneta/adapters/activerecord/adapter_activerecord_spec.rb 2022-11-10 12:51:52.000000000 +0100 @@ -1,4 +1,4 @@ -describe 'adapter_activerecord', adapter: :ActiveRecord do +describe 'adapter_activerecord', adapter: :ActiveRecord, broken: ::Gem::Version.new(RUBY_ENGINE_VERSION) >= ::Gem::Version.new('3.0.0') do activerecord_specs = ADAPTER_SPECS.with_values(:nil).with_each_key shared_examples :adapter_activerecord do |specs| @@ -64,6 +64,7 @@ adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), host: mysql_host, port: mysql_port, + socket: mysql_socket, database: mysql_database1, username: mysql_username, password: mysql_password @@ -75,6 +76,7 @@ adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), host: mysql_host, port: mysql_port, + socket: mysql_socket, database: mysql_database2, username: mysql_username, password: mysql_password diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/moneta/adapters/activerecord/standard_activerecord_spec.rb new/spec/moneta/adapters/activerecord/standard_activerecord_spec.rb --- old/spec/moneta/adapters/activerecord/standard_activerecord_spec.rb 2022-04-13 12:17:04.000000000 +0200 +++ new/spec/moneta/adapters/activerecord/standard_activerecord_spec.rb 2022-11-10 12:51:52.000000000 +0100 @@ -1,4 +1,4 @@ -describe "standard_activerecord", adapter: :ActiveRecord, mysql: true do +describe "standard_activerecord", adapter: :ActiveRecord, mysql: true, broken: ::Gem::Version.new(RUBY_ENGINE_VERSION) >= ::Gem::Version.new('3.0.0') do moneta_store :ActiveRecord do { table: 'standard_activerecord', @@ -6,6 +6,7 @@ adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), host: mysql_host, port: mysql_port, + socket: mysql_socket, database: mysql_database1, username: mysql_username, password: mysql_password diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/moneta/adapters/activerecord/standard_activerecord_with_expires_spec.rb new/spec/moneta/adapters/activerecord/standard_activerecord_with_expires_spec.rb --- old/spec/moneta/adapters/activerecord/standard_activerecord_with_expires_spec.rb 2022-04-13 12:17:04.000000000 +0200 +++ new/spec/moneta/adapters/activerecord/standard_activerecord_with_expires_spec.rb 2022-11-10 12:51:52.000000000 +0100 @@ -1,4 +1,4 @@ -describe "standard_activerecord_with_expires", adapter: :ActiveRecord, mysql: true do +describe "standard_activerecord_with_expires", adapter: :ActiveRecord, mysql: true, broken: ::Gem::Version.new(RUBY_ENGINE_VERSION) >= ::Gem::Version.new('3.0.0') do let(:t_res) { 0.125 } let(:min_ttl) { t_res } use_timecop @@ -10,6 +10,7 @@ adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), host: mysql_host, port: mysql_port, + socket: mysql_socket, database: mysql_database1, username: mysql_username, password: mysql_password diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/moneta/adapters/activesupportcache/adapter_activesupportcache_spec.rb new/spec/moneta/adapters/activesupportcache/adapter_activesupportcache_spec.rb --- old/spec/moneta/adapters/activesupportcache/adapter_activesupportcache_spec.rb 2022-04-13 12:17:04.000000000 +0200 +++ new/spec/moneta/adapters/activesupportcache/adapter_activesupportcache_spec.rb 2022-11-10 12:51:52.000000000 +0100 @@ -1,6 +1,6 @@ require_relative '../memcached_helper.rb' -describe 'adapter_activesupportcache', adapter: :ActiveSupportCache do +describe 'adapter_activesupportcache', adapter: :ActiveSupportCache, broken: ::Gem::Version.new(RUBY_ENGINE_VERSION) >= ::Gem::Version.new('3.0.0') do before :all do require 'active_support' require 'active_support/cache/moneta_store' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/moneta/adapters/activesupportcache/adapter_activesupportcache_with_default_expires_spec.rb new/spec/moneta/adapters/activesupportcache/adapter_activesupportcache_with_default_expires_spec.rb --- old/spec/moneta/adapters/activesupportcache/adapter_activesupportcache_with_default_expires_spec.rb 2022-04-13 12:17:04.000000000 +0200 +++ new/spec/moneta/adapters/activesupportcache/adapter_activesupportcache_with_default_expires_spec.rb 2022-11-10 12:51:52.000000000 +0100 @@ -1,6 +1,6 @@ require_relative '../memcached_helper' -describe 'adapter_activesupportcache_with_default_expires', adapter: :ActiveSupportCache do +describe 'adapter_activesupportcache_with_default_expires', adapter: :ActiveSupportCache, broken: ::Gem::Version.new(RUBY_ENGINE_VERSION) >= ::Gem::Version.new('3.0.0') do before :all do require 'active_support' require 'active_support/cache/moneta_store' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/moneta/adapters/activesupportcache/standard_activesupportcache_spec.rb new/spec/moneta/adapters/activesupportcache/standard_activesupportcache_spec.rb --- old/spec/moneta/adapters/activesupportcache/standard_activesupportcache_spec.rb 2022-04-13 12:17:04.000000000 +0200 +++ new/spec/moneta/adapters/activesupportcache/standard_activesupportcache_spec.rb 2022-11-10 12:51:52.000000000 +0100 @@ -1,4 +1,4 @@ -describe 'standard_activesupportcache' do +describe 'standard_activesupportcache', adapter: :ActiveSupportCache, broken: ::Gem::Version.new(RUBY_ENGINE_VERSION) >= ::Gem::Version.new('3.0.0') do before :context do require 'active_support' end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/moneta/adapters/datamapper/adapter_datamapper_spec.rb new/spec/moneta/adapters/datamapper/adapter_datamapper_spec.rb --- old/spec/moneta/adapters/datamapper/adapter_datamapper_spec.rb 2022-04-13 12:17:04.000000000 +0200 +++ new/spec/moneta/adapters/datamapper/adapter_datamapper_spec.rb 2022-11-10 12:51:52.000000000 +0100 @@ -6,9 +6,13 @@ DataMapper.setup(:default, adapter: :in_memory) end + let :database_uri do + "mysql://#{mysql_username}:#{mysql_password}@#{mysql_host}:#{mysql_port}/#{mysql_database1}" + (mysql_socket ? "?socket=#{mysql_socket}" : "") + end + moneta_build do Moneta::Adapters::DataMapper.new( - setup: "mysql://#{mysql_username}:#{mysql_password}@#{mysql_host}:#{mysql_port}/#{mysql_database1}", + setup: database_uri, table: "adapter_datamapper" ) end @@ -17,14 +21,14 @@ it 'does not cross contaminate when storing' do first = Moneta::Adapters::DataMapper.new( - setup: "mysql://#{mysql_username}:#{mysql_password}@#{mysql_host}:#{mysql_port}/#{mysql_database1}", + setup: database_uri, table: "datamapper_first" ) first.clear second = Moneta::Adapters::DataMapper.new( repository: :sample, - setup: "mysql://#{mysql_username}:#{mysql_password}@#{mysql_host}:#{mysql_port}/#{mysql_database1}", + setup: database_uri, table: "datamapper_second" ) second.clear @@ -38,14 +42,14 @@ it 'does not cross contaminate when deleting' do first = Moneta::Adapters::DataMapper.new( - setup: "mysql://#{mysql_username}:#{mysql_password}@#{mysql_host}:#{mysql_port}/#{mysql_database1}", + setup: database_uri, table: "datamapper_first" ) first.clear second = Moneta::Adapters::DataMapper.new( repository: :sample, - setup: "mysql://#{mysql_username}:#{mysql_password}@#{mysql_host}:#{mysql_port}/#{mysql_database1}", + setup: database_uri, table: "datamapper_second" ) second.clear diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/moneta/adapters/datamapper/standard_datamapper_spec.rb new/spec/moneta/adapters/datamapper/standard_datamapper_spec.rb --- old/spec/moneta/adapters/datamapper/standard_datamapper_spec.rb 2022-04-13 12:17:04.000000000 +0200 +++ new/spec/moneta/adapters/datamapper/standard_datamapper_spec.rb 2022-11-10 12:51:52.000000000 +0100 @@ -8,7 +8,7 @@ moneta_store :DataMapper do { - setup: "mysql://#{mysql_username}:#{mysql_password}@#{mysql_host}:#{mysql_port}/#{mysql_database1}", + setup: "mysql://#{mysql_username}:#{mysql_password}@#{mysql_host}:#{mysql_port}/#{mysql_database1}" + (mysql_socket ? "?socket=#{mysql_socket}" : ""), table: "simple_datamapper" } end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/moneta/adapters/datamapper/standard_datamapper_with_expires_spec.rb new/spec/moneta/adapters/datamapper/standard_datamapper_with_expires_spec.rb --- old/spec/moneta/adapters/datamapper/standard_datamapper_with_expires_spec.rb 2022-04-13 12:17:04.000000000 +0200 +++ new/spec/moneta/adapters/datamapper/standard_datamapper_with_expires_spec.rb 2022-11-10 12:51:52.000000000 +0100 @@ -12,7 +12,7 @@ moneta_store :DataMapper do { - setup: "mysql://#{mysql_username}:#{mysql_password}@#{mysql_host}:#{mysql_port}/#{mysql_database1}", + setup: "mysql://#{mysql_username}:#{mysql_password}@#{mysql_host}:#{mysql_port}/#{mysql_database1}" + (mysql_socket ? "?socket=#{mysql_socket}" : ""), table: "simple_datamapper_with_expires", expires: true } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/moneta/adapters/datamapper/standard_datamapper_with_repository_spec.rb new/spec/moneta/adapters/datamapper/standard_datamapper_with_repository_spec.rb --- old/spec/moneta/adapters/datamapper/standard_datamapper_with_repository_spec.rb 2022-04-13 12:17:04.000000000 +0200 +++ new/spec/moneta/adapters/datamapper/standard_datamapper_with_repository_spec.rb 2022-11-10 12:51:52.000000000 +0100 @@ -9,7 +9,7 @@ moneta_store :DataMapper do { repository: :repo, - setup: "mysql://#{mysql_username}:#{mysql_password}@#{mysql_host}:#{mysql_port}/#{mysql_database1}", + setup: "mysql://#{mysql_username}:#{mysql_password}@#{mysql_host}:#{mysql_port}/#{mysql_database1}" + (mysql_socket ? "?socket=#{mysql_socket}" : ""), table: "simple_datamapper_with_repository" } end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/moneta/adapters/null/standard_null_spec.rb new/spec/moneta/adapters/null/standard_null_spec.rb --- old/spec/moneta/adapters/null/standard_null_spec.rb 2022-04-13 12:17:04.000000000 +0200 +++ new/spec/moneta/adapters/null/standard_null_spec.rb 2022-11-10 12:51:52.000000000 +0100 @@ -1,4 +1,9 @@ describe 'standard_null', adapter: :Null do moneta_store :Null moneta_specs STANDARD_SPECS.without_increment.without_create.without_store.without_persist + + it 'works when constructed with a proxy object' do + store = Moneta.new(:Null, expires: 1) + expect { store['moneta'] = 'test' }.not_to raise_error + end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/moneta/adapters/sequel/helper.rb new/spec/moneta/adapters/sequel/helper.rb --- old/spec/moneta/adapters/sequel/helper.rb 2022-04-13 12:17:04.000000000 +0200 +++ new/spec/moneta/adapters/sequel/helper.rb 2022-11-10 12:51:52.000000000 +0100 @@ -4,9 +4,12 @@ if defined?(JRUBY_VERSION) uri = "jdbc:mysql://#{mysql_host}:#{mysql_port}/#{database}?user=#{mysql_username}&useSSL=false" uri += "&password=#{mysql_password}" if mysql_password + uri += "&socket=#{mysql_socket}" if mysql_socket uri else - "mysql2://#{mysql_username}:#{mysql_password}@#{mysql_host}:#{mysql_port}/#{database}" + uri = "mysql2://#{mysql_username}:#{mysql_password}@#{mysql_host}:#{mysql_port}/#{database}" + uri += "?socket=#{mysql_socket}" if mysql_socket + uri end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/action_dispatch/session_moneta_store_test.rb new/test/action_dispatch/session_moneta_store_test.rb --- old/test/action_dispatch/session_moneta_store_test.rb 2022-04-13 12:17:04.000000000 +0200 +++ new/test/action_dispatch/session_moneta_store_test.rb 2022-11-10 12:51:52.000000000 +0100 @@ -24,7 +24,7 @@ end def get_session_id - render plain: "#{request.cookies['_session_id']}" + render plain: request.cookies['_session_id'].to_s end def call_reset_session @@ -60,13 +60,13 @@ get '/set_session_value' assert_response :success assert cookies['_session_id'] - session_cookie = cookies.send(:hash_for)['_session_id'] + session_cookie = cookies.to_hash['_session_id'] get '/call_reset_session' assert_response :success assert_not_equal [], headers['Set-Cookie'] - cookies << session_cookie # replace our new session_id with our old, pre-reset session_id + cookies.merge(session_cookie) # replace our new session_id with our old, pre-reset session_id get '/get_session_value' assert_response :success @@ -157,7 +157,7 @@ reset! - get '/set_session_value', params: {_session_id: session_id} + get "/set_session_value?_session_id=#{session_id}" assert_response :success assert_not_equal session_id, cookies['_session_id'] end @@ -174,7 +174,7 @@ ActiveSupport::Dependencies.autoload_paths << path yield ensure - ActiveSupport::Dependencies.autoload_paths.reject! {|p| p == path} + ActiveSupport::Dependencies.autoload_paths.reject! { |p| p == path } ActiveSupport::Dependencies.clear end end