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 2021-01-21 21:55:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-moneta (Old) and /work/SRC/openSUSE:Factory/.rubygem-moneta.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-moneta" Thu Jan 21 21:55:59 2021 rev:12 rq:865209 version:1.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-moneta/rubygem-moneta.changes 2020-10-05 19:32:13.620974374 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-moneta.new.28504/rubygem-moneta.changes 2021-01-21 21:56:00.769821408 +0100 @@ -1,0 +2,12 @@ +Wed Jan 20 12:56:36 UTC 2021 - Stephan Kulow <[email protected]> + +updated to version 1.4.1 + see installed CHANGES + + 1.4.1 + + * Adapters::Mongo - deprecate :db option, document :database option (#194) + * Adapters::Mongo - add retries to increment operation + + +------------------------------------------------------------------- Old: ---- moneta-1.4.0.gem New: ---- moneta-1.4.1.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-moneta.spec ++++++ --- /var/tmp/diff_new_pack.C219vl/_old 2021-01-21 21:56:01.445821878 +0100 +++ /var/tmp/diff_new_pack.C219vl/_new 2021-01-21 21:56:01.449821881 +0100 @@ -1,7 +1,7 @@ # # spec file for package rubygem-moneta # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ # Name: rubygem-moneta -Version: 1.4.0 +Version: 1.4.1 Release: 0 %define mod_name moneta %define mod_full_name %{mod_name}-%{version} ++++++ moneta-1.4.0.gem -> moneta-1.4.1.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHANGES new/CHANGES --- old/CHANGES 2020-08-23 06:35:55.000000000 +0200 +++ new/CHANGES 2020-10-27 08:50:48.000000000 +0100 @@ -1,3 +1,8 @@ +1.4.1 + +* Adapters::Mongo - deprecate :db option, document :database option (#194) +* Adapters::Mongo - add retries to increment operation + 1.4.0 * Adapters::Mongo - drop support for moped gem (#182) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gemfile new/Gemfile --- old/Gemfile 2020-08-23 06:35:55.000000000 +0200 +++ new/Gemfile 2020-10-27 08:50:48.000000000 +0100 @@ -99,7 +99,7 @@ # Used for generating the feature matrix group :doc, optional: true do - gem 'kramdown', '~> 1.17.0' + gem 'kramdown', '~> 2.3.0' gem 'yard', '~> 0.9.20' end Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ 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 2020-08-23 06:35:55.000000000 +0200 +++ new/lib/moneta/adapters/mongo.rb 2020-10-27 08:50:48.000000000 +0100 @@ -29,7 +29,7 @@ # @option options [String] :user Username used to authenticate # @option options [String] :password Password used to authenticate # @option options [Integer] :port (MongoDB default port) MongoDB server port - # @option options [String] :db ('moneta') MongoDB database + # @option options [String] :database ('moneta') MongoDB database # @option options [Integer] :expires Default expiration time # @option options [String] :expires_field ('expiresAt') Document field to store expiration time # @option options [String] :value_field ('value') Document field to store value @@ -43,8 +43,12 @@ @type_field = options.delete(:type_field) || 'type' collection = options.delete(:collection) || 'moneta' - db = options.delete(:db) || 'moneta' - @backend = options[:backend] || + + if options.key?(:db) + warn('Moneta::Adapters::Mongo - the :db option is deprecated and will be removed in a future version. Use :database instead') + end + database = options.delete(:database) || options.delete(:db) || 'moneta' + backend = options[:backend] || begin host = options.delete(:host) || '127.0.0.1' port = options.delete(:port) || DEFAULT_PORT @@ -53,7 +57,8 @@ end ::Mongo::Client.new(["#{host}:#{port}"], options) end - @backend.use(db) + + @backend = backend.use(database) @collection = @backend[collection] if @backend.command(buildinfo: 1).documents.first['version'] >= '2.2' @collection.indexes.create_one({ @expires_field => 1 }, expire_after: 0) @@ -111,6 +116,9 @@ { :$inc => { @value_field => amount } }, return_document: :after, upsert: true)[@value_field] + rescue ::Mongo::Error::OperationFailure + tries ||= 0 + (tries += 1) < 3 ? retry : raise end # (see Proxy#create) 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 2020-08-23 06:35:55.000000000 +0200 +++ new/lib/moneta/version.rb 2020-10-27 08:50:48.000000000 +0100 @@ -1,5 +1,5 @@ module Moneta # Moneta version number # @api public - VERSION = '1.4.0'.freeze + VERSION = '1.4.1'.freeze end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2020-08-23 06:35:55.000000000 +0200 +++ new/metadata 2020-10-27 08:50:48.000000000 +0100 @@ -1,7 +1,7 @@ --- !ruby/object:Gem::Specification name: moneta version: !ruby/object:Gem::Version - version: 1.4.0 + version: 1.4.1 platform: ruby authors: - Daniel Mendler @@ -11,7 +11,7 @@ autorequire: bindir: bin cert_chain: [] -date: 2020-08-23 00:00:00.000000000 Z +date: 2020-10-27 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: parallel_tests @@ -426,7 +426,6 @@ - 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 @@ -434,9 +433,9 @@ - MIT metadata: bug_tracker_uri: https://github.com/moneta-rb/moneta/issues - changelog_uri: https://github.com/moneta-rb/moneta/blob/v1.4.0/CHANGES - documentation_uri: https://www.rubydoc.info/gems/moneta/1.4.0 - source_code_uri: https://github.com/moneta-rb/moneta/tree/v1.4.0 + changelog_uri: https://github.com/moneta-rb/moneta/blob/v1.4.1/CHANGES + documentation_uri: https://www.rubydoc.info/gems/moneta/1.4.1 + source_code_uri: https://github.com/moneta-rb/moneta/tree/v1.4.1 post_install_message: rdoc_options: [] require_paths: @@ -673,6 +672,5 @@ - 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/helper.rb new/spec/helper.rb --- old/spec/helper.rb 2020-08-23 06:35:55.000000000 +0200 +++ new/spec/helper.rb 2020-10-27 08:50:48.000000000 +0100 @@ -10,7 +10,6 @@ require 'rantly/rspec_extensions' # rantly/shrinks require 'timecop' -require_relative 'support/mongo_helper' class MonetaParallelFormatter < RSpec::Core::Formatters::BaseTextFormatter def start(*args) @@ -366,7 +365,6 @@ config.extend MonetaHelpers::ClassMethods config.include MonetaHelpers::InstanceMethods - config.include MongoHelper, adapter: :Mongo end # FIXME: Get rid of this once raise_error expectations no longer generate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/moneta/adapters/mongo/adapter_mongo_spec.rb new/spec/moneta/adapters/mongo/adapter_mongo_spec.rb --- old/spec/moneta/adapters/mongo/adapter_mongo_spec.rb 2020-08-23 06:35:55.000000000 +0200 +++ new/spec/moneta/adapters/mongo/adapter_mongo_spec.rb 2020-10-27 08:50:48.000000000 +0100 @@ -2,11 +2,13 @@ let(:t_res) { 0.125 } let(:min_ttl) { t_res } + let(:database) { File.basename(__FILE__, '.rb') } + moneta_build do - Moneta::Adapters::Mongo.new(mongo_config( - db: File.basename(__FILE__, '.rb'), + Moneta::Adapters::Mongo.new( + database: database, collection: 'adapter_mongo' - )) + ) end moneta_specs ADAPTER_SPECS.with_each_key.with_native_expires.simplevalues_only @@ -24,4 +26,16 @@ 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/moneta/adapters/mongo/adapter_mongo_with_default_expires_spec.rb new/spec/moneta/adapters/mongo/adapter_mongo_with_default_expires_spec.rb --- old/spec/moneta/adapters/mongo/adapter_mongo_with_default_expires_spec.rb 2020-08-23 06:35:55.000000000 +0200 +++ new/spec/moneta/adapters/mongo/adapter_mongo_with_default_expires_spec.rb 2020-10-27 08:50:48.000000000 +0100 @@ -3,11 +3,11 @@ let(:min_ttl) { t_res } moneta_build do - Moneta::Adapters::Mongo.new(mongo_config( - db: File.basename(__FILE__, '.rb'), + 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/moneta/adapters/mongo/standard_mongo_spec.rb new/spec/moneta/adapters/mongo/standard_mongo_spec.rb --- old/spec/moneta/adapters/mongo/standard_mongo_spec.rb 2020-08-23 06:35:55.000000000 +0200 +++ new/spec/moneta/adapters/mongo/standard_mongo_spec.rb 2020-10-27 08:50:48.000000000 +0100 @@ -2,6 +2,6 @@ let(:t_res) { 0.125 } let(:min_ttl) { t_res } - moneta_store :Mongo, MongoHelper::mongo_config(db: File.basename(__FILE__, '.rb'), collection: 'standard_mongo') + moneta_store :Mongo, {database: File.basename(__FILE__, '.rb'), collection: 'standard_mongo'} moneta_specs STANDARD_SPECS.with_native_expires.with_each_key end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/support/mongo_helper.rb new/spec/support/mongo_helper.rb --- old/spec/support/mongo_helper.rb 2020-08-23 06:35:55.000000000 +0200 +++ new/spec/support/mongo_helper.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -# 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
