cycr 0.2.1 → 0.2.2

data/changelog.txt

@@ -1,3 +1,7 @@
+0.2.2
+- Fix invalid use of ? expression
+- Fix unscoped reference to Symbol in Cache
+- Thread-safe query cache
 0.2.1
 - Introduce query cache
 0.2.0

data/lib/cyc/cache.rb

@@ -1,3 +1,4 @@
+require 'thread'
 require 'ref'
 
 module Cyc
@@ -5,6 +6,31 @@ module Cyc
     def initialize
       @soft_references = Ref::SoftValueMap.new
       @hard_references = {}
+      @in_progress = {}
+      @lock = Mutex.new
+    end
+
+    # Get cached value of a key or generate new one using given block
+    def cached_value(key)
+      monitor = value = nil
+      @lock.synchronize do
+        if @hard_references.has_key?(key)
+          return @hard_references[key]
+        elsif (value = @soft_references[key])
+          return value
+        elsif (monitor = @in_progress[key])
+          monitor.wait(@lock)
+          return self[key]
+        end
+        @in_progress[key] = monitor = ConditionVariable.new
+      end
+      value = yield
+      @lock.synchronize do
+        self[key] = value
+        @in_progress.delete key
+        monitor.broadcast
+      end
+      value
     end
 
     # Get a value from cache.
@@ -19,7 +45,7 @@ module Cyc
     # Put a value for a given key to the cache.
     def []=(key,value)
       case value
-      when TrueClass,FalseClass,NilClass,Fixnum,Symbol
+      when TrueClass,FalseClass,NilClass,Fixnum,::Symbol
         @soft_references.delete(key)
         @hard_references[key] = value
       else
@@ -30,8 +56,10 @@ module Cyc
 
     # Clear the cache.
     def clear
-      @soft_references.clear
-      @hard_references.clear
+      @lock.synchronize do
+        @soft_references.clear
+        @hard_references.clear
+      end
     end
   end
 end

data/lib/cyc/client.rb

@@ -29,6 +29,11 @@ module Cyc #:nodoc:
     # (and calls based on it -- i.e. direct Cyc calls, e.g. cyc.genls :Dog).
     attr_accessor :cache_enabled
 
+    # The +cache+ instance of a client.
+    # You may call +clear+ on it to clear cache's content,
+    # You may copy it's reference to the other client instances.
+    attr_accessor :cache
+
     # The +host+ the client connects to.
     attr_reader :host
 
@@ -55,7 +60,7 @@ module Cyc #:nodoc:
     # - +:host+ = +localhost+   server address
     # - +:port+ = +3601+        server port
     # - +:debug+ = +false+      initial debug flag
-    # - +:cache+ = +false+      initial cache enabled flag
+    # - +:cache+ = +false+      initial cache enabled flag or external cache instance
     # - +:timeout+ = +0.2+      connection timeout in seconds
     # - +:url+ (String):        +cyc://host:port+ overrides +:host+, +:port+
     # - +:driver+ (Class) = Cyc::Connection::Socket  client connection driver class
@@ -85,8 +90,9 @@ module Cyc #:nodoc:
       @timeout = (options[:timeout] || 0.2).to_f
       @driver = options[:driver] || Connection.driver
       @debug = !!options[:debug]
-      @cache_enabled = !!options[:cache]
-      @cache = Cache.new
+      cache = options[:cache]
+      @cache_enabled = !!cache
+      @cache = cache.respond_to?(:cached_value) ? cache : Cache.new
       @thread_safe = !!options[:thread_safe]
 
       if @thread_safe
@@ -149,15 +155,15 @@ module Cyc #:nodoc:
 
     # Sends the +messsage+ to the Cyc server and returns a parsed answer.
     def talk(message, options={})
-      if @cache_enabled && @cache[message]
-        return @cache[message]
-      end
-      send_message(message)
-      result = receive_answer(options)
       if @cache_enabled
-        @cache[message] = result
+        @cache.cached_value(message) do
+          send_message(message)
+          receive_answer(options)
+        end
+      else
+        send_message(message)
+        receive_answer(options)
       end
-      result
     end
 
     # Sends the +message+ to the Cyc server and

data/lib/cyc/version.rb

@@ -1,3 +1,3 @@
 module Cyc
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -2,7 +2,7 @@
 name: cycr
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Aleksander Pohl
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-02 00:00:00 Z
+date: 2012-06-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec