moneta 1.2.1 → 1.3.0

data/spec/helper.rb

@@ -10,9 +10,11 @@ require 'rantly'
 require 'rantly/rspec_extensions'
 # rantly/shrinks
 require 'timecop'
+require_relative 'support/mongo_helper'
 
 class MonetaParallelFormatter < RSpec::Core::Formatters::BaseTextFormatter
   def start(*args)
+
     output.puts colorise_summary("STARTING #{ARGV.join(' ')}")
     @stopped = false
     @passed_count = 0
@@ -58,12 +60,12 @@ class MonetaSpecs
     'integer' => :integer,
     'float' => :float,
     'boolean' => :boolean,
-    'string' => proc { sized(range(5, 10)) { string(:alnum) } },
-    'path' => proc { array(range(2, 3)) { sized(range(5, 10)) { string(:alpha) } }.join('/') },
+    'string' => proc{ sized(range 5, 10){ string(:alnum) } },
+    'path' => proc{ array(range 2, 3){ sized(range 5, 10){ string(:alpha) } }.join('/') },
     'binary' => [:string, :cntrl],
-    'object' => proc { choose Value.new(:objkey1), Value.new(:objkey2) },
-    'hash' => proc { dict(2) { sized(range(5, 10)) { [string(:alnum), string(:alnum)] } } }
-  }.freeze
+    'object' => proc{ choose Value.new(:objkey1), Value.new(:objkey2) },
+    'hash' => proc{ dict(2){ sized(range 5, 10){ [string(:alnum), string(:alnum)] } } }
+  }
 
   VALUES = {
     'nil' => [:literal, nil],
@@ -72,10 +74,10 @@ class MonetaSpecs
     'boolean' => :boolean,
     'string' => [:string, :alnum],
     'binary' => [:string, :cntrl],
-    'object' => proc { choose Value.new(:objval1), Value.new(:objval2) },
-    'hash' => proc { dict { [string(:alnum), array(2) { choose(string(:alnum), integer, dict { [string(:alnum), integer] }) }] } },
-    'smallhash' => proc { dict(2) { sized(range(5, 10)) { [string(:alnum), string(:alnum)] } } }
-  }.freeze
+    'object' => proc{ choose Value.new(:objval1), Value.new(:objval2) },
+    'hash' => proc{ dict{ [string(:alnum), array(2){ choose(string(:alnum), integer, dict{ [string(:alnum), integer] }) }] } },
+    'smallhash' => proc{ dict(2){ sized(range 5, 10){ [string(:alnum), string(:alnum)] } } }
+  }
 
   attr_reader :key, :value, :specs, :features
 
@@ -87,23 +89,23 @@ class MonetaSpecs
   end
 
   def new(options)
-    self.class.new({ specs: specs, key: key, value: value }.merge(options))
+    self.class.new({specs: specs, key: key, value: value}.merge(options))
   end
 
   def with_keys(*keys)
-    new(key: key | keys.map(&:to_s))
+    new(key: self.key | keys.map(&:to_s))
   end
 
   def without_keys(*keys)
-    new(key: key - keys.map(&:to_s))
+    new(key: self.key - keys.map(&:to_s))
   end
 
   def with_values(*values)
-    new(value: value | values.map(&:to_s))
+    new(value: self.value | values.map(&:to_s))
   end
 
   def without_values(*values)
-    new(value: value - values.map(&:to_s))
+    new(value: self.value - values.map(&:to_s))
   end
 
   def without_keys_or_values(*types)
@@ -208,55 +210,53 @@ end
 
 ADAPTER_SPECS = MonetaSpecs.new(
   specs: [:null, :store, :returndifferent,
-          :increment, :concurrent_increment, :concurrent_create, :persist, :multiprocess,
-          :create, :features, :store_large, :not_each_key],
+    :increment, :concurrent_increment, :concurrent_create, :persist, :multiprocess,
+    :create, :features, :store_large, :not_each_key],
   key: %w(string path),
-  value: %w(string path binary)
-)
+  value: %w(string path binary))
 STANDARD_SPECS = MonetaSpecs.new(
   specs: [:null, :store, :returndifferent,
-          :marshallable_key, :marshallable_value, :transform_value, :increment,
-          :concurrent_increment, :concurrent_create, :persist, :multiprocess, :create,
-          :features, :store_large, :not_each_key]
-)
+    :marshallable_key, :marshallable_value, :transform_value, :increment,
+    :concurrent_increment, :concurrent_create, :persist, :multiprocess, :create,
+    :features, :store_large, :not_each_key])
 TRANSFORMER_SPECS = MonetaSpecs.new(
   specs: [:null, :store, :returndifferent,
-          :transform_value, :increment, :create, :features, :store_large,
-          :not_each_key]
-)
+    :transform_value, :increment, :create, :features, :store_large,
+    :not_each_key])
 
 module MonetaHelpers
   module ClassMethods
-    def moneta_store(store_name, options = {}, &block)
-      name = description
+
+    def moneta_store store_name, options={}, &block
+      name = self.description
       builder = proc do
         if block
           options = instance_exec(&block)
         end
 
-        Moneta.new(store_name, options.merge(logger: { file: File.join(tempdir, "#{name}.log") }))
+        Moneta.new(store_name, options.merge(logger: {file: File.join(tempdir, "#{name}.log")}))
       end
 
       include_context :setup_moneta_store, builder
     end
 
-    def moneta_build(&block)
+    def moneta_build &block
       include_context :setup_moneta_store, block
     end
 
-    def moneta_loader(&block)
+    def moneta_loader &block
       before do
         @moneta_value_loader = block
       end
     end
 
-    def moneta_specs(specs)
-      let(:features) { specs.features }
+    def moneta_specs specs
+      let(:features){ specs.features }
       let(:keys_meta) do
-        [:branch, *specs.key.map { |k| MonetaSpecs::KEYS[k] }.compact]
+        [:branch, *specs.key.map{ |k| MonetaSpecs::KEYS[k] }.compact]
       end
       let(:values_meta) do
-        [:branch, *specs.value.map { |k| MonetaSpecs::VALUES[k] }.compact]
+        [:branch, *specs.value.map{ |k| MonetaSpecs::VALUES[k] }.compact]
       end
 
       # Used by tests that rely on MySQL.  These env vars can be used if you
@@ -270,6 +270,9 @@ module MonetaHelpers
       let(:postgres_database1) { ENV['MONETA_POSTGRES_DATABSASE1'] || 'moneta1' }
       let(:postgres_database2) { ENV['MONETA_POSTGRES_DATABSASE1'] || 'moneta2' }
 
+      let(:couch_login) { ENV['COUCH_LOGIN'] || 'admin' }
+      let(:couch_password) { ENV['COUCH_PASSWORD'] || 'password' }
+
       before do
         store = new_store
         store.clear
@@ -299,7 +302,7 @@ module MonetaHelpers
     end
 
     def use_timecop
-      before { @timecop = true }
+      before{ @timecop = true }
     end
   end
 
@@ -316,7 +319,7 @@ module MonetaHelpers
       @store ||= new_store
     end
 
-    def load_value(value)
+    def load_value value
       if @moneta_value_loader
         @moneta_value_loader.call value
       else
@@ -324,14 +327,6 @@ module MonetaHelpers
       end
     end
 
-    def start_server(*args)
-      server = Moneta::Server.new(*args)
-      Thread.new { server.run }
-      sleep 0.1 until server.running?
-    rescue Exception => ex
-      puts "Failed to start server - #{ex.message}"
-    end
-
     def moneta_property_of(keys: 0, values: 0)
       keys_meta = self.keys_meta
       values_meta = self.values_meta
@@ -342,9 +337,9 @@ module MonetaHelpers
         value_values = values.times.map { call(values_meta) }
         guard value_values.uniq.length == value_values.length
 
-        [[:keys, key_values], [:values, value_values]]
-          .reject { |_key, value| value.empty? }
-          .to_h
+        [[:keys, key_values], [:values, value_values]].
+          reject { |key, value| value.empty? }.
+          to_h
       end
     end
 
@@ -362,8 +357,8 @@ end
 RSpec.configure do |config|
   config.verbose_retry = true
   config.color = true
-  # config.tty = true
-  # config.formatter = ENV['PARALLEL_TESTS'] ? MonetaParallelFormatter : :progress
+  #config.tty = true
+  #config.formatter = ENV['PARALLEL_TESTS'] ? MonetaParallelFormatter : :progress
   config.silence_filter_announcements = true if ENV['PARALLEL_TESTS']
 
   # Allow "should" syntax as well as "expect"
@@ -371,6 +366,7 @@ RSpec.configure do |config|
 
   config.extend MonetaHelpers::ClassMethods
   config.include MonetaHelpers::InstanceMethods
+  config.include MongoHelper, adapter: :Mongo
 end
 
 # FIXME: Get rid of this once raise_error expectations no longer generate
@@ -380,9 +376,9 @@ RSpec::Expectations.configuration.on_potential_false_positives = :nothing
 # Disable jruby stdout pollution by memcached
 if defined?(JRUBY_VERSION)
   require 'java'
-  properties = java.lang.System.getProperties
-  properties.put('net.spy.log.LoggerImpl', 'net.spy.memcached.compat.log.SunLogger')
-  java.lang.System.setProperties(properties)
+  properties = java.lang.System.getProperties();
+  properties.put('net.spy.log.LoggerImpl', 'net.spy.memcached.compat.log.SunLogger');
+  java.lang.System.setProperties(properties);
   java.util.logging.Logger.getLogger('').setLevel(java.util.logging.Level::OFF)
 end
 
@@ -405,6 +401,7 @@ class Value
   end
 end
 
+
 def marshal_error
   # HACK: Marshalling structs in rubinius without class name throws
   # NoMethodError (to_sym). TODO: Create an issue for rubinius!
@@ -415,12 +412,14 @@ def marshal_error
   end
 end
 
+
 RSpec.shared_context :setup_moneta_store do |builder|
   before do
     @moneta_store_builder = builder
   end
 
   after do
+    RSpec::Mocks.space.proxy_for(@store).reset
     if @store
       @store.close.should == nil
       @store = nil
@@ -450,4 +449,4 @@ RSpec.shared_examples :at_usec do |usec|
   end
 end
 
-Dir['./spec/features/*.rb'].each { |rb| require rb }
+Dir['./spec/features/*.rb'].each{ |rb| require rb }

data/spec/moneta/adapters/activerecord/standard_activerecord_spec.rb

@@ -14,5 +14,5 @@ describe "standard_activerecord", adapter: :ActiveRecord do
     ::Marshal.load(value.unpack('m').first)
   end
 
-  moneta_specs STANDARD_SPECS
+  moneta_specs STANDARD_SPECS.with_each_key
 end

data/spec/moneta/adapters/activerecord/standard_activerecord_with_expires_spec.rb

@@ -20,5 +20,5 @@ describe "standard_activerecord_with_expires", adapter: :ActiveRecord do
     ::Marshal.load(value.unpack('m').first)
   end
 
-  moneta_specs STANDARD_SPECS.with_expires
+  moneta_specs STANDARD_SPECS.with_expires.with_each_key
 end

data/spec/moneta/adapters/cassandra/standard_cassandra_spec.rb

@@ -14,5 +14,5 @@ describe "standard_cassandra", retry: 3, adapter: :Cassandra do
     }
   end
 
-  moneta_specs STANDARD_SPECS.without_increment.without_create.with_native_expires
+  moneta_specs STANDARD_SPECS.without_increment.without_create.with_native_expires.with_each_key
 end

data/spec/moneta/adapters/client/adapter_client_spec.rb

@@ -1,11 +1,11 @@
-describe 'adapter_client', isolate: true, adapter: :Client do
-  before :all do
-    start_server(Moneta::Adapters::Memory.new)
-  end
+require_relative './client_helper.rb'
+
+describe 'adapter_client', adapter: :Client do
+  include_context :start_server, port: 9002, backend: ->{ Moneta::Adapters::Memory.new }
 
   moneta_build do
-    Moneta::Adapters::Client.new
+    Moneta::Adapters::Client.new(port: 9002)
   end
 
-  moneta_specs ADAPTER_SPECS
+  moneta_specs ADAPTER_SPECS.with_each_key
 end

data/spec/moneta/adapters/client/client_helper.rb

@@ -0,0 +1,24 @@
+RSpec.shared_context :start_server do |**options|
+  before :context do
+    begin
+      options.each do |key, value|
+        options[key] = instance_exec(&value) if value.respond_to? :call
+      end
+      backend = options.delete(:backend)
+      @server = Moneta::Server.new(backend, options)
+      @thread = Thread.new { @server.run }
+      sleep 0.1 until @server.running?
+    rescue Exception => ex
+      puts "Failed to start server - #{ex.message}"
+      tries ||= 0
+      tries += 1
+      sleep Moneta::Server::TIMEOUT
+      tries < 3 ? retry : raise
+    end
+  end
+
+  after :context do
+    @server.stop
+    @thread.join
+  end
+end

data/spec/moneta/adapters/client/standard_client_tcp_spec.rb

@@ -1,17 +1,17 @@
-describe "standard_client_tcp", isolate: true, adapter: :Client do
-  before :all do
-    start_server(Moneta::Adapters::Memory.new)
-  end
+require_relative './client_helper.rb'
+
+describe "standard_client_tcp", adapter: :Client do
+  include_context :start_server, port: 9003, backend: ->{ Moneta::Adapters::Memory.new }
 
-  moneta_store :Client
-  moneta_specs STANDARD_SPECS
+  moneta_store :Client, port: 9003
+  moneta_specs STANDARD_SPECS.with_each_key
 
   it 'supports multiple clients' do
     store['shared_key'] = 'shared_val'
-    threads = (1..100).map do |i|
+    threads = (1..32).map do |i|
       Thread.new do
         client = new_store
-        (1..100).each do |j|
+        (1..31).each do |j|
           client['shared_key'].should == 'shared_val'
           client["key-\#{j}-\#{i}"] = "val-\#{j}-\#{i}"
           client["key-\#{j}-\#{i}"].should == "val-\#{j}-\#{i}"

data/spec/moneta/adapters/client/standard_client_unix_spec.rb

@@ -1,12 +1,28 @@
-describe "standard_client_unix", isolate: true, adapter: :Client do
-  before :all do
-    start_server Moneta::Adapters::Memory.new,
-                 socket: File.join(tempdir, 'standard_client_unix')
-  end
+require_relative './client_helper.rb'
+
+describe "standard_client_unix", adapter: :Client do
+  include_context :start_server,
+                  backend: ->{ Moneta::Adapters::Memory.new },
+                  socket: ->{ File.join(tempdir, 'standard_client_unix') }
 
   moneta_store :Client do
-    {socket: File.join(tempdir, 'standard_client_unix')}
+    { socket: File.join(tempdir, 'standard_client_unix') }
   end
 
-  moneta_specs STANDARD_SPECS
+  moneta_specs STANDARD_SPECS.with_each_key
+
+  it 'supports multiple clients' do
+    store['shared_key'] = 'shared_val'
+    threads = (1..32).map do |i|
+      Thread.new do
+        client = new_store
+        (1..31).each do |j|
+          client['shared_key'].should == 'shared_val'
+          client["key-\#{j}-\#{i}"] = "val-\#{j}-\#{i}"
+          client["key-\#{j}-\#{i}"].should == "val-\#{j}-\#{i}"
+        end
+      end
+    end
+    threads.map(&:join)
+  end
 end

data/spec/moneta/adapters/couch/adapter_couch_spec.rb

@@ -4,7 +4,7 @@ describe 'adapter_couch', adapter: :Couch do
   include_context :faraday_adapter
 
   moneta_build do
-    Moneta::Adapters::Couch.new(db: 'adapter_couch', adapter: faraday_adapter)
+    Moneta::Adapters::Couch.new(db: 'adapter_couch', adapter: faraday_adapter, login: couch_login, password: couch_password)
   end
 
   moneta_specs ADAPTER_SPECS.without_increment.simplevalues_only.without_path.with_each_key

data/spec/moneta/adapters/couch/standard_couch_spec.rb

@@ -4,12 +4,12 @@ describe "standard_couch", adapter: :Couch do
   include_context :faraday_adapter
 
   moneta_store :Couch do
-    { db: 'standard_couch', adapter: faraday_adapter }
+    { db: 'standard_couch', adapter: faraday_adapter, login: couch_login, password: couch_password }
   end
 
   moneta_loader do |value|
     ::Marshal.load(value.unpack('m').first)
   end
 
-  moneta_specs STANDARD_SPECS.without_increment
+  moneta_specs STANDARD_SPECS.without_increment.with_each_key
 end

data/spec/moneta/adapters/couch/standard_couch_with_expires_spec.rb

@@ -8,12 +8,12 @@ describe "standard_couch_with_expires", adapter: :Couch do
   include_context :faraday_adapter
 
   moneta_store :Couch do
-    { db: 'standard_couch_with_expires', adapter: faraday_adapter, expires: true }
+    { db: 'standard_couch_with_expires', adapter: faraday_adapter, expires: true, login: couch_login, password: couch_password }
   end
 
   moneta_loader do |value|
     ::Marshal.load(value.unpack('m').first)
   end
 
-  moneta_specs STANDARD_SPECS.without_increment.with_expires
+  moneta_specs STANDARD_SPECS.without_increment.with_expires.with_each_key
 end

data/spec/moneta/adapters/daybreak/standard_daybreak_spec.rb

@@ -3,5 +3,5 @@ describe 'standard_daybreak', adapter: :Daybreak do
     {file: File.join(tempdir, "simple_daybreak")}
   end
 
-  moneta_specs STANDARD_SPECS.without_multiprocess
+  moneta_specs STANDARD_SPECS.without_multiprocess.with_each_key
 end

data/spec/moneta/adapters/daybreak/standard_daybreak_with_expires_spec.rb

@@ -7,5 +7,5 @@ describe 'standard_daybreak_with_expires', adapter: :Daybreak do
     {file: File.join(tempdir, "simple_daybreak_with_expires"), expires: true}
   end
 
-  moneta_specs STANDARD_SPECS.without_multiprocess.with_expires
+  moneta_specs STANDARD_SPECS.without_multiprocess.with_expires.with_each_key
 end