moneta 0.7.20 → 0.8.0

data/spec/moneta/adapter_lruhash_spec.rb

@@ -28,7 +28,7 @@ describe_moneta "adapter_lruhash" do
   it_should_behave_like 'store_pathkey_stringvalue'
   it_should_behave_like 'store_large'
   it 'deletes oldest' do
-    store = Moneta::Adapters::LRUHash.new(:max_size => 10)
+    store = Moneta::Adapters::LRUHash.new(max_size: 10)
     store[0]  = 'y'
     (1..1000).each do |i|
       store[i] = 'x'

data/spec/moneta/adapter_memcached_dalli_spec.rb

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

data/spec/moneta/adapter_memcached_dalli_with_default_expires_spec.rb

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

data/spec/moneta/adapter_memcached_native_spec.rb

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

data/spec/moneta/adapter_memcached_native_with_default_expires_spec.rb

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

data/spec/moneta/adapter_memcached_spec.rb

@@ -8,7 +8,7 @@ describe_moneta "adapter_memcached" do
   end
 
   def new_store
-    Moneta::Adapters::Memcached.new(:namespace => "adapter_memcached")
+    Moneta::Adapters::Memcached.new(namespace: "adapter_memcached")
   end
 
   def load_value(value)

data/spec/moneta/adapter_memcached_with_default_expires_spec.rb

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

data/spec/moneta/adapter_mongo_moped_spec.rb

@@ -0,0 +1,56 @@
+# coding: binary
+# Generated by generate-specs
+require 'helper'
+
+describe_moneta "adapter_mongo_moped" do
+  def features
+    [:create, :expires, :increment]
+  end
+
+  def new_store
+    Moneta::Adapters::MongoMoped.new(db: "adapter_mongo")
+  end
+
+  def load_value(value)
+    Marshal.load(value)
+  end
+
+  include_context 'setup_store'
+  it_should_behave_like 'concurrent_create'
+  it_should_behave_like 'concurrent_increment'
+  it_should_behave_like 'create'
+  it_should_behave_like 'create_expires'
+  it_should_behave_like 'expires'
+  it_should_behave_like 'features'
+  it_should_behave_like 'increment'
+  it_should_behave_like 'multiprocess'
+  it_should_behave_like 'null_stringkey_stringvalue'
+  it_should_behave_like 'null_stringkey_hashvalue'
+  it_should_behave_like 'null_stringkey_integervalue'
+  it_should_behave_like 'null_pathkey_stringvalue'
+  it_should_behave_like 'null_pathkey_hashvalue'
+  it_should_behave_like 'null_pathkey_integervalue'
+  it_should_behave_like 'persist_stringkey_stringvalue'
+  it_should_behave_like 'persist_stringkey_hashvalue'
+  it_should_behave_like 'persist_stringkey_integervalue'
+  it_should_behave_like 'persist_pathkey_stringvalue'
+  it_should_behave_like 'persist_pathkey_hashvalue'
+  it_should_behave_like 'persist_pathkey_integervalue'
+  it_should_behave_like 'returndifferent_stringkey_stringvalue'
+  it_should_behave_like 'returndifferent_stringkey_hashvalue'
+  it_should_behave_like 'returndifferent_pathkey_stringvalue'
+  it_should_behave_like 'returndifferent_pathkey_hashvalue'
+  it_should_behave_like 'store_stringkey_stringvalue'
+  it_should_behave_like 'store_stringkey_hashvalue'
+  it_should_behave_like 'store_stringkey_integervalue'
+  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'
+  it 'automatically deletes expired document' do
+    store.store('key', 'val', expires: 5)
+    store.instance_variable_get(:@collection).find('_id' => ::Moped::BSON::Binary.new(:generic, 'key')).one.should_not be_nil
+    sleep 70 # Mongo needs up to 60 seconds
+    store.instance_variable_get(:@collection).find('_id' => ::Moped::BSON::Binary.new(:generic, 'key')).one.should be_nil
+  end
+end

data/spec/moneta/adapter_mongo_moped_with_default_expires_spec.rb

@@ -0,0 +1,51 @@
+# coding: binary
+# Generated by generate-specs
+require 'helper'
+
+describe_moneta "adapter_mongo_moped_with_default_expires" do
+  def features
+    [:create, :expires, :increment]
+  end
+
+  def new_store
+    Moneta::Adapters::MongoMoped.new(expires: 1)
+  end
+
+  def load_value(value)
+    Marshal.load(value)
+  end
+
+  include_context 'setup_store'
+  it_should_behave_like 'concurrent_create'
+  it_should_behave_like 'concurrent_increment'
+  it_should_behave_like 'create'
+  it_should_behave_like 'create_expires'
+  it_should_behave_like 'default_expires'
+  it_should_behave_like 'expires'
+  it_should_behave_like 'features'
+  it_should_behave_like 'increment'
+  it_should_behave_like 'multiprocess'
+  it_should_behave_like 'null_stringkey_stringvalue'
+  it_should_behave_like 'null_stringkey_hashvalue'
+  it_should_behave_like 'null_stringkey_integervalue'
+  it_should_behave_like 'null_pathkey_stringvalue'
+  it_should_behave_like 'null_pathkey_hashvalue'
+  it_should_behave_like 'null_pathkey_integervalue'
+  it_should_behave_like 'persist_stringkey_stringvalue'
+  it_should_behave_like 'persist_stringkey_hashvalue'
+  it_should_behave_like 'persist_stringkey_integervalue'
+  it_should_behave_like 'persist_pathkey_stringvalue'
+  it_should_behave_like 'persist_pathkey_hashvalue'
+  it_should_behave_like 'persist_pathkey_integervalue'
+  it_should_behave_like 'returndifferent_stringkey_stringvalue'
+  it_should_behave_like 'returndifferent_stringkey_hashvalue'
+  it_should_behave_like 'returndifferent_pathkey_stringvalue'
+  it_should_behave_like 'returndifferent_pathkey_hashvalue'
+  it_should_behave_like 'store_stringkey_stringvalue'
+  it_should_behave_like 'store_stringkey_hashvalue'
+  it_should_behave_like 'store_stringkey_integervalue'
+  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

data/spec/moneta/adapter_mongo_official_spec.rb

@@ -0,0 +1,56 @@
+# coding: binary
+# Generated by generate-specs
+require 'helper'
+
+describe_moneta "adapter_mongo_official" do
+  def features
+    [:create, :expires, :increment]
+  end
+
+  def new_store
+    Moneta::Adapters::MongoOfficial.new(db: "adapter_mongo")
+  end
+
+  def load_value(value)
+    Marshal.load(value)
+  end
+
+  include_context 'setup_store'
+  it_should_behave_like 'concurrent_create'
+  it_should_behave_like 'concurrent_increment'
+  it_should_behave_like 'create'
+  it_should_behave_like 'create_expires'
+  it_should_behave_like 'expires'
+  it_should_behave_like 'features'
+  it_should_behave_like 'increment'
+  it_should_behave_like 'multiprocess'
+  it_should_behave_like 'null_stringkey_stringvalue'
+  it_should_behave_like 'null_stringkey_hashvalue'
+  it_should_behave_like 'null_stringkey_integervalue'
+  it_should_behave_like 'null_pathkey_stringvalue'
+  it_should_behave_like 'null_pathkey_hashvalue'
+  it_should_behave_like 'null_pathkey_integervalue'
+  it_should_behave_like 'persist_stringkey_stringvalue'
+  it_should_behave_like 'persist_stringkey_hashvalue'
+  it_should_behave_like 'persist_stringkey_integervalue'
+  it_should_behave_like 'persist_pathkey_stringvalue'
+  it_should_behave_like 'persist_pathkey_hashvalue'
+  it_should_behave_like 'persist_pathkey_integervalue'
+  it_should_behave_like 'returndifferent_stringkey_stringvalue'
+  it_should_behave_like 'returndifferent_stringkey_hashvalue'
+  it_should_behave_like 'returndifferent_pathkey_stringvalue'
+  it_should_behave_like 'returndifferent_pathkey_hashvalue'
+  it_should_behave_like 'store_stringkey_stringvalue'
+  it_should_behave_like 'store_stringkey_hashvalue'
+  it_should_behave_like 'store_stringkey_integervalue'
+  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'
+  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

data/spec/moneta/adapter_mongo_official_with_default_expires_spec.rb

@@ -0,0 +1,51 @@
+# coding: binary
+# Generated by generate-specs
+require 'helper'
+
+describe_moneta "adapter_mongo_official_with_default_expires" do
+  def features
+    [:create, :expires, :increment]
+  end
+
+  def new_store
+    Moneta::Adapters::MongoOfficial.new(expires: 1)
+  end
+
+  def load_value(value)
+    Marshal.load(value)
+  end
+
+  include_context 'setup_store'
+  it_should_behave_like 'concurrent_create'
+  it_should_behave_like 'concurrent_increment'
+  it_should_behave_like 'create'
+  it_should_behave_like 'create_expires'
+  it_should_behave_like 'default_expires'
+  it_should_behave_like 'expires'
+  it_should_behave_like 'features'
+  it_should_behave_like 'increment'
+  it_should_behave_like 'multiprocess'
+  it_should_behave_like 'null_stringkey_stringvalue'
+  it_should_behave_like 'null_stringkey_hashvalue'
+  it_should_behave_like 'null_stringkey_integervalue'
+  it_should_behave_like 'null_pathkey_stringvalue'
+  it_should_behave_like 'null_pathkey_hashvalue'
+  it_should_behave_like 'null_pathkey_integervalue'
+  it_should_behave_like 'persist_stringkey_stringvalue'
+  it_should_behave_like 'persist_stringkey_hashvalue'
+  it_should_behave_like 'persist_stringkey_integervalue'
+  it_should_behave_like 'persist_pathkey_stringvalue'
+  it_should_behave_like 'persist_pathkey_hashvalue'
+  it_should_behave_like 'persist_pathkey_integervalue'
+  it_should_behave_like 'returndifferent_stringkey_stringvalue'
+  it_should_behave_like 'returndifferent_stringkey_hashvalue'
+  it_should_behave_like 'returndifferent_pathkey_stringvalue'
+  it_should_behave_like 'returndifferent_pathkey_hashvalue'
+  it_should_behave_like 'store_stringkey_stringvalue'
+  it_should_behave_like 'store_stringkey_hashvalue'
+  it_should_behave_like 'store_stringkey_integervalue'
+  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

data/spec/moneta/adapter_mongo_spec.rb

@@ -8,7 +8,7 @@ describe_moneta "adapter_mongo" do
   end
 
   def new_store
-    Moneta::Adapters::Mongo.new(:db => "adapter_mongo")
+    Moneta::Adapters::Mongo.new(db: "adapter_mongo")
   end
 
   def load_value(value)
@@ -47,10 +47,4 @@ describe_moneta "adapter_mongo" do
   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

data/spec/moneta/adapter_mongo_with_default_expires_spec.rb

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

data/spec/moneta/adapter_pstore_spec.rb

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

data/spec/moneta/adapter_redis_with_default_expires_spec.rb

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

data/spec/moneta/adapter_restclient_spec.rb

@@ -9,7 +9,7 @@ describe_moneta "adapter_restclient" do
   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)

data/spec/moneta/adapter_sdbm_spec.rb

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

data/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" : "mysql2://root:@localhost/moneta"), table: "adapter_sequel")
   end
 
   def load_value(value)

data/spec/moneta/adapter_sqlite_spec.rb

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

data/spec/moneta/adapter_tdb_spec.rb

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

data/spec/moneta/adapter_tokyocabinet_bdb_spec.rb

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

data/spec/moneta/adapter_tokyocabinet_hdb_spec.rb

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

data/spec/moneta/adapter_yaml_spec.rb

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

data/spec/moneta/cache_file_memory_spec.rb

@@ -10,7 +10,7 @@ describe_moneta "cache_file_memory" do
   def new_store
     Moneta.build do
       use(:Cache) do
-        adapter { adapter :File, :dir => File.join(make_tempdir, "cache_file_memory") }
+        adapter { adapter :File, dir: File.join(make_tempdir, "cache_file_memory") }
         cache { adapter :Memory }
       end
     end

data/spec/moneta/expires_file_spec.rb

@@ -10,8 +10,8 @@ describe_moneta "expires_file" do
   def new_store
     Moneta.build do
       use :Expires
-      use :Transformer, :key => [:marshal, :escape], :value => :marshal
-      adapter :File, :dir => File.join(make_tempdir, "expires-file")
+      use :Transformer, key: [:marshal, :escape], value: :marshal
+      adapter :File, dir: File.join(make_tempdir, "expires-file")
     end
   end
 
@@ -65,7 +65,7 @@ describe_moneta "expires_file" do
   it_should_behave_like 'store_large'
   it_should_behave_like 'transform_value_expires'
   it 'deletes expired value in underlying file storage' do
-    store.store('foo', 'bar', :expires => 2)
+    store.store('foo', 'bar', expires: 2)
     store['foo'].should == 'bar'
     sleep 1
     store['foo'].should == 'bar'