moneta 0.7.12 → 0.7.13

data/.travis.yml

@@ -1,11 +1,11 @@
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.3
-  - jruby-18mode
+  - 1.8.7
   - jruby-19mode
-#  - rbx-18mode
+  - jruby-18mode
 #  - rbx-19mode
+#  - rbx-18mode
 before_install:
   - script/kill-travis
   - script/install-kyotocabinet

data/CHANGES

@@ -1,3 +1,8 @@
+0.7.13
+
+* Adapters::ActiveRecord: Use connection_pool
+* Adapters::File: Race condition in #increment fixed
+
 0.7.12
 
 * Concurrency tests added

data/Gemfile

@@ -34,7 +34,8 @@ gem 'fog'
 gem 'activerecord', '>= 3.2.11'
 gem 'redis'
 gem 'mongo'
-gem 'sequel'
+# Use sequel master because of deprecation warnings
+gem 'sequel', :github => 'jeremyevans/sequel'
 gem 'dalli'
 gem 'riak-client'
 gem 'cassandra'

data/README.md

@@ -144,13 +144,13 @@ __NOTE:__ <a name="backend-matrix">The backend matrix</a> is much more readable
 
 <tr><td>Sequel</td><td>sequel</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td><a href="http://sequel.rubyforge.org/">Sequel</a> ORM</td></tr>
 
-<tr><td>Sqlite</td><td>sqlite3</td><td style="text-align:center;background:#55F">?</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td><a href="http://sqlite.org/">Sqlite3</a> database</td></tr>
+<tr><td>TokyoTyrant</td><td>tokyotyrant or ruby-tokyotyrant</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td><a href="http://fallabs.com/tokyotyrant/">TokyoTyrant</a> database</td></tr>
 
-<tr><td>PStore</td><td>-</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td><a href="http://ruby-doc.org/stdlib/libdoc/pstore/rdoc/PStore.html">PStore</a> store</td></tr>
+<tr><td>PStore</td><td>-</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#5F5">✓<sup>[10]</sup></td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td><a href="http://ruby-doc.org/stdlib/libdoc/pstore/rdoc/PStore.html">PStore</a> store</td></tr>
 
-<tr><td>TokyoTyrant</td><td>tokyotyrant or ruby-tokyotyrant</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td><a href="http://fallabs.com/tokyotyrant/">TokyoTyrant</a> database</td></tr>
+<tr><td>YAML</td><td>-</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#5F5">✓<sup>[10]</sup></td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td><a href="http://www.ruby-doc.org/stdlib/libdoc/yaml/rdoc/YAML/Store.html">YAML</a> store</td></tr>
 
-<tr><td>YAML</td><td>-</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td><a href="http://www.ruby-doc.org/stdlib/libdoc/yaml/rdoc/YAML/Store.html">YAML</a> store</td></tr>
+<tr><td>Sqlite</td><td>sqlite3</td><td style="text-align:center;background:#55F">?</td><td style="text-align:center;background:#5F5">✓<sup>[10]</sup></td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td><a href="http://sqlite.org/">Sqlite3</a> database</td></tr>
 
 <tr><td>Daybreak</td><td>daybreak</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#55F">(✓)<sup>[7]</sup></td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td>Incredibly fast pure-ruby key/value store <a href="http://propublica.github.com/daybreak/">Daybreak</a></td></tr>
 
@@ -211,8 +211,9 @@ __NOTE:__ <a name="backend-matrix">The backend matrix</a> is much more readable
 * [5]: Depends on server
 * [6]: Store is multi-process safe because it is an in-memory store, values are not shared between multiple processes
 * [7]: Store is multi-process safe, but not synchronized automatically between multiple processes
-* [8]: If a store provides atomic increment it can be used with `Moneta::Semaphore`. You can add weak `#increment` using the `Moneta::WeakIncrement` proxy.
-* [8]: If a store provides atomic creation it can be used with `Moneta::Mutex`. You can add weak `#create` using the `Moneta::WeakCreate` proxy.
+* [8]: If a store provides atomic increment it can be used with `Moneta::Semaphore`. You can add weak `#increment` support using the `Moneta::WeakIncrement` proxy.
+* [9]: If a store provides atomic creation it can be used with `Moneta::Mutex`. You can add weak `#create` support using the `Moneta::WeakCreate` proxy.
+* [10]: Sqlite/YAML/PStore are multiprocess safe, but the performance suffers badly since the whole database file must be locked for writing. Use a key/value server if you want multiprocess concurrency!
 
 ------
 

data/Rakefile

@@ -21,7 +21,7 @@ task :test do
   # Shuffle specs to ensure equal distribution over the test groups
   # We have to shuffle with the same seed every time because rake is started
   # multiple times!
-  old_seed = srand(42)
+  old_seed = srand(43)
   specs.shuffle!
   srand(old_seed)
 
@@ -33,8 +33,10 @@ task :test do
   #   QuickLZ is also not maintained on Github, but on Bitbucket
   #   and I don't know where the issue tracker is.
   #
-  # * Cassandra fails spuriously (An expert has to check the adapter!)
-  unstable = specs.select {|s| s =~ /quicklz|cassandra/ }
+  # * Cassandra and Riak fail spuriously (An expert has to check the adapters!)
+  #
+  # * ActiveRecord has some connection problems (An expert has to check the adapter!)
+  unstable = specs.select {|s| s =~ /quicklz|cassandra|riak|activerecord/ }
   specs -= unstable
 
   if group =~ /^(\d+)\/(\d+)$/

data/lib/moneta/adapters/activerecord.rb

@@ -36,33 +36,41 @@ module Moneta
           end
         end
 
-        unless @table.table_exists?
-          @table.connection.create_table(@table.table_name, :id => false) do |t|
-            # Do not use binary columns (Issue #17)
-            t.string :k, :null => false
-            t.string :v
+        @table.connection_pool.with_connection do |conn|
+          unless @table.table_exists?
+            conn.create_table(table, :id => false) do |t|
+              # Do not use binary columns (Issue #17)
+              t.string :k, :null => false
+              t.string :v
+            end
+            conn.add_index(table, :k, :unique => true)
           end
-          @table.connection.add_index(@table.table_name, :k, :unique => true)
         end
       end
 
       # (see Proxy#key?)
       def key?(key, options = {})
-        !@table.where(:k => key).empty?
+        @table.connection_pool.with_connection do
+          !@table.where(:k => key).empty?
+        end
       end
 
       # (see Proxy#load)
       def load(key, options = {})
-        record = @table.select(:v).where(:k => key).first
-        record && record.v
+        @table.connection_pool.with_connection do
+          record = @table.select(:v).where(:k => key).first
+          record && record.v
+        end
       end
 
       # (see Proxy#store)
       def store(key, value, options = {})
-        record = @table.select(:k).where(:k => key).first_or_initialize
-        record.v = value
-        record.save
-        value
+        @table.connection_pool.with_connection do
+          record = @table.select(:k).where(:k => key).first_or_initialize
+          record.v = value
+          record.save
+          value
+        end
       rescue
         tries ||= 0
         (tries += 1) < 10 ? retry : raise
@@ -70,24 +78,28 @@ module Moneta
 
       # (see Proxy#delete)
       def delete(key, options = {})
-        if record = @table.where(:k => key).first
-          record.destroy
-          record.v
+        @table.connection_pool.with_connection do
+          if record = @table.where(:k => key).first
+            record.destroy
+            record.v
+          end
         end
       end
 
       # (see Proxy#increment)
       def increment(key, amount = 1, options = {})
-        @table.transaction do
-          if record = @table.where(:k => key).lock.first
-            value = Utils.to_int(record.v) + amount
-            record.v = value.to_s
-            record.save
-            value
-          elsif create(key, amount.to_s, options)
-            amount
-          else
-            raise 'Concurrent modification'
+        @table.connection_pool.with_connection do
+          @table.transaction do
+            if record = @table.where(:k => key).lock.first
+              value = Utils.to_int(record.v) + amount
+              record.v = value.to_s
+              record.save
+              value
+            elsif create(key, amount.to_s, options)
+              amount
+            else
+              raise 'Concurrent modification'
+            end
           end
         end
       rescue
@@ -97,11 +109,13 @@ module Moneta
 
       # (see Proxy#create)
       def create(key, value, options = {})
-        record = @table.new
-        record.k = key
-        record.v = value
-        record.save
-        true
+        @table.connection_pool.with_connection do
+          record = @table.new
+          record.k = key
+          record.v = value
+          record.save
+          true
+        end
       rescue
         # FIXME: This catches too many errors
         # it should only catch a not-unique-exception
@@ -110,7 +124,9 @@ module Moneta
 
       # (see Proxy#clear)
       def clear(options = {})
-        @table.delete_all
+        @table.connection_pool.with_connection do
+          @table.delete_all
+        end
         self
       end
     end

data/lib/moneta/adapters/file.rb

@@ -33,12 +33,8 @@ module Moneta
         temp_file = ::File.join(@dir, "value-#{$$}-#{Thread.current.object_id}")
         FileUtils.mkpath(::File.dirname(path))
         ::File.open(temp_file, 'wb') {|file| file.write(value) }
-        ::File.unlink(path) if ::File.exist?(path)
         ::File.rename(temp_file, path)
         value
-      rescue Errno::ENOENT
-        ::File.unlink(temp_file) rescue nil
-        value
       end
 
       # (see Proxy#delete)
@@ -63,20 +59,15 @@ module Moneta
       # (see Proxy#increment)
       def increment(key, amount = 1, options = {})
         path = store_path(key)
-        ::File.open(path, 'rb+') do |f|
+        FileUtils.mkpath(::File.dirname(path))
+        existed = ::File.exists?(path)
+        ::File.open(path, 'ab+') do |f|
           Thread.pass until f.flock(::File::LOCK_EX)
-          value = Utils.to_int(f.read) + amount
+          content = f.read
           f.truncate(0)
-          f.pos = 0
-          f.write(value.to_s)
-          value
-        end
-      rescue Errno::ENOENT
-        if create(key, amount.to_s, options)
+          amount += Utils.to_int(content) if existed || !content.empty?
+          f.write(amount.to_s)
           amount
-        else
-          # Concurrent modification
-          retry
         end
       end
 

data/lib/moneta/adapters/memcached/dalli.rb

@@ -53,7 +53,12 @@ module Moneta
         # FIXME: There is a Dalli bug, load(key) returns a wrong value after increment
         # therefore we set default = nil and create the counter manually
 	# See https://github.com/mperham/dalli/issues/309
-        result = amount >= 0 ? @backend.incr(key, amount, nil, nil) : @backend.decr(key, -amount, nil, nil)
+        result =
+          if amount >= 0
+            @backend.incr(key, amount, expires_value(options) || nil, nil)
+          else
+            @backend.decr(key, -amount, expires_value(options) || nil, nil)
+          end
         if result
           result
         elsif create(key, amount.to_s, options)

data/lib/moneta/adapters/redis.rb

@@ -60,7 +60,9 @@ module Moneta
 
       # (see Proxy#increment)
       def increment(key, amount = 1, options = {})
-        @backend.incrby(key, amount)
+        value = @backend.incrby(key, amount)
+        update_expires(key, options)
+        value
       end
 
       # (see Proxy#clear)

data/lib/moneta/mixins.rb

@@ -45,7 +45,7 @@ module Moneta
     # @return [OptionMerger]
     # @api public
     def expires(expires)
-      with(:expires => expires, :only => [:store, :create])
+      with(:expires => expires, :only => [:store, :create, :increment])
     end
   end
 

data/lib/moneta/version.rb

@@ -1,5 +1,5 @@
 module Moneta
   # Moneta version number
   # @api public
-  VERSION = '0.7.12'
+  VERSION = '0.7.13'
 end

data/script/benchmarks

@@ -34,7 +34,7 @@ class MonetaBenchmarks
     # SDBM is unstable, YAML is too slow
     # :SDBM => { :file => "#{DIR}/sdbm" },
     # :YAML => { :file => "#{DIR}/yaml" },
-    :ActiveRecord => { :table => 'activerecord', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta' } },
+    :ActiveRecord => { :table => 'activerecord', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :username => 'root', :database => 'moneta' } },
     :Cassandra => {},
     :Client => {},
     :Couch => {},
@@ -57,7 +57,10 @@ class MonetaBenchmarks
     :Redis => {},
     :RestClient => { :url => 'http://localhost:8808/' },
     :Riak => {},
-    :Sequel => { :db => (defined?(JRUBY_VERSION) ? 'jdbc:mysql' : 'mysql2') + '://root:@localhost/moneta', :table => 'sequel' },
+    :Sequel => { :table => 'sequel',
+      :db => (defined?(JRUBY_VERSION) ?
+              'jdbc:mysql://localhost/moneta?user=root' :
+              'mysql2://root:@localhost/moneta') },
     :Sqlite => { :file => ':memory:' },
     :TDB => { :file => "#{DIR}/tdb" },
     :TokyoCabinet => { :file => "#{DIR}/tokyocabinet" },
@@ -306,14 +309,13 @@ class MonetaBenchmarks
 
       @config[:runs].times do |run|
         store.clear
-        print "%s[%-#{2 * @config[:runs]}s] " % ["\b" * (2 * @config[:runs] + 3), state << 'W']
 
         @data.shuffle!
         m1 = Benchmark.measure do
           @data.each {|k,v| store[k] = v }
         end
 
-        print "%s[%-#{2 * @config[:runs]}s] " % ["\b" * (2 * @config[:runs] + 3), state << 'R']
+        print "%s[%-#{2 * @config[:runs]}s] " % ["\b" * (2 * @config[:runs] + 3), state << 'W']
 
         @data.shuffle!
         error = 0
@@ -323,6 +325,8 @@ class MonetaBenchmarks
           end
         end
 
+        print "%s[%-#{2 * @config[:runs]}s] " % ["\b" * (2 * @config[:runs] + 3), state << 'R']
+
         if type == 'Measure'
           @stats[name][:write] << m1.real * 1000
           @stats[name][:error] << error
@@ -340,7 +344,10 @@ class MonetaBenchmarks
   end
 
   def run_benchmarks
-    STORES.each {|name, options| benchmark_store(name, options) }
+    STORES.each do |name, options|
+      benchmark_store(name, options)
+      sleep 1
+    end
   end
 
   def print_summary

data/script/generate-specs

@@ -305,13 +305,13 @@ end
   'simple_yaml' => {
     :store => :YAML,
     :options => ':file => File.join(make_tempdir, "simple_yaml")',
-    :specs => STANDARD_SPECS.without_marshallable_value,
+    :specs => STANDARD_SPECS.without_marshallable_value.without_concurrent,
     :load_value => 'value'
   },
   'simple_yaml_with_expires' => {
     :store => :YAML,
     :options => ':file => File.join(make_tempdir, "simple_yaml_with_expires"), :expires => true',
-    :specs => STANDARD_SPECS.without_marshallable_value.with_expires,
+    :specs => STANDARD_SPECS.without_marshallable_value.with_expires.without_concurrent,
     :load_value => 'value'
   },
   'simple_localmemcache' => {
@@ -423,13 +423,13 @@ end
   },
   'simple_sequel' => {
     :store => :Sequel,
-    :options => ':db => (defined?(JRUBY_VERSION) ? "jdbc:mysql" : "mysql2") + "://root:@localhost/moneta", :table => "simple_sequel"',
+    :options => ':db => (defined?(JRUBY_VERSION) ? "jdbc:mysql://localhost/moneta?user=root" : "mysql2://root:@localhost/moneta"), :table => "simple_sequel"',
     :load_value => '::Marshal.load(value.unpack(\'m\').first)',
     :specs => STANDARD_SPECS
   },
   'simple_sequel_with_expires' => {
     :store => :Sequel,
-    :options => ':db => (defined?(JRUBY_VERSION) ? "jdbc:mysql" : "mysql2") + "://root:@localhost/moneta", :table => "simple_sequel_with_expires", :expires => true',
+    :options => ':db => (defined?(JRUBY_VERSION) ? "jdbc:mysql://localhost/moneta?user=root" : "mysql2://root:@localhost/moneta"), :table => "simple_sequel_with_expires", :expires => true',
     :specs => STANDARD_SPECS.with_expires,
     :load_value => '::Marshal.load(value.unpack(\'m\').first)'
   },
@@ -460,12 +460,12 @@ end
   'simple_activerecord' => {
     :store => :ActiveRecord,
     :specs => STANDARD_SPECS,
-    :options => ":table => 'simple_activerecord', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta' }",
+    :options => ":table => 'simple_activerecord', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root' }",
     :load_value => '::Marshal.load(value.unpack(\'m\').first)'
   },
   'simple_activerecord_with_expires' => {
     :store => :ActiveRecord,
-    :options => ":table => 'simple_activerecord_with_expires', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta' }, :expires => true",
+    :options => ":table => 'simple_activerecord_with_expires', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root' }, :expires => true",
     :specs => STANDARD_SPECS.with_expires,
     :load_value => '::Marshal.load(value.unpack(\'m\').first)'
   },
@@ -1101,7 +1101,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' })",
+    :build => "Moneta::Adapters::ActiveRecord.new(:table => 'adapter_activerecord', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root' })",
     :specs => ADAPTER_SPECS,
     :tests => %{
 it 'updates an existing key/value' do
@@ -1112,7 +1112,7 @@ it 'updates an existing key/value' do
 end
 
 it 'uses an existing connection' do
-  ActiveRecord::Base.establish_connection :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta'
+  ActiveRecord::Base.establish_connection :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root'
 
   store = Moneta::Adapters::ActiveRecord.new(:table => 'activerecord_existing')
   store.table.should be_table_exists
@@ -1308,7 +1308,7 @@ end}
     :specs => ADAPTER_SPECS.without_multiprocess
   },
   'adapter_sequel' => {
-    :build => 'Moneta::Adapters::Sequel.new(:db => (defined?(JRUBY_VERSION) ? "jdbc:mysql" : "mysql2") + "://root:@localhost/moneta", :table => "adapter_sequel")',
+    :build => 'Moneta::Adapters::Sequel.new(:db => (defined?(JRUBY_VERSION) ? "jdbc:mysql://localhost/moneta?user=root" : "mysql2://root:@localhost/moneta"), :table => "adapter_sequel")',
     :specs => ADAPTER_SPECS
   },
   'adapter_sqlite' => {
@@ -1333,7 +1333,7 @@ end}
   },
   'adapter_yaml' => {
     :build => 'Moneta::Adapters::YAML.new(:file => File.join(make_tempdir, "adapter_yaml"))',
-    :specs => STANDARD_SPECS.simplevalues_only.simplekeys_only.without_transform
+    :specs => STANDARD_SPECS.simplevalues_only.simplekeys_only.without_transform.without_concurrent
   },
   'mutex' => {
     :store => :Memory,
@@ -1531,7 +1531,7 @@ it 'has method #raw' do
 end
 
 it 'has method #expires' do
-  store.expires(10).default_options.should == {:store=>{:expires=>10},:create=>{:expires=>10}}
+  store.expires(10).default_options.should == {:store=>{:expires=>10},:create=>{:expires=>10},:increment=>{:expires=>10}}
 end
 
 it 'has method #prefix' do
@@ -1974,7 +1974,7 @@ SPECS['concurrent_increment'] = %{def increment_thread(name)
   Thread.new do
     s = new_store
     1000.times do |i|
-      s.increment('counter')
+      s.increment('counter', 1, :expires => false)
       s.store("\#{name}\#{i}", i.to_s, :expires => false)
       sleep 0.01 if i % 100 == 0
     end

data/script/start-services

@@ -12,6 +12,6 @@ echo 'Starting TokyoTyrant'
 # Waiting for servers to start
 sleep 3
 
-echo 'TokyoTyrant status'
-ps aux | grep ttserver
-cat /tmp/ttserver.log
+#echo 'TokyoTyrant status'
+#ps aux | grep ttserver
+#cat /tmp/ttserver.log

data/spec/moneta/adapter_activerecord_spec.rb

@@ -7,7 +7,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' })
+    Moneta::Adapters::ActiveRecord.new(:table => 'adapter_activerecord', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root' })
   end
 
   def load_value(value)
@@ -33,7 +33,7 @@ describe_moneta "adapter_activerecord" do
   end
 
   it 'uses an existing connection' do
-    ActiveRecord::Base.establish_connection :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta'
+    ActiveRecord::Base.establish_connection :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root'
 
     store = Moneta::Adapters::ActiveRecord.new(:table => 'activerecord_existing')
     store.table.should be_table_exists

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:mysql" : "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_yaml_spec.rb

@@ -15,8 +15,6 @@ 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/optionmerger_spec.rb

@@ -81,7 +81,7 @@ describe_moneta "optionmerger" do
   end
 
   it 'has method #expires' do
-    store.expires(10).default_options.should == {:store=>{:expires=>10},:create=>{:expires=>10}}
+    store.expires(10).default_options.should == {:store=>{:expires=>10},:create=>{:expires=>10},:increment=>{:expires=>10}}
   end
 
   it 'has method #prefix' do

data/spec/moneta/simple_activerecord_spec.rb

@@ -7,7 +7,7 @@ describe_moneta "simple_activerecord" do
   end
 
   def new_store
-    Moneta.new(:ActiveRecord, :table => 'simple_activerecord', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta' }, :logger => {:file => File.join(make_tempdir, 'simple_activerecord.log')})
+    Moneta.new(:ActiveRecord, :table => 'simple_activerecord', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root' }, :logger => {:file => File.join(make_tempdir, 'simple_activerecord.log')})
   end
 
   def load_value(value)

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, :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')})
+    Moneta.new(:ActiveRecord, :table => 'simple_activerecord_with_expires', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root' }, :expires => true, :logger => {:file => File.join(make_tempdir, 'simple_activerecord_with_expires.log')})
   end
 
   def load_value(value)

data/spec/moneta/simple_sequel_spec.rb

@@ -7,7 +7,7 @@ describe_moneta "simple_sequel" do
   end
 
   def new_store
-    Moneta.new(:Sequel, :db => (defined?(JRUBY_VERSION) ? "jdbc:mysql" : "mysql2") + "://root:@localhost/moneta", :table => "simple_sequel", :logger => {:file => File.join(make_tempdir, 'simple_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, 'simple_sequel.log')})
   end
 
   def load_value(value)

data/spec/moneta/simple_sequel_with_expires_spec.rb

@@ -7,7 +7,7 @@ describe_moneta "simple_sequel_with_expires" do
   end
 
   def new_store
-    Moneta.new(:Sequel, :db => (defined?(JRUBY_VERSION) ? "jdbc:mysql" : "mysql2") + "://root:@localhost/moneta", :table => "simple_sequel_with_expires", :expires => true, :logger => {:file => File.join(make_tempdir, 'simple_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, 'simple_sequel_with_expires.log')})
   end
 
   def load_value(value)

data/spec/moneta/simple_yaml_spec.rb

@@ -15,8 +15,6 @@ describe_moneta "simple_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/simple_yaml_with_expires_spec.rb

@@ -15,8 +15,6 @@ describe_moneta "simple_yaml_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/monetaspecs.rb

@@ -17149,7 +17149,7 @@ shared_examples_for 'concurrent_increment' do
     Thread.new do
       s = new_store
       1000.times do |i|
-        s.increment('counter')
+        s.increment('counter', 1, :expires => false)
         s.store("#{name}#{i}", i.to_s, :expires => false)
         sleep 0.01 if i % 100 == 0
       end

data/spec/rack/session_moneta_spec.rb

@@ -304,7 +304,7 @@ describe Rack::Session::Moneta do
   end
 
   it "does not suffer a race-condition in get_session" do
-    # By lying about existence of a key this proxy tricks the session 
+    # By lying about existence of a key this proxy tricks the session
     # to overwrite values when it wouldn't normally.
     broken_key = Class.new(::Moneta::Proxy) do
       def key?(key, *args)
@@ -318,15 +318,14 @@ describe Rack::Session::Moneta do
     end
 
     # Override the SID generator with one that returns predefined values.
-    gen = ["deadbeef", "deadbeef", "caffee"]
-    def gen.hex(_)
-      shift || raise("Empty!")
+    def pool.generate_sid(*)
+      @fake_sid ||= %w(deadbeef deadbeef caffee)
+      @fake_sid.shift || raise('Empty!')
     end
-    pool.instance_variable_set(:@sid_secure, gen)
+
     req = Rack::MockRequest.new(pool)
     req.get('/')
     res = req.get('/')
     res['Set-Cookie'].should =~ /\Arack.session=caffee; /
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moneta
 version: !ruby/object:Gem::Version
-  version: 0.7.12
+  version: 0.7.13
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies: []
 description: A unified interface to key/value stores
 email:
@@ -464,3 +464,4 @@ test_files:
 - spec/rack/moneta_cookies_spec.rb
 - spec/rack/moneta_store_spec.rb
 - spec/rack/session_moneta_spec.rb
+has_rdoc: