moneta 0.7.15 → 0.7.16

data/.travis.yml

@@ -9,7 +9,7 @@ rvm:
 #  - rbx-18mode
 before_install:
   - script/kill-travis
-  - script/install-kyotocabinet
+  #- script/install-kyotocabinet
   - sudo apt-get install -qq libtokyocabinet8 libtokyocabinet-dev liblzo2-dev libtdb-dev tokyotyrant
   - script/start-services
   - script/install-bundle
@@ -41,9 +41,7 @@ matrix:
     - rvm: jruby-19mode
     - rvm: rbx-18mode
     - rvm: rbx-19mode
-    - env:
-      - "TASK=test TEST_GROUP=unstable"
-      - secure: "B0vx1g1CB1A6mM3B/iy2ATicfS4OXT80bb2RVe8mSRsPzez1B4q4Q4hJcaMI\nrMARONN8Krtnti+IqvmDnB0Z0AKYMEyIc+zT37zJOCjLdkLJl+x/thuU/MbC\nvlLVwjMf6JE2EUzTfORDRFYc5ycCqfsfgNk1Go0D2CPT6P9u9uQ="
+    - env: "TASK=test TEST_GROUP=unstable"
 script: "bundle exec rake $TASK"
 branches:
   only:

data/Gemfile

@@ -50,11 +50,11 @@ gem 'leveldb-ruby', :platforms => :ruby
 if RUBY_VERSION < '2.0'
   gem 'tokyocabinet', :platforms => :ruby
 end
-if RUBY_VERSION < '2.0' && !defined?(JRUBY_VERSION)
+#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'
-end
+#  gem 'kyotocabinet-ruby', :github => 'minad/kyotocabinet-ruby'
+#end
 gem 'memcached', :platforms => :ruby
 gem 'jruby-memcached', :platforms => :jruby
 gem 'sqlite3', :platforms => :ruby

data/README.md

@@ -323,8 +323,12 @@ If you want to have control over the proxies, you have to use `Moneta.build`:
 store = Moneta.build do
   # Adds expires proxy
   use :Expires
+
   # Transform key using Marshal and Base64 and value using Marshal
   use :Transformer, :key => [:marshal, :base64], :value => :marshal
+
+  # IMPORTANT: adapter must be defined last for the builder to function properly.
+
   # Memory backend
   adapter :Memory
 end

data/Rakefile

@@ -35,7 +35,7 @@ task :test do
   #
   # * PStore and File increment/locking doesn't work correctly on JRuby
   #
-  unstable = %w(quicklz)
+  unstable = %w(quicklz riak)
   unstable += %w(file pstore) if defined?(JRUBY_VERSION)
 
   unstable_re = /#{unstable.join('|')}/

data/lib/moneta/adapters/sequel.rb

@@ -7,6 +7,10 @@ module Moneta
     class Sequel
       include Defaults
 
+      # Sequel::UniqueConstraintViolation is defined since sequel 3.44.0
+      # older versions raise a Sequel::DatabaseError.
+      UniqueConstraintViolation = defined?(::Sequel::UniqueConstraintViolation) ? ::Sequel::UniqueConstraintViolation : ::Sequel::DatabaseError
+
       supports :create, :increment
       attr_reader :backend
 
@@ -44,7 +48,7 @@ module Moneta
       def store(key, value, options = {})
         begin
           @table.insert(:k => key, :v => value)
-        rescue ::Sequel::DatabaseError
+        rescue UniqueConstraintViolation
           @table.where(:k => key).update(:v => value)
         end
         value
@@ -57,9 +61,7 @@ module Moneta
       def create(key, value, options = {})
         @table.insert(:k => key, :v => value)
         true
-      rescue ::Sequel::DatabaseError
-        # FIXME: This catches too many errors
-        # it should only catch a not-unique-exception
+      rescue UniqueConstraintViolation
         false
       end
 
@@ -77,8 +79,7 @@ module Moneta
           end
         end
       rescue ::Sequel::DatabaseError
-        # FIXME: This catches too many errors
-        # it should only catch a not-unique-exception
+        # Concurrent modification might throw a bunch of different errors
         tries ||= 0
         (tries += 1) < 10 ? retry : raise
       end

data/lib/moneta/builder.rb

@@ -17,11 +17,14 @@ module Moneta
       adapter = @proxies.first
       if Array === adapter
         klass, options, block = adapter
-        adapter = klass.new(options, &block)
+        adapter = new_proxy(klass, options, &block)
+        check_arity(klass, adapter, 1)
       end
-      @proxies[1..-1].inject([adapter]) do |stores, proxy|
+      @proxies[1..-1].inject([adapter]) do |result, proxy|
         klass, options, block = proxy
-        stores << klass.new(stores.last, options, &block)
+        proxy = new_proxy(klass, result.last, options, &block)
+        check_arity(klass, proxy, 2)
+        result << proxy
       end
     end
 
@@ -55,5 +58,26 @@ module Moneta
         nil
       end
     end
+
+    protected
+
+    def new_proxy(klass, *args, &block)
+      klass.new(*args, &block)
+    rescue ArgumentError => ex
+      check_arity(klass, klass.allocate, args.size)
+      raise
+    end
+
+    def check_arity(klass, proxy, expected)
+      args = proxy.method(:initialize).arity.abs
+      raise(ArgumentError, %{#{klass.name}#new accepts wrong number of arguments (#{args} accepted, #{expected} expected)
+
+Please check your Moneta builder block:
+  * Proxies must be used before the adapter
+  * Only one adapter is allowed
+  * The adapter must be used last
+}) if args != expected
+    end
   end
+
 end

data/lib/moneta/version.rb

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

data/spec/moneta/builder_spec.rb

@@ -0,0 +1,29 @@
+require 'moneta'
+describe Moneta::Builder do
+  it 'raises an error if #use is called after #adapter' do
+    expect do
+      Moneta::Builder.new do
+        adapter :Null
+        use :Lock
+      end.build
+    end.to raise_error /Please check/
+  end
+
+  it 'raises an error if #adapter called twice' do
+    expect do
+      Moneta::Builder.new do
+        adapter :Null
+        adapter :Null
+      end.build
+    end.to raise_error /Please check/
+  end
+
+  it 'raises an error if no #adapter is specified' do
+    expect do
+      Moneta::Builder.new do
+        use :Lock
+        use :Lock
+      end.build
+    end.to raise_error /Please check/
+  end
+end

metadata

@@ -1,30 +1,39 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: moneta
-version: !ruby/object:Gem::Version
-  version: 0.7.15
+version: !ruby/object:Gem::Version 
+  hash: 35
   prerelease: 
+  segments: 
+  - 0
+  - 7
+  - 16
+  version: 0.7.16
 platform: ruby
-authors:
+authors: 
 - Daniel Mendler
 - Yehuda Katz
 - Hannes Georg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+
+date: 2013-05-23 00:00:00 Z
 dependencies: []
+
 description: A unified interface to key/value stores
-email:
+email: 
 - mail@daniel-mendler.de
 - wycats@gmail.com
 - hannes.georg@googlemail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.md
 - SPEC.md
 - LICENSE
-files:
+files: 
 - .gitignore
 - .travis.yml
 - .yardopts
@@ -149,6 +158,7 @@ files:
 - spec/moneta/adapter_tokyocabinet_hdb_spec.rb
 - spec/moneta/adapter_tokyotyrant_spec.rb
 - spec/moneta/adapter_yaml_spec.rb
+- spec/moneta/builder_spec.rb
 - spec/moneta/cache_file_memory_spec.rb
 - spec/moneta/cache_memory_null_spec.rb
 - spec/moneta/expires_file_spec.rb
@@ -275,30 +285,38 @@ files:
 - spec/rack/session_moneta_spec.rb
 homepage: http://github.com/minad/moneta
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: A unified interface to key/value stores, including Redis, Memcached, TokyoCabinet,
-  ActiveRecord and many more
-test_files:
+summary: A unified interface to key/value stores, including Redis, Memcached, TokyoCabinet, ActiveRecord and many more
+test_files: 
 - spec/action_dispatch/fixtures/session_autoload_test/foo.rb
 - spec/action_dispatch/session_moneta_store_spec.rb
 - spec/active_support/cache_moneta_store_spec.rb
@@ -343,6 +361,7 @@ test_files:
 - spec/moneta/adapter_tokyocabinet_hdb_spec.rb
 - spec/moneta/adapter_tokyotyrant_spec.rb
 - spec/moneta/adapter_yaml_spec.rb
+- spec/moneta/builder_spec.rb
 - spec/moneta/cache_file_memory_spec.rb
 - spec/moneta/cache_memory_null_spec.rb
 - spec/moneta/expires_file_spec.rb