moneta 0.7.14 → 0.7.15

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
+  - 2.0.0
   - 1.9.3
   - 1.8.7
   - jruby-19mode

data/.yardopts

@@ -1 +1 @@
-- README.md SPEC.md CHANGES LICENSE
+- README.md SPEC.md CHANGES LICENSE CONTRIBUTORS

data/CHANGES

@@ -1,3 +1,8 @@
+0.7.15
+
+* CONTRIBUTORS file added
+* Adapters::File#increment fixed
+
 0.7.14
 
 * Adapters::ActiveRecord, Adapters::Sequel: store values as blobs

data/CONTRIBUTORS

@@ -0,0 +1,21 @@
+Adrian Madrid <aemadrid@gmail.com>
+Alejandro Crosa <acrosa@sharing.local>
+Anthony Eden <anthonyeden@gmail.com>
+Benjamin Yu <benjaminlyu@gmail.com>
+Ben Schwarz <ben.schwarz@gmail.com>
+Daniel Mendler <mail@daniel-mendler.de>
+Derek Kastner <dkastner@gmail.com>
+Dylan Egan <me@dylanegan.com>
+Hampton Catlin <hcatlin@gmail.com>
+Hannes Georg <hannes.georg@xing.com>
+Scott Wadden <scott.wadden@gmail.com>
+Jari Bakken <jari.bakken@gmail.com>
+Jeremy Voorhis <jvoorhis@gmail.com>
+Jon Crosby <jon@joncrosby.me>
+lakshan <lakshan@web2media.net>
+Potapov Sergey <blake131313@gmail.com>
+Quin Hoxie <quin@aboutus.org>
+Tom Meier <ozmeier@yahoo.co.uk>
+Xavier Shay <xavier@rhnh.net>
+Yehuda Katz <wycats@gmail.com>
+

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec
 
 # Testing
@@ -18,7 +18,9 @@ gem 'msgpack-jruby', :platforms => :jruby
 gem 'bert', :platforms => :ruby
 
 # Compressors used by Transformer
-gem 'bzip2-ruby', :platforms => :mri # Only on mri currently
+if RUBY_VERSION < '2.0'
+  gem 'bzip2-ruby', :platforms => :mri # Only on mri currently
+end
 gem 'ruby-lzma', :platforms => :ruby
 gem 'lzoruby', :platforms => :ruby
 gem 'snappy', :platforms => :ruby
@@ -45,8 +47,10 @@ gem 'tokyotyrant'
 #gem 'localmemcache'
 gem 'tdb', :platforms => :ruby
 gem 'leveldb-ruby', :platforms => :ruby
-gem 'tokyocabinet', :platforms => :ruby
-unless defined?(JRUBY_VERSION)
+if RUBY_VERSION < '2.0'
+  gem 'tokyocabinet', :platforms => :ruby
+end
+if RUBY_VERSION < '2.0' && !defined?(JRUBY_VERSION)
   # FIXME: We have to check manually for jruby
   # otherwise bundle install --deployment doesn't work
   gem 'kyotocabinet-ruby', :github => 'minad/kyotocabinet-ruby'

data/README.md

@@ -1,6 +1,6 @@
 # Moneta: A unified interface for key/value stores
 
-[![Gem Version](https://badge.fury.io/rb/moneta.png)](http://rubygems.org/gems/moneta) [![Build Status](https://secure.travis-ci.org/minad/moneta.png?branch=master)](http://travis-ci.org/minad/moneta) [![Dependency Status](https://gemnasium.com/minad/moneta.png?travis)](https://gemnasium.com/minad/moneta) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/minad/moneta)
+[![Gem Version](https://badge.fury.io/rb/moneta.png)](http://rubygems.org/gems/moneta) [![Build Status](https://secure.travis-ci.org/minad/moneta.png?branch=master)](http://travis-ci.org/minad/moneta) [![Dependency Status](https://gemnasium.com/minad/moneta.png?travis)](https://gemnasium.com/minad/moneta) [![Code Climate](https://codeclimate.com/github/minad/moneta.png)](https://codeclimate.com/github/minad/moneta)
 
 Moneta provides a standard interface for interacting with various kinds of key/value stores. A short overview of the features:
 
@@ -96,7 +96,7 @@ Out of the box, it supports the following backends. Use the backend name symbol
     * Filesystem directory store (`:File`)
     * Filesystem directory store which spreads files in subdirectories using md5 hash (`:HashFile`)
 * Key/value databases:
-    * [Berkeley DB](http://www.ruby-doc.org/stdlib/libdoc/dbm/rdoc/DBM.html) (`:DBM`)
+    * [Berkeley DB using DBM interface or NDBM (Depends on Ruby environment)](http://www.ruby-doc.org/stdlib/libdoc/dbm/rdoc/DBM.html) (`:DBM`)
     * [Cassandra](http://cassandra.apache.org/) (`:Cassandra`)
     * [Daybreak](http://propublica.github.com/daybreak/) (`:Daybreak`)
     * [GDBM](http://www.ruby-doc.org/stdlib/libdoc/gdbm/rdoc/GDBM.html) (`:GDBM`)
@@ -154,7 +154,7 @@ __NOTE:__ <a name="backend-matrix">The backend matrix</a> is much more readable
 
 <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>
 
-<tr><td>DBM</td><td>-</td><td style="text-align:center;background:#F44">✗</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:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td><a href="http://www.ruby-doc.org/stdlib/libdoc/dbm/rdoc/DBM.html">Berkeley DB</a></td></tr>
+<tr><td>DBM</td><td>-</td><td style="text-align:center;background:#F44">✗</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:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td><a href="http://www.ruby-doc.org/stdlib/libdoc/dbm/rdoc/DBM.html">Berkeley DB using DBM interface or NDBM (Depends on Ruby environment)</a></td></tr>
 
 <tr><td>GDBM</td><td>-</td><td style="text-align:center;background:#F44">✗</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:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td><a href="http://www.ruby-doc.org/stdlib/libdoc/gdbm/rdoc/GDBM.html">GDBM</a> database</td></tr>
 
@@ -758,6 +758,33 @@ to compare the speed of the different key value stores for different key/value s
 Feel free to add your own configurations! The impact of Moneta should be minimal since it is only a thin layer
 on top of the different stores.
 
+
+------
+
+## How to contribute?
+
+Always feel free to open an issue on
+https://github.com/minad/moneta/issues if something doesn't work
+as you expect it to work. Feedback is also very welcome!
+
+My only request about patches is that you please try
+to test them before submitting.
+
+### Contribute an adapter
+
+If you want support for another adapter you can at first at it to the list of
+missing adapters at https://github.com/minad/moneta/issues/16
+
+If you choose to implement an adapter please also add tests. Usually you
+only have to add a few lines to `script/generate-specs` to generate appropriate
+tests for your adapter. Please check also if travis.yml needs changes, for example
+if you need to start additional services.
+
+Check if the default settings in Moneta#new are appropriate for your adapter. If
+not specify a better one.
+
+Don't forget to edit the README.md and the CHANGES.
+
 ------
 
 ## Alternatives

data/Rakefile

@@ -33,11 +33,9 @@ task :test do
   #   QuickLZ is also not maintained on Github, but on Bitbucket
   #   and I don't know where the issue tracker is.
   #
-  # * Cassandra and Riak fail spuriously (An expert has to check the adapters!)
-  #
   # * PStore and File increment/locking doesn't work correctly on JRuby
   #
-  unstable = %w(quicklz cassandra riak)
+  unstable = %w(quicklz)
   unstable += %w(file pstore) if defined?(JRUBY_VERSION)
 
   unstable_re = /#{unstable.join('|')}/

data/lib/moneta/adapters/cassandra.rb

@@ -1,12 +1,10 @@
-# Copyright: 2011 TMX Credit
-# Author: Potapov Sergey (aka Blake)
-
 require 'cassandra'
 
 module Moneta
   module Adapters
     # Cassandra backend
     # @api public
+    # @author Potapov Sergey (aka Blake)
     class Cassandra
       include Defaults
       include ExpiresSupport
@@ -94,6 +92,12 @@ module Moneta
         end
         self
       end
+
+      # (see Proxy#close)
+      def close
+        @backend.disconnect!
+        nil
+      end
     end
   end
 end

data/lib/moneta/adapters/file.rb

@@ -29,12 +29,15 @@ module Moneta
 
       # (see Proxy#store)
       def store(key, value, options = {})
-        path = store_path(key)
         temp_file = ::File.join(@dir, "value-#{$$}-#{Thread.current.object_id}")
+        path = store_path(key)
         FileUtils.mkpath(::File.dirname(path))
         ::File.open(temp_file, 'wb') {|f| f.write(value) }
         ::File.rename(temp_file, path)
         value
+      rescue Exception
+        File.unlink(temp_file) rescue nil
+        raise
       end
 
       # (see Proxy#delete)
@@ -50,25 +53,22 @@ module Moneta
         temp_dir = "#{@dir}-#{$$}-#{Thread.current.object_id}"
         ::File.rename(@dir, temp_dir)
         FileUtils.mkpath(@dir)
-        FileUtils.rm_rf(temp_dir)
         self
       rescue Errno::ENOENT
         self
+      ensure
+        FileUtils.rm_rf(temp_dir)
       end
 
       # (see Proxy#increment)
       def increment(key, amount = 1, options = {})
         path = store_path(key)
         FileUtils.mkpath(::File.dirname(path))
-        existed = ::File.exists?(path)
-        ::File.open(path, 'ab+') do |f|
+        ::File.open(path, ::File::RDWR | ::File::CREAT) do |f|
           Thread.pass until f.flock(::File::LOCK_EX)
-          # FIXME: JRuby needs synchronous mode, otherwise f.read might return wrong value
-          f.sync = true if defined?(JRUBY_VERSION)
-          content = f.read
-          amount += Utils.to_int(content) if existed || !content.empty?
-          f.truncate(0)
-          f.write(amount.to_s)
+          content = ::File.read(path)
+          amount += Utils.to_int(content) unless content.empty?
+          ::File.open(path, 'wb') {|o| o.write(amount.to_s) }
           amount
         end
       end

data/lib/moneta/adapters/riak.rb

@@ -1,12 +1,10 @@
-# Copyright: 2011 TMX Credit
-# Author: Potapov Sergey (aka Blake)
-
 require 'riak'
 
 module Moneta
   module Adapters
     # Riak backend
     # @api public
+    # @author Potapov Sergey (aka Blake)
     class Riak
       include Defaults
 

data/lib/moneta/mixins.rb

@@ -222,7 +222,6 @@ module Moneta
   # @api private
   module IncrementSupport
     # (see Defaults#increment)
-    # @api public
     def increment(key, amount = 1, options = {})
       value = Utils.to_int(load(key, options)) + amount
       store(key, value.to_s, options)
@@ -239,8 +238,7 @@ module Moneta
   # This is sufficient for non-shared stores or if atomicity is not required.
   # @api private
   module CreateSupport
-    # (see Default#create)
-    # @api public
+    # (see Defaults#create)
     def create(key, value, options = {})
       if key? key
         false

data/lib/moneta/version.rb

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

data/script/generate-specs

@@ -2012,10 +2012,12 @@ end}
 SPECS['concurrent_increment'] = %{def increment_thread(name)
   Thread.new do
     s = new_store
-    1000.times do |i|
-      s.increment('counter', 1, :expires => false)
+    100.times do |i|
+      100.times do |j|
+        s.increment("counter\#{j}", 1, :expires => false)
+        Thread.pass if rand(1000) >= 995
+      end
       s.store("\#{name}\#{i}", i.to_s, :expires => false)
-      sleep 0.01 if i % 100 == 0
     end
     s.close
   end
@@ -2028,12 +2030,14 @@ it 'have atomic increment across multiple processes' do
   a.join
   b.join
   c.join
-  1000.times do |i|
+  100.times do |i|
     store["a\#{i}"].should == i.to_s
     store["b\#{i}"].should == i.to_s
     store["c\#{i}"].should == i.to_s
   end
-  store.raw['counter'].should == 3000.to_s
+  100.times do |j|
+    store.raw["counter\#{j}"].should == 300.to_s
+  end
 end}
 
 SPECS['concurrent_create'] = %{def create_thread(name)
@@ -2041,7 +2045,7 @@ SPECS['concurrent_create'] = %{def create_thread(name)
     s = new_store
     1000.times do |i|
       s[i.to_s].should == name if s.create(i.to_s, name, :expires => false)
-      sleep 0.01 if i % 100 == 0
+      Thread.pass if rand(100) >= 99
     end
     s.close
   end

data/spec/monetaspecs.rb

@@ -17164,10 +17164,12 @@ shared_examples_for 'concurrent_increment' do
   def increment_thread(name)
     Thread.new do
       s = new_store
-      1000.times do |i|
-        s.increment('counter', 1, :expires => false)
+      100.times do |i|
+        100.times do |j|
+          s.increment("counter#{j}", 1, :expires => false)
+          Thread.pass if rand(1000) >= 995
+        end
         s.store("#{name}#{i}", i.to_s, :expires => false)
-        sleep 0.01 if i % 100 == 0
       end
       s.close
     end
@@ -17180,12 +17182,14 @@ shared_examples_for 'concurrent_increment' do
     a.join
     b.join
     c.join
-    1000.times do |i|
+    100.times do |i|
       store["a#{i}"].should == i.to_s
       store["b#{i}"].should == i.to_s
       store["c#{i}"].should == i.to_s
     end
-    store.raw['counter'].should == 3000.to_s
+    100.times do |j|
+      store.raw["counter#{j}"].should == 300.to_s
+    end
   end
 end
 
@@ -17197,7 +17201,7 @@ shared_examples_for 'concurrent_create' do
       s = new_store
       1000.times do |i|
         s[i.to_s].should == name if s.create(i.to_s, name, :expires => false)
-        sleep 0.01 if i % 100 == 0
+        Thread.pass if rand(100) >= 99
       end
       s.close
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moneta
 version: !ruby/object:Gem::Version
-  version: 0.7.14
+  version: 0.7.15
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies: []
 description: A unified interface to key/value stores
 email:
@@ -29,6 +29,7 @@ files:
 - .travis.yml
 - .yardopts
 - CHANGES
+- CONTRIBUTORS
 - Gemfile
 - LICENSE
 - README.md