cycr 0.2.5 → 0.2.6

data/changelog.txt

@@ -1,3 +1,5 @@
+0.2.6
+- fix deadlock in cache
 0.2.5
 - Escape backslash and quote in string literals
 0.2.3

data/integration/client.rb

@@ -117,7 +117,7 @@ if defined? Cyc::Connection::SynchronyDriver
     it "should have consistent results running long query in separate fibers" do
       @fiber = Fiber.current
       done = 0
-      size = ('A'..'Z').to_a.each do |char|
+      size = ('A'..'C').to_a.each do |char|
         Fiber.new do
           result_size = @client.fi_complete(char).each do |value|
             value.to_s[0].upcase.should == char
@@ -154,7 +154,7 @@ describe "client thread concurrency" do
   it "should have consistent results running long query in separate threads" do
     results = {}
     mutex = Mutex.new
-    ('A'..'Z').map do |char|
+    ('A'..'C').map do |char|
       Thread.new do
         Thread.pass
         result = @client.fi_complete char

data/lib/cyc/cache.rb

@@ -24,15 +24,28 @@ module Cyc
         end
         @in_progress[key] = monitor = ConditionVariable.new
       end
-      value = yield
-      @lock.synchronize do
-        self[key] = value
-        @in_progress.delete key
-        monitor.broadcast
+      begin
+        value = yield
+        value_set = true
+      ensure
+        @lock.synchronize do
+          self[key] = value if value_set
+          @in_progress.delete key
+          monitor.broadcast
+        end
       end
       value
     end
 
+    # Clear the cache.
+    def clear
+      @lock.synchronize do
+        @soft_references.clear
+        @hard_references.clear
+      end
+    end
+
+    private
     # Get a value from cache.
     def [](key)
       if @hard_references.has_key?(key)
@@ -53,13 +66,5 @@ module Cyc
         @soft_references[key] = value
       end
     end
-
-    # Clear the cache.
-    def clear
-      @lock.synchronize do
-        @soft_references.clear
-        @hard_references.clear
-      end
-    end
   end
 end

data/lib/cyc/version.rb

@@ -1,3 +1,3 @@
 module Cyc
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cycr
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -126,3 +126,4 @@ test_files:
 - spec/conversion.rb
 - integration/assertion.rb
 - integration/client.rb
+has_rdoc: true