suo 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 413b62af263af5a28c0fbf5691b30963f42f0883
-  data.tar.gz: 546c7fd3bac7b2222f6d9d2701a456c6a2aa6e36
+  metadata.gz: ef6a0837cc8be9a03a3767df546c630adf1e74cf
+  data.tar.gz: d2fefd52a16706479a3f62b4a89557ece8e74672
 SHA512:
-  metadata.gz: eca791c152ebf80a02307f7af951eb352b8891e1bf8ec75e674ca9db772c317df2bcdb63bc880f1c844a52f0246d0448aab6937bae9d914bf0c85c886714f61d
-  data.tar.gz: 721d0b259f9c87338227ec70e5d2a20b72672ab71d0402984c1e1afceb2dc71eaa3e274a50e1760ef4764220c0184a4994c0c37c6b4760579a346c91b55de6ab
+  metadata.gz: 4dc9fa8f2377e19efce5d6d4d009a145214360fd51efac442aaabcd9ba9077e49bdbad7828304c9aab9a273ad76b017c6fadce7bccf83c1d0897d31c63a0333d
+  data.tar.gz: a0de3ab597fc8d61fe6f47f2b239aeaa11baf9d6cde481481840f96a8f673150a9d10db13e53796cd552cafceb01fbedffaa4160228686b6396335444dbf64e5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.1
+
+- Fix bug when dealing with real-world Redis error conditions.
+
 ## 0.2.0
 
 - Refactor class methods into instance methods to simplify implementation.

data/lib/suo.rb

@@ -1,2 +1,16 @@
+require "securerandom"
+require "monitor"
+
+require "dalli"
+require "dalli/cas/client"
+
+require "redis"
+
+require "msgpack"
+
 require "suo/version"
-require "suo/clients"
+
+require "suo/errors"
+require "suo/client/base"
+require "suo/client/memcached"
+require "suo/client/redis"

data/lib/suo/client/base.rb

@@ -49,7 +49,7 @@ module Suo
           val, cas = get(key)
 
           if val.nil?
-            set_initial(key)
+            initial_set(key)
             next
           end
 
@@ -94,7 +94,7 @@ module Suo
           val, cas = get(key)
 
           if val.nil?
-            set_initial(key)
+            initial_set(key)
             next
           end
 
@@ -123,7 +123,7 @@ module Suo
         fail NotImplementedError
       end
 
-      def set_initial(key) # rubocop:disable Lint/UnusedMethodArgument
+      def initial_set(key) # rubocop:disable Lint/UnusedMethodArgument
         fail NotImplementedError
       end
 

data/lib/suo/client/memcached.rb

@@ -20,7 +20,7 @@ module Suo
         @client.set_cas(key, newval, cas)
       end
 
-      def set_initial(key)
+      def initial_set(key)
         @client.set(key, "")
       end
     end

data/lib/suo/client/redis.rb

@@ -21,7 +21,7 @@ module Suo
           multi.set(key, newval)
         end
 
-        ret[0] == "OK"
+        ret && ret[0] == "OK"
       end
 
       def synchronize(key)
@@ -32,7 +32,7 @@ module Suo
         @client.unwatch
       end
 
-      def set_initial(key)
+      def initial_set(key)
         @client.set(key, "")
       end
     end

data/lib/suo/version.rb

@@ -1,3 +1,3 @@
 module Suo
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/test/client_test.rb

@@ -10,7 +10,7 @@ module ClientTests
     end
   end
 
-  def test_class_single_resource_locking
+  def test_single_resource_locking
     lock1 = @client.lock(TEST_KEY, 1)
     refute_nil lock1
 
@@ -27,7 +27,7 @@ module ClientTests
     assert_equal false, locked
   end
 
-  def test_class_multiple_resource_locking
+  def test_multiple_resource_locking
     lock1 = @client.lock(TEST_KEY, 2)
     refute_nil lock1
 
@@ -72,8 +72,9 @@ module ClientTests
     output = Queue.new
     threads = []
 
-    threads << Thread.new { @client.lock(TEST_KEY, 2) { output << "One"; sleep 2 } }
-    threads << Thread.new { @client.lock(TEST_KEY, 2) { output << "Two"; sleep 2 } }
+    threads << Thread.new { @client.lock(TEST_KEY, 2) { output << "One"; sleep 0.5 } }
+    threads << Thread.new { @client.lock(TEST_KEY, 2) { output << "Two"; sleep 0.5 } }
+    sleep 0.1
     threads << Thread.new { @client.lock(TEST_KEY, 2) { output << "Three" } }
 
     threads.map(&:join)
@@ -86,10 +87,10 @@ module ClientTests
     ret.sort!
 
     assert_equal 0, output.size
-    assert_equal ["One", "Two"], ret
+    assert_equal %w(One Two), ret
   end
 
-  def test_instance_multiple_resource_locking
+  def test_block_multiple_resource_locking
     success_counter = Queue.new
     failure_counter = Queue.new
 
@@ -97,7 +98,7 @@ module ClientTests
 
     100.times.map do |i|
       Thread.new do
-        success = @client.lock(TEST_KEY, 50) do
+        success = client.lock(TEST_KEY, 50) do
           sleep(3)
           success_counter << i
         end
@@ -110,7 +111,7 @@ module ClientTests
     assert_equal 50, failure_counter.size
   end
 
-  def test_instance_multiple_resource_locking_longer_timeout
+  def test_block_multiple_resource_locking_longer_timeout
     success_counter = Queue.new
     failure_counter = Queue.new
 

data/test/test_helper.rb

@@ -6,4 +6,3 @@ require "minitest/autorun"
 require "minitest/benchmark"
 
 ENV["SUO_TEST"] = "true"
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: suo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Nick Elser
@@ -131,7 +131,6 @@ files:
 - lib/suo/client/base.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

data/lib/suo/clients.rb

@@ -1,14 +0,0 @@
-require "securerandom"
-require "monitor"
-
-require "dalli"
-require "dalli/cas/client"
-
-require "redis"
-
-require "msgpack"
-
-require "suo/errors"
-require "suo/client/base"
-require "suo/client/memcached"
-require "suo/client/redis"