[DRE-commits] [ruby-moneta] 07/09: refresh patch
Daisuke Higuchi
dai at moszumanska.debian.org
Fri Jul 28 13:50:29 UTC 2017
This is an automated email from the git hooks/post-receive script.
dai pushed a commit to branch exp/debian
in repository ruby-moneta.
commit a4e4295bd98a1877ed5bba1239ca6ecbe10a6c71
Author: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
Date: Fri Jul 28 21:38:36 2017 +0900
refresh patch
---
...ecify-the-MySQL-socket-through-the-MYSQL_.patch | 171 +++----
...Skip-specs-for-which-we-miss-a-dependency.patch | 12 +-
...enerate-specs-using-script-generate-specs.patch | 515 +++++++++++----------
3 files changed, 351 insertions(+), 347 deletions(-)
diff --git a/debian/patches/0001-Allow-to-specify-the-MySQL-socket-through-the-MYSQL_.patch b/debian/patches/0001-Allow-to-specify-the-MySQL-socket-through-the-MYSQL_.patch
index f6304eb..d9a9cc8 100644
--- a/debian/patches/0001-Allow-to-specify-the-MySQL-socket-through-the-MYSQL_.patch
+++ b/debian/patches/0001-Allow-to-specify-the-MySQL-socket-through-the-MYSQL_.patch
@@ -2,150 +2,151 @@ From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Bobbio?= <lunar at debian.org>
Date: Mon, 25 Mar 2013 17:58:14 +0000
Subject: Allow to specify the MySQL socket through the MYSQL_TEST_SOCKET
environment variable
+Last-Update: 2017-07-28
---
script/generate-specs | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
-diff --git a/script/generate-specs b/script/generate-specs
-index 7b3b06f..31ec752 100755
---- a/script/generate-specs
-+++ b/script/generate-specs
-@@ -438,27 +438,27 @@ end
+Index: ruby-moneta/script/generate-specs
+===================================================================
+--- ruby-moneta.orig/script/generate-specs
++++ ruby-moneta/script/generate-specs
+@@ -448,27 +448,27 @@ end
},
'standard_sequel' => {
- :store => :Sequel,
-- :options => ':db => (defined?(JRUBY_VERSION) ? "jdbc:mysql://localhost/moneta?user=root" : "mysql2://root:@localhost/moneta"), :table => "simple_sequel"',
-+ :options => ':db => (defined?(JRUBY_VERSION) ? "jdbc:mysql://localhost/moneta?user=root#{ENV["MYSQL_TEST_SOCKET"] ? "&socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}" : "mysql2://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}"), :table => "simple_sequel"',
- :load_value => '::Marshal.load(value)',
- :specs => STANDARD_SPECS
+ store: :Sequel,
+- options: 'db: (defined?(JRUBY_VERSION) ? "jdbc:mysql://localhost/moneta?user=root" : "mysql2://root:@localhost/moneta"), table: "simple_sequel"',
++ options: 'db: (defined?(JRUBY_VERSION) ? "jdbc:mysql://localhost/moneta?user=root#{ENV["MYSQL_TEST_SOCKET"] ? "&socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}" : "mysql2://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}"), table: "simple_sequel"',
+ load_value: '::Marshal.load(value)',
+ specs: STANDARD_SPECS
},
'standard_sequel_with_expires' => {
- :store => :Sequel,
-- :options => ':db => (defined?(JRUBY_VERSION) ? "jdbc:mysql://localhost/moneta?user=root" : "mysql2://root:@localhost/moneta"), :table => "simple_sequel_with_expires", :expires => true',
-+ :options => ':db => (defined?(JRUBY_VERSION) ? "jdbc:mysql://localhost/moneta?user=root#{ENV["MYSQL_TEST_SOCKET"] ? "&socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}" : "mysql2://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}"), :table => "simple_sequel_with_expires", :expires => true',
- :specs => STANDARD_SPECS.with_expires,
- :load_value => '::Marshal.load(value)'
+ store: :Sequel,
+- options: 'db: (defined?(JRUBY_VERSION) ? "jdbc:mysql://localhost/moneta?user=root" : "mysql2://root:@localhost/moneta"), table: "simple_sequel_with_expires", expires: true',
++ options: 'db: (defined?(JRUBY_VERSION) ? "jdbc:mysql://localhost/moneta?user=root#{ENV["MYSQL_TEST_SOCKET"] ? "&socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}" : "mysql2://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}"), table: "simple_sequel_with_expires", expires: true',
+ specs: STANDARD_SPECS.with_expires,
+ load_value: '::Marshal.load(value)'
},
'standard_datamapper' => {
- :store => :DataMapper,
- :specs => STANDARD_SPECS.without_increment,
-- :options => ':setup => "mysql://root:@localhost/moneta", :table => "simple_datamapper"',
-+ :options => ':setup => "mysql://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}", :table => "simple_datamapper"',
+ store: :DataMapper,
+ specs: STANDARD_SPECS.without_increment,
+- options: 'setup: "mysql://root:@localhost/moneta", table: "simple_datamapper"',
++ options: 'setup: "mysql://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}", table: "simple_datamapper"',
# DataMapper needs default repository to be setup
- :preamble => "require 'dm-core'\nDataMapper.setup(:default, :adapter => :in_memory)\n",
- :load_value => '::Marshal.load(value.unpack(\'m\').first)'
+ preamble: "require 'dm-core'\nDataMapper.setup(:default, adapter: :in_memory)\n",
+ load_value: '::Marshal.load(value.unpack(\'m\').first)'
},
'standard_datamapper_with_expires' => {
- :store => :DataMapper,
-- :options => ':setup => "mysql://root:@localhost/moneta", :table => "simple_datamapper_with_expires", :expires => true',
-+ :options => ':setup => "mysql://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}", :table => "simple_datamapper_with_expires", :expires => true',
+ store: :DataMapper,
+- options: 'setup: "mysql://root:@localhost/moneta", table: "simple_datamapper_with_expires", expires: true',
++ options: 'setup: "mysql://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}", table: "simple_datamapper_with_expires", expires: true',
# DataMapper needs default repository to be setup
- :preamble => "require 'dm-core'\nDataMapper.setup(:default, :adapter => :in_memory)\n",
- :specs => STANDARD_SPECS.without_increment.with_expires,
-@@ -467,7 +467,7 @@ end
+ preamble: "require 'dm-core'\nDataMapper.setup(:default, adapter: :in_memory)\n",
+ specs: STANDARD_SPECS.without_increment.with_expires,
+@@ -477,7 +477,7 @@ end
'standard_datamapper_with_repository' => {
- :store => :DataMapper,
- :specs => STANDARD_SPECS.without_increment,
-- :options => ':repository => :repo, :setup => "mysql://root:@localhost/moneta", :table => "simple_datamapper_with_repository"',
-+ :options => ':repository => :repo, :setup => "mysql://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}", :table => "simple_datamapper_with_repository"',
+ store: :DataMapper,
+ specs: STANDARD_SPECS.without_increment,
+- options: 'repository: :repo, setup: "mysql://root:@localhost/moneta", table: "simple_datamapper_with_repository"',
++ options: 'repository: :repo, setup: "mysql://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}", table: "simple_datamapper_with_repository"',
# DataMapper needs default repository to be setup
- :preamble => "require 'dm-core'\nDataMapper.setup(:default, :adapter => :in_memory)\n",
- :load_value => '::Marshal.load(value.unpack(\'m\').first)'
-@@ -475,12 +475,12 @@ end
+ preamble: "require 'dm-core'\nDataMapper.setup(:default, adapter: :in_memory)\n",
+ load_value: '::Marshal.load(value.unpack(\'m\').first)'
+@@ -485,12 +485,12 @@ end
'standard_activerecord' => {
- :store => :ActiveRecord,
- :specs => STANDARD_SPECS,
-- :options => ":table => 'standard_activerecord', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root' }",
-+ :options => ":table => 'standard_activerecord', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root', :socket => ENV['MYSQL_TEST_SOCKET'] }",
- :load_value => '::Marshal.load(value.unpack(\'m\').first)'
+ store: :ActiveRecord,
+ specs: STANDARD_SPECS,
+- options: "table: 'standard_activerecord', connection: { adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), database: 'moneta', username: 'root' }",
++ options: "table: 'standard_activerecord', connection: { adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), database: 'moneta', username: 'root', socket: ENV['MYSQL_TEST_SOCKET'] }",
+ load_value: '::Marshal.load(value.unpack(\'m\').first)'
},
'standard_activerecord_with_expires' => {
- :store => :ActiveRecord,
-- :options => ":table => 'standard_activerecord_with_expires', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root' }, :expires => true",
-+ :options => ":table => 'standard_activerecord_with_expires', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root', :socket => ENV['MYSQL_TEST_SOCKET'] }, :expires => true",
- :specs => STANDARD_SPECS.with_expires,
- :load_value => '::Marshal.load(value.unpack(\'m\').first)'
+ store: :ActiveRecord,
+- options: "table: 'standard_activerecord_with_expires', connection: { adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), database: 'moneta', username: 'root' }, expires: true",
++ options: "table: 'standard_activerecord_with_expires', connection: { adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), database: 'moneta', username: 'root', socket: ENV['MYSQL_TEST_SOCKET'] }, expires: true",
+ specs: STANDARD_SPECS.with_expires,
+ load_value: '::Marshal.load(value.unpack(\'m\').first)'
},
-@@ -1203,7 +1203,7 @@ it 'compile transformer class' do
+@@ -1218,7 +1218,7 @@ it 'compile transformer class' do
end}
},
'adapter_activerecord' => {
-- :build => "Moneta::Adapters::ActiveRecord.new(:table => 'adapter_activerecord', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root' })",
-+ :build => "Moneta::Adapters::ActiveRecord.new(:table => 'adapter_activerecord', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root', :socket => ENV['MYSQL_TEST_SOCKET'] })",
- :specs => ADAPTER_SPECS,
- :tests => %{
+- build: "Moneta::Adapters::ActiveRecord.new(table: 'adapter_activerecord', connection: { adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), database: 'moneta', username: 'root' })",
++ build: "Moneta::Adapters::ActiveRecord.new(table: 'adapter_activerecord', connection: { adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), database: 'moneta', username: 'root', socket: ENV['MYSQL_TEST_SOCKET'] })",
+ specs: ADAPTER_SPECS,
+ tests: %{
it 'updates an existing key/value' do
-@@ -1213,8 +1213,8 @@ it 'updates an existing key/value' do
+@@ -1228,8 +1228,8 @@ it 'updates an existing key/value' do
end
it 'supports different tables same database' do
-- store1 = Moneta::Adapters::ActiveRecord.new(:table => 'adapter_activerecord1', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root' })
-- store2 = Moneta::Adapters::ActiveRecord.new(:table => 'adapter_activerecord2', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root' })
-+ store1 = Moneta::Adapters::ActiveRecord.new(:table => 'adapter_activerecord1', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root', :socket => ENV['MYSQL_TEST_SOCKET'] })
-+ store2 = Moneta::Adapters::ActiveRecord.new(:table => 'adapter_activerecord2', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root', :socket => ENV['MYSQL_TEST_SOCKET'] })
+- store1 = Moneta::Adapters::ActiveRecord.new(table: 'adapter_activerecord1', connection: { adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), database: 'moneta', username: 'root' })
+- store2 = Moneta::Adapters::ActiveRecord.new(table: 'adapter_activerecord2', connection: { adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), database: 'moneta', username: 'root' })
++ store1 = Moneta::Adapters::ActiveRecord.new(table: 'adapter_activerecord1', connection: { adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), database: 'moneta', username: 'root', socket: ENV['MYSQL_TEST_SOCKET'] })
++ store2 = Moneta::Adapters::ActiveRecord.new(table: 'adapter_activerecord2', connection: { adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), database: 'moneta', username: 'root', socket: ENV['MYSQL_TEST_SOCKET'] })
store1['key'] = 'value1'
store2['key'] = 'value2'
-@@ -1226,8 +1226,8 @@ it 'supports different tables same database' do
+@@ -1241,8 +1241,8 @@ it 'supports different tables same datab
end
it 'supports different databases same table' do
-- store1 = Moneta::Adapters::ActiveRecord.new(:table => 'adapter_activerecord', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta_activerecord1', :username => 'root' })
-- store2 = Moneta::Adapters::ActiveRecord.new(:table => 'adapter_activerecord', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta_activerecord2', :username => 'root' })
-+ store1 = Moneta::Adapters::ActiveRecord.new(:table => 'adapter_activerecord', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta_activerecord1', :username => 'root', :socket => ENV['MYSQL_TEST_SOCKET'] })
-+ store2 = Moneta::Adapters::ActiveRecord.new(:table => 'adapter_activerecord', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta_activerecord2', :username => 'root', :socket => ENV['MYSQL_TEST_SOCKET'] })
+- store1 = Moneta::Adapters::ActiveRecord.new(table: 'adapter_activerecord', connection: { adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), database: 'moneta_activerecord1', username: 'root' })
+- store2 = Moneta::Adapters::ActiveRecord.new(table: 'adapter_activerecord', connection: { adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), database: 'moneta_activerecord2', username: 'root' })
++ store1 = Moneta::Adapters::ActiveRecord.new(table: 'adapter_activerecord', connection: { adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), database: 'moneta_activerecord1', username: 'root', socket: ENV['MYSQL_TEST_SOCKET'] })
++ store2 = Moneta::Adapters::ActiveRecord.new(table: 'adapter_activerecord', connection: { adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), database: 'moneta_activerecord2', username: 'root', socket: ENV['MYSQL_TEST_SOCKET'] })
store1['key'] = 'value1'
store2['key'] = 'value2'
-@@ -1239,7 +1239,7 @@ it 'supports different databases same table' do
+@@ -1254,7 +1254,7 @@ it 'supports different databases same ta
end}
},
'adapter_activerecord_exisiting_connection' => {
-- :preamble => "require 'active_record'\nActiveRecord::Base.establish_connection :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root'\n",
-+ :preamble => "require 'active_record'\nActiveRecord::Base.establish_connection :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root', :socket => ENV['MYSQL_TEST_SOCKET']\n",
- :build => "Moneta::Adapters::ActiveRecord.new(:table => 'adapter_activerecord_existing_connection')",
- :specs => ADAPTER_SPECS
+- preamble: "require 'active_record'\nActiveRecord::Base.establish_connection adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), database: 'moneta', username: 'root'\n",
++ preamble: "require 'active_record'\nActiveRecord::Base.establish_connection adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), database: 'moneta', username: 'root', socket: ENV['MYSQL_TEST_SOCKET']\n",
+ build: "Moneta::Adapters::ActiveRecord.new(table: 'adapter_activerecord_existing_connection')",
+ specs: ADAPTER_SPECS
},
-@@ -1274,16 +1274,16 @@ end}
- :specs => ADAPTER_SPECS.without_increment.simplevalues_only.without_path
+@@ -1289,16 +1289,16 @@ end}
+ specs: ADAPTER_SPECS.without_increment.simplevalues_only.without_path
},
'adapter_datamapper' => {
-- :build => 'Moneta::Adapters::DataMapper.new(:setup => "mysql://root:@localhost/moneta", :table => "adapter_datamapper")',
-+ :build => 'Moneta::Adapters::DataMapper.new(:setup => "mysql://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}", :table => "adapter_datamapper")',
+- build: 'Moneta::Adapters::DataMapper.new(setup: "mysql://root:@localhost/moneta", table: "adapter_datamapper")',
++ build: 'Moneta::Adapters::DataMapper.new(setup: "mysql://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}", table: "adapter_datamapper")',
# DataMapper needs default repository to be setup
- :preamble => "require 'dm-core'\nDataMapper.setup(:default, :adapter => :in_memory)\n",
- :specs => ADAPTER_SPECS.without_increment,
- :tests => %q{
+ preamble: "require 'dm-core'\nDataMapper.setup(:default, adapter: :in_memory)\n",
+ specs: ADAPTER_SPECS.without_increment,
+ tests: %q{
it 'does not cross contaminate when storing' do
-- first = Moneta::Adapters::DataMapper.new(:setup => "mysql://root:@localhost/moneta", :table => "datamapper_first")
-+ first = Moneta::Adapters::DataMapper.new(:setup => "mysql://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}", :table => "datamapper_first")
+- first = Moneta::Adapters::DataMapper.new(setup: "mysql://root:@localhost/moneta", table: "datamapper_first")
++ first = Moneta::Adapters::DataMapper.new(setup: "mysql://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}", table: "datamapper_first")
first.clear
-- second = Moneta::Adapters::DataMapper.new(:repository => :sample, :setup => "mysql://root:@localhost/moneta", :table => "datamapper_second")
-+ second = Moneta::Adapters::DataMapper.new(:repository => :sample, :setup => "mysql://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}", :table => "datamapper_second")
+- second = Moneta::Adapters::DataMapper.new(repository: :sample, setup: "mysql://root:@localhost/moneta", table: "datamapper_second")
++ second = Moneta::Adapters::DataMapper.new(repository: :sample, setup: "mysql://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}", table: "datamapper_second")
second.clear
first['key'] = 'value'
-@@ -1294,10 +1294,10 @@ it 'does not cross contaminate when storing' do
+@@ -1309,10 +1309,10 @@ it 'does not cross contaminate when stor
end
it 'does not cross contaminate when deleting' do
-- first = Moneta::Adapters::DataMapper.new(:setup => "mysql://root:@localhost/moneta", :table => "datamapper_first")
-+ first = Moneta::Adapters::DataMapper.new(:setup => "mysql://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}", :table => "datamapper_first")
+- first = Moneta::Adapters::DataMapper.new(setup: "mysql://root:@localhost/moneta", table: "datamapper_first")
++ first = Moneta::Adapters::DataMapper.new(setup: "mysql://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}", table: "datamapper_first")
first.clear
-- second = Moneta::Adapters::DataMapper.new(:repository => :sample, :setup => "mysql://root:@localhost/moneta", :table => "datamapper_second")
-+ second = Moneta::Adapters::DataMapper.new(:repository => :sample, :setup => "mysql://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}", :table => "datamapper_second")
+- second = Moneta::Adapters::DataMapper.new(repository: :sample, setup: "mysql://root:@localhost/moneta", table: "datamapper_second")
++ second = Moneta::Adapters::DataMapper.new(repository: :sample, setup: "mysql://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}", table: "datamapper_second")
second.clear
first['key'] = 'value'
-@@ -1440,7 +1440,7 @@ end}
- :specs => ADAPTER_SPECS.without_multiprocess
+@@ -1600,7 +1600,7 @@ Moneta::Adapters::MongoOfficial.new(db:
+ specs: ADAPTER_SPECS.without_multiprocess
},
'adapter_sequel' => {
-- :build => 'Moneta::Adapters::Sequel.new(:db => (defined?(JRUBY_VERSION) ? "jdbc:mysql://localhost/moneta?user=root" : "mysql2://root:@localhost/moneta"), :table => "adapter_sequel")',
-+ :build => 'Moneta::Adapters::Sequel.new(:db => (defined?(JRUBY_VERSION) ? "jdbc:mysql://localhost/moneta?user=root#{ENV["MYSQL_TEST_SOCKET"] ? "&socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}" : "mysql2://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}"), :table => "adapter_sequel")',
- :specs => ADAPTER_SPECS
+- build: 'Moneta::Adapters::Sequel.new(db: (defined?(JRUBY_VERSION) ? "jdbc:mysql://localhost/moneta?user=root" : "mysql2://root:@localhost/moneta"), table: "adapter_sequel")',
++ build: 'Moneta::Adapters::Sequel.new(db: (defined?(JRUBY_VERSION) ? "jdbc:mysql://localhost/moneta?user=root#{ENV["MYSQL_TEST_SOCKET"] ? "&socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}" : "mysql2://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}"), table: "adapter_sequel")',
+ specs: ADAPTER_SPECS
},
'adapter_sqlite' => {
diff --git a/debian/patches/0003-Skip-specs-for-which-we-miss-a-dependency.patch b/debian/patches/0003-Skip-specs-for-which-we-miss-a-dependency.patch
index 55c4393..e69920a 100644
--- a/debian/patches/0003-Skip-specs-for-which-we-miss-a-dependency.patch
+++ b/debian/patches/0003-Skip-specs-for-which-we-miss-a-dependency.patch
@@ -6,11 +6,11 @@ Subject: Skip specs for which we miss a dependency
script/generate-specs | 66 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 65 insertions(+), 1 deletion(-)
-diff --git a/script/generate-specs b/script/generate-specs
-index 31ec752..ea32694 100755
---- a/script/generate-specs
-+++ b/script/generate-specs
-@@ -2487,6 +2487,70 @@ end
+Index: ruby-moneta/script/generate-specs
+===================================================================
+--- ruby-moneta.orig/script/generate-specs
++++ ruby-moneta/script/generate-specs
+@@ -2647,6 +2647,70 @@ end
specs_code.gsub!(/\n +\n/, "\n\n")
File.open(File.join(PATH, 'monetaspecs.rb'), 'w') {|out| out << specs_code }
@@ -81,7 +81,7 @@ index 31ec752..ea32694 100755
TESTS.each do |name, options|
build = options.delete(:build)
store = options.delete(:store)
-@@ -2532,5 +2596,5 @@ end
+@@ -2692,5 +2756,5 @@ end
}
code.gsub!(/\n +\n/, "\n\n")
diff --git a/debian/patches/0099-Re-generate-specs-using-script-generate-specs.patch b/debian/patches/0099-Re-generate-specs-using-script-generate-specs.patch
index 74271e9..0058a6e 100644
--- a/debian/patches/0099-Re-generate-specs-using-script-generate-specs.patch
+++ b/debian/patches/0099-Re-generate-specs-using-script-generate-specs.patch
@@ -1,6 +1,7 @@
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Bobbio?= <lunar at debian.org>
Date: Mon, 25 Mar 2013 17:59:16 +0000
Subject: Re-generate specs using script/generate-specs
+Last-Update: 2017-07-28
---
...apter_activerecord_exisiting_connection_spec.rb | 36 ----
@@ -48,10 +49,10 @@ Subject: Re-generate specs using script/generate-specs
spec/moneta/weak_increment_spec.rb | 41 -----
43 files changed, 8 insertions(+), 1696 deletions(-)
-diff --git a/spec/moneta/adapter_activerecord_exisiting_connection_spec.rb b/spec/moneta/adapter_activerecord_exisiting_connection_spec.rb
-index 21dde9b..e69de29 100644
---- a/spec/moneta/adapter_activerecord_exisiting_connection_spec.rb
-+++ b/spec/moneta/adapter_activerecord_exisiting_connection_spec.rb
+Index: ruby-moneta/spec/moneta/adapter_activerecord_exisiting_connection_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/adapter_activerecord_exisiting_connection_spec.rb
++++ ruby-moneta/spec/moneta/adapter_activerecord_exisiting_connection_spec.rb
@@ -1,36 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -59,13 +60,13 @@ index 21dde9b..e69de29 100644
-
-describe_moneta "adapter_activerecord_exisiting_connection" do
- require 'active_record'
-- ActiveRecord::Base.establish_connection :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root'
+- ActiveRecord::Base.establish_connection adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), database: 'moneta', username: 'root'
- def features
- [:create, :increment]
- end
-
- def new_store
-- Moneta::Adapters::ActiveRecord.new(:table => 'adapter_activerecord_existing_connection')
+- Moneta::Adapters::ActiveRecord.new(table: 'adapter_activerecord_existing_connection')
- end
-
- def load_value(value)
@@ -89,10 +90,10 @@ index 21dde9b..e69de29 100644
- it_should_behave_like 'store_pathkey_stringvalue'
- it_should_behave_like 'store_large'
-end
-diff --git a/spec/moneta/adapter_activerecord_spec.rb b/spec/moneta/adapter_activerecord_spec.rb
-index 540aee6..e69de29 100644
---- a/spec/moneta/adapter_activerecord_spec.rb
-+++ b/spec/moneta/adapter_activerecord_spec.rb
+Index: ruby-moneta/spec/moneta/adapter_activerecord_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/adapter_activerecord_spec.rb
++++ ruby-moneta/spec/moneta/adapter_activerecord_spec.rb
@@ -1,65 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -104,7 +105,7 @@ index 540aee6..e69de29 100644
- end
-
- def new_store
-- Moneta::Adapters::ActiveRecord.new(:table => 'adapter_activerecord', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root' })
+- Moneta::Adapters::ActiveRecord.new(table: 'adapter_activerecord', connection: { adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), database: 'moneta', username: 'root' })
- end
-
- def load_value(value)
@@ -130,12 +131,12 @@ index 540aee6..e69de29 100644
- it 'updates an existing key/value' do
- store['foo/bar'] = '1'
- store['foo/bar'] = '2'
-- store.table.where(:k => 'foo/bar').count.should == 1
+- store.table.where(k: 'foo/bar').count.should == 1
- end
-
- it 'supports different tables same database' do
-- store1 = Moneta::Adapters::ActiveRecord.new(:table => 'adapter_activerecord1', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root' })
-- store2 = Moneta::Adapters::ActiveRecord.new(:table => 'adapter_activerecord2', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root' })
+- store1 = Moneta::Adapters::ActiveRecord.new(table: 'adapter_activerecord1', connection: { adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), database: 'moneta', username: 'root' })
+- store2 = Moneta::Adapters::ActiveRecord.new(table: 'adapter_activerecord2', connection: { adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), database: 'moneta', username: 'root' })
-
- store1['key'] = 'value1'
- store2['key'] = 'value2'
@@ -147,8 +148,8 @@ index 540aee6..e69de29 100644
- end
-
- it 'supports different databases same table' do
-- store1 = Moneta::Adapters::ActiveRecord.new(:table => 'adapter_activerecord', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta_activerecord1', :username => 'root' })
-- store2 = Moneta::Adapters::ActiveRecord.new(:table => 'adapter_activerecord', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta_activerecord2', :username => 'root' })
+- store1 = Moneta::Adapters::ActiveRecord.new(table: 'adapter_activerecord', connection: { adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), database: 'moneta_activerecord1', username: 'root' })
+- store2 = Moneta::Adapters::ActiveRecord.new(table: 'adapter_activerecord', connection: { adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), database: 'moneta_activerecord2', username: 'root' })
-
- store1['key'] = 'value1'
- store2['key'] = 'value2'
@@ -159,10 +160,10 @@ index 540aee6..e69de29 100644
- store2.close
- end
-end
-diff --git a/spec/moneta/adapter_couch_spec.rb b/spec/moneta/adapter_couch_spec.rb
-index 1880c9c..e69de29 100644
---- a/spec/moneta/adapter_couch_spec.rb
-+++ b/spec/moneta/adapter_couch_spec.rb
+Index: ruby-moneta/spec/moneta/adapter_couch_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/adapter_couch_spec.rb
++++ ruby-moneta/spec/moneta/adapter_couch_spec.rb
@@ -1,36 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -174,7 +175,7 @@ index 1880c9c..e69de29 100644
- end
-
- def new_store
-- Moneta::Adapters::Couch.new(:db => 'adapter_couch')
+- Moneta::Adapters::Couch.new(db: 'adapter_couch')
- end
-
- def load_value(value)
@@ -200,10 +201,10 @@ index 1880c9c..e69de29 100644
- it_should_behave_like 'store_stringkey_integervalue'
- it_should_behave_like 'store_large'
-end
-diff --git a/spec/moneta/adapter_datamapper_spec.rb b/spec/moneta/adapter_datamapper_spec.rb
-index 6218340..e69de29 100644
---- a/spec/moneta/adapter_datamapper_spec.rb
-+++ b/spec/moneta/adapter_datamapper_spec.rb
+Index: ruby-moneta/spec/moneta/adapter_datamapper_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/adapter_datamapper_spec.rb
++++ ruby-moneta/spec/moneta/adapter_datamapper_spec.rb
@@ -1,64 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -211,13 +212,13 @@ index 6218340..e69de29 100644
-
-describe_moneta "adapter_datamapper" do
- require 'dm-core'
-- DataMapper.setup(:default, :adapter => :in_memory)
+- DataMapper.setup(:default, adapter: :in_memory)
- def features
- [:create]
- end
-
- def new_store
-- Moneta::Adapters::DataMapper.new(:setup => "mysql://root:@localhost/moneta", :table => "adapter_datamapper")
+- Moneta::Adapters::DataMapper.new(setup: "mysql://root:@localhost/moneta", table: "adapter_datamapper")
- end
-
- def load_value(value)
@@ -240,10 +241,10 @@ index 6218340..e69de29 100644
- it_should_behave_like 'store_pathkey_stringvalue'
- it_should_behave_like 'store_large'
- it 'does not cross contaminate when storing' do
-- first = Moneta::Adapters::DataMapper.new(:setup => "mysql://root:@localhost/moneta", :table => "datamapper_first")
+- first = Moneta::Adapters::DataMapper.new(setup: "mysql://root:@localhost/moneta", table: "datamapper_first")
- first.clear
-
-- second = Moneta::Adapters::DataMapper.new(:repository => :sample, :setup => "mysql://root:@localhost/moneta", :table => "datamapper_second")
+- second = Moneta::Adapters::DataMapper.new(repository: :sample, setup: "mysql://root:@localhost/moneta", table: "datamapper_second")
- second.clear
-
- first['key'] = 'value'
@@ -254,25 +255,25 @@ index 6218340..e69de29 100644
- end
-
- it 'does not cross contaminate when deleting' do
-- first = Moneta::Adapters::DataMapper.new(:setup => "mysql://root:@localhost/moneta", :table => "datamapper_first")
+- first = Moneta::Adapters::DataMapper.new(setup: "mysql://root:@localhost/moneta", table: "datamapper_first")
- first.clear
-
-- second = Moneta::Adapters::DataMapper.new(:repository => :sample, :setup => "mysql://root:@localhost/moneta", :table => "datamapper_second")
+- second = Moneta::Adapters::DataMapper.new(repository: :sample, setup: "mysql://root:@localhost/moneta", table: "datamapper_second")
- second.clear
-
- first['key'] = 'value'
- second['key'] = 'value2'
-
- first.delete('key').should == 'value'
-- first.key?('key').should be_false
+- first.key?('key').should be false
- second['key'].should == 'value2'
- end
-
-end
-diff --git a/spec/moneta/adapter_daybreak_spec.rb b/spec/moneta/adapter_daybreak_spec.rb
-index c177fa5..e69de29 100644
---- a/spec/moneta/adapter_daybreak_spec.rb
-+++ b/spec/moneta/adapter_daybreak_spec.rb
+Index: ruby-moneta/spec/moneta/adapter_daybreak_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/adapter_daybreak_spec.rb
++++ ruby-moneta/spec/moneta/adapter_daybreak_spec.rb
@@ -1,31 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -284,7 +285,7 @@ index c177fa5..e69de29 100644
- end
-
- def new_store
-- Moneta::Adapters::Daybreak.new(:file => File.join(make_tempdir, "adapter_daybreak"))
+- Moneta::Adapters::Daybreak.new(file: File.join(make_tempdir, "adapter_daybreak"))
- end
-
- def load_value(value)
@@ -305,10 +306,10 @@ index c177fa5..e69de29 100644
- it_should_behave_like 'store_pathkey_stringvalue'
- it_should_behave_like 'store_large'
-end
-diff --git a/spec/moneta/adapter_hbase_spec.rb b/spec/moneta/adapter_hbase_spec.rb
-index a3f896e..e69de29 100644
---- a/spec/moneta/adapter_hbase_spec.rb
-+++ b/spec/moneta/adapter_hbase_spec.rb
+Index: ruby-moneta/spec/moneta/adapter_hbase_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/adapter_hbase_spec.rb
++++ ruby-moneta/spec/moneta/adapter_hbase_spec.rb
@@ -1,33 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -320,7 +321,7 @@ index a3f896e..e69de29 100644
- end
-
- def new_store
-- Moneta::Adapters::HBase.new(:table => 'adapter_hbase')
+- Moneta::Adapters::HBase.new(table: 'adapter_hbase')
- end
-
- def load_value(value)
@@ -343,10 +344,10 @@ index a3f896e..e69de29 100644
- it_should_behave_like 'store_pathkey_stringvalue'
- it_should_behave_like 'store_large'
-end
-diff --git a/spec/moneta/adapter_leveldb_spec.rb b/spec/moneta/adapter_leveldb_spec.rb
-index 3e5537c..e69de29 100644
---- a/spec/moneta/adapter_leveldb_spec.rb
-+++ b/spec/moneta/adapter_leveldb_spec.rb
+Index: ruby-moneta/spec/moneta/adapter_leveldb_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/adapter_leveldb_spec.rb
++++ ruby-moneta/spec/moneta/adapter_leveldb_spec.rb
@@ -1,31 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -358,7 +359,7 @@ index 3e5537c..e69de29 100644
- end
-
- def new_store
-- Moneta::Adapters::LevelDB.new(:dir => File.join(make_tempdir, "adapter_leveldb"))
+- Moneta::Adapters::LevelDB.new(dir: File.join(make_tempdir, "adapter_leveldb"))
- end
-
- def load_value(value)
@@ -379,10 +380,10 @@ index 3e5537c..e69de29 100644
- it_should_behave_like 'store_pathkey_stringvalue'
- it_should_behave_like 'store_large'
-end
-diff --git a/spec/moneta/adapter_localmemcache_spec.rb b/spec/moneta/adapter_localmemcache_spec.rb
-index f9ccec1..e69de29 100644
---- a/spec/moneta/adapter_localmemcache_spec.rb
-+++ b/spec/moneta/adapter_localmemcache_spec.rb
+Index: ruby-moneta/spec/moneta/adapter_localmemcache_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/adapter_localmemcache_spec.rb
++++ ruby-moneta/spec/moneta/adapter_localmemcache_spec.rb
@@ -1,32 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -394,7 +395,7 @@ index f9ccec1..e69de29 100644
- end
-
- def new_store
-- Moneta::Adapters::LocalMemCache.new(:file => File.join(make_tempdir, "adapter_localmemcache"))
+- Moneta::Adapters::LocalMemCache.new(file: File.join(make_tempdir, "adapter_localmemcache"))
- end
-
- def load_value(value)
@@ -416,10 +417,10 @@ index f9ccec1..e69de29 100644
- it_should_behave_like 'store_pathkey_stringvalue'
- it_should_behave_like 'store_large'
-end
-diff --git a/spec/moneta/adapter_memcached_dalli_spec.rb b/spec/moneta/adapter_memcached_dalli_spec.rb
-index b72769f..e69de29 100644
---- a/spec/moneta/adapter_memcached_dalli_spec.rb
-+++ b/spec/moneta/adapter_memcached_dalli_spec.rb
+Index: ruby-moneta/spec/moneta/adapter_memcached_dalli_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/adapter_memcached_dalli_spec.rb
++++ ruby-moneta/spec/moneta/adapter_memcached_dalli_spec.rb
@@ -1,36 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -431,7 +432,7 @@ index b72769f..e69de29 100644
- end
-
- def new_store
-- Moneta::Adapters::MemcachedDalli.new(:namespace => "adapter_memcached_dalli")
+- Moneta::Adapters::MemcachedDalli.new(namespace: "adapter_memcached_dalli")
- end
-
- def load_value(value)
@@ -457,10 +458,10 @@ index b72769f..e69de29 100644
- it_should_behave_like 'store_pathkey_stringvalue'
- it_should_behave_like 'store_large'
-end
-diff --git a/spec/moneta/adapter_memcached_dalli_with_default_expires_spec.rb b/spec/moneta/adapter_memcached_dalli_with_default_expires_spec.rb
-index 3e5b60c..e69de29 100644
---- a/spec/moneta/adapter_memcached_dalli_with_default_expires_spec.rb
-+++ b/spec/moneta/adapter_memcached_dalli_with_default_expires_spec.rb
+Index: ruby-moneta/spec/moneta/adapter_memcached_dalli_with_default_expires_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/adapter_memcached_dalli_with_default_expires_spec.rb
++++ ruby-moneta/spec/moneta/adapter_memcached_dalli_with_default_expires_spec.rb
@@ -1,37 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -472,7 +473,7 @@ index 3e5b60c..e69de29 100644
- end
-
- def new_store
-- Moneta::Adapters::MemcachedDalli.new(:expires => 1)
+- Moneta::Adapters::MemcachedDalli.new(expires: 1)
- end
-
- def load_value(value)
@@ -499,10 +500,10 @@ index 3e5b60c..e69de29 100644
- it_should_behave_like 'store_pathkey_stringvalue'
- it_should_behave_like 'store_large'
-end
-diff --git a/spec/moneta/adapter_memcached_native_spec.rb b/spec/moneta/adapter_memcached_native_spec.rb
-index 3fc7381..e69de29 100644
---- a/spec/moneta/adapter_memcached_native_spec.rb
-+++ b/spec/moneta/adapter_memcached_native_spec.rb
+Index: ruby-moneta/spec/moneta/adapter_memcached_native_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/adapter_memcached_native_spec.rb
++++ ruby-moneta/spec/moneta/adapter_memcached_native_spec.rb
@@ -1,36 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -514,7 +515,7 @@ index 3fc7381..e69de29 100644
- end
-
- def new_store
-- Moneta::Adapters::MemcachedNative.new(:namespace => "adapter_memcached_native")
+- Moneta::Adapters::MemcachedNative.new(namespace: "adapter_memcached_native")
- end
-
- def load_value(value)
@@ -540,10 +541,10 @@ index 3fc7381..e69de29 100644
- it_should_behave_like 'store_pathkey_stringvalue'
- it_should_behave_like 'store_large'
-end
-diff --git a/spec/moneta/adapter_memcached_native_with_default_expires_spec.rb b/spec/moneta/adapter_memcached_native_with_default_expires_spec.rb
-index ecaf597..e69de29 100644
---- a/spec/moneta/adapter_memcached_native_with_default_expires_spec.rb
-+++ b/spec/moneta/adapter_memcached_native_with_default_expires_spec.rb
+Index: ruby-moneta/spec/moneta/adapter_memcached_native_with_default_expires_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/adapter_memcached_native_with_default_expires_spec.rb
++++ ruby-moneta/spec/moneta/adapter_memcached_native_with_default_expires_spec.rb
@@ -1,37 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -555,7 +556,7 @@ index ecaf597..e69de29 100644
- end
-
- def new_store
-- Moneta::Adapters::MemcachedNative.new(:expires => 1)
+- Moneta::Adapters::MemcachedNative.new(expires: 1)
- end
-
- def load_value(value)
@@ -582,10 +583,10 @@ index ecaf597..e69de29 100644
- it_should_behave_like 'store_pathkey_stringvalue'
- it_should_behave_like 'store_large'
-end
-diff --git a/spec/moneta/adapter_memcached_spec.rb b/spec/moneta/adapter_memcached_spec.rb
-index 844f502..e69de29 100644
---- a/spec/moneta/adapter_memcached_spec.rb
-+++ b/spec/moneta/adapter_memcached_spec.rb
+Index: ruby-moneta/spec/moneta/adapter_memcached_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/adapter_memcached_spec.rb
++++ ruby-moneta/spec/moneta/adapter_memcached_spec.rb
@@ -1,36 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -597,7 +598,7 @@ index 844f502..e69de29 100644
- end
-
- def new_store
-- Moneta::Adapters::Memcached.new(:namespace => "adapter_memcached")
+- Moneta::Adapters::Memcached.new(namespace: "adapter_memcached")
- end
-
- def load_value(value)
@@ -623,10 +624,10 @@ index 844f502..e69de29 100644
- it_should_behave_like 'store_pathkey_stringvalue'
- it_should_behave_like 'store_large'
-end
-diff --git a/spec/moneta/adapter_memcached_with_default_expires_spec.rb b/spec/moneta/adapter_memcached_with_default_expires_spec.rb
-index 493e90c..e69de29 100644
---- a/spec/moneta/adapter_memcached_with_default_expires_spec.rb
-+++ b/spec/moneta/adapter_memcached_with_default_expires_spec.rb
+Index: ruby-moneta/spec/moneta/adapter_memcached_with_default_expires_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/adapter_memcached_with_default_expires_spec.rb
++++ ruby-moneta/spec/moneta/adapter_memcached_with_default_expires_spec.rb
@@ -1,37 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -638,7 +639,7 @@ index 493e90c..e69de29 100644
- end
-
- def new_store
-- Moneta::Adapters::Memcached.new(:expires => 1)
+- Moneta::Adapters::Memcached.new(expires: 1)
- end
-
- def load_value(value)
@@ -665,11 +666,11 @@ index 493e90c..e69de29 100644
- it_should_behave_like 'store_pathkey_stringvalue'
- it_should_behave_like 'store_large'
-end
-diff --git a/spec/moneta/adapter_mongo_spec.rb b/spec/moneta/adapter_mongo_spec.rb
-index d701a56..e69de29 100644
---- a/spec/moneta/adapter_mongo_spec.rb
-+++ b/spec/moneta/adapter_mongo_spec.rb
-@@ -1,56 +0,0 @@
+Index: ruby-moneta/spec/moneta/adapter_mongo_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/adapter_mongo_spec.rb
++++ ruby-moneta/spec/moneta/adapter_mongo_spec.rb
+@@ -1,51 +0,0 @@
-# coding: binary
-# Generated by generate-specs
-require 'helper'
@@ -680,7 +681,8 @@ index d701a56..e69de29 100644
- end
-
- def new_store
-- Moneta::Adapters::Mongo.new(:db => "adapter_mongo")
+- Moneta::Adapters::Mongo.new(db: "adapter_mongo",
+- collection: 'default')
- end
-
- def load_value(value)
@@ -719,18 +721,12 @@ index d701a56..e69de29 100644
- it_should_behave_like 'store_pathkey_hashvalue'
- it_should_behave_like 'store_pathkey_integervalue'
- it_should_behave_like 'store_large'
-- it 'automatically deletes expired document' do
-- store.store('key', 'val', :expires => 5)
-- store.instance_variable_get(:@collection).find_one('_id' => ::BSON::Binary.new('key')).should_not be_nil
-- sleep 70 # Mongo needs up to 60 seconds
-- store.instance_variable_get(:@collection).find_one('_id' => ::BSON::Binary.new('key')).should be_nil
-- end
-end
-diff --git a/spec/moneta/adapter_mongo_with_default_expires_spec.rb b/spec/moneta/adapter_mongo_with_default_expires_spec.rb
-index 538de30..e69de29 100644
---- a/spec/moneta/adapter_mongo_with_default_expires_spec.rb
-+++ b/spec/moneta/adapter_mongo_with_default_expires_spec.rb
-@@ -1,51 +0,0 @@
+Index: ruby-moneta/spec/moneta/adapter_mongo_with_default_expires_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/adapter_mongo_with_default_expires_spec.rb
++++ ruby-moneta/spec/moneta/adapter_mongo_with_default_expires_spec.rb
+@@ -1,53 +1,2 @@
-# coding: binary
-# Generated by generate-specs
-require 'helper'
@@ -741,7 +737,9 @@ index 538de30..e69de29 100644
- end
-
- def new_store
-- Moneta::Adapters::Mongo.new(:expires => 1)
+- Moneta::Adapters::Mongo.new(db: "adapter_mongo",
+- collection: 'with_default_expires',
+- expires: 1)
- end
-
- def load_value(value)
@@ -780,12 +778,12 @@ index 538de30..e69de29 100644
- it_should_behave_like 'store_pathkey_stringvalue'
- it_should_behave_like 'store_pathkey_hashvalue'
- it_should_behave_like 'store_pathkey_integervalue'
-- it_should_behave_like 'store_large'
--end
-diff --git a/spec/moneta/adapter_redis_spec.rb b/spec/moneta/adapter_redis_spec.rb
-index e64f094..e69de29 100644
---- a/spec/moneta/adapter_redis_spec.rb
-+++ b/spec/moneta/adapter_redis_spec.rb
+ it_should_behave_like 'store_large'
+ end
+Index: ruby-moneta/spec/moneta/adapter_redis_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/adapter_redis_spec.rb
++++ ruby-moneta/spec/moneta/adapter_redis_spec.rb
@@ -1,36 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -823,10 +821,10 @@ index e64f094..e69de29 100644
- it_should_behave_like 'store_pathkey_stringvalue'
- it_should_behave_like 'store_large'
-end
-diff --git a/spec/moneta/adapter_redis_with_default_expires_spec.rb b/spec/moneta/adapter_redis_with_default_expires_spec.rb
-index 9346da5..e69de29 100644
---- a/spec/moneta/adapter_redis_with_default_expires_spec.rb
-+++ b/spec/moneta/adapter_redis_with_default_expires_spec.rb
+Index: ruby-moneta/spec/moneta/adapter_redis_with_default_expires_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/adapter_redis_with_default_expires_spec.rb
++++ ruby-moneta/spec/moneta/adapter_redis_with_default_expires_spec.rb
@@ -1,37 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -838,7 +836,7 @@ index 9346da5..e69de29 100644
- end
-
- def new_store
-- Moneta::Adapters::Redis.new(:expires => 1)
+- Moneta::Adapters::Redis.new(expires: 1)
- end
-
- def load_value(value)
@@ -865,10 +863,10 @@ index 9346da5..e69de29 100644
- it_should_behave_like 'store_pathkey_stringvalue'
- it_should_behave_like 'store_large'
-end
-diff --git a/spec/moneta/adapter_restclient_spec.rb b/spec/moneta/adapter_restclient_spec.rb
-index d52f392..e69de29 100644
---- a/spec/moneta/adapter_restclient_spec.rb
-+++ b/spec/moneta/adapter_restclient_spec.rb
+Index: ruby-moneta/spec/moneta/adapter_restclient_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/adapter_restclient_spec.rb
++++ ruby-moneta/spec/moneta/adapter_restclient_spec.rb
@@ -1,33 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -881,7 +879,7 @@ index d52f392..e69de29 100644
- end
-
- def new_store
-- Moneta::Adapters::RestClient.new(:url => 'http://localhost:8808/moneta/')
+- Moneta::Adapters::RestClient.new(url: 'http://localhost:8808/moneta/')
- end
-
- def load_value(value)
@@ -903,23 +901,23 @@ index d52f392..e69de29 100644
- it_should_behave_like 'store_pathkey_stringvalue'
- it_should_behave_like 'store_large'
-end
-diff --git a/spec/moneta/adapter_sequel_spec.rb b/spec/moneta/adapter_sequel_spec.rb
-index 0f129c4..d57efd3 100644
---- a/spec/moneta/adapter_sequel_spec.rb
-+++ b/spec/moneta/adapter_sequel_spec.rb
+Index: ruby-moneta/spec/moneta/adapter_sequel_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/adapter_sequel_spec.rb
++++ ruby-moneta/spec/moneta/adapter_sequel_spec.rb
@@ -8,7 +8,7 @@ describe_moneta "adapter_sequel" do
end
def new_store
-- Moneta::Adapters::Sequel.new(:db => (defined?(JRUBY_VERSION) ? "jdbc:mysql://localhost/moneta?user=root" : "mysql2://root:@localhost/moneta"), :table => "adapter_sequel")
-+ Moneta::Adapters::Sequel.new(:db => (defined?(JRUBY_VERSION) ? "jdbc:mysql://localhost/moneta?user=root#{ENV["MYSQL_TEST_SOCKET"] ? "&socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}" : "mysql2://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}"), :table => "adapter_sequel")
+- Moneta::Adapters::Sequel.new(db: (defined?(JRUBY_VERSION) ? "jdbc:mysql://localhost/moneta?user=root" : "mysql2://root:@localhost/moneta"), table: "adapter_sequel")
++ Moneta::Adapters::Sequel.new(db: (defined?(JRUBY_VERSION) ? "jdbc:mysql://localhost/moneta?user=root#{ENV["MYSQL_TEST_SOCKET"] ? "&socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}" : "mysql2://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}"), table: "adapter_sequel")
end
def load_value(value)
-diff --git a/spec/moneta/adapter_tdb_spec.rb b/spec/moneta/adapter_tdb_spec.rb
-index 659e940..e69de29 100644
---- a/spec/moneta/adapter_tdb_spec.rb
-+++ b/spec/moneta/adapter_tdb_spec.rb
+Index: ruby-moneta/spec/moneta/adapter_tdb_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/adapter_tdb_spec.rb
++++ ruby-moneta/spec/moneta/adapter_tdb_spec.rb
@@ -1,31 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -931,7 +929,7 @@ index 659e940..e69de29 100644
- end
-
- def new_store
-- Moneta::Adapters::TDB.new(:file => File.join(make_tempdir, "adapter_tdb"))
+- Moneta::Adapters::TDB.new(file: File.join(make_tempdir, "adapter_tdb"))
- end
-
- def load_value(value)
@@ -952,10 +950,10 @@ index 659e940..e69de29 100644
- it_should_behave_like 'store_pathkey_stringvalue'
- it_should_behave_like 'store_large'
-end
-diff --git a/spec/moneta/adapter_tokyotyrant_spec.rb b/spec/moneta/adapter_tokyotyrant_spec.rb
-index 03bdbd9..e69de29 100644
---- a/spec/moneta/adapter_tokyotyrant_spec.rb
-+++ b/spec/moneta/adapter_tokyotyrant_spec.rb
+Index: ruby-moneta/spec/moneta/adapter_tokyotyrant_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/adapter_tokyotyrant_spec.rb
++++ ruby-moneta/spec/moneta/adapter_tokyotyrant_spec.rb
@@ -1,34 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -991,10 +989,10 @@ index 03bdbd9..e69de29 100644
- it_should_behave_like 'store_pathkey_stringvalue'
- it_should_behave_like 'store_large'
-end
-diff --git a/spec/moneta/proxy_redis_spec.rb b/spec/moneta/proxy_redis_spec.rb
-index fd5f984..e69de29 100644
---- a/spec/moneta/proxy_redis_spec.rb
-+++ b/spec/moneta/proxy_redis_spec.rb
+Index: ruby-moneta/spec/moneta/proxy_redis_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/proxy_redis_spec.rb
++++ ruby-moneta/spec/moneta/proxy_redis_spec.rb
@@ -1,40 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -1036,101 +1034,101 @@ index fd5f984..e69de29 100644
- it_should_behave_like 'store_pathkey_stringvalue'
- it_should_behave_like 'store_large'
-end
-diff --git a/spec/moneta/standard_activerecord_spec.rb b/spec/moneta/standard_activerecord_spec.rb
-index 43a1c37..2c153cc 100644
---- a/spec/moneta/standard_activerecord_spec.rb
-+++ b/spec/moneta/standard_activerecord_spec.rb
-@@ -8,7 +8,7 @@ describe_moneta "standard_activerecord" do
+Index: ruby-moneta/spec/moneta/standard_activerecord_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/standard_activerecord_spec.rb
++++ ruby-moneta/spec/moneta/standard_activerecord_spec.rb
+@@ -8,7 +8,7 @@ describe_moneta "standard_activerecord"
end
def new_store
-- Moneta.new(:ActiveRecord, :table => 'standard_activerecord', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root' }, :logger => {:file => File.join(make_tempdir, 'standard_activerecord.log')})
-+ Moneta.new(:ActiveRecord, :table => 'standard_activerecord', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root', :socket => ENV['MYSQL_TEST_SOCKET'] }, :logger => {:file => File.join(make_tempdir, 'standard_activerecord.log')})
+- Moneta.new(:ActiveRecord, table: 'standard_activerecord', connection: { adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), database: 'moneta', username: 'root' }, logger: {file: File.join(make_tempdir, 'standard_activerecord.log')})
++ Moneta.new(:ActiveRecord, table: 'standard_activerecord', connection: { adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), database: 'moneta', username: 'root', socket: ENV['MYSQL_TEST_SOCKET'] }, logger: {file: File.join(make_tempdir, 'standard_activerecord.log')})
end
def load_value(value)
-diff --git a/spec/moneta/standard_activerecord_with_expires_spec.rb b/spec/moneta/standard_activerecord_with_expires_spec.rb
-index e9061bd..54f3df5 100644
---- a/spec/moneta/standard_activerecord_with_expires_spec.rb
-+++ b/spec/moneta/standard_activerecord_with_expires_spec.rb
-@@ -8,7 +8,7 @@ describe_moneta "standard_activerecord_with_expires" do
+Index: ruby-moneta/spec/moneta/standard_activerecord_with_expires_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/standard_activerecord_with_expires_spec.rb
++++ ruby-moneta/spec/moneta/standard_activerecord_with_expires_spec.rb
+@@ -8,7 +8,7 @@ describe_moneta "standard_activerecord_w
end
def new_store
-- Moneta.new(:ActiveRecord, :table => 'standard_activerecord_with_expires', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root' }, :expires => true, :logger => {:file => File.join(make_tempdir, 'standard_activerecord_with_expires.log')})
-+ Moneta.new(:ActiveRecord, :table => 'standard_activerecord_with_expires', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root', :socket => ENV['MYSQL_TEST_SOCKET'] }, :expires => true, :logger => {:file => File.join(make_tempdir, 'standard_activerecord_with_expires.log')})
+- Moneta.new(:ActiveRecord, table: 'standard_activerecord_with_expires', connection: { adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), database: 'moneta', username: 'root' }, expires: true, logger: {file: File.join(make_tempdir, 'standard_activerecord_with_expires.log')})
++ Moneta.new(:ActiveRecord, table: 'standard_activerecord_with_expires', connection: { adapter: (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), database: 'moneta', username: 'root', socket: ENV['MYSQL_TEST_SOCKET'] }, expires: true, logger: {file: File.join(make_tempdir, 'standard_activerecord_with_expires.log')})
end
def load_value(value)
-diff --git a/spec/moneta/standard_datamapper_spec.rb b/spec/moneta/standard_datamapper_spec.rb
-index 1df1c07..cbf7a0e 100644
---- a/spec/moneta/standard_datamapper_spec.rb
-+++ b/spec/moneta/standard_datamapper_spec.rb
+Index: ruby-moneta/spec/moneta/standard_datamapper_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/standard_datamapper_spec.rb
++++ ruby-moneta/spec/moneta/standard_datamapper_spec.rb
@@ -10,7 +10,7 @@ describe_moneta "standard_datamapper" do
end
def new_store
-- Moneta.new(:DataMapper, :setup => "mysql://root:@localhost/moneta", :table => "simple_datamapper", :logger => {:file => File.join(make_tempdir, 'standard_datamapper.log')})
-+ Moneta.new(:DataMapper, :setup => "mysql://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}", :table => "simple_datamapper", :logger => {:file => File.join(make_tempdir, 'standard_datamapper.log')})
+- Moneta.new(:DataMapper, setup: "mysql://root:@localhost/moneta", table: "simple_datamapper", logger: {file: File.join(make_tempdir, 'standard_datamapper.log')})
++ Moneta.new(:DataMapper, setup: "mysql://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}", table: "simple_datamapper", logger: {file: File.join(make_tempdir, 'standard_datamapper.log')})
end
def load_value(value)
-diff --git a/spec/moneta/standard_datamapper_with_expires_spec.rb b/spec/moneta/standard_datamapper_with_expires_spec.rb
-index 3aaca7c..cc6c605 100644
---- a/spec/moneta/standard_datamapper_with_expires_spec.rb
-+++ b/spec/moneta/standard_datamapper_with_expires_spec.rb
-@@ -10,7 +10,7 @@ describe_moneta "standard_datamapper_with_expires" do
+Index: ruby-moneta/spec/moneta/standard_datamapper_with_expires_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/standard_datamapper_with_expires_spec.rb
++++ ruby-moneta/spec/moneta/standard_datamapper_with_expires_spec.rb
+@@ -10,7 +10,7 @@ describe_moneta "standard_datamapper_wit
end
def new_store
-- Moneta.new(:DataMapper, :setup => "mysql://root:@localhost/moneta", :table => "simple_datamapper_with_expires", :expires => true, :logger => {:file => File.join(make_tempdir, 'standard_datamapper_with_expires.log')})
-+ Moneta.new(:DataMapper, :setup => "mysql://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}", :table => "simple_datamapper_with_expires", :expires => true, :logger => {:file => File.join(make_tempdir, 'standard_datamapper_with_expires.log')})
+- Moneta.new(:DataMapper, setup: "mysql://root:@localhost/moneta", table: "simple_datamapper_with_expires", expires: true, logger: {file: File.join(make_tempdir, 'standard_datamapper_with_expires.log')})
++ Moneta.new(:DataMapper, setup: "mysql://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}", table: "simple_datamapper_with_expires", expires: true, logger: {file: File.join(make_tempdir, 'standard_datamapper_with_expires.log')})
end
def load_value(value)
-diff --git a/spec/moneta/standard_datamapper_with_repository_spec.rb b/spec/moneta/standard_datamapper_with_repository_spec.rb
-index 8b91013..0e255ea 100644
---- a/spec/moneta/standard_datamapper_with_repository_spec.rb
-+++ b/spec/moneta/standard_datamapper_with_repository_spec.rb
-@@ -10,7 +10,7 @@ describe_moneta "standard_datamapper_with_repository" do
+Index: ruby-moneta/spec/moneta/standard_datamapper_with_repository_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/standard_datamapper_with_repository_spec.rb
++++ ruby-moneta/spec/moneta/standard_datamapper_with_repository_spec.rb
+@@ -10,7 +10,7 @@ describe_moneta "standard_datamapper_wit
end
def new_store
-- Moneta.new(:DataMapper, :repository => :repo, :setup => "mysql://root:@localhost/moneta", :table => "simple_datamapper_with_repository", :logger => {:file => File.join(make_tempdir, 'standard_datamapper_with_repository.log')})
-+ Moneta.new(:DataMapper, :repository => :repo, :setup => "mysql://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}", :table => "simple_datamapper_with_repository", :logger => {:file => File.join(make_tempdir, 'standard_datamapper_with_repository.log')})
+- Moneta.new(:DataMapper, repository: :repo, setup: "mysql://root:@localhost/moneta", table: "simple_datamapper_with_repository", logger: {file: File.join(make_tempdir, 'standard_datamapper_with_repository.log')})
++ Moneta.new(:DataMapper, repository: :repo, setup: "mysql://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}", table: "simple_datamapper_with_repository", logger: {file: File.join(make_tempdir, 'standard_datamapper_with_repository.log')})
end
def load_value(value)
-diff --git a/spec/moneta/standard_sequel_spec.rb b/spec/moneta/standard_sequel_spec.rb
-index adaf6dc..dd054ce 100644
---- a/spec/moneta/standard_sequel_spec.rb
-+++ b/spec/moneta/standard_sequel_spec.rb
+Index: ruby-moneta/spec/moneta/standard_sequel_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/standard_sequel_spec.rb
++++ ruby-moneta/spec/moneta/standard_sequel_spec.rb
@@ -8,7 +8,7 @@ describe_moneta "standard_sequel" do
end
def new_store
-- Moneta.new(:Sequel, :db => (defined?(JRUBY_VERSION) ? "jdbc:mysql://localhost/moneta?user=root" : "mysql2://root:@localhost/moneta"), :table => "simple_sequel", :logger => {:file => File.join(make_tempdir, 'standard_sequel.log')})
-+ Moneta.new(:Sequel, :db => (defined?(JRUBY_VERSION) ? "jdbc:mysql://localhost/moneta?user=root#{ENV["MYSQL_TEST_SOCKET"] ? "&socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}" : "mysql2://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}"), :table => "simple_sequel", :logger => {:file => File.join(make_tempdir, 'standard_sequel.log')})
+- Moneta.new(:Sequel, db: (defined?(JRUBY_VERSION) ? "jdbc:mysql://localhost/moneta?user=root" : "mysql2://root:@localhost/moneta"), table: "simple_sequel", logger: {file: File.join(make_tempdir, 'standard_sequel.log')})
++ Moneta.new(:Sequel, db: (defined?(JRUBY_VERSION) ? "jdbc:mysql://localhost/moneta?user=root#{ENV["MYSQL_TEST_SOCKET"] ? "&socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}" : "mysql2://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}"), table: "simple_sequel", logger: {file: File.join(make_tempdir, 'standard_sequel.log')})
end
def load_value(value)
-diff --git a/spec/moneta/standard_sequel_with_expires_spec.rb b/spec/moneta/standard_sequel_with_expires_spec.rb
-index a090d55..00e05ec 100644
---- a/spec/moneta/standard_sequel_with_expires_spec.rb
-+++ b/spec/moneta/standard_sequel_with_expires_spec.rb
-@@ -8,7 +8,7 @@ describe_moneta "standard_sequel_with_expires" do
+Index: ruby-moneta/spec/moneta/standard_sequel_with_expires_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/standard_sequel_with_expires_spec.rb
++++ ruby-moneta/spec/moneta/standard_sequel_with_expires_spec.rb
+@@ -8,7 +8,7 @@ describe_moneta "standard_sequel_with_ex
end
def new_store
-- Moneta.new(:Sequel, :db => (defined?(JRUBY_VERSION) ? "jdbc:mysql://localhost/moneta?user=root" : "mysql2://root:@localhost/moneta"), :table => "simple_sequel_with_expires", :expires => true, :logger => {:file => File.join(make_tempdir, 'standard_sequel_with_expires.log')})
-+ Moneta.new(:Sequel, :db => (defined?(JRUBY_VERSION) ? "jdbc:mysql://localhost/moneta?user=root#{ENV["MYSQL_TEST_SOCKET"] ? "&socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}" : "mysql2://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}"), :table => "simple_sequel_with_expires", :expires => true, :logger => {:file => File.join(make_tempdir, 'standard_sequel_with_expires.log')})
+- Moneta.new(:Sequel, db: (defined?(JRUBY_VERSION) ? "jdbc:mysql://localhost/moneta?user=root" : "mysql2://root:@localhost/moneta"), table: "simple_sequel_with_expires", expires: true, logger: {file: File.join(make_tempdir, 'standard_sequel_with_expires.log')})
++ Moneta.new(:Sequel, db: (defined?(JRUBY_VERSION) ? "jdbc:mysql://localhost/moneta?user=root#{ENV["MYSQL_TEST_SOCKET"] ? "&socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}" : "mysql2://root:@localhost/moneta#{ENV["MYSQL_TEST_SOCKET"] ? "?socket=#{ENV["MYSQL_TEST_SOCKET"]}" : ""}"), table: "simple_sequel_with_expires", expires: true, logger: {file: File.join(make_tempdir, 'standard_sequel_with_expires.log')})
end
def load_value(value)
-diff --git a/spec/moneta/transformer_bencode_spec.rb b/spec/moneta/transformer_bencode_spec.rb
-index 8a7da1c..e69de29 100644
---- a/spec/moneta/transformer_bencode_spec.rb
-+++ b/spec/moneta/transformer_bencode_spec.rb
+Index: ruby-moneta/spec/moneta/transformer_bencode_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/transformer_bencode_spec.rb
++++ ruby-moneta/spec/moneta/transformer_bencode_spec.rb
@@ -1,55 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -1143,7 +1141,7 @@ index 8a7da1c..e69de29 100644
-
- def new_store
- Moneta.build do
-- use :Transformer, :key => :bencode, :value => :bencode
+- use :Transformer, key: :bencode, value: :bencode
- adapter :Memory
- end
- end
@@ -1187,10 +1185,10 @@ index 8a7da1c..e69de29 100644
- Moneta::Transformer::BencodeKeyBencodeValue.should_not be_nil
- end
-end
-diff --git a/spec/moneta/transformer_bert_spec.rb b/spec/moneta/transformer_bert_spec.rb
-index abba0cb..e69de29 100644
---- a/spec/moneta/transformer_bert_spec.rb
-+++ b/spec/moneta/transformer_bert_spec.rb
+Index: ruby-moneta/spec/moneta/transformer_bert_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/transformer_bert_spec.rb
++++ ruby-moneta/spec/moneta/transformer_bert_spec.rb
@@ -1,55 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -1203,7 +1201,7 @@ index abba0cb..e69de29 100644
-
- def new_store
- Moneta.build do
-- use :Transformer, :key => :bert, :value => :bert
+- use :Transformer, key: :bert, value: :bert
- adapter :Memory
- end
- end
@@ -1247,11 +1245,11 @@ index abba0cb..e69de29 100644
- Moneta::Transformer::BertKeyBertValue.should_not be_nil
- end
-end
-diff --git a/spec/moneta/transformer_bson_spec.rb b/spec/moneta/transformer_bson_spec.rb
-index 32c6da2..e69de29 100644
---- a/spec/moneta/transformer_bson_spec.rb
-+++ b/spec/moneta/transformer_bson_spec.rb
-@@ -1,55 +0,0 @@
+Index: ruby-moneta/spec/moneta/transformer_bson_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/transformer_bson_spec.rb
++++ ruby-moneta/spec/moneta/transformer_bson_spec.rb
+@@ -1,60 +0,0 @@
-# coding: binary
-# Generated by generate-specs
-require 'helper'
@@ -1263,13 +1261,18 @@ index 32c6da2..e69de29 100644
-
- def new_store
- Moneta.build do
-- use :Transformer, :key => :bson, :value => :bson
+- use :Transformer, key: :bson, value: :bson
- adapter :Memory
- end
- end
-
- def load_value(value)
-- ::BSON.deserialize(value)['v']
+-
+- if ::BSON::VERSION >= '4.0.0'
+- ::BSON::Document.from_bson(::BSON::ByteBuffer.new(value))['v']
+- else
+- ::BSON::Document.from_bson(::StringIO.new(value))['v']
+- end
- end
-
- include_context 'setup_store'
@@ -1307,10 +1310,10 @@ index 32c6da2..e69de29 100644
- Moneta::Transformer::BsonKeyBsonValue.should_not be_nil
- end
-end
-diff --git a/spec/moneta/transformer_bzip2_spec.rb b/spec/moneta/transformer_bzip2_spec.rb
-index 5fdec1e..e69de29 100644
---- a/spec/moneta/transformer_bzip2_spec.rb
-+++ b/spec/moneta/transformer_bzip2_spec.rb
+Index: ruby-moneta/spec/moneta/transformer_bzip2_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/transformer_bzip2_spec.rb
++++ ruby-moneta/spec/moneta/transformer_bzip2_spec.rb
@@ -1,55 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -1323,13 +1326,13 @@ index 5fdec1e..e69de29 100644
-
- def new_store
- Moneta.build do
-- use :Transformer, :value => :bzip2
+- use :Transformer, value: :bzip2
- adapter :Memory
- end
- end
-
- def load_value(value)
-- ::Bzip2.uncompress(value)
+- ::RBzip2::Decompressor.new(::StringIO.new(value)).read
- end
-
- include_context 'setup_store'
@@ -1367,10 +1370,10 @@ index 5fdec1e..e69de29 100644
- Moneta::Transformer::Bzip2Value.should_not be_nil
- end
-end
-diff --git a/spec/moneta/transformer_lzma_spec.rb b/spec/moneta/transformer_lzma_spec.rb
-index 49d247f..e69de29 100644
---- a/spec/moneta/transformer_lzma_spec.rb
-+++ b/spec/moneta/transformer_lzma_spec.rb
+Index: ruby-moneta/spec/moneta/transformer_lzma_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/transformer_lzma_spec.rb
++++ ruby-moneta/spec/moneta/transformer_lzma_spec.rb
@@ -1,55 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -1383,7 +1386,7 @@ index 49d247f..e69de29 100644
-
- def new_store
- Moneta.build do
-- use :Transformer, :value => :lzma
+- use :Transformer, value: :lzma
- adapter :Memory
- end
- end
@@ -1427,10 +1430,10 @@ index 49d247f..e69de29 100644
- Moneta::Transformer::LzmaValue.should_not be_nil
- end
-end
-diff --git a/spec/moneta/transformer_lzo_spec.rb b/spec/moneta/transformer_lzo_spec.rb
-index 2a346a8..e69de29 100644
---- a/spec/moneta/transformer_lzo_spec.rb
-+++ b/spec/moneta/transformer_lzo_spec.rb
+Index: ruby-moneta/spec/moneta/transformer_lzo_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/transformer_lzo_spec.rb
++++ ruby-moneta/spec/moneta/transformer_lzo_spec.rb
@@ -1,55 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -1443,7 +1446,7 @@ index 2a346a8..e69de29 100644
-
- def new_store
- Moneta.build do
-- use :Transformer, :value => :lzo
+- use :Transformer, value: :lzo
- adapter :Memory
- end
- end
@@ -1487,10 +1490,10 @@ index 2a346a8..e69de29 100644
- Moneta::Transformer::LzoValue.should_not be_nil
- end
-end
-diff --git a/spec/moneta/transformer_msgpack_spec.rb b/spec/moneta/transformer_msgpack_spec.rb
-index 34d789a..e69de29 100644
---- a/spec/moneta/transformer_msgpack_spec.rb
-+++ b/spec/moneta/transformer_msgpack_spec.rb
+Index: ruby-moneta/spec/moneta/transformer_msgpack_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/transformer_msgpack_spec.rb
++++ ruby-moneta/spec/moneta/transformer_msgpack_spec.rb
@@ -1,55 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -1503,7 +1506,7 @@ index 34d789a..e69de29 100644
-
- def new_store
- Moneta.build do
-- use :Transformer, :key => :msgpack, :value => :msgpack
+- use :Transformer, key: :msgpack, value: :msgpack
- adapter :Memory
- end
- end
@@ -1547,10 +1550,10 @@ index 34d789a..e69de29 100644
- Moneta::Transformer::MsgpackKeyMsgpackValue.should_not be_nil
- end
-end
-diff --git a/spec/moneta/transformer_ox_spec.rb b/spec/moneta/transformer_ox_spec.rb
-index 18a6d75..e69de29 100644
---- a/spec/moneta/transformer_ox_spec.rb
-+++ b/spec/moneta/transformer_ox_spec.rb
+Index: ruby-moneta/spec/moneta/transformer_ox_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/transformer_ox_spec.rb
++++ ruby-moneta/spec/moneta/transformer_ox_spec.rb
@@ -1,191 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -1563,7 +1566,7 @@ index 18a6d75..e69de29 100644
-
- def new_store
- Moneta.build do
-- use :Transformer, :key => :ox, :value => :ox
+- use :Transformer, key: :ox, value: :ox
- adapter :Memory
- end
- end
@@ -1743,10 +1746,10 @@ index 18a6d75..e69de29 100644
- Moneta::Transformer::OxKeyOxValue.should_not be_nil
- end
-end
-diff --git a/spec/moneta/transformer_quicklz_spec.rb b/spec/moneta/transformer_quicklz_spec.rb
-index 4d75174..e69de29 100644
---- a/spec/moneta/transformer_quicklz_spec.rb
-+++ b/spec/moneta/transformer_quicklz_spec.rb
+Index: ruby-moneta/spec/moneta/transformer_quicklz_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/transformer_quicklz_spec.rb
++++ ruby-moneta/spec/moneta/transformer_quicklz_spec.rb
@@ -1,55 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -1759,7 +1762,7 @@ index 4d75174..e69de29 100644
-
- def new_store
- Moneta.build do
-- use :Transformer, :value => :quicklz
+- use :Transformer, value: :quicklz
- adapter :Memory
- end
- end
@@ -1803,10 +1806,10 @@ index 4d75174..e69de29 100644
- Moneta::Transformer::QuicklzValue.should_not be_nil
- end
-end
-diff --git a/spec/moneta/transformer_snappy_spec.rb b/spec/moneta/transformer_snappy_spec.rb
-index 71ec418..e69de29 100644
---- a/spec/moneta/transformer_snappy_spec.rb
-+++ b/spec/moneta/transformer_snappy_spec.rb
+Index: ruby-moneta/spec/moneta/transformer_snappy_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/transformer_snappy_spec.rb
++++ ruby-moneta/spec/moneta/transformer_snappy_spec.rb
@@ -1,55 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -1819,7 +1822,7 @@ index 71ec418..e69de29 100644
-
- def new_store
- Moneta.build do
-- use :Transformer, :value => :snappy
+- use :Transformer, value: :snappy
- adapter :Memory
- end
- end
@@ -1863,10 +1866,10 @@ index 71ec418..e69de29 100644
- Moneta::Transformer::SnappyValue.should_not be_nil
- end
-end
-diff --git a/spec/moneta/transformer_tnet_spec.rb b/spec/moneta/transformer_tnet_spec.rb
-index 1b07360..e69de29 100644
---- a/spec/moneta/transformer_tnet_spec.rb
-+++ b/spec/moneta/transformer_tnet_spec.rb
+Index: ruby-moneta/spec/moneta/transformer_tnet_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/transformer_tnet_spec.rb
++++ ruby-moneta/spec/moneta/transformer_tnet_spec.rb
@@ -1,55 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -1879,7 +1882,7 @@ index 1b07360..e69de29 100644
-
- def new_store
- Moneta.build do
-- use :Transformer, :key => :tnet, :value => :tnet
+- use :Transformer, key: :tnet, value: :tnet
- adapter :Memory
- end
- end
@@ -1923,10 +1926,10 @@ index 1b07360..e69de29 100644
- Moneta::Transformer::TnetKeyTnetValue.should_not be_nil
- end
-end
-diff --git a/spec/moneta/weak_create_spec.rb b/spec/moneta/weak_create_spec.rb
-index 3cd5842..e69de29 100644
---- a/spec/moneta/weak_create_spec.rb
-+++ b/spec/moneta/weak_create_spec.rb
+Index: ruby-moneta/spec/moneta/weak_create_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/weak_create_spec.rb
++++ ruby-moneta/spec/moneta/weak_create_spec.rb
@@ -1,41 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -1943,10 +1946,10 @@ index 3cd5842..e69de29 100644
- Moneta.build do
- use :WeakCreate
- adapter :Fog,
-- :aws_access_key_id => 'fake_access_key_id',
-- :aws_secret_access_key => 'fake_secret_access_key',
-- :provider => 'AWS',
-- :dir => 'weak_create'
+- aws_access_key_id: 'fake_access_key_id',
+- aws_secret_access_key: 'fake_secret_access_key',
+- provider: 'AWS',
+- dir: 'weak_create'
- end
- end
-
@@ -1969,10 +1972,10 @@ index 3cd5842..e69de29 100644
- it_should_behave_like 'store_pathkey_stringvalue'
- it_should_behave_like 'store_large'
-end
-diff --git a/spec/moneta/weak_increment_spec.rb b/spec/moneta/weak_increment_spec.rb
-index 10f509a..e69de29 100644
---- a/spec/moneta/weak_increment_spec.rb
-+++ b/spec/moneta/weak_increment_spec.rb
+Index: ruby-moneta/spec/moneta/weak_increment_spec.rb
+===================================================================
+--- ruby-moneta.orig/spec/moneta/weak_increment_spec.rb
++++ ruby-moneta/spec/moneta/weak_increment_spec.rb
@@ -1,41 +0,0 @@
-# coding: binary
-# Generated by generate-specs
@@ -1989,10 +1992,10 @@ index 10f509a..e69de29 100644
- Moneta.build do
- use :WeakIncrement
- adapter :Fog,
-- :aws_access_key_id => 'fake_access_key_id',
-- :aws_secret_access_key => 'fake_secret_access_key',
-- :provider => 'AWS',
-- :dir => 'weak_increment'
+- aws_access_key_id: 'fake_access_key_id',
+- aws_secret_access_key: 'fake_secret_access_key',
+- provider: 'AWS',
+- dir: 'weak_increment'
- end
- end
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-moneta.git
More information about the Pkg-ruby-extras-commits
mailing list