suo 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6334c57e0648ae8fefdeb1113664c3e6631dd03c
-  data.tar.gz: 0f35accaea812d463d911b1602a30372952ca19b
+  metadata.gz: 0688005f9b0d058a3aa50d0225cf15c52b74e036
+  data.tar.gz: 65a1be72254409473e51e7455a8e718db505c87a
 SHA512:
-  metadata.gz: 51081aad925fa7032551ff81be52f724ed8fcd9592dfbfb7aea70d1a837597bdeabdcbe0bb9946629cbc2f853a81d1e8b501ec2b1d1ba8ba3c57a4ff6d43a77a
-  data.tar.gz: cce84bf639f8303f241a3c901d92991ae5e72b95c918601db06b75ca98cef250c85d3a00c0a2e3412ce539f2eb6acfedfeda1297ae1fbf033844477bc26b79fa
+  metadata.gz: 8e8f222bb46a28971467792d8b75c939d8e62869860a53dffa587e85cd2d9075211e229c670d14868730b714dcd2ac8db2e2a3b4666717238450a8f6022772f5
+  data.tar.gz: 0671a1a94f678a9da525c50b756fee60b3a8e207de45693bfe79deddf9d1cf333d0be0130e166c0c1ef4a088f9e6d95810bdd955fd6d5a0c7e83df20fe5b98ca

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.3
+
+- Properly throw Suo::LockClientError when the connection itself fails (Memcache server not reachable, etc.)
+
 ## 0.1.2
 
 - Fix retry_timeout to properly use the full time (was being calculated incorrectly).

data/lib/suo/client/base.rb

@@ -1,6 +1,7 @@
 module Suo
   module Client
     class Base
+
       DEFAULT_OPTIONS = {
         retry_timeout: 0.1,
         retry_delay: 0.01,
@@ -111,7 +112,7 @@ module Suo
             break unless acquisition_lock
             break if set(key, serialize_locks(locks), cas, options)
           end
-        rescue FailedToAcquireLock => _ # rubocop:disable Lint/HandleExceptions
+        rescue LockClientError => _ # rubocop:disable Lint/HandleExceptions
           # ignore - assume success due to optimistic locking
         end
 
@@ -124,8 +125,6 @@ module Suo
 
           fail "Client required" unless options[:client]
 
-          options[:retry_count] = (options[:retry_timeout] / options[:retry_delay].to_f).ceil
-
           options
         end
 
@@ -148,13 +147,13 @@ module Suo
         end
 
         def retry_with_timeout(key, options)
+          count = (options[:retry_timeout] / options[:retry_delay].to_f).ceil
+
           start = Time.now.to_f
 
-          options[:retry_count].times do
-            if options[:retry_timeout]
-              now = Time.now.to_f
-              break if now - start > options[:retry_timeout]
-            end
+          count.times do
+            now = Time.now.to_f
+            break if now - start > options[:retry_timeout]
 
             synchronize(key, options) do
               yield
@@ -163,7 +162,7 @@ module Suo
             sleep(rand(options[:retry_delay] * 1000).to_f / 1000)
           end
         rescue => _
-          raise FailedToAcquireLock
+          raise LockClientError
         end
 
         def serialize_locks(locks)

data/lib/suo/clients.rb

@@ -8,7 +8,7 @@ require "redis"
 
 require "msgpack"
 
-require "suo/client/errors"
+require "suo/errors"
 require "suo/client/base"
 require "suo/client/memcached"
 require "suo/client/redis"

data/lib/suo/errors.rb

@@ -0,0 +1,3 @@
+module Suo
+  class LockClientError < StandardError; end
+end

data/lib/suo/version.rb

@@ -1,3 +1,3 @@
 module Suo
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/suo.gemspec

@@ -20,6 +20,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = "~> 2.0"
+
   spec.add_dependency "dalli"
   spec.add_dependency "redis"
   spec.add_dependency "msgpack"

data/test/client_test.rb

@@ -11,6 +11,12 @@ module ClientTests
     assert_equal "Client required", exception.message
   end
 
+  def test_throws_failed_error_on_bad_client
+    assert_raises(Suo::LockClientError) do
+      @klass.lock(TEST_KEY, 1, client: {})
+    end
+  end
+
   def test_class_single_resource_locking
     lock1 = @klass.lock(TEST_KEY, 1, client: @klass_client)
     refute_nil lock1
@@ -73,10 +79,10 @@ module ClientTests
     success_counter = Queue.new
     failure_counter = Queue.new
 
-    100.times.map do |i|
+    50.times.map do |i|
       Thread.new do
-        success = @client.lock(TEST_KEY, 50, retry_timeout: 0.5) do
-          sleep(2)
+        success = @client.lock(TEST_KEY, 25, retry_timeout: 0.9) do
+          sleep(3)
           success_counter << i
         end
 
@@ -84,17 +90,17 @@ module ClientTests
       end
     end.map(&:join)
 
-    assert_equal 50, success_counter.size
-    assert_equal 50, failure_counter.size
+    assert_equal 25, success_counter.size
+    assert_equal 25, failure_counter.size
   end
 
   def test_instance_multiple_resource_locking_longer_timeout
     success_counter = Queue.new
     failure_counter = Queue.new
 
-    100.times.map do |i|
+    50.times.map do |i|
       Thread.new do
-        success = @client.lock(TEST_KEY, 50, retry_timeout: 2) do
+        success = @client.lock(TEST_KEY, 25, retry_timeout: 2) do
           sleep(0.5)
           success_counter << i
         end
@@ -103,7 +109,7 @@ module ClientTests
       end
     end.map(&:join)
 
-    assert_equal 100, success_counter.size
+    assert_equal 50, success_counter.size
     assert_equal 0, failure_counter.size
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: suo
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Nick Elser
@@ -129,10 +129,10 @@ files:
 - bin/setup
 - lib/suo.rb
 - lib/suo/client/base.rb
-- lib/suo/client/errors.rb
 - lib/suo/client/memcached.rb
 - lib/suo/client/redis.rb
 - lib/suo/clients.rb
+- lib/suo/errors.rb
 - lib/suo/version.rb
 - suo.gemspec
 - test/client_test.rb
@@ -147,9 +147,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/suo/client/errors.rb

@@ -1,7 +0,0 @@
-module Suo
-  module Client
-    module Errors
-      class FailedToAcquireLock < StandardError; end
-    end
-  end
-end