moneta 0.7.20 → 0.8.0

data/script/install-bundle

@@ -16,7 +16,7 @@ end
 
 BUNDLE_FILE = "moneta-bundle-#{RUBY_VERSION}-#{ruby}.tar.gz"
 
-if system("curl -f -u moneta:#{ENV['DAV_PW']} -k -o #{BUNDLE_FILE} https://mendler.net/dav/#{BUNDLE_FILE}")
+if system("curl -f -u moneta:#{ENV['DAV_PW']} -k -o #{BUNDLE_FILE} https://qxqx.de/dav/#{BUNDLE_FILE}")
   cmd 'rm -rf .bundle'
   cmd "tar -xpf #{BUNDLE_FILE}"
   cmd "rm -f #{BUNDLE_FILE}"

data/script/install-kyotocabinet

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if `wget --no-check-certificate --quiet -O kyotocabinet.tar.gz https://moneta:$DAV_PW@mendler.net/dav/kyotocabinet.tar.gz`; then
+if `wget --no-check-certificate --quiet -O kyotocabinet.tar.gz https://moneta:$DAV_PW@qxqx.de/dav/kyotocabinet.tar.gz`; then
   tar -xf kyotocabinet.tar.gz
 else
   wget http://fallabs.com/kyotocabinet/pkg/kyotocabinet-1.2.76.tar.gz
@@ -11,7 +11,7 @@ else
   make
   cd ..
   tar -czf kyotocabinet.tar.gz kyotocabinet-*
-  curl -u moneta:$DAV_PW -k -T kyotocabinet.tar.gz https://mendler.net/dav/ || echo 'Nothing uploaded'
+  curl -u moneta:$DAV_PW -k -T kyotocabinet.tar.gz https://qxqx.de/dav/ || echo 'Nothing uploaded'
 fi
 cd kyotocabinet-*
 sudo make install

data/script/memusage

@@ -31,7 +31,7 @@ stats
 
 %q{require 'moneta'
 Moneta.new(:Memory)
-Moneta.new(:File, :dir => 'filestore')
+Moneta.new(:File, dir: 'filestore')
 Moneta.new(:MemcachedNative)
 Moneta.new(:MemcachedDalli)}.each_line do |line|
   puts line

data/script/upload-bundle

@@ -1,2 +1,2 @@
 #!/bin/bash
-curl -f -u moneta:$DAV_PW -k -T moneta-bundle-*.tar.gz https://mendler.net/dav/ || echo 'Nothing uploaded'
+curl -f -u moneta:$DAV_PW -k -T moneta-bundle-*.tar.gz https://qxqx.de/dav/ || echo 'Nothing uploaded'

data/spec/action_dispatch/session_moneta_store_spec.rb

@@ -20,11 +20,11 @@ class MonetaStoreTest < ActionDispatch::IntegrationTest
     end
 
     def get_session_value
-      render :text => "foo: #{session[:foo].inspect}"
+      render text: "foo: #{session[:foo].inspect}"
     end
 
     def get_session_id
-      render :text => "#{request.session_options[:id]}"
+      render text: "#{request.session_options[:id]}"
     end
 
     def call_reset_session
@@ -157,7 +157,7 @@ class MonetaStoreTest < ActionDispatch::IntegrationTest
 
       reset!
 
-      get '/set_session_value', :_session_id => session_id
+      get '/set_session_value', _session_id: session_id
       assert_response :success
       assert_not_equal session_id, cookies['_session_id']
     end
@@ -183,11 +183,11 @@ class MonetaStoreTest < ActionDispatch::IntegrationTest
   def with_test_route_set
     with_routing do |set|
       set.draw do
-        get ':action', :to => ::MonetaStoreTest::TestController
+        get ':action', to: ::MonetaStoreTest::TestController
       end
 
       @app = ActionDispatch::MiddlewareStack.new do |middleware|
-        middleware.use ActionDispatch::Session::MonetaStore, :key => '_session_id', :store => :Memory
+        middleware.use ActionDispatch::Session::MonetaStore, key: '_session_id', store: :Memory
       end.build(set)
 
       yield

data/spec/active_support/cache_moneta_store_spec.rb

@@ -13,9 +13,9 @@ describe ActiveSupport::Cache::MonetaStore do
 
   before(:each) do
     @events.clear
-    @store  = ActiveSupport::Cache::MonetaStore.new(:store => Moneta.new(:Memory))
-    @rabbit = OpenStruct.new :name => 'bunny'
-    @white_rabbit = OpenStruct.new :color => 'white'
+    @store  = ActiveSupport::Cache::MonetaStore.new(store: Moneta.new(:Memory))
+    @rabbit = OpenStruct.new name: 'bunny'
+    @white_rabbit = OpenStruct.new color: 'white'
 
     @store.write 'rabbit', @rabbit
     @store.delete 'counter'
@@ -32,7 +32,7 @@ describe ActiveSupport::Cache::MonetaStore do
   end
 
   it 'writes the data with expiration time' do
-    @store.write 'rabbit', @white_rabbit, :expires_in => 1.second
+    @store.write 'rabbit', @white_rabbit, expires_in: 1.second
     @store.read('rabbit').should == @white_rabbit
     sleep 2
     @store.read('rabbit').should be_nil
@@ -53,8 +53,8 @@ describe ActiveSupport::Cache::MonetaStore do
     @store.fetch('rub-a-dub').should be_nil
     @store.fetch('rub-a-dub') { 'Flora de Cana' }
     @store.fetch('rub-a-dub').should == 'Flora de Cana'
-    @store.fetch('rabbit', :force => true) # force cache miss
-    @store.fetch('rabbit', :force => true, :expires_in => 1.second) { @white_rabbit }
+    @store.fetch('rabbit', force: true) # force cache miss
+    @store.fetch('rabbit', force: true, expires_in: 1.second) { @white_rabbit }
     @store.fetch('rabbit').should == @white_rabbit
     sleep 2
     @store.fetch('rabbit').should be_nil
@@ -76,24 +76,24 @@ describe ActiveSupport::Cache::MonetaStore do
 
   it 'increments a key' do
     3.times { @store.increment 'counter' }
-    @store.read('counter', :raw => true).should == '3'
+    @store.read('counter', raw: true).should == '3'
   end
 
   it 'decrements a key' do
     3.times { @store.increment 'counter' }
     2.times { @store.decrement 'counter' }
-    @store.read('counter', :raw => true).should == '1'
+    @store.read('counter', raw: true).should == '1'
   end
 
   it 'increments a key by given value' do
     @store.increment 'counter', 3
-    @store.read('counter', :raw => true).should == '3'
+    @store.read('counter', raw: true).should == '3'
   end
 
   it 'decrements a key by given value' do
     3.times { @store.increment 'counter' }
     @store.decrement 'counter', 2
-    @store.read('counter', :raw => true).should == '1'
+    @store.read('counter', raw: true).should == '1'
   end
 
   describe 'notifications' do
@@ -105,13 +105,13 @@ describe ActiveSupport::Cache::MonetaStore do
       read, generate, write = @events
 
       read.name.should == 'cache_read.active_support'
-      read.payload.should == { :key => 'radiohead', :super_operation => :fetch }
+      read.payload.should == { key: 'radiohead', super_operation: :fetch }
 
       generate.name.should == 'cache_generate.active_support'
-      generate.payload.should == { :key => 'radiohead' }
+      generate.payload.should == { key: 'radiohead' }
 
       write.name.should == 'cache_write.active_support'
-      write.payload.should == { :key => 'radiohead' }
+      write.payload.should == { key: 'radiohead' }
     end
 
     it 'notifies on #read' do
@@ -121,7 +121,7 @@ describe ActiveSupport::Cache::MonetaStore do
 
       read = @events.first
       read.name.should == 'cache_read.active_support'
-      read.payload.should == { :key => 'metallica', :hit => false }
+      read.payload.should == { key: 'metallica', hit: false }
     end
 
     it 'notifies on #write' do
@@ -131,7 +131,7 @@ describe ActiveSupport::Cache::MonetaStore do
 
       write = @events.first
       write.name.should == 'cache_write.active_support'
-      write.payload.should == { :key => 'depeche mode' }
+      write.payload.should == { key: 'depeche mode' }
     end
 
     it 'notifies on #delete' do
@@ -141,7 +141,7 @@ describe ActiveSupport::Cache::MonetaStore do
 
       delete = @events.first
       delete.name.should == 'cache_delete.active_support'
-      delete.payload.should == { :key => 'the new cardigans' }
+      delete.payload.should == { key: 'the new cardigans' }
     end
 
     it 'notifies on #exist?' do
@@ -151,7 +151,7 @@ describe ActiveSupport::Cache::MonetaStore do
 
       exist = @events.first
       exist.name.should == 'cache_exist?.active_support'
-      exist.payload.should == { :key => 'the smiths' }
+      exist.payload.should == { key: 'the smiths' }
     end
 
     it 'notifies on #increment' do
@@ -161,7 +161,7 @@ describe ActiveSupport::Cache::MonetaStore do
 
       increment = @events.first
       increment.name.should == 'cache_increment.active_support'
-      increment.payload.should == { :key => 'pearl jam', :amount => 1 }
+      increment.payload.should == { key: 'pearl jam', amount: 1 }
     end
 
     it 'notifies on #decrement' do
@@ -171,7 +171,7 @@ describe ActiveSupport::Cache::MonetaStore do
 
       decrement = @events.first
       decrement.name.should == 'cache_decrement.active_support'
-      decrement.payload.should == { :key => 'placebo', :amount => 1 }
+      decrement.payload.should == { key: 'placebo', amount: 1 }
     end
 
     it 'should notify on clear' do
@@ -181,7 +181,7 @@ describe ActiveSupport::Cache::MonetaStore do
 
       clear = @events.first
       clear.name.should == 'cache_clear.active_support'
-      clear.payload.should == { :key => nil }
+      clear.payload.should == { key: nil }
     end
   end
 

data/spec/moneta/adapter_activerecord_exisiting_connection_spec.rb

@@ -4,13 +4,13 @@ require 'helper'
 
 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)

data/spec/moneta/adapter_activerecord_spec.rb

@@ -8,7 +8,7 @@ describe_moneta "adapter_activerecord" do
   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)
@@ -34,12 +34,12 @@ describe_moneta "adapter_activerecord" do
   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'
@@ -51,8 +51,8 @@ describe_moneta "adapter_activerecord" do
   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'

data/spec/moneta/adapter_cassandra_spec.rb

@@ -8,7 +8,7 @@ describe_moneta "adapter_cassandra" do
   end
 
   def new_store
-    Moneta::Adapters::Cassandra.new(:keyspace => 'adapter_cassandra')
+    Moneta::Adapters::Cassandra.new(keyspace: 'adapter_cassandra')
   end
 
   def load_value(value)

data/spec/moneta/adapter_cassandra_with_default_expires_spec.rb

@@ -8,7 +8,7 @@ describe_moneta "adapter_cassandra_with_default_expires" do
   end
 
   def new_store
-    Moneta::Adapters::Cassandra.new(:keyspace => 'adapter_cassandra_with_default_expires', :expires => 1)
+    Moneta::Adapters::Cassandra.new(keyspace: 'adapter_cassandra_with_default_expires', expires: 1)
   end
 
   def load_value(value)

data/spec/moneta/adapter_couch_spec.rb

@@ -8,7 +8,7 @@ describe_moneta "adapter_couch" do
   end
 
   def new_store
-    Moneta::Adapters::Couch.new(:db => 'adapter_couch')
+    Moneta::Adapters::Couch.new(db: 'adapter_couch')
   end
 
   def load_value(value)

data/spec/moneta/adapter_datamapper_spec.rb

@@ -4,13 +4,13 @@ require 'helper'
 
 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)
@@ -33,10 +33,10 @@ describe_moneta "adapter_datamapper" do
   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'
@@ -47,10 +47,10 @@ describe_moneta "adapter_datamapper" do
   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'

data/spec/moneta/adapter_daybreak_spec.rb

@@ -8,7 +8,7 @@ describe_moneta "adapter_daybreak" do
   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)

data/spec/moneta/adapter_dbm_spec.rb

@@ -8,7 +8,7 @@ describe_moneta "adapter_dbm" do
   end
 
   def new_store
-    Moneta::Adapters::DBM.new(:file => File.join(make_tempdir, "adapter_dbm"))
+    Moneta::Adapters::DBM.new(file: File.join(make_tempdir, "adapter_dbm"))
   end
 
   def load_value(value)

data/spec/moneta/adapter_file_spec.rb

@@ -8,7 +8,7 @@ describe_moneta "adapter_file" do
   end
 
   def new_store
-    Moneta::Adapters::File.new(:dir => File.join(make_tempdir, "adapter_file"))
+    Moneta::Adapters::File.new(dir: File.join(make_tempdir, "adapter_file"))
   end
 
   def load_value(value)

data/spec/moneta/adapter_fog_spec.rb

@@ -10,10 +10,10 @@ describe_moneta "adapter_fog" do
   end
 
   def new_store
-    Moneta::Adapters::Fog.new(:aws_access_key_id => 'fake_access_key_id',
-        :aws_secret_access_key  => 'fake_secret_access_key',
-        :provider               => 'AWS',
-        :dir                    => 'adapter_fog')
+    Moneta::Adapters::Fog.new(aws_access_key_id: 'fake_access_key_id',
+        aws_secret_access_key:  'fake_secret_access_key',
+        provider:               'AWS',
+        dir:                    'adapter_fog')
   end
 
   def load_value(value)

data/spec/moneta/adapter_gdbm_spec.rb

@@ -8,7 +8,7 @@ describe_moneta "adapter_gdbm" do
   end
 
   def new_store
-    Moneta::Adapters::GDBM.new(:file => File.join(make_tempdir, "adapter_gdbm"))
+    Moneta::Adapters::GDBM.new(file: File.join(make_tempdir, "adapter_gdbm"))
   end
 
   def load_value(value)

data/spec/moneta/adapter_hbase_spec.rb

@@ -8,7 +8,7 @@ describe_moneta "adapter_hbase" do
   end
 
   def new_store
-    Moneta::Adapters::HBase.new(:table => 'adapter_hbase')
+    Moneta::Adapters::HBase.new(table: 'adapter_hbase')
   end
 
   def load_value(value)

data/spec/moneta/adapter_kyotocabinet_spec.rb

@@ -8,7 +8,7 @@ describe_moneta "adapter_kyotocabinet" do
   end
 
   def new_store
-    Moneta::Adapters::KyotoCabinet.new(:file => File.join(make_tempdir, "adapter_kyotocabinet.kch"))
+    Moneta::Adapters::KyotoCabinet.new(file: File.join(make_tempdir, "adapter_kyotocabinet.kch"))
   end
 
   def load_value(value)

data/spec/moneta/adapter_leveldb_spec.rb

@@ -8,7 +8,7 @@ describe_moneta "adapter_leveldb" do
   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)

data/spec/moneta/adapter_lmdb_spec.rb

@@ -8,7 +8,7 @@ describe_moneta "adapter_lmdb" do
   end
 
   def new_store
-    Moneta::Adapters::LMDB.new(:dir => File.join(make_tempdir, "adapter_lmdb"))
+    Moneta::Adapters::LMDB.new(dir: File.join(make_tempdir, "adapter_lmdb"))
   end
 
   def load_value(value)

data/spec/moneta/adapter_lmdb_with_db_spec.rb

@@ -8,7 +8,7 @@ describe_moneta "adapter_lmdb_with_db" do
   end
 
   def new_store
-    Moneta::Adapters::LMDB.new(:dir => File.join(make_tempdir, "adapter_lmdb"), :db => "adapter_lmdb_with_db")
+    Moneta::Adapters::LMDB.new(dir: File.join(make_tempdir, "adapter_lmdb"), db: "adapter_lmdb_with_db")
   end
 
   def load_value(value)

data/spec/moneta/adapter_localmemcache_spec.rb

@@ -8,7 +8,7 @@ describe_moneta "adapter_localmemcache" do
   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)