moneta 0.7.11 → 0.7.12

data/script/install-bundle

@@ -22,6 +22,7 @@ if system("wget --no-check-certificate --quiet -O #{BUNDLE_FILE} https://moneta:
   cmd "rm -f #{BUNDLE_FILE}"
 else
   cmd 'bundle install --path .bundle'
+  cmd 'bundle update'
   cmd 'bundle install --deployment --path .bundle'
   cmd "tar -cpzf #{BUNDLE_FILE} Gemfile.lock .bundle"
 end

data/spec/helper.rb

@@ -5,9 +5,11 @@ require 'moneta'
 require 'fileutils'
 require 'monetaspecs'
 
-RSpec::Core::Formatters::ProgressFormatter.class_eval do
-  def example_passed(example)
-    # do nothing
+if ENV['TRAVIS']
+  RSpec::Core::Formatters::ProgressFormatter.class_eval do
+    def example_passed(example)
+      # do nothing
+    end
   end
 end
 

data/spec/moneta/adapter_activerecord_spec.rb

@@ -7,7 +7,7 @@ describe_moneta "adapter_activerecord" do
   end
 
   def new_store
-    Moneta::Adapters::ActiveRecord.new(:connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcsqlite3' : 'sqlite3'), :database => File.join(make_tempdir, 'adapter_activerecord') })
+    Moneta::Adapters::ActiveRecord.new(:table => 'adapter_activerecord', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta' })
   end
 
   def load_value(value)
@@ -15,6 +15,8 @@ describe_moneta "adapter_activerecord" do
   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 'features'
   it_should_behave_like 'increment'
@@ -31,9 +33,9 @@ describe_moneta "adapter_activerecord" do
   end
 
   it 'uses an existing connection' do
-    ActiveRecord::Base.establish_connection :adapter => (defined?(JRUBY_VERSION) ? 'jdbcsqlite3' : 'sqlite3'), :database => File.join(make_tempdir, 'activerecord-existing')
+    ActiveRecord::Base.establish_connection :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta'
 
-    store = Moneta::Adapters::ActiveRecord.new
+    store = Moneta::Adapters::ActiveRecord.new(:table => 'activerecord_existing')
     store.table.should be_table_exists
   end
 

data/spec/moneta/adapter_client_spec.rb

@@ -16,6 +16,8 @@ describe_moneta "adapter_client" do
   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 'features'
   it_should_behave_like 'increment'

data/spec/moneta/adapter_datamapper_spec.rb

@@ -9,7 +9,7 @@ describe_moneta "adapter_datamapper" do
   require 'dm-core'
   DataMapper.setup(:default, :adapter => :in_memory)
   def new_store
-    Moneta::Adapters::DataMapper.new(:setup => "sqlite3://#{make_tempdir}/adapter_datamapper")
+    Moneta::Adapters::DataMapper.new(:setup => "mysql://root:@localhost/moneta", :table => "adapter_datamapper")
   end
 
   def load_value(value)
@@ -17,6 +17,7 @@ describe_moneta "adapter_datamapper" do
   end
 
   include_context 'setup_store'
+  it_should_behave_like 'concurrent_create'
   it_should_behave_like 'create'
   it_should_behave_like 'features'
   it_should_behave_like 'multiprocess'
@@ -26,10 +27,10 @@ describe_moneta "adapter_datamapper" do
   it_should_behave_like 'returndifferent_stringkey_stringvalue'
   it_should_behave_like 'store_stringkey_stringvalue'
   it 'does not cross contaminate when storing' do
-    first = Moneta::Adapters::DataMapper.new(:setup => "sqlite3://#{make_tempdir}/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 => "sqlite3://#{make_tempdir}/datamapper-second")
+    second = Moneta::Adapters::DataMapper.new(:repository => :sample, :setup => "mysql://root:@localhost/moneta", :table => "datamapper_second")
     second.clear
 
     first['key'] = 'value'
@@ -40,10 +41,10 @@ describe_moneta "adapter_datamapper" do
   end
 
   it 'does not cross contaminate when deleting' do
-    first = Moneta::Adapters::DataMapper.new(:setup => "sqlite3://#{make_tempdir}/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 => "sqlite3://#{make_tempdir}/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_file_spec.rb

@@ -15,6 +15,8 @@ describe_moneta "adapter_file" do
   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 'features'
   it_should_behave_like 'increment'

data/spec/moneta/adapter_hbase_spec.rb

@@ -15,6 +15,7 @@ describe_moneta "adapter_hbase" do
   end
 
   include_context 'setup_store'
+  it_should_behave_like 'concurrent_increment'
   it_should_behave_like 'features'
   it_should_behave_like 'increment'
   it_should_behave_like 'multiprocess'

data/spec/moneta/adapter_memcached_dalli_spec.rb

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

data/spec/moneta/adapter_memcached_dalli_with_default_expires_spec.rb

@@ -15,6 +15,8 @@ describe_moneta "adapter_memcached_dalli_with_default_expires" do
   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'

data/spec/moneta/adapter_memcached_native_spec.rb

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

data/spec/moneta/adapter_memcached_native_with_default_expires_spec.rb

@@ -15,6 +15,8 @@ describe_moneta "adapter_memcached_native_with_default_expires" do
   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'

data/spec/moneta/adapter_memcached_spec.rb

@@ -15,6 +15,8 @@ describe_moneta "adapter_memcached" do
   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'

data/spec/moneta/adapter_memcached_with_default_expires_spec.rb

@@ -15,6 +15,8 @@ describe_moneta "adapter_memcached_with_default_expires" do
   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'

data/spec/moneta/adapter_mongo_spec.rb

@@ -15,6 +15,8 @@ describe_moneta "adapter_mongo" do
   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'

data/spec/moneta/adapter_mongo_with_default_expires_spec.rb

@@ -15,6 +15,8 @@ describe_moneta "adapter_mongo_with_default_expires" do
   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'

data/spec/moneta/adapter_pstore_spec.rb

@@ -15,6 +15,8 @@ describe_moneta "adapter_pstore" do
   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 'features'
   it_should_behave_like 'increment'

data/spec/moneta/adapter_redis_spec.rb

@@ -15,6 +15,8 @@ describe_moneta "adapter_redis" do
   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'

data/spec/moneta/adapter_redis_with_default_expires_spec.rb

@@ -15,6 +15,8 @@ describe_moneta "adapter_redis_with_default_expires" do
   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'

data/spec/moneta/adapter_sequel_spec.rb

@@ -7,7 +7,7 @@ describe_moneta "adapter_sequel" do
   end
 
   def new_store
-    Moneta::Adapters::Sequel.new(:db => (defined?(JRUBY_VERSION) ? "jdbc:sqlite:" : "sqlite:") + File.join(make_tempdir, "adapter_sequel"))
+    Moneta::Adapters::Sequel.new(:db => (defined?(JRUBY_VERSION) ? "jdbc:mysql" : "mysql2") + "://root:@localhost/moneta", :table => "adapter_sequel")
   end
 
   def load_value(value)
@@ -15,6 +15,8 @@ describe_moneta "adapter_sequel" do
   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 'features'
   it_should_behave_like 'increment'

data/spec/moneta/adapter_tokyotyrant_spec.rb

@@ -15,6 +15,8 @@ describe_moneta "adapter_tokyotyrant" do
   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 'features'
   it_should_behave_like 'increment'

data/spec/moneta/adapter_yaml_spec.rb

@@ -15,6 +15,8 @@ describe_moneta "adapter_yaml" do
   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 'features'
   it_should_behave_like 'increment'

data/spec/moneta/cache_file_memory_spec.rb

@@ -20,6 +20,8 @@ describe_moneta "cache_file_memory" do
   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 'features'
   it_should_behave_like 'increment'

data/spec/moneta/expires_file_spec.rb

@@ -19,6 +19,8 @@ describe_moneta "expires_file" do
   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'

data/spec/moneta/pool_spec.rb

@@ -19,6 +19,8 @@ describe_moneta "pool" do
   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 'features'
   it_should_behave_like 'increment'

data/spec/moneta/proxy_redis_spec.rb

@@ -19,6 +19,8 @@ describe_moneta "proxy_redis" do
   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'

data/spec/moneta/shared_tcp_spec.rb

@@ -19,6 +19,8 @@ describe_moneta "shared_tcp" do
   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 'features'
   it_should_behave_like 'increment'

data/spec/moneta/shared_unix_spec.rb

@@ -19,6 +19,8 @@ describe_moneta "shared_unix" do
   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 'features'
   it_should_behave_like 'increment'

data/spec/moneta/simple_activerecord_spec.rb

@@ -7,7 +7,7 @@ describe_moneta "simple_activerecord" do
   end
 
   def new_store
-    Moneta.new(:ActiveRecord, :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcsqlite3' : 'sqlite3'), :database => File.join(make_tempdir, 'simple_activerecord') }, :logger => {:file => File.join(make_tempdir, 'simple_activerecord.log')})
+    Moneta.new(:ActiveRecord, :table => 'simple_activerecord', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta' }, :logger => {:file => File.join(make_tempdir, 'simple_activerecord.log')})
   end
 
   def load_value(value)
@@ -15,6 +15,8 @@ describe_moneta "simple_activerecord" do
   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 'features'
   it_should_behave_like 'increment'

data/spec/moneta/simple_activerecord_with_expires_spec.rb

@@ -7,7 +7,7 @@ describe_moneta "simple_activerecord_with_expires" do
   end
 
   def new_store
-    Moneta.new(:ActiveRecord, :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcsqlite3' : 'sqlite3'), :database => File.join(make_tempdir, 'simple_activerecord_with_expires') }, :expires => true, :logger => {:file => File.join(make_tempdir, 'simple_activerecord_with_expires.log')})
+    Moneta.new(:ActiveRecord, :table => 'simple_activerecord_with_expires', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta' }, :expires => true, :logger => {:file => File.join(make_tempdir, 'simple_activerecord_with_expires.log')})
   end
 
   def load_value(value)
@@ -15,6 +15,8 @@ describe_moneta "simple_activerecord_with_expires" do
   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'

data/spec/moneta/simple_client_tcp_spec.rb

@@ -16,6 +16,8 @@ describe_moneta "simple_client_tcp" do
   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 'features'
   it_should_behave_like 'increment'

data/spec/moneta/simple_client_unix_spec.rb

@@ -16,6 +16,8 @@ describe_moneta "simple_client_unix" do
   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 'features'
   it_should_behave_like 'increment'

data/spec/moneta/simple_datamapper_spec.rb

@@ -9,7 +9,7 @@ describe_moneta "simple_datamapper" do
   require 'dm-core'
   DataMapper.setup(:default, :adapter => :in_memory)
   def new_store
-    Moneta.new(:DataMapper, :setup => "sqlite3://#{make_tempdir}/simple_datamapper", :logger => {:file => File.join(make_tempdir, 'simple_datamapper.log')})
+    Moneta.new(:DataMapper, :setup => "mysql://root:@localhost/moneta", :table => "simple_datamapper", :logger => {:file => File.join(make_tempdir, 'simple_datamapper.log')})
   end
 
   def load_value(value)
@@ -17,6 +17,7 @@ describe_moneta "simple_datamapper" do
   end
 
   include_context 'setup_store'
+  it_should_behave_like 'concurrent_create'
   it_should_behave_like 'create'
   it_should_behave_like 'features'
   it_should_behave_like 'marshallable_key'

data/spec/moneta/simple_datamapper_with_expires_spec.rb

@@ -9,7 +9,7 @@ describe_moneta "simple_datamapper_with_expires" do
   require 'dm-core'
   DataMapper.setup(:default, :adapter => :in_memory)
   def new_store
-    Moneta.new(:DataMapper, :setup => "sqlite3://#{make_tempdir}/simple_datamapper_with_expires", :expires => true, :logger => {:file => File.join(make_tempdir, 'simple_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, 'simple_datamapper_with_expires.log')})
   end
 
   def load_value(value)
@@ -17,6 +17,7 @@ describe_moneta "simple_datamapper_with_expires" do
   end
 
   include_context 'setup_store'
+  it_should_behave_like 'concurrent_create'
   it_should_behave_like 'create'
   it_should_behave_like 'create_expires'
   it_should_behave_like 'expires'

data/spec/moneta/simple_datamapper_with_repository_spec.rb

@@ -9,7 +9,7 @@ describe_moneta "simple_datamapper_with_repository" do
   require 'dm-core'
   DataMapper.setup(:default, :adapter => :in_memory)
   def new_store
-    Moneta.new(:DataMapper, :repository => :repo, :setup => "sqlite3://#{make_tempdir}/simple_datamapper_with_repository", :logger => {:file => File.join(make_tempdir, 'simple_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, 'simple_datamapper_with_repository.log')})
   end
 
   def load_value(value)
@@ -17,6 +17,7 @@ describe_moneta "simple_datamapper_with_repository" do
   end
 
   include_context 'setup_store'
+  it_should_behave_like 'concurrent_create'
   it_should_behave_like 'create'
   it_should_behave_like 'features'
   it_should_behave_like 'marshallable_key'