cycr 0.2.0 → 0.2.1

data/changelog.txt

@@ -1,3 +1,5 @@
+0.2.1
+- Introduce query cache
 0.2.0
 - Rake task for changelog
 - Support for Ruby 1.8 dropped

data/cycr.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ["README.rdoc"]
   s.add_development_dependency("rspec", ["~> 2.8.0"])
   s.add_development_dependency("em-synchrony", ["~> 1.0.0"])
+  s.add_dependency("ref", ["~> 1.0.0"])
 end

data/integration/client.rb

@@ -45,6 +45,20 @@ shared_examples Cyc::Client do
     @client.talk('(gather-predicate-extent-index #$minimizeExtent)').size.should > 100
   end
 
+  it "should allow to use cached results" do
+    @client.cache_enabled = true
+    start_time = Time.now
+    @client.specs(:Animal).size.should > 100
+    end_time = Time.now
+    duration1 = end_time - start_time
+    start_time = Time.now
+    100.times{ @client.specs(:Animal).size.should > 100}
+    end_time = Time.now
+    duration2 = end_time - start_time
+    duration2.should < duration1
+    @client.cache_enabled = false
+  end
+
 end
 
 describe Cyc::Client do

data/lib/cyc/cache.rb

@@ -0,0 +1,37 @@
+require 'ref'
+
+module Cyc
+  class Cache
+    def initialize
+      @soft_references = Ref::SoftValueMap.new
+      @hard_references = {}
+    end
+
+    # Get a value from cache.
+    def [](key)
+      if @hard_references.has_key?(key)
+        @hard_references[key]
+      else
+        @soft_references[key]
+      end
+    end
+
+    # Put a value for a given key to the cache.
+    def []=(key,value)
+      case value
+      when TrueClass,FalseClass,NilClass,Fixnum,Symbol
+        @soft_references.delete(key)
+        @hard_references[key] = value
+      else
+        @hard_references.delete(key)
+        @soft_references[key] = value
+      end
+    end
+
+    # Clear the cache.
+    def clear
+      @soft_references.clear
+      @hard_references.clear
+    end
+  end
+end

data/lib/cyc/client.rb

@@ -1,6 +1,7 @@
 require 'uri'
 require 'cyc/connection'
 require 'cyc/exception'
+require 'cyc/cache'
 
 module Cyc #:nodoc:
   # Author:: Aleksander Pohl (mailto:apohllo@o2.pl)
@@ -19,6 +20,14 @@ module Cyc #:nodoc:
     # If set to true, all communication with the server is logged
     # to standard output
     attr_accessor :debug
+    #
+    # If set to true, results of the queries are cached. This is
+    # turned off by default, since there is a functional-languages
+    # assumption, that the result for the same query is always the
+    # same, but this might not be true in case of Cyc (however
+    # highly probable). The cache is used only in the +talk+ call
+    # (and calls based on it -- i.e. direct Cyc calls, e.g. cyc.genls :Dog).
+    attr_accessor :cache_enabled
 
     # The +host+ the client connects to.
     attr_reader :host
@@ -46,6 +55,7 @@ module Cyc #:nodoc:
     # - +:host+ = +localhost+   server address
     # - +:port+ = +3601+        server port
     # - +:debug+ = +false+      initial debug flag
+    # - +:cache+ = +false+      initial cache enabled flag
     # - +:timeout+ = +0.2+      connection timeout in seconds
     # - +:url+ (String):        +cyc://host:port+ overrides +:host+, +:port+
     # - +:driver+ (Class) = Cyc::Connection::Socket  client connection driver class
@@ -75,6 +85,8 @@ 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
       @thread_safe = !!options[:thread_safe]
 
       if @thread_safe
@@ -137,8 +149,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)
-      receive_answer(options)
+      result = receive_answer(options)
+      if @cache_enabled
+        @cache[message] = result
+      end
+      result
     end
 
     # Sends the +message+ to the Cyc server and

data/lib/cyc/extensions.rb

@@ -27,6 +27,12 @@ class Fixnum
   end
 end
 
+class Proc
+  def to_cyc(raw=false)
+    self.call.to_s
+  end
+end
+
 module Cyc
   class LiteralString < String
     def to_cyc(raw=false)

data/lib/cyc/version.rb

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

data/lib/cycr.rb

@@ -9,3 +9,4 @@ require 'cyc/sexpr.rex'
 require 'cyc/symbol'
 require 'cyc/variable'
 require 'cyc/version'
+require 'cyc/cache'

data/spec/conversion.rb

@@ -0,0 +1,10 @@
+$:.unshift "lib"
+require 'cycr'
+
+describe Cyc do
+  describe "Ruby types conversions" do
+    it "should convert proc to literal string" do
+      lambda{ "#'null"}.to_cyc.should == "#'null"
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: cycr
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Aleksander Pohl
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-16 00:00:00 Z
+date: 2012-06-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -35,6 +35,17 @@ dependencies:
         version: 1.0.0
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: ref
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id003
 description: Ruby wrapper for (Open)Cyc server and ontology
 email: apohllo@o2.pl
 executables: []
@@ -53,6 +64,7 @@ files:
 - integration/client.rb
 - lib/cyc/assertion.rb
 - lib/cyc/builder.rb
+- lib/cyc/cache.rb
 - lib/cyc/client.rb
 - lib/cyc/collection.rb
 - lib/cyc/connection.rb
@@ -69,6 +81,7 @@ files:
 - lib/cyc/variable.rb
 - lib/cyc/version.rb
 - lib/cycr.rb
+- spec/conversion.rb
 - spec/parser.rb
 homepage: http://github.com/apohllo/cycr
 licenses: []
@@ -94,11 +107,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby client for the (Open)Cyc server
 test_files: 
 - spec/parser.rb
+- spec/conversion.rb
 - integration/client.rb
 - integration/assertion.rb
+has_rdoc: true