Merge branch 'develop' into xapian-dcabo

Conflicts:
	spec/models/xapian_spec.rb

1 files changed, 41 insertions, 0 deletions

diff --git a/vendor/gems/rdoc-2.4.3/lib/rdoc/cache.rb b/vendor/gems/rdoc-2.4.3/lib/rdoc/cache.rb
new file mode 100644
index 000000000..bdd830a13
--- /dev/null
+++ b/vendor/gems/rdoc-2.4.3/lib/rdoc/cache.rb
@@ -0,0 +1,41 @@
+require 'thread'
+require 'singleton'
+
+##
+# A generic, thread-safe in-memory cache. It's used for caching
+# RDoc::TemplatePage objects when generating RDoc output.
+
+class RDoc::Cache
+
+  include Singleton
+
+  ##
+  # Creates a new, empty cache
+
+  def initialize
+    @contents = {}
+    @lock = Mutex.new
+  end
+
+  ##
+  # Checks whether there's a value in the cache with key +key+. If so, then
+  # that value will be returned. Otherwise, the given block will be run, and
+  # its return value will be put into the cache, and returned.
+
+  def cache(key)
+    @lock.synchronize do
+      @contents[key] ||= yield
+    end
+  end
+
+  ##
+  # Clears the contents of the cache
+
+  def clear
+    @lock.synchronize do
+      @contents.clear
+    end
+  end
+
+end
+